etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address review comments (missed these)

This commit is contained in:
James Alan Nguyen 2022-05-12 10:55:47 +10:00
parent fbcd84d79b
commit 63d2e12c27
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/engine/fileOpsIns.cpp
View File

@ -1167,7 +1167,7 @@ void DivEngine::loadGYB(SafeReader& reader, std::vector<DivInstrument*>& ret, St
uint32_t bankOffset = reader.readI();
uint32_t mapOffset = reader.readI();
if (reader.size() != fileSize || bankOffset > fileSize || mapOffset > fileSize) {
if (bankOffset > fileSize || mapOffset > fileSize) {
lastError = "GYBv3 file appears to have invalid data offsets.";
logE("GYBv3 file appears to have invalid data offsets.");
}
@ -1177,9 +1177,9 @@ void DivEngine::loadGYB(SafeReader& reader, std::vector<DivInstrument*>& ret, St
}
uint16_t insCount = reader.readS();
size_t patchPosOffset = reader.tell();
for (int i = 0; i < insCount; ++i) {
reader.tell(); // skip patchPosOffset
reader.readS(); // skip patchSize
uint16_t patchSize = reader.readS();
readInstrument(reader, true);
// Additional data
@ -1196,6 +1196,11 @@ void DivEngine::loadGYB(SafeReader& reader, std::vector<DivInstrument*>& ret, St
// Instrument Name
readInstrumentName(reader, insList[i]);
// Retrieve next patch
if (!reader.seek(patchPosOffset + patchSize, SEEK_SET)) {
throw EndOfFileException(&reader, patchPosOffset + patchSize);
}
}
}
reader.seek(0, SEEK_END);