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

Replace assertion with an error message.

Browse Source 
(cherry picked from commit 4ec1768415ba015041a9bb28ab17c1ccf6a8c63e)
This commit is contained in:
Kevin Backhouse 2021-08-03 17:25:46 +01:00 committed by mergify-bot
parent d3e311fa62
commit e34e150f22
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tiffcomposite_int.cpp
View File

@ -999,9 +999,16 @@ namespace Exiv2 {
if (!mn_) {
return TiffEntryBase::doCount();
}
#ifndef SUPPRESS_WARNINGS
// Count of IFD makernote in tag Exif.Photo.MakerNote is the size of the
// Makernote in bytes
assert(tiffType() == ttUndefined || tiffType() == ttUnsignedByte || tiffType() == ttSignedByte);
if (tiffType() != ttUndefined && tiffType() != ttUnsignedByte && tiffType() != ttSignedByte) {
EXV_ERROR << "Makernote entry 0x" << std::setw(4)
<< std::setfill('0') << std::hex << tag()
<< " has incorrect Exif (TIFF) type " << std::dec << tiffType()
<< ". (Expected signed or unsigned byte.)\n";
}
#endif
return mn_->size();
}

BIN
test/data/issue_1833_poc.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

17
tests/bugfixes/github/test_issue_1833.py Normal file
View File

@ -0,0 +1,17 @@
# -*- coding: utf-8 -*-
from system_tests import CaseMeta, path, check_no_ASAN_UBSAN_errors
class TiffMnEntryDoCountInvalidTiffType(metaclass=CaseMeta):
"""
Test for the bug described in:
https://github.com/Exiv2/exiv2/issues/1833
"""
url = "https://github.com/Exiv2/exiv2/issues/1833"
filename = path("$data_path/issue_1833_poc.jpg")
commands = ["$exiv2 -pS $filename"]
stderr = [""]
retval = [0]
compare_stdout = check_no_ASAN_UBSAN_errors