From 091242b5dc1b63817e793d0e60451251ca470d77 Mon Sep 17 00:00:00 2001 From: Bruno Larsen Date: Wed, 22 Sep 2021 15:27:20 -0300 Subject: [PATCH] Backport [gdb/cli] Don't assert on empty string for core-file (Tom de Vries) Resolves: RHBZ 1916516 --- _gdb.spec.Patch.include | 4 ++ _gdb.spec.patch.include | 1 + _patch_order | 1 + ...1916516-pathstuffs132-internal-error.patch | 67 +++++++++++++++++++ gdb.spec | 8 ++- 5 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 gdb-rhbz1916516-pathstuffs132-internal-error.patch diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include index 219586e..bd3f136 100644 --- a/_gdb.spec.Patch.include +++ b/_gdb.spec.Patch.include @@ -403,3 +403,7 @@ Patch097: gdb-rhbz1971096-glibc2.34-4.patch # Backport patch adjusting test gdb.mi/mi-sym-info.exp (RH BZ 1971096). Patch098: gdb-rhbz1971096-glibc2.34-5.patch +#[gdb/cli] Don't assert on empty string for core-file +#(Tom de Vries) +Patch099: gdb-rhbz1916516-pathstuffs132-internal-error.patch + diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include index b089bb1..dddd45a 100644 --- a/_gdb.spec.patch.include +++ b/_gdb.spec.patch.include @@ -96,3 +96,4 @@ %patch096 -p1 %patch097 -p1 %patch098 -p1 +%patch099 -p1 diff --git a/_patch_order b/_patch_order index a767691..15fcc3c 100644 --- a/_patch_order +++ b/_patch_order @@ -96,3 +96,4 @@ gdb-rhbz1971096-glibc2.34-2.patch gdb-rhbz1971096-glibc2.34-3.patch gdb-rhbz1971096-glibc2.34-4.patch gdb-rhbz1971096-glibc2.34-5.patch +gdb-rhbz1916516-pathstuffs132-internal-error.patch diff --git a/gdb-rhbz1916516-pathstuffs132-internal-error.patch b/gdb-rhbz1916516-pathstuffs132-internal-error.patch new file mode 100644 index 0000000..bb0cd9d --- /dev/null +++ b/gdb-rhbz1916516-pathstuffs132-internal-error.patch @@ -0,0 +1,67 @@ +From FEDORA_PATCHES Mon Sep 17 00:00:00 2001 +From: Bruno Larsen +Date: Wed, 22 Sep 2021 12:22:44 -0300 +Subject: gdb-rhbz1916516-pathstuffs132-internal-error.patch + +;;[gdb/cli] Don't assert on empty string for core-file +;;(Tom de Vries) + +With current gdb we run into: +... +$ gdb -batch '' '' +: No such file or directory. +pathstuff.cc:132: internal-error: \ + gdb::unique_xmalloc_ptr gdb_abspath(const char*): \ + Assertion `path != NULL && path[0] != '\0'' failed. +... + +Fix this by skipping the call to gdb_abspath in core_target_open in the +empty-string case, such that we have instead: +... +$ gdb -batch '' '' +: No such file or directory. +: No such file or directory. +$ +... + +Tested on x86_64-linux. + +gdb/ChangeLog: + +2021-08-30 Tom de Vries + + PR cli/28290 + * gdb/corelow.c (core_target_open): Skip call to gdb_abspath in the + empty-string case. + +gdb/testsuite/ChangeLog: + +2021-08-30 Tom de Vries + + PR cli/28290 + * gdb.base/batch-exit-status.exp: Add gdb '' and gdb '' '' tests. + +diff --git a/gdb/corelow.c b/gdb/corelow.c +--- a/gdb/corelow.c ++++ b/gdb/corelow.c +@@ -446,7 +446,8 @@ core_target_open (const char *arg, int from_tty) + } + + gdb::unique_xmalloc_ptr filename (tilde_expand (arg)); +- if (!IS_ABSOLUTE_PATH (filename.get ())) ++ if (strlen (filename.get ()) != 0 ++ && !IS_ABSOLUTE_PATH (filename.get ())) + filename = gdb_abspath (filename.get ()); + + flags = O_BINARY | O_LARGEFILE; +diff --git a/gdb/testsuite/gdb.base/batch-exit-status.exp b/gdb/testsuite/gdb.base/batch-exit-status.exp +--- a/gdb/testsuite/gdb.base/batch-exit-status.exp ++++ b/gdb/testsuite/gdb.base/batch-exit-status.exp +@@ -76,3 +76,7 @@ test_exit_status 1 "-batch -x $good_commands -x $bad_commands" \ + "-batch -x good-commands -x bad-commands" + test_exit_status 1 "-batch -x $good_commands -ex \"set not-a-thing 4\"" \ + "-batch -x good-commands -ex \"set not-a-thing 4\"" ++ ++set no_such_re ": No such file or directory\\." ++test_exit_status 1 "-batch \"\"" $no_such_re ++test_exit_status 1 "-batch \"\" \"\"" [multi_line $no_such_re $no_such_re] diff --git a/gdb.spec b/gdb.spec index c86647f..604b4fe 100644 --- a/gdb.spec +++ b/gdb.spec @@ -37,7 +37,7 @@ Version: 10.2 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL # Do not provide URL for snapshots as the file lasts there only for 2 days. @@ -1143,10 +1143,14 @@ fi %endif %changelog +* Wed Sep 22 2021 Bruno Larsen - 10.2-8 +- Backport "[gdb/cli] Don't assert on empty string for core-file" + (Tom de Vries) + * Tue Sep 21 2021 Peter Robinson 10.2-7 - Use guile 2.2 (rhbz #1901353) -* Wed Jul 21 2021 Fedora Release Engineering 10.2-6 +* Wed Jul 21 2021 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Tue Jul 20 2021 Kevin Buettner - 10.2-5