Allow - in %p for printf

PR cli/19918 points out that a printf format like "%-5p" will cause a
gdb crash.  The bug is problem is that printf_pointer doesn't take the
"-" flag into account.

gdb/ChangeLog
2018-03-14  Tom Tromey  <tom@tromey.com>

	PR cli/19918:
	* printcmd.c (printf_pointer): Allow "-" in format.

gdb/testsuite/ChangeLog
2018-03-14  Tom Tromey  <tom@tromey.com>

	PR cli/19918:
	* gdb.base/printcmds.exp (test_printf): Add printf test using '-'
	flag.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ba227ab62bb947486656694cb38420740374f016..da59b39f4e781aea7e901bc3062bb85f2b126b80 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-14  Tom Tromey  <tom@tromey.com>
+
+       PR cli/19918:
+       * printcmd.c (printf_pointer): Allow "-" in format.
+
 2018-03-14  Tom Tromey  <tom@tromey.com>
 
        * printcmd.c (_initialize_printcmd): Add usage to printf.

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 13b967f0a2ccab0b1b0eba96e6b8c3873027eec5..17c67eee4e52fa84657c70659dd6a31c8d0e63ce 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -2399,8 +2399,9 @@ printf_pointer (struct ui_file *stream, const char *format,
   if (val != 0)
     *fmt_p++ = '#';
 
-  /* Copy any width.  */
-  while (*p >= '0' && *p < '9')
+  /* Copy any width or flags.  Only the "-" flag is valid for pointers
+     -- see the format_pieces constructor.  */
+  while (*p == '-' || (*p >= '0' && *p < '9'))
     *fmt_p++ = *p++;
 
   gdb_assert (*p == 'p' && *(p + 1) == '\0');

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c24ae5fb20a5ebf405d246c2e1df8a267b2e50eb..abac29fae13008890b504e5d84dec19365d66b63 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-14  Tom Tromey  <tom@tromey.com>
+
+       PR cli/19918:
+       * gdb.base/printcmds.exp (test_printf): Add printf test using '-'
+       flag.
+
 2018-03-08  Simon Marchi  <simon.marchi@ericsson.com>
 
        PR gdb/22841

diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp
index 9402d97ef323b4d3241e23a98b123e1a96e62132..56cedb908f1726614f4cfc6493177e92176dd790 100644 (file)
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ b/gdb/testsuite/gdb.base/printcmds.exp
@@ -776,6 +776,10 @@ proc test_printf {} {
        "" \
        "create hibob command"
     gdb_test "hibob" "hi bob zzz.*y" "run hibob command"
+
+    # PR cli/19918.
+    gdb_test "printf \"%-16dq\\n\", 0" "0               q"
+    gdb_test "printf \"%-16pq\\n\", 0" "\\(nil\\)           q"
 }
 
 #Test printing DFP values with printf