third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check that the string is properly terminated.

Browse Source
This commit is contained in:
Kevin Backhouse 2021-04-19 16:28:51 +01:00 committed by Luis Díaz Más
parent e8422732af
commit 8388223deb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bmffimage.cpp
View File

@ -287,7 +287,11 @@ namespace Exiv2
skip += 2;
/* getShort(data.pData_+skip,endian_) ; */ skip += 2; // protection
std::string id;
std::string name((const char*)data.pData_ + skip);
// Check that the string has a '\0' terminator.
const char* str = (const char*)data.pData_ + skip;
const size_t maxlen = static_cast<size_t>(data.size_ - skip);
enforce(strnlen(str, maxlen) < maxlen, Exiv2::kerCorruptedMetadata);
std::string name(str);
if ( !name.find("Exif") ) { // "Exif" or "ExifExif"
exifID_ = ID;
id=" *** Exif ***";