Apple-2-Tools/atrcopy
1
0
Fork 0
mirror of https://github.com/robmcmullen/atrcopy.git synced 2024-11-25 16:32:07 +00:00
Code Issues Projects Releases Wiki Activity

Refs #1: BSAVE parser now much more strict on detecting valid file

Browse Source 
* 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
This commit is contained in:
Rob McMullen 2018-06-25 11:55:05 -07:00
parent f03517f0b0
commit 98e46ac23c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
atrcopy/dos33.py
View File

@ -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):