atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix segfault if metatile count != metatile attrs count

Browse source
This commit is contained in:
Diegoisawesome 2018-09-17 14:23:25 -05:00
parent 43eeffcf75
commit ef657628fa
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
project.cpp
View file

@ -835,7 +835,13 @@ void Project::loadTilesetAssets(Tileset* tileset) {
//qDebug() << metatile_attrs_path; //qDebug() << metatile_attrs_path;
if (attrs_file.open(QIODevice::ReadOnly)) { if (attrs_file.open(QIODevice::ReadOnly)) {
QByteArray data = attrs_file.readAll(); QByteArray data = attrs_file.readAll();
int num_metatiles = data.length() / 2; int num_metatiles = tileset->metatiles->count();
int num_metatileAttrs = data.length() / 2;
if (num_metatiles != num_metatileAttrs) {
qDebug() << QString("Metatile count %1 does not match metatile attribute count %2").arg(num_metatiles).arg(num_metatileAttrs);
if (num_metatiles > num_metatileAttrs)
num_metatiles = num_metatileAttrs;
}
for (int i = 0; i < num_metatiles; i++) { for (int i = 0; i < num_metatiles; i++) {
uint16_t word = data[i*2] & 0xff; uint16_t word = data[i*2] & 0xff;
word += (data[i*2 + 1] & 0xff) << 8; word += (data[i*2 + 1] & 0xff) << 8;
@ -1092,7 +1098,7 @@ QMap<QString, QStringList> Project::getTilesets() {
// Advance to command specifying whether or not it is a secondary tileset // Advance to command specifying whether or not it is a secondary tileset
i += 2; i += 2;
if (commands->at(i).at(0) != ".byte") { if (commands->at(i).at(0) != ".byte") {
qDebug() << "Unexpected command found for secondary tileset flag. Expected '.byte', but found: " << commands->at(i).at(0); qDebug() << "Unexpected command found for secondary tileset flag in tileset" << tilesetLabel << ". Expected '.byte', but found: " << commands->at(i).at(0);
continue; continue;
} }