From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17159 invoked by alias); 24 Oct 2016 22:26:06 -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 17141 invoked by uid 89); 24 Oct 2016 22:26:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 24 Oct 2016 22:26:04 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 69BB7335F95; Mon, 24 Oct 2016 22:26:03 +0000 (UTC) Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9OMQ1Z4000518; Mon, 24 Oct 2016 18:26:02 -0400 Subject: Re: [PATCH] Fix potential NULL pointer dereference To: Luis Machado , gdb-patches@sourceware.org References: <1477345938-32287-1-git-send-email-lgustavo@codesourcery.com> From: Pedro Alves Message-ID: <9acb4532-8f30-b9d3-697a-9c9542ca1178@redhat.com> Date: Mon, 24 Oct 2016 22:26:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <1477345938-32287-1-git-send-email-lgustavo@codesourcery.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2016-10/txt/msg00671.txt.bz2 On 10/24/2016 10:52 PM, Luis Machado wrote: > diff --git a/gdb/exec.c b/gdb/exec.c > index 67ecc63..5eeac44 100644 > --- a/gdb/exec.c > +++ b/gdb/exec.c > @@ -221,13 +221,20 @@ exec_file_locate_attach (int pid, int defer_bp_reset, int from_tty) > } > CATCH (err, RETURN_MASK_ERROR) > { > + const char *msg; > + > if (err.message != NULL) > - warning ("%s", err.message); > + { > + warning ("%s", err.message); > + msg = err.message; > + } > + else > + msg = ""; > This is overcomplicating a bit, IMO. > prev_err = err; > > /* Save message so it doesn't get trashed by the catch below. */ > - prev_err.message = xstrdup (err.message); > + prev_err.message = xstrdup (msg); I think this one liner: + if (err.message != NULL) prev_err.message = xstrdup (err.message); would have the same effect, since exception_print_same handles NULL ex.message? Thanks, Pedro Alves