check for exifSize

80df9dde · jiakai · 1260060d · 80df9dde
Commit 80df9dde authored Nov 05, 2015 by jiakai
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

jpeg_exif.cpp modules/imgcodecs/src/jpeg_exif.cpp +3 -0

No files found.
--- a/modules/imgcodecs/src/jpeg_exif.cpp
+++ b/modules/imgcodecs/src/jpeg_exif.cpp
@@ -158,6 +158,9 @@ std::map<int, ExifEntry_t > ExifReader::getExif()

            case APP1: //actual Exif Marker
                exifSize = getFieldSize(f);
+                if (exifSize <= offsetToTiffHeader) {
+                    throw ExifParsingError();
+                }
                m_data.resize( exifSize - offsetToTiffHeader );
                fseek(f, static_cast<long>( offsetToTiffHeader ), SEEK_CUR);
                count = fread( &m_data[0], sizeof( unsigned char ), exifSize - offsetToTiffHeader, f );