From a2b97de20f665d3be703727378a78a06bb9fa8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Tue, 4 Apr 2023 14:35:41 +0200 Subject: [PATCH 1/3] CI: bump Conan version --- .github/workflows/on_PR_linux_matrix.yml | 2 +- .github/workflows/on_PR_linux_special_buils.yml | 8 ++++---- .github/workflows/on_PR_windows_matrix.yml | 2 +- .github/workflows/on_push_BasicWinLinMac.yml | 4 ++-- .github/workflows/on_push_ExtraJobsForMain.yml | 2 +- .github/workflows/release.yml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml index 4292316252..fee6434db1 100644 --- a/.github/workflows/on_PR_linux_matrix.yml +++ b/.github/workflows/on_PR_linux_matrix.yml @@ -19,7 +19,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.53.0 + pip3 install conan==1.54.0 - name: Conan common config run: | diff --git a/.github/workflows/on_PR_linux_special_buils.yml b/.github/workflows/on_PR_linux_special_buils.yml index c46f717a7d..143c2f0e9a 100644 --- a/.github/workflows/on_PR_linux_special_buils.yml +++ b/.github/workflows/on_PR_linux_special_buils.yml @@ -16,7 +16,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.53.0 + pip3 install conan==1.54.0 - name: Conan common config run: | @@ -63,7 +63,7 @@ jobs: run: | sudo apt-get update sudo apt-get install valgrind ninja-build - pip3 install conan==1.53.0 + pip3 install conan==1.54.0 - name: Conan common config run: | @@ -100,7 +100,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.53.0 + pip3 install conan==1.54.0 - name: Conan common config run: | @@ -136,7 +136,7 @@ jobs: run: | sudo apt-get update sudo apt-get install valgrind doxygen graphviz gettext - pip3 install conan==1.53.0 + pip3 install conan==1.54.0 - name: Conan common config run: | diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml index 4d04c6fcff..e7a2d6bcbb 100644 --- a/.github/workflows/on_PR_windows_matrix.yml +++ b/.github/workflows/on_PR_windows_matrix.yml @@ -46,7 +46,7 @@ jobs: - name: Install Conan & Common config run: | - pip.exe install "conan==1.53.0" + pip.exe install "conan==1.54.0" conan profile new --detect default conan profile update settings.build_type=${{matrix.build_type}} default conan profile update settings.compiler="Visual Studio" default diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index 6a0926d91a..6b0831ceb3 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -31,7 +31,7 @@ jobs: - name: Install Conan & Common config run: | - pip.exe install "conan==1.53.0" + pip.exe install "conan==1.54.0" conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile show default @@ -77,7 +77,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.53.0 + pip3 install conan==1.54.0 - name: Conan run: | diff --git a/.github/workflows/on_push_ExtraJobsForMain.yml b/.github/workflows/on_push_ExtraJobsForMain.yml index e122e59f7c..e7789bed7d 100644 --- a/.github/workflows/on_push_ExtraJobsForMain.yml +++ b/.github/workflows/on_push_ExtraJobsForMain.yml @@ -17,7 +17,7 @@ jobs: - name: install dependencies run: | - pip3 install conan==1.53.0 + pip3 install conan==1.54.0 - name: Conan common config run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0abf80bdc3..8ebe417867 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: - name: Install dependencies run: | sudo apt-get install ninja-build gettext doxygen graphviz - pip3 install conan==1.53.0 + pip3 install conan==1.54.0 - name: Conan common config run: | @@ -110,7 +110,7 @@ jobs: - name: Install Conan & Common config run: | - pip.exe install "conan==1.53.0" + pip.exe install "conan==1.54.0" conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.build_type=Release default From 04d3a7cd8a0c106f44dfe8e5f33ef0e0cce5a42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Tue, 4 Apr 2023 14:14:54 +0200 Subject: [PATCH 2/3] makernotes: workaround for Olympus header corruption (backport #2567) --- src/makernote_int.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp index 467ce2051f..8b6e9adcd6 100644 --- a/src/makernote_int.cpp +++ b/src/makernote_int.cpp @@ -930,6 +930,13 @@ namespace Exiv2 { uint32_t size, ByteOrder /*byteOrder*/) { + // FIXME: workaround for overwritten OM System header in Olympus files (https://github.com/Exiv2/exiv2/issues/2542) + if (size >= 14 && std::string(reinterpret_cast(pData), 14) + == std::string("OM SYSTEM\0\0\0II", 14)) { + // Require at least the header and an IFD with 1 entry + if (size < OMSystemMnHeader::sizeOfSignature() + 18) return 0; + return newOMSystemMn2(tag, group, olympus2Id); + } if (size < 10 || std::string(reinterpret_cast(pData), 10) != std::string("OLYMPUS\0II", 10)) { // Require at least the header and an IFD with 1 entry From aa1001309897e9b6870c136e30c186951b699080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Mon, 17 Apr 2023 14:27:03 +0200 Subject: [PATCH 3/3] Add test case for #2542 --- test/data/poc_2542.exv | Bin 0 -> 18519 bytes tests/bugfixes/github/test_issue_2542.py | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 test/data/poc_2542.exv create mode 100644 tests/bugfixes/github/test_issue_2542.py diff --git a/test/data/poc_2542.exv b/test/data/poc_2542.exv new file mode 100644 index 0000000000000000000000000000000000000000..da7dee85d8e979e8d044e05d3681118111478339 GIT binary patch literal 18519 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 QVz&=otV_XtfpA~`19z9s7ytkO literal 0 HcmV?d00001 diff --git a/tests/bugfixes/github/test_issue_2542.py b/tests/bugfixes/github/test_issue_2542.py new file mode 100644 index 0000000000..6790ff9999 --- /dev/null +++ b/tests/bugfixes/github/test_issue_2542.py @@ -0,0 +1,15 @@ +from system_tests import CaseMeta, path + +class OMSystemMakerNoteAlias(metaclass=CaseMeta): + """ + Regression test for the bug described in: + https://github.com/Exiv2/exiv2/issues/2542 + """ + url = "https://github.com/Exiv2/exiv2/issues/2542" + + filename = path("$data_path/poc_2542.exv") + commands = ["$exiv2 -q -K Exif.Olympus2.CameraID $filename"] + stdout = ["""Exif.Olympus2.CameraID Undefined 32 OLYMPUS DIGITAL CAMERA +"""] + stderr = [""] + retval = [0]