root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00
Code Issues Projects Releases Activity

Be more tolerant to unknown file header data

Browse Source
This commit is contained in:
Martin Tůma 2023-08-04 09:34:36 +02:00
parent 4bf81e020f
commit 61b51e5596
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/data/gpiparser.cpp
View File

@ -218,18 +218,6 @@ quint32 DataStream::readTranslatedObjects(QList<TranslatedString> &objects)
} }
static quint32 readFprsRecord(DataStream &stream)
{
RecordHeader rh;
quint16 s1;
quint8 rs, s2, s3, s4;
rs = stream.readRecordHeader(rh);
stream >> s1 >> s2 >> s3 >> s4;
return rs + 5;
}
static quint32 readFileDataRecord(DataStream &stream) static quint32 readFileDataRecord(DataStream &stream)
{ {
RecordHeader rh; RecordHeader rh;
@ -771,12 +759,15 @@ bool GPIParser::readFileHeader(DataStream &stream, quint32 &ebs)
stream >> s5 >> s6 >> s7 >> s8 >> s9 >> s10; stream >> s5 >> s6 >> s7 >> s8 >> s9 >> s10;
stream.skipRawData(s10); stream.skipRawData(s10);
ds = sizeof(magic) + 10 + s10; ds = sizeof(magic) + 10 + s10;
if (rh.flags & 8)
ds += readFprsRecord(stream);
ebs = (s8 & 0x4) ? s9 * 8 + 8 : 0; ebs = (s8 & 0x4) ? s9 * 8 + 8 : 0;
if (stream.status() != QDataStream::Ok || ds != rh.size) { if (ds > rh.size)
stream.setStatus(QDataStream::ReadCorruptData);
else if (ds < rh.size)
stream.skipRawData(rh.size - ds);
if (stream.status() != QDataStream::Ok) {
_errorString = "Invalid file header"; _errorString = "Invalid file header";
return false; return false;
} else } else