mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-19 00:18:26 +00:00
bd33507695This commit adds two patches from upstream and bumps the revision. Bug: https://bugs.gentoo.org/783522 Signed-off-by: Federico Denkena <federico.denkena@posteo.de> Signed-off-by: Sam James <sam@gentoo.org>
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
https://bugs.gentoo.org/783522
|
|
|
|
Source: https://github.com/libexif/exif/commit/f6334d9d32437ef13dc902f0a88a2be0063d9d1c.patch
|
|
From: Marcus Meissner <marcus@jet.franken.de>
|
|
Date: Thu, 25 Feb 2021 08:31:53 +0100
|
|
Subject: [PATCH] added empty strign check, which would lead to NULL ptr
|
|
deref/crash in exif XML display. fixes
|
|
https://github.com/libexif/exif/issues/4
|
|
|
|
--- a/exif/actions.c
|
|
+++ b/exif/actions.c
|
|
@@ -661,6 +661,8 @@ escape_xml(const char *text)
|
|
char *out;
|
|
size_t len;
|
|
|
|
+ if (!strlen(text)) return "empty string";
|
|
+
|
|
for (out=escaped, len=0; *text; ++len, ++out, ++text) {
|
|
/* Make sure there's plenty of room for a quoted character */
|
|
if ((len + 8) > escaped_size) {
|
|
|
|
Source: https://github.com/libexif/exif/commit/eb84b0e3c5f2a86013b6fcfb800d187896a648fa.patch
|
|
From: Marcus Meissner <marcus@jet.franken.de>
|
|
Date: Thu, 25 Feb 2021 09:45:36 +0100
|
|
Subject: [PATCH] actually return empty stringand not 'em,pty string' as
|
|
expected
|
|
|
|
--- a/exif/actions.c
|
|
+++ b/exif/actions.c
|
|
@@ -661,7 +661,7 @@ escape_xml(const char *text)
|
|
char *out;
|
|
size_t len;
|
|
|
|
- if (!strlen(text)) return "empty string";
|
|
+ if (!strlen(text)) return "";
|
|
|
|
for (out=escaped, len=0; *text; ++len, ++out, ++text) {
|
|
/* Make sure there's plenty of room for a quoted character */
|
|
|
|
|