Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

[gdb/tui] Fix length of status line string

Browse Source 
In commit 5d10a2041e ("gdb: add string_file::release method") this was added:
...
+  std::string string_val = string.release ();
...
without updating subsequent uses of string.size (), which returns 0 after the
string.release () call.

Fix this by:
- using string_val.size () instead of string.size (), and
- adding an assert that would have caught this regression.

Tested on x86_64-linux.

Reviewed-By: Simon Marchi <simon.marchi@efficios.com>
PR tui/30389
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30389
This commit is contained in:
Tom de Vries
2023-04-26 18:15:56 +02:00
parent 3ad6c165ca
commit 17f091b31e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/tui/tui-stack.c
View File

@@ -183,10 +183,13 @@ tui_locator_window::make_status_line () const
std::string string_val = string.release ();
if (string.size () < status_size)
string_val.append (status_size - string.size (), ' ');
else if (string.size () > status_size)
string_val.erase (status_size, string.size ());
size_t len = string_val.size ();
if (len < status_size)
string_val.append (status_size - len, ' ');
else if (len > status_size)
string_val.erase (status_size, len);
gdb_assert (string_val.size () == status_size);
return string_val;
}