NTF: fix heap buffer overflow. Fixes https://bugs.chromium.org/p/oss-…

…fuzz/issues/detail?id=2135. Credit to OSS Fuzz git-svn-id: https://svn.osgeo.org/gdal/trunk@38931 f0d54148-0727-0410-94bb-9a71ac55c965
OSGeo · Jun 7, 2017 · 9c3a4a4 · 9c3a4a4
1 parent 48640d3
commit 9c3a4a4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/gdal/ogr/ogrsf_frmts/ntf/ntffilereader.cpp b/gdal/ogr/ogrsf_frmts/ntf/ntffilereader.cpp
@@ -923,7 +923,8 @@ int NTFFileReader::ProcessAttRec( NTFRecord * poRecord,
         if( nFWidth == 0 )
         {
             const char * pszData2 = poRecord->GetData();
-
+            if( iOffset + 2 >= poRecord->GetLength() )
+                break;
             for( nEnd = iOffset + 2;
                  pszData2[nEnd] != '\\' && pszData2[nEnd] != '\0';
                  nEnd++ ) {}
@@ -946,6 +947,8 @@ int NTFFileReader::ProcessAttRec( NTFRecord * poRecord,
         if( nFWidth == 0 )
         {
             iOffset = nEnd;
+            if( iOffset >= poRecord->GetLength() )
+                break;
             if( pszData[iOffset] == '\\' )
                 iOffset++;
         }