rpms
/
gdb
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport [gdb] Improve early exits for env var in debuginfod-support.c 

(Tom de Vries)

Resolves: RHBZ 1970741
This commit is contained in:
Bruno Larsen 2021-09-22 12:46:17 -03:00
parent 4cf9f20b12
commit 170c3b942c
5 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_gdb.spec.Patch.include
View File

@ -407,3 +407,7 @@ Patch098: gdb-rhbz1971096-glibc2.34-5.patch
#(Tom de Vries)
Patch099: gdb-rhbz1916516-pathstuffs132-internal-error.patch
#[gdb] Improve early exits for env var in debuginfod-support.c
#(Tom de Vries)
Patch100: gdb-rhbz1970741-early-exit-for-empty-debuginfod-url.patch

1
_gdb.spec.patch.include
View File

@ -97,3 +97,4 @@
%patch097 -p1
%patch098 -p1
%patch099 -p1
%patch100 -p1

1
_patch_order
View File

@ -97,3 +97,4 @@ gdb-rhbz1971096-glibc2.34-3.patch
gdb-rhbz1971096-glibc2.34-4.patch
gdb-rhbz1971096-glibc2.34-5.patch
gdb-rhbz1916516-pathstuffs132-internal-error.patch
gdb-rhbz1970741-early-exit-for-empty-debuginfod-url.patch

51
gdb-rhbz1970741-early-exit-for-empty-debuginfod-url.patch Normal file
View File

@ -0,0 +1,51 @@
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
From: Bruno Larsen <blarsen@redhat.com>
Date: Wed, 22 Sep 2021 12:29:11 -0300
Subject: gdb-rhbz1970741-early-exit-for-empty-debuginfod-url.patch
;;[gdb] Improve early exits for env var in debuginfod-support.c
;;(Tom de Vries)
There's an early exit in libdebuginfod's debuginfod_query_server, which checks
both for:
- getenv (DEBUGINFOD_URLS_ENV_VAR) == NULL, and
- (getenv (DEBUGINFOD_URLS_ENV_VAR))[0] == '\0'.
In debuginfod_source_query and debuginfod_debuginfo_query (which both
end up calling debuginfod_query_server) there are also early exits checking
the same env var, but those just check for NULL.
Make the early exit tests in debuginfod-support.c match those in
libdebuginfod.
gdb/ChangeLog:
2020-11-18 Tom de Vries <tdevries@suse.de>
* debuginfod-support.c (debuginfod_source_query)
(debuginfod_debuginfo_query): Also do early exit if
"(getenv (DEBUGINFOD_URLS_ENV_VAR))[0] == '\0'".
diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
--- a/gdb/debuginfod-support.c
+++ b/gdb/debuginfod-support.c
@@ -98,7 +98,8 @@ debuginfod_source_query (const unsigned char *build_id,
const char *srcpath,
gdb::unique_xmalloc_ptr<char> *destname)
{
- if (getenv (DEBUGINFOD_URLS_ENV_VAR) == NULL)
+ const char *urls_env_var = getenv (DEBUGINFOD_URLS_ENV_VAR);
+ if (urls_env_var == NULL || urls_env_var[0] == '\0')
return scoped_fd (-ENOSYS);
debuginfod_client *c = debuginfod_init ();
@@ -135,7 +136,8 @@ debuginfod_debuginfo_query (const unsigned char *build_id,
const char *filename,
gdb::unique_xmalloc_ptr<char> *destname)
{
- if (getenv (DEBUGINFOD_URLS_ENV_VAR) == NULL)
+ const char *urls_env_var = getenv (DEBUGINFOD_URLS_ENV_VAR);
+ if (urls_env_var == NULL || urls_env_var[0] == '\0')
return scoped_fd (-ENOSYS);
debuginfod_client *c = debuginfod_init ();

4
gdb.spec
View File

@ -1143,6 +1143,10 @@ fi
%endif
%changelog
* Wed Sep 22 2021 Bruno Larsen <blarsen@redhat.com> - 10.2-8
- Backport "[gdb] Improve early exits for env var in debuginfod-support.c"
(Tom de Vries)
* Wed Sep 22 2021 Bruno Larsen <blarsen@redhat.com> - 10.2-8
- Backport "[gdb/cli] Don't assert on empty string for core-file"
(Tom de Vries)