otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Decided to EOF fail seeks beyond bounds

Browse source
This commit is contained in:
James Alan Nguyen 2022-04-24 12:37:49 +10:00
parent 18f7dcc0b0
commit 580cff9d32
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/engine/fileOpsIns.cpp
View file

@ -818,11 +818,15 @@ void DivEngine::loadY12(SafeReader& reader, std::vector<DivInstrument*>& ret, St
insOp.rr = tmp & 0xF; insOp.rr = tmp & 0xF;
insOp.sl = ((tmp >> 4) & 0xF); insOp.sl = ((tmp >> 4) & 0xF);
insOp.ssgEnv = reader.readC(); insOp.ssgEnv = reader.readC();
reader.seek(9, SEEK_CUR); if (!reader.seek(9, SEEK_CUR)) {
throw EndOfFileException(&reader, reader.tell() + 9);
}
} }
ins->fm.alg = reader.readC(); ins->fm.alg = reader.readC();
ins->fm.fb = reader.readC(); ins->fm.fb = reader.readC();
reader.seek(62, SEEK_CUR); if (!reader.seek(62, SEEK_CUR)) {
throw EndOfFileException(&reader, reader.tell() + 62);
}
ret.push_back(ins); ret.push_back(ins);
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError="premature end of file"; lastError="premature end of file";
@ -858,7 +862,9 @@ void DivEngine::loadBNK(SafeReader& reader, std::vector<DivInstrument*>& ret, St
} }
// Seek to BNK data // Seek to BNK data
reader.seek(data_offset, SEEK_SET); if (!reader.seek(data_offset, SEEK_SET)) {
throw EndOfFileException(&reader, data_offset);
};
// Read until EOF // Read until EOF
for (int i = 0; i < readCount; ++i) { for (int i = 0; i < readCount; ++i) {