From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 91085 invoked by alias); 22 Mar 2017 17:52:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 90980 invoked by uid 89); 22 Mar 2017 17:52:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.0 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy= X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0b-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.158.5) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 22 Mar 2017 17:52:30 +0000 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v2MHi7pL140653 for ; Wed, 22 Mar 2017 13:52:30 -0400 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0b-001b2d01.pphosted.com with ESMTP id 29b9vr36vg-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 22 Mar 2017 13:52:30 -0400 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 22 Mar 2017 17:52:28 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 22 Mar 2017 17:52:26 -0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v2MHqPIX17891592; Wed, 22 Mar 2017 17:52:25 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B688CAE045; Wed, 22 Mar 2017 17:51:56 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9794BAE056; Wed, 22 Mar 2017 17:51:56 +0000 (GMT) Received: from ThinkPad (unknown [9.152.212.148]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 22 Mar 2017 17:51:56 +0000 (GMT) Date: Wed, 22 Mar 2017 17:52:00 -0000 From: Philipp Rudo To: Pedro Alves Cc: gdb-patches@sourceware.org Subject: Re: [PATCH] Fix memory leak in python.c:do_start_initialization In-Reply-To: References: <20170322131132.98976-1-prudo@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 17032217-0020-0000-0000-0000032B4BC8 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17032217-0021-0000-0000-000040E9AC3E Message-Id: <20170322185224.40a2a37c@ThinkPad> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-03-22_15:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703220154 X-IsSubscribed: yes X-SW-Source: 2017-03/txt/msg00407.txt.bz2 On Wed, 22 Mar 2017 15:19:16 +0000 Pedro Alves wrote: > Hi Philipp, > > Thanks. > > On 03/22/2017 01:11 PM, Philipp Rudo wrote: > > > diff --git a/gdb/python/python.c b/gdb/python/python.c > > index 73fb3d0..6b16613 100644 > > --- a/gdb/python/python.c > > +++ b/gdb/python/python.c > > @@ -1535,7 +1535,7 @@ extern initialize_file_ftype > > _initialize_python; static bool > > do_start_initialization () > > { > > - char *progname; > > + char *progname, *libdir; > > #ifdef IS_PY3K > > int i; > > size_t progsize, count; > > @@ -1550,8 +1550,10 @@ do_start_initialization () > > /foo/bin/python > > /foo/lib/pythonX.Y/... > > This must be done before calling Py_Initialize. */ > > - progname = concat (ldirname (python_libdir), SLASH_STRING, "bin", > > + libdir = ldirname (python_libdir); > > + progname = concat (libdir, SLASH_STRING, "bin", > > SLASH_STRING, "python", (char *) NULL); > > + xfree (libdir); > > Let's restrict the new variable to the #if block that needs it. > I.e., declare the variable where is initialized, like: > > const char *libdir = ldirname (python_libdir); > progname = concat (libdir, SLASH_STRING, "bin", > > OK with that change. Please push. Shall I fix it? Or do we go with your ldirname fix? > > Note, you could have used reconcat instead of concat, avoiding the > xfree call, and maybe one reallocation, but that's hardly an > issue here. Thought about using reconcat. But in the end reconcat would have done the same -- calling free on libdir. Thats why I decided it would be better readable when not hidden. > Perhaps better overall would be to make ldirname return a std::string > and eliminate these leaks "by design". It'd get rid of several > make_cleanup calls throughout too. I'll give that a quick try. Or maybe combining all path handling in a 'class gdbpath'. But make ldirname return std::string definitely is an advantage. > > Thanks, > Pedro Alves >