Fix NULL dereference if no integer arg given to monitor block_list cmd

Reported by Florian (spotted by coverity).

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13257

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 1197c9c2a7a5154459ea5075e408625fdccc6ff4..3ee4abd9151ba8cc68e2647da45af8aff900e45e 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -5386,9 +5386,10 @@ static Bool handle_gdb_monitor_command (ThreadId tid, HChar *req)
       HChar *endptr;
       UInt lr_nr = 0;
       wl = VG_(strtok_r) (NULL, " ", &ssaveptr);
-      lr_nr = VG_(strtoull10) (wl, &endptr);
-      if (wl != NULL && *endptr != '\0') {
-         VG_(gdb_printf) ("malformed integer\n");
+      if (wl != NULL)
+         lr_nr = VG_(strtoull10) (wl, &endptr);
+      if (wl == NULL || *endptr != '\0') {
+         VG_(gdb_printf) ("malformed or missing integer\n");
       } else {
          // lr_nr-1 as what is shown to the user is 1 more than the index in lr_array.
          if (lr_nr == 0 || ! MC_(print_block_list) (lr_nr-1))