pool/gdb
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Backport fix for tui assert [swo#27680]:

Browse Source 
* gdb-tui-fix-len_without_escapes-in-tui-disasm.c.patch

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=274
This commit is contained in:
Tom de Vries 2021-05-03 07:47:57 +00:00 committed by Git OBS Bridge
parent fbee92fc2b
commit dc44c74411
3 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
gdb-tui-fix-len_without_escapes-in-tui-disasm.c.patch Normal file
View File

@ -0,0 +1,71 @@
[gdb/tui] Fix len_without_escapes in tui-disasm.c
On openSUSE Tumbleweed I run into:
...
FAIL: gdb.tui/basic.exp: asm window shows main
ERROR: invalid command name "_csi_L"
...
Using a minimal example, we get:
...
$ gdb -q outputs/gdb.tui/basic/basic -ex "tui enable" -ex "layout asm"
<TUI output>
src/gdb/ui-style.c:243: internal-error: bool \
ui_file_style::parse(const char*, size_t*): Assertion `match == 0' failed.
...
The problem is in len_without_escapes, where we detect the start of an escape
sequence, but then pass ptr to style.parse while ptr no longer points to the
escape due to the ptr++ in the while condition:
...
while ((c = *ptr++) != '\0')
{
if (c == '\033')
{
ui_file_style style;
size_t n_read;
if (style.parse (ptr, &n_read))
...
Fix this by removing the ++ in the while condition, and adding ptr++ in the
loop body where appropriate.
Tested on x86_64-linux.
gdb/ChangeLog:
2021-04-06 Tom de Vries <tdevries@suse.de>
PR tui/27680
* tui/tui-disasm.c (len_without_escapes): Pass ptr pointing at escape
to style.parse.
---
gdb/tui/tui-disasm.c | 7 +++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 65b300cb008..163552aede4 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -61,7 +61,7 @@ len_without_escapes (const std::string &str)
const char *ptr = str.c_str ();
char c;
- while ((c = *ptr++) != '\0')
+ while ((c = *ptr) != '\0')
{
if (c == '\033')
{
@@ -77,7 +77,10 @@ len_without_escapes (const std::string &str)
}
}
else
- ++len;
+ {
+ ++len;
+ ++ptr;
+ }
}
return len;
}

6
gdb.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun May 2 18:24:36 UTC 2021 - Tom de Vries <tdevries@suse.com>
- Backport fix for tui assert [swo#27680]:
* gdb-tui-fix-len_without_escapes-in-tui-disasm.c.patch
-------------------------------------------------------------------
Wed Apr 7 03:51:41 UTC 2021 - Tom de Vries <tdevries@suse.com>

2
gdb.spec
View File

@ -316,6 +316,7 @@ Patch2014: gdb-testsuite-fix-xfail-handling-in-gdb.threads-gcore-thread.exp
Patch2015: gdb-threads-fix-lin_thread_get_thread_signals-for-glibc-2.28.patch
Patch2016: gdb-testsuite-ignore-debuginfod_urls.patch
Patch2017: gdb-testsuite-fix-unset-of-debuginfod_urls-in-default_gdb_init.patch
Patch2018: gdb-tui-fix-len_without_escapes-in-tui-disasm.c.patch
# Testsuite patches
@ -732,6 +733,7 @@ find -name "*.info*"|xargs rm -f
%patch2015 -p1
%patch2016 -p1
%patch2017 -p1
%patch2018 -p1
%patch2500 -p1
%if 0%{?suse_version} > 1500