From 766111f48d5c20b5f86bd37ee7cde3ee26316f7f Mon Sep 17 00:00:00 2001
From: Kevin Backhouse <kevinbackhouse@github.com>
Date: Fri, 23 Apr 2021 11:43:59 +0100
Subject: [PATCH] Regression test for
 https://github.com/Exiv2/exiv2/security/advisories/GHSA-7569-phvm-vwc2

(cherry picked from commit f0ff11f044b2c8ddf4792415beb91fd815c633a1)
---
 test/data/issue_ghsa_7569_phvm_vwc2_poc.exv   | Bin 0 -> 51 bytes
 test/data/issue_ghsa_7569_phvm_vwc2_poc.jp2   | Bin 0 -> 4248 bytes
 .../github/test_issue_ghsa_7569_phvm_vwc2.py  |  24 ++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 test/data/issue_ghsa_7569_phvm_vwc2_poc.exv
 create mode 100644 test/data/issue_ghsa_7569_phvm_vwc2_poc.jp2
 create mode 100644 tests/bugfixes/github/test_issue_ghsa_7569_phvm_vwc2.py

diff --git a/test/data/issue_ghsa_7569_phvm_vwc2_poc.exv b/test/data/issue_ghsa_7569_phvm_vwc2_poc.exv
new file mode 100644
index 0000000000000000000000000000000000000000..b2165bc95764f723fc2400d754f34a21b40ab197
GIT binary patch
literal 51
scmey*=vt9kX7v9dg9eb1#=zj|sl~v-00MkK%*enXz)%S0LW%!30YKXcj{pDw

literal 0
HcmV?d00001

diff --git a/test/data/issue_ghsa_7569_phvm_vwc2_poc.jp2 b/test/data/issue_ghsa_7569_phvm_vwc2_poc.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..7be2d2142243dd5ed36f1ac43fe55b5d0a72d61f
GIT binary patch
literal 4248
zcmds4O-NKx82#>ynT;b2l@cStBM3xr8fV6=Au<ZX(MDeoVMGg=VdM#-m4Yo&aWl3M
z#7$5X1qS^=7A<mDt%O|kL(oE_O&C$MZuR=^eSi1;%yZ_=;6h=1ci!K;bMATPoC^TK
zAyE+O0{H*{9HQek922O*uT!!tD+lWZw&UFu+`BTqA!W0pgXg7Ou5;o@uH{6x7)zy^
zp&GuzJv<>q<f&TRcH(Cb@k0<`gWxz!f<U)R_-Q0N*!VTTbQ7LK{>m~Qi?<To{SwaM
zDFo7eLM)Pqv;oAT(WA*kdoq4fXl+j>;>l<n?$q3#VK<R78T?UY3=2LP4$k^RFzXMJ
zKX@hH3FddQ$B)KhQUAOTRIqJ`t%U;{kwv01f#^ffk5_8!2smc!@E7Rp0K0wA#?Htq
z#?D$QHHqwi%8n0ep?bf@4rPSEca5D3ZtUD}X6L{r?5ulXhe|;Q`+-Tp#Et@XT*`Kj
z4qld?<$g>^ycBq_h7=UAh7_J7cq)Z1+!iB+IF&+AWu$POlY$AXqWc11hneoP4D6()
zdj;%M;)5p$#5}VGSaoK9Qxa6LQfa!++;r9b-r{s`fIWs!;ykmO?lo7KVN!ToC7N8J
zknX)mVF?~sTw!=KSBR*(mj}GK!hMS?oEg@@8oGC7=ab=?`isJQCS_*??5^OAoyP_{
z?`8DN0c7XfmV2h59X%lMMd_kUFwf*&K?w-z3cX^ifdxcyuJ8qAx%C0j0Rt=`*7Sf-
z!6vvg%<=)jgH1~k+BgM!&Fl&xbOoA*m{BYZtrlqU`-e?r3}<$ZpV?b@sY4o$>1lYe
za2hrgn})WTT^4N?7#zA}?g|BUUsEyNTcxnLnJaKzVYLEXffVfuE8|KU8oJkuky-bP
zycAy0fKbYiMGDh3redVX=uP=O2WyMN%wpWv1@ZzunnTa|$PU&Q^!w6#&Rr{5z6EaE
zp2J1ItBm=c^Vv(dah2Cw&r$k)IXwq0%X80h@AtdP=sByb{Oeh@eS6L?ZS_-j&rz34
zwt&#qh86BPhxO?H$9m50(mHZw)`kvXZJufO`x1MOn+3KyFZH-^^STgr=s8!}QqQ&L
zgw$|LOSFrqJqKU#cz6!>t>XgT{}X&+04YDkUVK=PVHtZ*vw(k%^dCTPs;935PWPQU
RE2jDd@e#0fpTm0p_<z4Z_J;rf

literal 0
HcmV?d00001

diff --git a/tests/bugfixes/github/test_issue_ghsa_7569_phvm_vwc2.py b/tests/bugfixes/github/test_issue_ghsa_7569_phvm_vwc2.py
new file mode 100644
index 00000000..c201576b
--- /dev/null
+++ b/tests/bugfixes/github/test_issue_ghsa_7569_phvm_vwc2.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+from system_tests import CaseMeta, path
+
+
+class Jp2ImageDoWriteMetadataOutOfBoundsRead(metaclass=CaseMeta):
+    """
+    Regression test for the bug described in:
+    https://github.com/Exiv2/exiv2/security/advisories/GHSA-7569-phvm-vwc2
+    """
+    url = "https://github.com/Exiv2/exiv2/security/advisories/GHSA-7569-phvm-vwc2"
+
+    filename1 = path("$data_path/issue_ghsa_7569_phvm_vwc2_poc.jp2")
+    filename2 = path("$data_path/issue_ghsa_7569_phvm_vwc2_poc.exv")
+    commands = ["$exiv2 in $filename1"]
+    stdout = [""]
+    stderr = [
+"""Warning: Directory Thumbnail, entry 0x1000 has unknown Exif (TIFF) type 28928; setting type size 1.
+Error: Directory Thumbnail: IFD entry 1 lies outside of the data buffer.
+Warning: Directory Thumbnail, entry 0x1000 has unknown Exif (TIFF) type 28928; setting type size 1.
+Error: Offset of directory Thumbnail, entry 0x1000 is out of bounds: Offset = 0x2020506a; truncating the entry
+$filename1: Could not write metadata to file: $kerCorruptedMetadata
+"""]
+    retval = [1]