From patchwork Sun Nov 25 23:04:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Waroquiers X-Patchwork-Id: 30305 Received: (qmail 34644 invoked by alias); 25 Nov 2018 23:05:01 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 34609 invoked by uid 89); 25 Nov 2018 23:05:00 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-27.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=throws X-HELO: mailsec110.isp.belgacom.be Received: from mailsec110.isp.belgacom.be (HELO mailsec110.isp.belgacom.be) (195.238.20.106) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 25 Nov 2018 23:04:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skynet.be; i=@skynet.be; q=dns/txt; s=securemail; t=1543187099; x=1574723099; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=e184R3VoEhGA5tayhl2Z7rZID0ZTuxeJDG9lmULKXJw=; b=j6oTWkBlLFWNp0HRgYgQNqiwX1UHyuIVkvLc4sjwEYLi/EPHQqK55+Vh iJY/uRAJjI7XPBOYumzHzmXy1WdoKQ==; Received: from 184.205-67-87.adsl-dyn.isp.belgacom.be (HELO md.home) ([87.67.205.184]) by relay.skynet.be with ESMTP/TLS/DHE-RSA-AES128-GCM-SHA256; 26 Nov 2018 00:04:57 +0100 From: Philippe Waroquiers To: gdb-patches@sourceware.org Cc: Philippe Waroquiers Subject: [RFAv2] Fix leak in linespec parser. Date: Mon, 26 Nov 2018 00:04:51 +0100 Message-Id: <20181125230451.6036-1-philippe.waroquiers@skynet.be> MIME-Version: 1.0 X-IsSubscribed: yes Valgrind reports the below leak. linespec_parser_new allocates a std::vector at line 2756, and stores the pointer to this vector in PARSER_RESULT (parser)->file_symtabs. At 3 different places in linespec.c, another std::vector is assigned to a linespec->file_symtabs, without first deleting the current value. The leak is fixed by delete-ing linespec->file_symtabs before assigning a new value to it, at 3 different places. At one of these places, declare a symtab_vector_up r, so as to do the delete of the previous value once a new value has been properly built. Tested on debian/amd64, + a bunch of tests re-run under valgrind (including the test that throws an error). Ok to push ? gdb/ChangeLog 2018-11-25 Philippe Waroquiers * linespec.c (create_sals_line_offset): Fix leak by deleting previous value before assigning new value. (convert_explicit_location_to_linespec): First build the symtab_vector_up r. Then likewise. (parse_linespec): Likewise. ==798== VALGRIND_GDB_ERROR_BEGIN ==798== 32 (24 direct, 8 indirect) bytes in 1 blocks are definitely lost in loss record 447 of 3,143 ==798== at 0x4C2C48C: operator new(unsigned long) (vg_replace_malloc.c:334) ==798== by 0x51D401: linespec_parser_new(ls_parser*, int, language_defn const*, program_space*, symtab*, int, linespec_result*) (linespec.c:2756) ==798== by 0x524BF7: decode_line_full(event_location const*, int, program_space*, symtab*, int, linespec_result*, char const*, char const*) (linespec.c:3271) ==798== by 0x3E8893: parse_breakpoint_sals(event_location const*, linespec_result*) (breakpoint.c:9067) ==798== by 0x3E4E7F: create_breakpoint(gdbarch*, event_location const*, char const*, int, char const*, int, int, bptype, int, auto_boolean, breakpoint_ops const*, int, int, int, unsigned int) (breakpoint.c:9248) ==798== by 0x3E55F5: break_command_1(char const*, int, int) (breakpoint.c:9434) ==798== by 0x40BA68: cmd_func(cmd_list_element*, char const*, int) (cli-decode.c:1888) ==798== by 0x665300: execute_command(char const*, int) (top.c:630) ... --- gdb/linespec.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gdb/linespec.c b/gdb/linespec.c index 00f59f9c28..567211f1de 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -2117,8 +2117,9 @@ create_sals_line_offset (struct linespec_state *self, set_default_source_symtab_and_line (); initialize_defaults (&self->default_symtab, &self->default_line); fullname = symtab_to_fullname (self->default_symtab); - symtab_vector_up r = - collect_symtabs_from_filename (fullname, self->search_pspace); + symtab_vector_up r + = collect_symtabs_from_filename (fullname, self->search_pspace); + delete ls->file_symtabs; ls->file_symtabs = r.release (); use_default = 1; } @@ -2401,9 +2402,11 @@ convert_explicit_location_to_linespec (struct linespec_state *self, { TRY { - result->file_symtabs + symtab_vector_up r = symtabs_from_filename (source_filename, - self->search_pspace).release (); + self->search_pspace); + delete result->file_symtabs; + result->file_symtabs = r.release (); } CATCH (except, RETURN_MASK_ERROR) { @@ -2630,6 +2633,7 @@ parse_linespec (linespec_parser *parser, const char *arg, symtab_vector_up r = symtabs_from_filename (user_filename.get (), PARSER_STATE (parser)->search_pspace); + delete PARSER_RESULT (parser)->file_symtabs; PARSER_RESULT (parser)->file_symtabs = r.release (); } CATCH (ex, RETURN_MASK_ERROR)