* [PATCH][gdb] Don't return non-existing path in debuginfod_source_query
@ 2020-11-16 11:16 Tom de Vries
2020-11-23 19:11 ` [committed][gdb] " Tom de Vries
0 siblings, 1 reply; 2+ messages in thread
From: Tom de Vries @ 2020-11-16 11:16 UTC (permalink / raw)
To: gdb-patches
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?
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;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [committed][gdb] Don't return non-existing path in debuginfod_source_query
2020-11-16 11:16 [PATCH][gdb] Don't return non-existing path in debuginfod_source_query Tom de Vries
@ 2020-11-23 19:11 ` Tom de Vries
0 siblings, 0 replies; 2+ messages in thread
From: Tom de Vries @ 2020-11-23 19:11 UTC (permalink / raw)
To: gdb-patches
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;
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-23 19:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-16 11:16 [PATCH][gdb] Don't return non-existing path in debuginfod_source_query Tom de Vries
2020-11-23 19:11 ` [committed][gdb] " Tom de Vries
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox