From b8c2339b2f46d4885b933b832fc5b37c7ca101a6 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 14 Feb 2018 11:12:17 -0700 Subject: 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 PR cli/19918: * printcmd.c (printf_pointer): Allow "-" in format. gdb/testsuite/ChangeLog 2018-03-14 Tom Tromey PR cli/19918: * gdb.base/printcmds.exp (test_printf): Add printf test using '-' flag. --- gdb/ChangeLog | 5 +++++ gdb/printcmd.c | 5 +++-- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/printcmds.exp | 4 ++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ba227ab62bb..da59b39f4e7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-03-14 Tom Tromey + + PR cli/19918: + * printcmd.c (printf_pointer): Allow "-" in format. + 2018-03-14 Tom Tromey * printcmd.c (_initialize_printcmd): Add usage to printf. diff --git a/gdb/printcmd.c b/gdb/printcmd.c index 13b967f0a2c..17c67eee4e5 100644 --- 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 c24ae5fb20a..abac29fae13 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-03-14 Tom Tromey + + PR cli/19918: + * gdb.base/printcmds.exp (test_printf): Add printf test using '-' + flag. + 2018-03-08 Simon Marchi PR gdb/22841 diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp index 9402d97ef32..56cedb908f1 100644 --- 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 -- cgit v1.2.1