From owner-svn-src-all@FreeBSD.ORG  Sat Aug  9 12:25:07 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 97BE91BB
 for <svn-src-all@freebsd.org>; Sat,  9 Aug 2014 12:25:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6D45F24E2
 for <svn-src-all@freebsd.org>; Sat,  9 Aug 2014 12:25:07 +0000 (UTC)
Received: from dim (uid 1236) (envelope-from dim@FreeBSD.org) id 201e
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Sat, 09 Aug 2014 12:25:07 +0000
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 9 Aug 2014 12:25:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269750 - head/lib/libproc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e61323.201e.1f54ad21@svn.freebsd.org>
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Sat, 09 Aug 2014 12:25:07 -0000

Author: dim
Date: Sat Aug  9 12:25:06 2014
New Revision: 269750
URL: http://svnweb.freebsd.org/changeset/base/269750

Log:
  In r268463, I misplaced a return in demangle(), causing the function to
  erroneously skip symbols that were not mangled at all.  Fix this by
  moving the return into the preceding if block.
  
  While here, simplify the code by letting __cxa_demangle() allocate the
  needed space for the demangled symbol.  This also fixes a memory leak,
  which would occur whenever __cxa_demangle() failed.
  
  Reported by:	pgj
  MFC after:	3 days

Modified:
  head/lib/libproc/proc_sym.c

Modified: head/lib/libproc/proc_sym.c
==============================================================================
--- head/lib/libproc/proc_sym.c	Sat Aug  9 09:13:10 2014	(r269749)
+++ head/lib/libproc/proc_sym.c	Sat Aug  9 12:25:06 2014	(r269750)
@@ -57,21 +57,15 @@ demangle(const char *symbol, char *buf, 
 {
 #ifndef NO_CXA_DEMANGLE
 	char *dembuf;
-	size_t demlen;
 
 	if (symbol[0] == '_' && symbol[1] == 'Z' && symbol[2]) {
-		dembuf = malloc(len);
-		if (!dembuf)
-			goto fail;
-		demlen = len;
-		dembuf = __cxa_demangle(symbol, dembuf, &demlen, NULL);
+		dembuf = __cxa_demangle(symbol, NULL, NULL, NULL);
 		if (!dembuf)
 			goto fail;
 		strlcpy(buf, dembuf, len);
 		free(dembuf);
+		return;
 	}
-
-	return;
 fail:
 #endif /* NO_CXA_DEMANGLE */
 	strlcpy(buf, symbol, len);