From: Aaron Merey <amerey@redhat.com>
To: gdb-patches@sourceware.org, simark@simark.ca, cbiesinger@google.com
Subject: Re: [PATCH] gdb: Check for nullptr when computing srcpath
Date: Thu, 27 Feb 2020 22:12:00 -0000 [thread overview]
Message-ID: <20200227221156.1248760-1-amerey@redhat.com> (raw)
In-Reply-To: <CAPTJ0XE7Wdq0YtbmbHPiRML9LJBObSXO6Xzcuyb7ovfgQjP3ZA@mail.gmail.com>
On Thu, Feb 27, 2020 at 2:18 PM Simon Marchi <simark@simark.ca> wrote:
> Please provide in the commit message an explanation of what this fixes, including
> how to reproduce the crash. Since this fixes the execution of an existing test
> case, you can include the "make check" command line used to run it, like:
>
> make check TESTS="gdb.dwarf2/dw2-ranges-base"
Fixed.
> Also, do you think you'd be able to send your patches using git-send-email? That makes
> it much easier to read and comment on.
Sure.
On Thu, Feb 27, 2020 at 2:33 PM Christian Biesinger <cbiesinger@google.com> wrote:
> + if (build_id != nullptr && srcpath.size () > 0)
>
> I usually prefer !srcpath.empty ()
Fixed.
Aaron
From d048f84f027006782cd96dc66a10477ed5a78243 Mon Sep 17 00:00:00 2001
From: Aaron Merey <amerey@redhat.com>
Date: Thu, 27 Feb 2020 15:51:11 -0500
Subject: [PATCH] gdb: Check for nullptr when computing srcpath
This fixes a regression caused by commit 0d79cdc494d5:
$ make check TESTS="gdb.dwarf2/dw2-ranges-base.exp"
[...]
ERROR: GDB process no longer exists
This error is caused by an abort during the computation of srcpath
when SYMTAB_DIRNAME (s) == NULL.
Computing srcpath only when SYMTAB_DIRNAME (s) is not NULL fixes this
error. Also change the condition for calling debuginfod_source_query
to include whether srcpath could be computed.
gdb/ChangeLog:
2020-02-27 Aaron Merey <amerey@redhat.com>
* source.c (open_source_file): Check for nullptr when computing
srcpath.
---
gdb/ChangeLog | 4 ++++
gdb/source.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4376161673..371ef91421 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-27 Aaron Merey <amerey@redhat.com>
+ * source.c (open_source_file): Check for nullptr when computing
+ srcpath.
+
2020-02-27 Andrew Burgess <andrew.burgess@embecosm.com>
* gdbtypes.c (create_array_type_with_stride): Use std::abs not
diff --git a/gdb/source.c b/gdb/source.c
index 051caf5c57..50de93952b 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1160,7 +1160,7 @@ open_source_file (struct symtab *s)
std::string srcpath;
if (IS_ABSOLUTE_PATH (s->filename))
srcpath = s->filename;
- else
+ else if (SYMTAB_DIRNAME (s) != nullptr)
{
srcpath = SYMTAB_DIRNAME (s);
srcpath += SLASH_STRING;
@@ -1170,7 +1170,7 @@ open_source_file (struct symtab *s)
const struct bfd_build_id *build_id = build_id_bfd_get (ofp->obfd);
/* Query debuginfod for the source file. */
- if (build_id != nullptr)
+ if (build_id != nullptr && !srcpath.empty ())
fd = debuginfod_source_query (build_id->data,
build_id->size,
srcpath.c_str (),
--
2.24.1
next prev parent reply other threads:[~2020-02-27 22:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 18:00 Aaron Merey
2020-02-27 19:18 ` Simon Marchi
2020-02-27 19:20 ` Simon Marchi
2020-02-27 19:33 ` Christian Biesinger via gdb-patches
2020-02-27 22:12 ` Aaron Merey [this message]
2020-02-27 23:37 ` Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200227221156.1248760-1-amerey@redhat.com \
--to=amerey@redhat.com \
--cc=cbiesinger@google.com \
--cc=gdb-patches@sourceware.org \
--cc=simark@simark.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).