TUI: avoid calling strcpy() on identical string objects

In tui_set_source_content(), when offset == 0 the source and destination
pointers of the call to strcpy() are actually the same.  In this case
not only is strcpy() unnecessary but it is also UB when the two strings
overlap.

gdb/ChangeLog:

	* tui/tui-source.c (tui_set_source_content): Avoid calling
	strcpy() when offset is 0.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ff7a75277d78b3d468f0cdecdfcd09f6ea949ef..d833876193d7bd8cef48253e600bdddc5228d616 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-28  Patrick Palka  <patrick@parcs.ath.cx>
+
+       * tui/tui-source.c (tui_set_source_content): Avoid calling
+       strcpy() when offset is 0.
+
 2015-04-28  Patrick Palka  <patrick@parcs.ath.cx>
 
        PR gdb/18155

diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index 31df0c8fb389ca053a91b49a14e174fcdb2685e1..018a1df8e5488b23a9031480db3c9f5a4f2f1b47 100644 (file)
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -218,7 +218,9 @@ tui_set_source_content (struct symtab *s,
                        }
                      /* Now copy the line taking the offset into
                         account.  */
-                     if (strlen (src_line) > offset)
+                     if (offset == 0)
+                       ;
+                     else if (strlen (src_line) > offset)
                        strcpy (TUI_SRC_WIN->generic.content[cur_line]
                                  ->which_element.source.line,
                                &src_line[offset]);