XPM: fix read heap buffer overflow on corrupted image. Fixes https://…

…bugs.chromium.org/p/oss-fuzz/issues/detail?id=13455. Credit to OSS Fuzz
OSGeo · Feb 28, 2019 · cc5d840 · cc5d840
1 parent 83ccdc0
commit cc5d840
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/gdal/frmts/xpm/xpmdataset.cpp b/gdal/frmts/xpm/xpmdataset.cpp
@@ -567,7 +567,8 @@ ParseXPM( const char *pszInput,
 
     for( int iColor = 0; iColor < nColorCount; iColor++ )
     {
-        if( papszXPMList[iColor+1] == nullptr )
+        if( papszXPMList[iColor+1] == nullptr ||
+            papszXPMList[iColor+1][0] == '\0' )
         {
             CPLError( CE_Failure, CPLE_AppDefined,
                       "Missing color definition for %d in XPM header.",