From d6ad74555b6fadf5f44c0ca9a065a2689b68884b Mon Sep 17 00:00:00 2001
From: Christopher Haster <geky@geky.net>
Date: Tue, 27 Dec 2022 14:12:04 -0600
Subject: [PATCH] Made dbgrbyd.py a bit more resilient to truncated data

---
 scripts/dbgrbyd.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/dbgrbyd.py b/scripts/dbgrbyd.py
index 9f247ae0..cfaa54c6 100755
--- a/scripts/dbgrbyd.py
+++ b/scripts/dbgrbyd.py
@@ -103,7 +103,7 @@ def main(disk, block_size, block1, block2=None, *,
 
     # first figure out which block as the most recent revision
     def fetch(data):
-        rev, = struct.unpack('<I', data[0:4])
+        rev, = struct.unpack('<I', data[0:4].ljust(4, b'\0'))
         crc = crc32c(data[0:4])
         off = 0
         j = 4
@@ -119,7 +119,7 @@ def main(disk, block_size, block1, block2=None, *,
                     crc = crc32c(data[j:j+size], crc)
                 # found a crc?
                 else:
-                    crc_, = struct.unpack('<I', data[j:j+4])
+                    crc_, = struct.unpack('<I', data[j:j+4].ljust(4, b'\0'))
                     if crc != crc_:
                         break
                     # commit what we have
@@ -234,7 +234,7 @@ def main(disk, block_size, block1, block2=None, *,
                 crc = crc32c(data[j:j+size], crc)
             # found a crc?
             else:
-                crc_, = struct.unpack('<I', data[j:j+4])
+                crc_, = struct.unpack('<I', data[j:j+4].ljust(4, b'\0'))
                 if crc != crc_:
                     notes.append('crc!=%08x' % crc)
             j += size