Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gdb for openSUSE:Factory checked in
at 2021-05-05 20:39:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gdb (Old)
and /work/SRC/openSUSE:Factory/.gdb.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdb"
Wed May 5 20:39:35 2021 rev:148 rq:890032 version:10.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/gdb/gdb.changes 2021-04-10 15:27:28.602385471
+0200
+++ /work/SRC/openSUSE:Factory/.gdb.new.2988/gdb.changes 2021-05-05
20:39:36.471017479 +0200
@@ -1,0 +2,6 @@
+Sun May 2 18:24:36 UTC 2021 - Tom de Vries <tdevr...@suse.com>
+
+- Backport fix for tui assert [swo#27680]:
+ * gdb-tui-fix-len_without_escapes-in-tui-disasm.c.patch
+
+-------------------------------------------------------------------
New:
----
gdb-tui-fix-len_without_escapes-in-tui-disasm.c.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gdb.spec ++++++
--- /var/tmp/diff_new_pack.utntjl/_old 2021-05-05 20:39:38.271009754 +0200
+++ /var/tmp/diff_new_pack.utntjl/_new 2021-05-05 20:39:38.271009754 +0200
@@ -316,6 +316,7 @@
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 @@
%patch2015 -p1
%patch2016 -p1
%patch2017 -p1
+%patch2018 -p1
%patch2500 -p1
%if 0%{?suse_version} > 1500
++++++ gdb-tui-fix-len_without_escapes-in-tui-disasm.c.patch ++++++
[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 <tdevr...@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;
}
