Address review comments (missed these)
This commit is contained in:
parent
fbcd84d79b
commit
63d2e12c27
|
@ -1167,7 +1167,7 @@ void DivEngine::loadGYB(SafeReader& reader, std::vector<DivInstrument*>& ret, St
|
||||||
uint32_t bankOffset = reader.readI();
|
uint32_t bankOffset = reader.readI();
|
||||||
uint32_t mapOffset = 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.";
|
lastError = "GYBv3 file appears to have invalid data offsets.";
|
||||||
logE("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();
|
uint16_t insCount = reader.readS();
|
||||||
|
|
||||||
|
size_t patchPosOffset = reader.tell();
|
||||||
for (int i = 0; i < insCount; ++i) {
|
for (int i = 0; i < insCount; ++i) {
|
||||||
reader.tell(); // skip patchPosOffset
|
uint16_t patchSize = reader.readS();
|
||||||
reader.readS(); // skip patchSize
|
|
||||||
readInstrument(reader, true);
|
readInstrument(reader, true);
|
||||||
|
|
||||||
// Additional data
|
// Additional data
|
||||||
|
@ -1196,6 +1196,11 @@ void DivEngine::loadGYB(SafeReader& reader, std::vector<DivInstrument*>& ret, St
|
||||||
|
|
||||||
// Instrument Name
|
// Instrument Name
|
||||||
readInstrumentName(reader, insList[i]);
|
readInstrumentName(reader, insList[i]);
|
||||||
|
|
||||||
|
// Retrieve next patch
|
||||||
|
if (!reader.seek(patchPosOffset + patchSize, SEEK_SET)) {
|
||||||
|
throw EndOfFileException(&reader, patchPosOffset + patchSize);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
reader.seek(0, SEEK_END);
|
reader.seek(0, SEEK_END);
|
||||||
|
|
Loading…
Reference in New Issue