From owner-svn-src-all@FreeBSD.ORG  Fri Sep  7 02:38:08 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F34531065672;
	Fri,  7 Sep 2012 02:38:07 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A2E98FC16;
	Fri,  7 Sep 2012 02:38:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q872c7K0023676;
	Fri, 7 Sep 2012 02:38:07 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q872c7E6023674;
	Fri, 7 Sep 2012 02:38:07 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201209070238.q872c7E6023674@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 7 Sep 2012 02:38:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240182 - head/lib/libproc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Sep 2012 02:38:08 -0000

Author: rpaulo
Date: Fri Sep  7 02:38:07 2012
New Revision: 240182
URL: http://svn.freebsd.org/changeset/base/240182

Log:
  When calling the C++ demangler, make sure to free the returned buffer,
  which might have been reallocated.
  
  Pointed out by:	stefanf

Modified:
  head/lib/libproc/proc_sym.c

Modified: head/lib/libproc/proc_sym.c
==============================================================================
--- head/lib/libproc/proc_sym.c	Fri Sep  7 01:33:25 2012	(r240181)
+++ head/lib/libproc/proc_sym.c	Fri Sep  7 02:38:07 2012	(r240182)
@@ -51,6 +51,26 @@ extern char *__cxa_demangle(const char *
 static void	proc_rdl2prmap(rd_loadobj_t *, prmap_t *);
 
 static void
+demangle(const char *symbol, char *buf, size_t len)
+{
+	char *dembuf;
+	size_t demlen = len;
+
+	dembuf = malloc(len);
+	if (!dembuf)
+		goto fail;
+	dembuf = __cxa_demangle(symbol, dembuf, &demlen, NULL);
+	if (!dembuf)
+		goto fail;
+	strlcpy(buf, dembuf, len);
+	free(dembuf);
+
+	return;
+fail:
+	strlcpy(buf, symbol, len);
+}
+
+static void
 proc_rdl2prmap(rd_loadobj_t *rdl, prmap_t *map)
 {
 	map->pr_vaddr = rdl->rdl_saddr;
@@ -268,9 +288,8 @@ proc_addr2sym(struct proc_handle *p, uin
 		if (addr >= rsym && addr <= (rsym + sym.st_size)) {
 			s = elf_strptr(e, dynsymstridx, sym.st_name);
 			if (s) {
-				if (strlen(s) > 2 && 
-				    s[0] == '_' && s[1] == 'Z')
-					__cxa_demangle(s, name, &namesz, NULL);
+				if (s[0] == '_' && s[1] == 'Z' && s[2])
+					demangle(s, name, namesz);
 				else
 					strlcpy(name, s, namesz);
 				memcpy(symcopy, &sym, sizeof(sym));
@@ -308,9 +327,8 @@ symtab:
 		if (addr >= rsym && addr <= (rsym + sym.st_size)) {
 			s = elf_strptr(e, symtabstridx, sym.st_name);
 			if (s) {
-				if (strlen(s) > 2 && 
-				    s[0] == '_' && s[1] == 'Z')
-					__cxa_demangle(s, name, &namesz, NULL);
+				if (s[0] == '_' && s[1] == 'Z' && s[2])
+					demangle(s, name, namesz);
 				else
 					strlcpy(name, s, namesz);
 				memcpy(symcopy, &sym, sizeof(sym));