From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11276 invoked by alias); 29 Apr 2008 18:30:26 -0000 Received: (qmail 11266 invoked by uid 22791); 29 Apr 2008 18:30:25 -0000 X-Spam-Check-By: sourceware.org Received: from main.gmane.org (HELO ciao.gmane.org) (80.91.229.2) by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 29 Apr 2008 18:30:05 +0000 Received: from root by ciao.gmane.org with local (Exim 4.43) id 1JquaY-0007Si-Kv for gdb-patches@sources.redhat.com; Tue, 29 Apr 2008 18:30:02 +0000 Received: from enigma.qnx.com ([209.226.137.106]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 29 Apr 2008 18:30:02 +0000 Received: from aristovski by enigma.qnx.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 29 Apr 2008 18:30:02 +0000 To: gdb-patches@sources.redhat.com From: Aleksandar Ristovski Subject: [patch] memleak in catch catch Date: Tue, 29 Apr 2008 20:37:00 -0000 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------090507090609070602030504" User-Agent: Thunderbird 2.0.0.12 (Windows/20080213) X-IsSubscribed: yes 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 X-SW-Source: 2008-04/txt/msg00672.txt.bz2 This is a multi-part message in MIME format. --------------090507090609070602030504 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 519 Hello, A trivial patch to fix memory leak in handle_gnu_v3_exceptions... this is probably going to change soon to allow setting catchpoints before program starts, but still. Thanks, Aleksandar Ristovski QNX Software Systems ChangeLog: * breakpoint.c (struct decode_line_args): New structure for passing arguments to decode_line_1. (call_decode_line_1): New function. (handle_gnu_v3_exceptions): Call decode_line_1 via catch_exception and the new call_decode_line_1 function. Free allocated string on failure. --------------090507090609070602030504 Content-Type: text/plain; name="breakpoint.c.memleak.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="breakpoint.c.memleak.diff" Content-length: 1590 Index: gdb/breakpoint.c =================================================================== RCS file: /cvs/src/src/gdb/breakpoint.c,v retrieving revision 1.316 diff -u -p -r1.316 breakpoint.c --- gdb/breakpoint.c 26 Apr 2008 05:43:45 -0000 1.316 +++ gdb/breakpoint.c 29 Apr 2008 18:20:24 -0000 @@ -6561,6 +6561,19 @@ static struct breakpoint_ops gnu_v3_exce print_mention_exception_catchpoint }; +struct decode_line_args +{ + char **argptr; + struct symtabs_and_lines *sals; +}; + +static void +call_decode_line_1 (struct ui_out *ui_out, void *arg) +{ + struct decode_line_args *dlargs = arg; + *dlargs->sals = decode_line_1 (dlargs->argptr, 1, NULL, 0, NULL, NULL); +} + static int handle_gnu_v3_exceptions (int tempflag, char *cond_string, enum exception_event_kind ex_event, int from_tty) @@ -6568,18 +6581,23 @@ handle_gnu_v3_exceptions (int tempflag, char *trigger_func_name, *nameptr; struct symtabs_and_lines sals; struct breakpoint *b; + struct decode_line_args dlargs = { &nameptr, &sals }; + struct gdb_exception e; + sals.nelts = 0; + if (ex_event == EX_EVENT_CATCH) trigger_func_name = xstrdup ("__cxa_begin_catch"); else trigger_func_name = xstrdup ("__cxa_throw"); nameptr = trigger_func_name; - sals = decode_line_1 (&nameptr, 1, NULL, 0, NULL, NULL); + e = catch_exception (uiout, call_decode_line_1, + &dlargs, RETURN_MASK_ERROR); if (sals.nelts == 0) { xfree (trigger_func_name); - return 0; + throw_exception (e); } b = set_raw_breakpoint (sals.sals[0], bp_breakpoint); --------------090507090609070602030504--