From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24578 invoked by alias); 9 May 2013 18:52:10 -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 24536 invoked by uid 89); 9 May 2013 18:52:10 -0000 X-Spam-SWARE-Status: No, score=-7.7 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 09 May 2013 18:52:09 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r49Iq8g2005848 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 9 May 2013 14:52:08 -0400 Received: from barimba (ovpn-113-133.phx2.redhat.com [10.3.113.133]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r49Iq6Rq024581 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Thu, 9 May 2013 14:52:07 -0400 From: Tom Tromey From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 29/40] fix in solib-aix.c In-Reply-To: References: Message-Id: <29862d1dbc5bb0ffb1057fe4775efc0d0c83bdf0.1368124285.git.tromey@redhat.com> Date: Thu, 09 May 2013 18:52:00 -0000 MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-05/txt/msg00343.txt.bz2 solib_aix_bfd_open has an early "return" that doesn't run cleanups. This fixes the problem by dropping the null_cleanup and using a later cleanup as the master cleanup for the function. * solib-aix.c (solib_aix_bfd_open): Don't use a null cleanup for 'cleanup'; instead use a later one. --- gdb/solib-aix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c index 9fa5de9..95b1ce1 100644 --- a/gdb/solib-aix.c +++ b/gdb/solib-aix.c @@ -643,7 +643,7 @@ solib_aix_bfd_open (char *pathname) int filename_len; char *member_name; bfd *archive_bfd, *object_bfd; - struct cleanup *cleanup = make_cleanup (null_cleanup, NULL); + struct cleanup *cleanup; if (pathname[path_len - 1] != ')') return solib_bfd_open (pathname); @@ -661,7 +661,7 @@ solib_aix_bfd_open (char *pathname) filename_len = sep - pathname; filename = xstrprintf ("%.*s", filename_len, pathname); - make_cleanup (xfree, filename); + cleanup = make_cleanup (xfree, filename); member_name = xstrprintf ("%.*s", path_len - filename_len - 2, sep + 1); make_cleanup (xfree, member_name); -- 1.8.1.4