[QMS-204] Garmin Map: Fix crash because of bad codec number

If the typ file has a bad codec number for UTF8 the code will be a nullptr. As a consequence the pointer ahs to be tested befor it is used.
Maproom · Jun 9, 2020 · 4d275a2 · 4d275a2
1 parent 00f4e35
commit 4d275a2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -16,6 +16,7 @@ V1.XX.X
 [QMS-183] Backward range selection causing small issues
 [QMS-192] Fix URLs still pointing to the bitbucket wiki
 [QMS-201] Fix GDAL deprecation warnings
+[QMS-204] Garmin Map: Fix crash because of bad codec number
 
 V1.14.1
 [QMS-37] Inconsistent use of time zones

diff --git a/src/qmapshack/map/garmin/CGarminTyp.cpp b/src/qmapshack/map/garmin/CGarminTyp.cpp
@@ -504,7 +504,10 @@ bool CGarminTyp::parsePolygon(QDataStream& in, QMap<quint32, polygon_property>&
 
                     str += t8;
                 }
-                property.strings[langcode] = codec->toUnicode(str);
+                if(codec != nullptr)
+                {
+                    property.strings[langcode] = codec->toUnicode(str);
+                }
 #ifdef DBG
                 qDebug() << len << langcode << property.strings[langcode];
 #endif
@@ -894,7 +897,10 @@ bool CGarminTyp::parsePolyline(QDataStream& in, QMap<quint32, polyline_property>
 
                     str += t8_1;
                 }
-                property.strings[langcode] = codec->toUnicode(str);
+                if(codec != nullptr)
+                {
+                    property.strings[langcode] = codec->toUnicode(str);
+                }
 #ifdef DBG
                 qDebug() << len << langcode << property.strings[langcode];
 #endif
@@ -1298,7 +1304,10 @@ bool CGarminTyp::parsePoint(QDataStream& in, QMap<quint32, point_property>& poin
 
                     str += t8_1;
                 }
-                property.strings[langcode] = codec->toUnicode(str);
+                if(codec != nullptr)
+                {
+                    property.strings[langcode] = codec->toUnicode(str);
+                }
 #ifdef DBG
                 qDebug() << len << langcode << property.strings[langcode];
 #endif