Handle error conditions for print.

f50695c7 · Eric Pouech · Alexandre Julliard · 7eba5c5c · f50695c7
Commit f50695c7 authored Oct 10, 2005 by Eric Pouech Committed by Alexandre Julliard Oct 10, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

memory.c programs/winedbg/memory.c +7 -4

No files found.
--- a/programs/winedbg/memory.c
+++ b/programs/winedbg/memory.c
@@ -347,10 +347,13 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue)
        {
            char    buffer[1024];

-            memory_get_string(dbg_curr_process, val_ptr, 
-                              lvalue->cookie == DLV_TARGET,
-                              size == 2, buffer, sizeof(buffer));
-            dbg_printf("\"%s\"", buffer);
+            if (!val_ptr) dbg_printf("0x0");
+            else if (memory_get_string(dbg_curr_process, val_ptr, 
+                                       lvalue->cookie == DLV_TARGET,
+                                       size == 2, buffer, sizeof(buffer)))
+                dbg_printf("\"%s\"", buffer);
+            else
+                dbg_printf("*** invalid address %p ***", val_ptr);
        }
        else dbg_printf("%p", val_ptr);
        break;