Be more careful of NULL pointers in CrawlHashTable/CrawlVector pretty printers

1 files changed, 10 insertions, 4 deletions

diff --git a/crawl-ref/source/crawl-gdb.py b/crawl-ref/source/crawl-gdb.py
index 08bb723edb..7ec7395f13 100644
--- a/crawl-ref/source/crawl-gdb.py
+++ b/crawl-ref/source/crawl-gdb.py
@@ -50,11 +50,14 @@ class CrawlHashTable_printer:
         return None
 
     def children(self):
-        # needs libstdc++ printers
+        if not self.val["hash_map"]:
+            return ()
+
         vis = gdb.default_visualizer(self.val["hash_map"].dereference())
         if vis:
             return vis.children()
-        raise NeedLibstdcxxPrinters
+        else:
+            raise NeedLibstdcxxPrinters
 
     def display_hint(self):
         return "map"
@@ -67,11 +70,14 @@ class CrawlVector_printer:
         return None
 
     def children(self):
-        # needs libstdc++ printers
+        if not self.val["vec"]:
+            return ()
+
         vis = gdb.default_visualizer(self.val["vec"])
         if vis:
             return vis.children()
-        raise NeedLibstdcxxPrinters
+        else:
+            raise NeedLibstdcxxPrinters
 
     def display_hint(self):
         return "array"