summaryrefslogtreecommitdiff
path: root/gdb/debuginfod-support.c
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2020-11-23 20:09:50 +0100
committerTom de Vries <tdevries@suse.de>2020-11-23 20:09:50 +0100
commitd6ab69dd5463192c74e9aeb1ab96a35d351d1df3 (patch)
tree8096c9f234744e535bc36791d70b6fab07452e2d /gdb/debuginfod-support.c
parentf60742b2a1988d276c77d5c1011143f320d9b4cb (diff)
downloadbinutils-gdb-d6ab69dd5463192c74e9aeb1ab96a35d351d1df3.tar.gz
[gdb] Don't return non-existing path in debuginfod_source_query
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. gdb/ChangeLog: 2020-11-23 Tom de Vries <tdevries@suse.de> * debuginfod-support.c (debuginfod_source_query) (debuginfod_debuginfo_query): Only set DESTNAME if successful.
Diffstat (limited to 'gdb/debuginfod-support.c')
-rw-r--r--gdb/debuginfod-support.c6
1 files 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;
}