generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

check for exifSize

Browse Source
This commit is contained in:
jiakai
2015-11-05 18:32:51 +08:00
parent 1260060d7d
commit 80df9ddedb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/imgcodecs/src/jpeg_exif.cpp
View File

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