From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 842 invoked by alias); 29 Nov 2013 15:05:28 -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 812 invoked by uid 89); 29 Nov 2013 15:05:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.3 required=5.0 tests=AWL,BAYES_50,RDNS_NONE,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from Unknown (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 29 Nov 2013 15:05:25 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rATF5G23032033 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 29 Nov 2013 10:05:16 -0500 Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rATF5Esj001254; Fri, 29 Nov 2013 10:05:15 -0500 Message-ID: <5298AD29.5020503@redhat.com> Date: Fri, 29 Nov 2013 15:27:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Hui Zhu CC: gdb-patches ml Subject: [pushed] Plug target side conditions and commands leaks (was: Re: [PATCH] Let gdbserver doesn't tell GDB it support target-side breakpoint conditions and commands if it doesn't support 'Z' packet) References: <5265022F.8060203@mentor.com> <52654A2C.9010202@redhat.com> <529707C7.4040504@mentor.com> In-Reply-To: <529707C7.4040504@mentor.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-SW-Source: 2013-11/txt/msg00936.txt.bz2 On 11/28/2013 09:07 AM, Hui Zhu wrote: > --- a/gdb/remote.c > +++ b/gdb/remote.c > @@ -8187,6 +8187,14 @@ static int > remote_insert_breakpoint (struct gdbarch *gdbarch, > struct bp_target_info *bp_tgt) > { > + int have_target_target_side_commands = 0; > + > + /* Check bp_tgt->tcommands in this place because > + remote_add_target_side_commands will release bp_tgt->tcommands. */ Well, that's quite fragile, isn't it. If Z packets have been found to not be supported, then nothing is releasing bp_tgt->tcommands (and bp_tgt->conditions). > + > + if (!VEC_empty (agent_expr_p, bp_tgt->tcommands)) > + have_target_target_side_commands = 1; > + I've pushed this patch below. ---------- Plug target side conditions and commands leaks. The memory management of bp_location->target_info.conditions|tcommands is currently a little fragile. If the target reports support for target conditions or commands, and then target side breakpoint support is disabled, or some error is thrown before remote_add_target_side_XXX is called, we'll leak these lists. This patch makes us free these lists when the locations are deleted, and also, just before recreating the commands|conditions lists. Tested on x86_64 Fedora 17, native and gdbserver. gdb/ 2013-11-29 Pedro Alves * breakpoint.c (build_target_condition_list): Release previous conditions. (build_target_command_list): Release previous commands. (bp_location_dtor): Release target conditions and commands. * remote.c (remote_add_target_side_condition): Don't release conditions. (remote_add_target_side_commands): Don't release commands. --- gdb/ChangeLog | 10 ++++++++++ gdb/breakpoint.c | 9 +++++++++ gdb/remote.c | 4 ---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e86f5c3..5f0626c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2013-11-29 Pedro Alves + + * breakpoint.c (build_target_condition_list): Release previous + conditions. + (build_target_command_list): Release previous commands. + (bp_location_dtor): Release target conditions and commands. + * remote.c (remote_add_target_side_condition): Don't release + conditions. + (remote_add_target_side_commands): Don't release commands. + 2013-11-29 Yao Qi Pedro Alves diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 897b664..111660f 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -2096,6 +2096,9 @@ build_target_condition_list (struct bp_location *bl) int modified = bl->needs_update; struct bp_location *loc; + /* Release conditions left over from a previous insert. */ + VEC_free (agent_expr_p, bl->target_info.conditions); + /* This is only meaningful if the target is evaluating conditions and if the user has opted for condition evaluation on the target's @@ -2287,6 +2290,9 @@ build_target_command_list (struct bp_location *bl) int modified = bl->needs_update; struct bp_location *loc; + /* Release commands left over from a previous insert. */ + VEC_free (agent_expr_p, bl->target_info.tcommands); + /* For now, limit to agent-style dprintf breakpoints. */ if (bl->owner->type != bp_dprintf || strcmp (dprintf_style, dprintf_style_agent) != 0) @@ -12734,6 +12740,9 @@ bp_location_dtor (struct bp_location *self) if (self->cond_bytecode) free_agent_expr (self->cond_bytecode); xfree (self->function_name); + + VEC_free (agent_expr_p, self->target_info.conditions); + VEC_free (agent_expr_p, self->target_info.tcommands); } static const struct bp_location_ops bp_location_ops = diff --git a/gdb/remote.c b/gdb/remote.c index 186c058..be54450 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -8151,8 +8151,6 @@ remote_add_target_side_condition (struct gdbarch *gdbarch, buf = pack_hex_byte (buf, aexpr->buf[i]); *buf = '\0'; } - - VEC_free (agent_expr_p, bp_tgt->conditions); return 0; } @@ -8183,8 +8181,6 @@ remote_add_target_side_commands (struct gdbarch *gdbarch, buf = pack_hex_byte (buf, aexpr->buf[i]); *buf = '\0'; } - - VEC_free (agent_expr_p, bp_tgt->tcommands); } /* Insert a breakpoint. On targets that have software breakpoint