From: Alan Modra <amodra@gmail.com>
To: binutils@sourceware.org
Subject: PR29720, objdump -S crashes if build-id is missing
Date: Wed, 26 Oct 2022 15:37:19 +1030 [thread overview]
Message-ID: <Y1jAhwbXhxJHL66v@squeak.grove.modra.org> (raw)
PR 29720
* objdump.c (slurp_file): Don't call debuginfod_find_source
when build_id is NULL.
diff --git a/binutils/objdump.c b/binutils/objdump.c
index f7b4695c3e8..a4ab0dbd66c 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1879,17 +1879,19 @@ slurp_file (const char * fn,
#if HAVE_LIBDEBUGINFOD
if (fd < 0 && use_debuginfod && fn[0] == '/' && abfd != NULL)
{
- unsigned char * build_id;
- debuginfod_client * client;
+ unsigned char *build_id = get_build_id (abfd);
- client = debuginfod_begin ();
- if (client == NULL)
- return NULL;
+ if (build_id)
+ {
+ debuginfod_client *client = debuginfod_begin ();
- build_id = get_build_id (abfd);
- fd = debuginfod_find_source (client, build_id, 0, fn, NULL);
- free (build_id);
- debuginfod_end (client);
+ if (client)
+ {
+ fd = debuginfod_find_source (client, build_id, 0, fn, NULL);
+ debuginfod_end (client);
+ }
+ free (build_id);
+ }
}
#endif
--
Alan Modra
Australia Development Lab, IBM
reply other threads:[~2022-10-26 5:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=Y1jAhwbXhxJHL66v@squeak.grove.modra.org \
--to=amodra@gmail.com \
--cc=binutils@sourceware.org \
/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).