From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [committed][gdb] Don't return non-existing path in debuginfod_source_query
Date: Mon, 23 Nov 2020 20:11:05 +0100 [thread overview]
Message-ID: <d0706924-4651-7e83-bc6d-6598d4206de0@suse.de> (raw)
In-Reply-To: <20201116111633.GA3063@delia>
On 11/16/20 12:16 PM, Tom de Vries wrote:
> Hi,
>
> When setting env var DEBUGINFOD_URLS to " " and running the testsuite, we run
> into these regressions:
> ...
> FAIL: gdb.base/list-missing-source.exp: info source
> FAIL: gdb.base/source-dir.exp: info source before setting directory search list
> ...
>
> Setting var DEBUGINFOD_URLS to " " allows the debuginfod query function
> debuginfod_source_query to get past its early exit.
>
> The function debuginfod_source_query is documented as: "If the file is
> successfully retrieved, its path on the local machine is stored in DESTNAME".
>
> However, in case we get back -ENOENT from libdebuginfod, we still set
> DESTNAME:
> ....
> if (fd.get () < 0 && fd.get () != -ENOENT)
> printf_filtered (_("Download failed: %s. Continuing without source file %ps.\n"),
> safe_strerror (-fd.get ()),
> styled_string (file_name_style.style (), srcpath));
> else
> *destname = make_unique_xstrdup (srcpath);
>
> return fd;
> ...
>
> Fix this by making debuginfod_source_query fit it's documentation and only
> setting DESTNAME when successfully retrieving a file. Likewise in
> debuginfod_debuginfo_query.
>
> Any comments?
>
Now committed.
Thanks,
- Tom
> [gdb] Don't return non-existing path in debuginfod_source_query
>
> gdb/ChangeLog:
>
> 2020-11-16 Tom de Vries <tdevries@suse.de>
>
> * debuginfod-support.c (debuginfod_source_query)
> (debuginfod_debuginfo_query): Only set DESTNAME if successful.
>
> ---
> gdb/debuginfod-support.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
> index a7c76ab6134..e21b2f40cae 100644
> --- a/gdb/debuginfod-support.c
> +++ b/gdb/debuginfod-support.c
> @@ -134,7 +134,8 @@ debuginfod_source_query (const unsigned char *build_id,
> printf_filtered (_("Download failed: %s. Continuing without source file %ps.\n"),
> safe_strerror (-fd.get ()),
> styled_string (file_name_style.style (), srcpath));
> - else
> +
> + if (fd.get () >= 0)
> *destname = make_unique_xstrdup (srcpath);
>
> return fd;
> @@ -169,7 +170,8 @@ debuginfod_debuginfo_query (const unsigned char *build_id,
> safe_strerror (-fd.get ()),
> styled_string (file_name_style.style (), filename));
>
> - destname->reset (dname);
> + if (fd.get () >= 0)
> + destname->reset (dname);
>
> return fd;
> }
>
prev parent reply other threads:[~2020-11-23 19:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 11:16 [PATCH][gdb] " Tom de Vries
2020-11-23 19:11 ` Tom de Vries [this message]
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=d0706924-4651-7e83-bc6d-6598d4206de0@suse.de \
--to=tdevries@suse.de \
--cc=gdb-patches@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