Merge pull request #7718 from guoxuedong:updateExifReader

4c5c7229 · Alexander Alekhin · 4fd00c1a · e69253a4 · 4c5c7229
Commit 4c5c7229 authored Nov 24, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

exif.cpp modules/imgcodecs/src/exif.cpp +4 -0

No files found.
--- a/modules/imgcodecs/src/exif.cpp
+++ b/modules/imgcodecs/src/exif.cpp
@@ -160,6 +160,10 @@ std::map<int, ExifEntry_t > ExifReader::getExif()
            case APP9: case APP10: case APP11: case APP12: case APP13: case APP14: case APP15:
            case COM:
                bytesToSkip = getFieldSize( f );
+                if (bytesToSkip < markerSize) {
+                    fclose(f);
+                    throw ExifParsingError();
+                }
                fseek( f, static_cast<long>( bytesToSkip - markerSize ), SEEK_CUR );
                break;