Special case NULL when using printf's %s format

This changes the printf command's %s and %ls formats to special-case
NULL, and print "(null)" for these.  This is PR cli/14977.  This
behavior seems a bit friendlier; I was undecided on whether other
invalid pointers should be handled specially somehow, so for the time
being I've left those out.

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

	PR cli/14977:
	* printcmd.c (printf_c_string, printf_wide_c_string): Special case
	for NULL.

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

	PR cli/14977:
	* ax.c (ax_printf): Special case for NULL.

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

	PR cli/14977:
	* gdb.base/printcmds.exp (test_printf): Add printf test of %s with
	a null pointer.
	* gdb.base/wchar.exp: Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index da59b39f4e781aea7e901bc3062bb85f2b126b80..a62255fb035e09f2aedc52f1bbd56434832fb010 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-14  Tom Tromey  <tom@tromey.com>
+
+       PR cli/14977:
+       * printcmd.c (printf_c_string, printf_wide_c_string): Special case
+       for NULL.
+
 2018-03-14  Tom Tromey  <tom@tromey.com>
 
        PR cli/19918:

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 053cf17ee525c58d95c7f536129fa2ced41a5ccb..2be87a6428894c5829df71a9de8c5b34fd2e797b 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-14  Tom Tromey  <tom@tromey.com>
+
+       PR cli/14977:
+       * ax.c (ax_printf): Special case for NULL.
+
 2018-03-08  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * linux-low.c (linux_qxfer_libraries_svr4): Use

diff --git a/gdb/gdbserver/ax.c b/gdb/gdbserver/ax.c
index b42ee54c84f98700b3f654f7d4d815be3eff7810..c754383df8f75f9013494c6b9ea1e8f1070a0737 100644 (file)
--- a/gdb/gdbserver/ax.c
+++ b/gdb/gdbserver/ax.c
@@ -847,6 +847,11 @@ ax_printf (CORE_ADDR fn, CORE_ADDR chan, const char *format,
            int j;
 
            tem = args[i];
+           if (tem == 0)
+             {
+               printf (current_substring, "(null)");
+               break;
+             }
 
            /* This is a %s argument.  Find the length of the string.  */
            for (j = 0;; j++)

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 17c67eee4e52fa84657c70659dd6a31c8d0e63ce..9fb2e026dfae2694db98ebdc6c182b550cf934bc 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -2220,6 +2220,11 @@ printf_c_string (struct ui_file *stream, const char *format,
   int j;
 
   tem = value_as_address (value);
+  if (tem == 0)
+    {
+      fprintf_filtered (stream, format, "(null)");
+      return;
+    }
 
   /* This is a %s argument.  Find the length of the string.  */
   for (j = 0;; j++)
@@ -2260,6 +2265,11 @@ printf_wide_c_string (struct ui_file *stream, const char *format,
   gdb_byte *buf = (gdb_byte *) alloca (wcwidth);
 
   tem = value_as_address (value);
+  if (tem == 0)
+    {
+      fprintf_filtered (stream, format, "(null)");
+      return;
+    }
 
   /* This is a %s argument.  Find the length of the string.  */
   for (j = 0;; j += wcwidth)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index abac29fae13008890b504e5d84dec19365d66b63..f31f91e8f628fa3d621d2638d634752cbed314fc 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2018-03-14  Tom Tromey  <tom@tromey.com>
+
+       PR cli/14977:
+       * gdb.base/printcmds.exp (test_printf): Add printf test of %s with
+       a null pointer.
+       * gdb.base/wchar.exp: Likewise.
+
 2018-03-14  Tom Tromey  <tom@tromey.com>
 
        PR cli/19918:

diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp
index 56cedb908f1726614f4cfc6493177e92176dd790..635bd621fda8b4c433e3c2386bb5ee93656bbd11 100644 (file)
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ b/gdb/testsuite/gdb.base/printcmds.exp
@@ -780,6 +780,9 @@ proc test_printf {} {
     # PR cli/19918.
     gdb_test "printf \"%-16dq\\n\", 0" "0               q"
     gdb_test "printf \"%-16pq\\n\", 0" "\\(nil\\)           q"
+
+    # PR cli/14977.
+    gdb_test "printf \"%s\\n\", 0" "\\(null\\)"
 }
 
 #Test printing DFP values with printf

diff --git a/gdb/testsuite/gdb.base/wchar.exp b/gdb/testsuite/gdb.base/wchar.exp
index 80b6513e22219ab36b32c320a6c2890198a76795..a4d9bce7d0fcd028ac94c222bb310a862b792e74 100644 (file)
--- a/gdb/testsuite/gdb.base/wchar.exp
+++ b/gdb/testsuite/gdb.base/wchar.exp
@@ -69,3 +69,6 @@ gdb_test "print repeat" "= L\"A$cent$cent\"\.\.\." \
 
 gdb_test "print repeat_p" "= $hex L\"A$cent$cent\"\.\.\." \
     "print repeat_p (print elements 3)"
+
+# From PR cli/14977, but here because it requires wchar_t.
+gdb_test "printf \"%ls\\n\", 0" "\\(null\\)"