6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Adds sanity checks around CAPS block.

Browse Source
This commit is contained in:
Thomas Harte 2021-12-25 17:32:29 -05:00
parent c118dd8afe
commit e457ce66ea
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Storage/Disk/DiskImage/Formats/IPF.cpp
View File

@ -19,12 +19,26 @@ IPF::IPF(const std::string &file_name) : file_(file_name) {
[[maybe_unused]] const uint32_t crc = file_.get32be();
if(file_.eof()) break;
#define BLOCK(a, b, c, d) (a << 24) | (b << 16) | (c << 8) | d
#define BLOCK(a, b, c, d) ((a << 24) | (b << 16) | (c << 8) | d)
// Sanity check: the first thing in a file should be the CAPS record.
if(!start_of_block && type != BLOCK('C', 'A', 'P', 'S')) {
throw Error::InvalidFormat;
}
switch(type) {
default:
printf("Ignoring %c%c%c%c, starting at %ld of length %d\n", (type >> 24), (type >> 16) & 0xff, (type >> 8) & 0xff, type & 0xff, start_of_block, length);
break;
case BLOCK('C', 'A', 'P', 'S'):
// Analogously to the sanity check above, if a CAPS block is anywhere other
// than first then something is amiss.
if(start_of_block) {
throw Error::InvalidFormat;
}
break;
case BLOCK('D', 'A', 'T', 'A'): {
length += file_.get32be();
printf("Handling DATA block at %ld of length %d\n", start_of_block, length);