From 98e46ac23cee85b3a7a51fd5f7ce013f7f0948b3 Mon Sep 17 00:00:00 2001
From: Rob McMullen <feedback@playermissile.com>
Date: Mon, 25 Jun 2018 11:55:05 -0700
Subject: [PATCH] Refs #1: BSAVE parser now much more strict on detecting valid
 file * size specified in header must now match exactly to the length of data
 in the file * i.e.: rejects incomplete files and files with extra data

---
 atrcopy/dos33.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/atrcopy/dos33.py b/atrcopy/dos33.py
index c711d2b..c99d328 100644
--- a/atrcopy/dos33.py
+++ b/atrcopy/dos33.py
@@ -659,16 +659,18 @@ class Dos33BinFile:
         if _xd: log.debug("Initial parsing: size=%d" % self.size)
         if len(b[pos:pos + 4]) == 4:
             start, count = b[pos:pos + 4].view(dtype='<u2')
+            if count != self.size - 4:
+                raise errors.InvalidBinaryFile(f"Extra data after BSAVE segment: file size {self.size}, header specifies {count} bytes")
             s[pos:pos + 4] = get_style_bits(data=True)
             data = b[pos + 4:pos + 4 + count]
             if len(data) == count:
                 name = "BSAVE data" % start
             else:
-                name = "Incomplete data: expected %04x, loaded %04x" % (count, len(data))
+                raise errors.InvalidBinaryFile(f"Incomplete BSAVE data: expected {count}, loaded {len(data)}")
             self.segments.append(ObjSegment(r[pos + 4:pos + 4 + count], pos, pos + 4, start, start + len(data), name))
 
         else:
-            self.segments.append(ObjSegment(r[pos:pos + 4], 0, 0, 0, len(b[pos:pos + 4]), "Short Segment Header"))
+            raise errors.InvalidBinaryFile(f"Invalid BSAVE header")
 
 
 class ProdosHeader(Dos33Header):