Merge pull request opencv#9906 from sturkmen72:fix_grfmt_gdal

mshabunin · mshabunin · commit 91323549f434 · 2017-10-23T12:20:08.000Z
diff --git a/modules/imgcodecs/src/grfmt_gdal.cpp b/modules/imgcodecs/src/grfmt_gdal.cpp
@@ -562,15 +562,14 @@ ImageDecoder GdalDecoder::newDecoder()const{
 */
 bool GdalDecoder::checkSignature( const String& signature )const{
 
-
     // look for NITF
     std::string str(signature);
     if( str.substr(0,4).find("NITF") != std::string::npos ){
         return true;
     }
 
     // look for DTED
-    if( str.substr(140,4) == "DTED" ){
+    if( str.size() > 144 && str.substr(140,4) == "DTED" ){
         return true;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -562,15 +562,14 @@ ImageDecoder GdalDecoder::newDecoder()const{`
`562`	`562`	`*/`
`563`	`563`	`bool GdalDecoder::checkSignature( const String& signature )const{`
`564`	`564`
`565`		`-`
`566`	`565`	`// look for NITF`
`567`	`566`	`std::string str(signature);`
`568`	`567`	`if( str.substr(0,4).find("NITF") != std::string::npos ){`
`569`	`568`	`return true;`
`570`	`569`	`}`
`571`	`570`
`572`	`571`	`// look for DTED`
`573`		`- if( str.substr(140,4) == "DTED" ){`
	`572`	`+ if( str.size() > 144 && str.substr(140,4) == "DTED" ){`
`574`	`573`	`return true;`
`575`	`574`	`}`
`576`	`575`