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

Merge pull request #1767 from kevinbackhouse/fix-issue-1763

Browse Source 
Fix null iterator deref in printCsLensTypeByMetadata
This commit is contained in:
Kevin Backhouse 2021-07-09 16:11:30 +01:00 committed by GitHub
commit 9284b58bfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/canonmn_int.cpp
View File

@ -2750,6 +2750,7 @@ namespace Exiv2 {
if (pos == metadata->end() || pos->value().count() < 3 || pos->value().typeId() != unsignedShort ||
pos->value().toFloat(2) == 0.0F) {
os << "Unknown Lens (" << lensType << ")";
return os;
}
int const exifFlMin = static_cast<int>(static_cast<float>(pos->value().toLong(1)) / pos->value().toFloat(2));
@ -2759,6 +2760,7 @@ namespace Exiv2 {
pos = metadata->findKey(aperKey);
if (pos == metadata->end() || pos->value().count() != 1 || pos->value().typeId() != unsignedShort) {
os << "Unknown Lens (" << lensType << ")";
return os;
}
auto exifAperMax = fnumber(canonEv(static_cast<int16_t>(pos->value().toLong(0))));

BIN
test/data/issue_1763_poc.exv Executable file
View File

Binary file not shown.

20
tests/bugfixes/github/test_issue_1763.py Normal file
View File

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
from system_tests import CaseMeta, path
class CanonPrintCsLensTypeByMetadataNullIteratorDeref(metaclass=CaseMeta):
"""
Regression test for the bug described in:
https://github.com/Exiv2/exiv2/issues/1763
"""
url = "https://github.com/Exiv2/exiv2/issues/1763"
filename = path("$data_path/issue_1763_poc.exv")
commands = ["$exiv2 -Pt $filename"]
stderr = [""]
retval = [0]
def compare_stdout(self, i, command, got_stdout, expected_stdout):
# Check that it printed "Bad value" for the date.
self.assertIn("Unknown Lens (254)", got_stdout)