aboutsummaryrefslogtreecommitdiff
path: root/gdb/tui
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2021-04-06 10:40:11 +0200
committerTom de Vries <tdevries@suse.de>2021-04-06 10:40:11 +0200
commitd811a7cf74fa8523f67a13c0527b27f4954e9ae1 (patch)
treefd8ccb886f54a2820b09315f596e1637f98dff03 /gdb/tui
parent043bcbaf818f0f699ff223064f3e46ee29b9cb69 (diff)
downloadgdb-d811a7cf74fa8523f67a13c0527b27f4954e9ae1.zip
gdb-d811a7cf74fa8523f67a13c0527b27f4954e9ae1.tar.gz
gdb-d811a7cf74fa8523f67a13c0527b27f4954e9ae1.tar.bz2
[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.
Diffstat (limited to 'gdb/tui')
-rw-r--r--gdb/tui/tui-disasm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 65b300c..163552a 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;
}