1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
|
From 9a34c3f4f70d8e19d11d93f8551c79c5180f902f Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Sun, 22 Feb 2026 13:41:40 +0100
Subject: [PATCH] also skip APP3 Marker on load
Origin: upstream, https://github.com/libexif/libexif/commit/9a34c3f4f70d8e19d11d93f8551c79c5180f902f.patch
Bug: https://github.com/libexif/exif/issues/23
Bug-Debian: https://bugs.debian.org/1128586
---
libexif/exif-loader.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libexif/exif-loader.c b/libexif/exif-loader.c
index aaaba6dd..073f79f5 100644
--- a/libexif/exif-loader.c
+++ b/libexif/exif-loader.c
@@ -45,6 +45,8 @@
#define JPEG_MARKER_APP1 0xe1
#undef JPEG_MARKER_APP2
#define JPEG_MARKER_APP2 0xe2
+#undef JPEG_MARKER_APP3
+#define JPEG_MARKER_APP3 0xe3
#undef JPEG_MARKER_APP4
#define JPEG_MARKER_APP4 0xe4
#undef JPEG_MARKER_APP5
@@ -319,6 +321,7 @@ exif_loader_write (ExifLoader *eld, unsigned char *buf, unsigned int len)
case JPEG_MARKER_DQT:
case JPEG_MARKER_APP0:
case JPEG_MARKER_APP2:
+ case JPEG_MARKER_APP3:
case JPEG_MARKER_APP4:
case JPEG_MARKER_APP5:
case JPEG_MARKER_APP10:
@@ -338,7 +341,7 @@ exif_loader_write (ExifLoader *eld, unsigned char *buf, unsigned int len)
EXIF_LOG_CODE_CORRUPT_DATA,
"ExifLoader", _("The data supplied "
"does not seem to contain "
- "EXIF data."));
+ "EXIF data. JPEG Marker type 0x%02x"), eld->b[i]);
exif_loader_reset (eld);
return 0;
}
|