diff --git a/src/preview.cpp b/src/preview.cpp index f2242805..ed45566c 100644 --- a/src/preview.cpp +++ b/src/preview.cpp @@ -806,6 +806,7 @@ namespace { } else { // FIXME: the buffer is probably copied twice, it should be optimized + enforce(size_ <= static_cast(io.size()), kerCorruptedMetadata); DataBuf buf(size_); uint32_t idxBuf = 0; for (int i = 0; i < sizes.count(); i++) { diff --git a/test/data/issue_839_poc.rw2 b/test/data/issue_839_poc.rw2 new file mode 100644 index 00000000..1f6758c1 Binary files /dev/null and b/test/data/issue_839_poc.rw2 differ diff --git a/tests/bugfixes/github/test_issue_839.py b/tests/bugfixes/github/test_issue_839.py new file mode 100644 index 00000000..18476dd6 --- /dev/null +++ b/tests/bugfixes/github/test_issue_839.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +from system_tests import CaseMeta, path, check_no_ASAN_UBSAN_errors + + +class OutOfMemoryInLoaderTiffGetData(metaclass=CaseMeta): + """ + Regression test for the bug described in: + https://github.com/Exiv2/exiv2/issues/839 + + Due to a missing bounds check, this test triggers a 4GB memory + allocation. So the test will fail with a std::bad_alloc exception + if less than 4GB is available. On Linux, you can use `ulimit -v + 4000000` to reduce the available memory to slightly less than 4GB. + """ + url = "https://github.com/Exiv2/exiv2/issues/839" + + filename = path("$data_path/issue_839_poc.rw2") + commands = ["$exiv2 $filename"] + stdout = [""] + stderr = [ + """$exiv2_exception_message $filename: +$kerCorruptedMetadata +"""] + compare_stderr = check_no_ASAN_UBSAN_errors + retval = [1]