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

Added propper error handling

Browse Source
This commit is contained in:
Martin Tůma 2019-11-10 19:20:25 +01:00
parent e38e12f89b
commit 1731aa1890
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/data/gpiparser.cpp
View File

@ -450,6 +450,7 @@ static quint32 readCamera(QDataStream &stream, QVector<Waypoint> &waypoints,
RecordHeader rh; RecordHeader rh;
quint8 flags, type, s7, rs; quint8 flags, type, s7, rs;
qint32 top, right, bottom, left; qint32 top, right, bottom, left;
quint32 ds = 15;
rs = readRecordHeader(stream, rh); rs = readRecordHeader(stream, rh);
@ -461,15 +462,14 @@ static quint32 readCamera(QDataStream &stream, QVector<Waypoint> &waypoints,
stream >> flags >> type >> s7; stream >> flags >> type >> s7;
if (s7) { if (s7) {
int skip = s7 + 2 + s7/4; quint32 skip = s7 + 2 + s7/4;
stream.skipRawData(skip); stream.skipRawData(skip);
qint32 lat = readInt24(stream); qint32 lat = readInt24(stream);
qint32 lon = readInt24(stream); qint32 lon = readInt24(stream);
stream.skipRawData(rh.size - 12 - 3 - skip - 6); ds += skip + 6;
waypoints.append(Coordinates(toWGS24(lon), toWGS24(lat))); waypoints.append(Coordinates(toWGS24(lon), toWGS24(lat)));
} else }
stream.skipRawData(rh.size - 15);
Area area; Area area;
Polygon polygon; Polygon polygon;
@ -498,6 +498,11 @@ static quint32 readCamera(QDataStream &stream, QVector<Waypoint> &waypoints,
polygons.append(area); polygons.append(area);
if (ds > rh.size)
stream.setStatus(QDataStream::ReadCorruptData);
else if (ds < rh.size)
stream.skipRawData(rh.size - ds);
return rs + rh.size; return rs + rh.size;
} }