From e10a58ccce18c3493e30dfe7222076964311a8d1 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 26 Oct 2023 21:46:38 +1100
Subject: [PATCH] Concatenate multiple EXIF markers

---
 Tests/images/multiple_exif.jpg | Bin 0 -> 364 bytes
 Tests/test_file_jpeg.py        |   4 ++++
 src/PIL/JpegImagePlugin.py     |  10 ++++++----
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 Tests/images/multiple_exif.jpg

diff --git a/Tests/images/multiple_exif.jpg b/Tests/images/multiple_exif.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..32e0aa301a94dfa13dc47faeb3071c25a5d8b573
GIT binary patch
literal 364
zcmex=<NpH&0WUXCHwH#V1_nkTWcdG(f!DPnGmU{EEwiY&1jyxsaEnuu^Yc>v-)3-T
z;9z58XJh4HXJ_Z+<ly2F;pO4x=8+T<<`<Ebl9!W}l95qR(NkAY(ovR?(J<H4F)%bS
zF_Bldw6!p@(K9wN`hS3dn*(GWBcmY0|04|YK)YFi93WtT0!Aig7FITP4o)s^pn|Oe
z3`~s7%uFoItgI|7K-INCc?K3iRv|@0M>gTWM0TY@5u?V53ptdXHXalWy7)oGIH{<K
zlS@ooLQ+aqO<hA%%f!^o+``hz*~Qh(-NVx>I3zSIJR&kGIVCkMJtH%#xTLhKyrQzI
zxuvzOy`!^h(&Q;qr%j(RbJn88OO`HMzGCI7O`ErD-L`$l&RvHNA31vL_=%IJE?vHI
v_1g6tH*Y<B^!UlsXU|`}eD(3u=PzHsegE<E*Z*4#93cPLGyMFw|Nl(@sOfhx

literal 0
HcmV?d00001

diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
index a0822d000..b4445f206 100644
--- a/Tests/test_file_jpeg.py
+++ b/Tests/test_file_jpeg.py
@@ -822,6 +822,10 @@ class TestFileJpeg:
             # Act / Assert
             assert im._getexif()[306] == "2017:03:13 23:03:09"
 
+    def test_multiple_exif(self):
+        with Image.open("Tests/images/multiple_exif.jpg") as im:
+            assert im.info["exif"] == b"Exif\x00\x00firstsecond"
+
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py
index c091697f5..97776f327 100644
--- a/src/PIL/JpegImagePlugin.py
+++ b/src/PIL/JpegImagePlugin.py
@@ -85,10 +85,12 @@ def APP(self, marker):
                 self.info["dpi"] = jfif_density
             self.info["jfif_unit"] = jfif_unit
             self.info["jfif_density"] = jfif_density
-    elif marker == 0xFFE1 and s[:5] == b"Exif\0":
-        if "exif" not in self.info:
-            # extract EXIF information (incomplete)
-            self.info["exif"] = s  # FIXME: value will change
+    elif marker == 0xFFE1 and s[:6] == b"Exif\0\0":
+        # extract EXIF information
+        if "exif" in self.info:
+            self.info["exif"] += s[6:]
+        else:
+            self.info["exif"] = s
             self._exif_offset = self.fp.tell() - n + 6
     elif marker == 0xFFE2 and s[:5] == b"FPXR\0":
         # extract FlashPix information (incomplete)