From patchwork Thu Mar 3 21:59:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Snyder X-Patchwork-Id: 85345 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id AEEFEB7105 for ; Fri, 4 Mar 2011 09:00:25 +1100 (EST) Received: (qmail 2036 invoked by alias); 3 Mar 2011 22:00:11 -0000 Received: (qmail 1999 invoked by uid 22791); 3 Mar 2011 22:00:09 -0000 X-SWARE-Spam-Status: No, hits=-5.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, TW_CP, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp-outbound-1.vmware.com (HELO smtp-outbound-1.vmware.com) (65.115.85.69) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 03 Mar 2011 21:59:59 +0000 Received: from mailhost2.vmware.com (mailhost2.vmware.com [10.16.67.167]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id B1EE5134D5; Thu, 3 Mar 2011 13:59:57 -0800 (PST) Received: from msnyder-server.eng.vmware.com (promd-2s-dhcp138.eng.vmware.com [10.20.124.138]) by mailhost2.vmware.com (Postfix) with ESMTP id A7DAD8EE04; Thu, 3 Mar 2011 13:59:57 -0800 (PST) Message-ID: <4D700F5D.2030109@vmware.com> Date: Thu, 03 Mar 2011 13:59:57 -0800 From: Michael Snyder User-Agent: Thunderbird 2.0.0.24 (X11/20101201) MIME-Version: 1.0 To: Jakub Jelinek CC: "dj@redhat.com" , "gdb-patches@sourceware.org" , "gcc-patches@gcc.gnu.org" Subject: Re: libiberty/cplus-dem.c, ada-demangle: plug memory leak. References: <4D70061C.10904@vmware.com> <20110303213008.GY30899@tyan-ft48-01.lab.bos.redhat.com> In-Reply-To: <20110303213008.GY30899@tyan-ft48-01.lab.bos.redhat.com> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Jakub Jelinek wrote: > On Thu, Mar 03, 2011 at 01:20:28PM -0800, Michael Snyder wrote: >> 2011-03-03 Michael Snyder >> >> * libiberty/cplus-dem.c (ada_demangle): Stop memory leak. >> Also fix a one line indent problem. > > No libiberty/ in libiberty/ChangeLog. > >> @@ -1129,10 +1129,11 @@ ada_demangle (const char *mangled, int o >> >> unknown: >> len0 = strlen (mangled); >> + xfree (demangled); >> demangled = XNEWVEC (char, len0 + 3); > > xfree isn't ever used in libiberty/*, use either free, or > XDELETE/XDELETEVEC. In fact, it seems to be defined only in gdb, > making cplus-dem.c dependent on gdb is obviously a wrong thing. Thanks for the review. How's this? 2011-03-03 Michael Snyder * cplus-dem.c (ada_demangle): Stop memory leak. Also fix a one line indent problem. Index: cplus-dem.c =================================================================== RCS file: /cvs/src/src/libiberty/cplus-dem.c,v retrieving revision 1.52 diff -u -p -u -p -r1.52 cplus-dem.c --- cplus-dem.c 3 Jan 2011 21:05:58 -0000 1.52 +++ cplus-dem.c 3 Mar 2011 21:59:08 -0000 @@ -883,7 +883,7 @@ ada_demangle (const char *mangled, int o int len0; const char* p; char *d; - char *demangled; + char *demangled = NULL; /* Discard leading _ada_, which is used for library level subprograms. */ if (strncmp (mangled, "_ada_", 5) == 0) @@ -1129,10 +1129,12 @@ ada_demangle (const char *mangled, int o unknown: len0 = strlen (mangled); + if (demangled != NULL) + free (demangled); demangled = XNEWVEC (char, len0 + 3); if (mangled[0] == '<') - strcpy (demangled, mangled); + strcpy (demangled, mangled); else sprintf (demangled, "<%s>", mangled);