From 929e6be305c6a5018e88c2c29cdde27845505624 Mon Sep 17 00:00:00 2001
From: Jennifer Taylor <dragonminded@dragonminded.com>
Date: Fri, 3 Sep 2021 04:32:53 +0000
Subject: [PATCH] Fix psmap display for nodes with default values.

---
 bemani/utils/psmap.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/bemani/utils/psmap.py b/bemani/utils/psmap.py
index 70a1901..4907065 100644
--- a/bemani/utils/psmap.py
+++ b/bemani/utils/psmap.py
@@ -41,12 +41,12 @@ def parse_psmap(data: bytes, offset: str, rootname: str, *, verbose: bool = Fals
             chunk = data[base:(base + 24)]
             base = base + 24
 
-            (nodetype, mandatory, outoffset, width, nameptr, defaultptr) = struct.unpack('<BBHIQQ', chunk)
+            (nodetype, mandatory, outoffset, width, nameptr, default) = struct.unpack('<BBHIQQ', chunk)
         else:  # 32 bit
             chunk = data[base:(base + 16)]
             base = base + 16
 
-            (nodetype, mandatory, outoffset, width, nameptr, defaultptr) = struct.unpack('<BBHIII', chunk)
+            (nodetype, mandatory, outoffset, width, nameptr, default) = struct.unpack('<BBHIII', chunk)
 
         if nodetype == 0xFF or nodetype == 0x00:  # if nodetype is 0 then we probably read garbage
             # End of nodes, see if we should exit
@@ -68,19 +68,26 @@ def parse_psmap(data: bytes, offset: str, rootname: str, *, verbose: bool = Fals
             pass
 
         # Grab the default
-        if defaultptr != 0:
-            defaultptr = pe.virtual_to_physical(defaultptr)
+        if default != 0:
+            try:
+                defaultptr = pe.virtual_to_physical(default)
+            except Exception:
+                defaultptr = 0
 
         if verbose:
             space = "    " * len(saved_root)
             print(
-                f"{space}Node offset: {hex(readbase)}{os.linesep}"
-                f"{space}  Type: {hex(nodetype)}{os.linesep}"
-                f"{space}  Mandatory: {'yes' if mandatory != 0 else 'no'}{os.linesep}"
-                f"{space}  Name: {name}{os.linesep}"
-                f"{space}  Parse Offset: {outoffset}{os.linesep}"
-                f"{space}  Data Width: {width}{os.linesep}"
-                f"{space}  Default Pointer: {'null' if defaultptr == 0 else hex(defaultptr)}",
+                f"{space}Node offset: {hex(readbase)}{os.linesep}" +
+                f"{space}  Type: {hex(nodetype)}{os.linesep}" +
+                f"{space}  Mandatory: {'yes' if mandatory != 0 else 'no'}{os.linesep}" +
+                f"{space}  Name: {name}{os.linesep}" +
+                f"{space}  Parse Offset: {outoffset}{os.linesep}" +
+                f"{space}  Data Width: {width}{os.linesep}" +
+                (
+                    f"{space}  Data Pointer: {'null' if defaultptr == 0 else hex(defaultptr)}"
+                    if nodetype == 0x01 else
+                    f"{space}  Default: {default}"
+                ),
                 file=sys.stderr,
             )