From: Tom de Vries <tdevries@suse.de>
Date: Wed, 26 Apr 2023 16:15:56 +0000 (+0200)
Subject: [gdb/tui] Fix length of status line string
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=17f091b31eb2ad8a838bf3ab21201afd2eaf1636;p=binutils-gdb.git

[gdb/tui] Fix length of status line string

In commit 5d10a2041eb ("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
---

diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c
index 0a750187c26..76b8f066abb 100644
--- a/gdb/tui/tui-stack.c
+++ b/gdb/tui/tui-stack.c
@@ -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;
 }