summaryrefslogtreecommitdiff
path: root/media-gfx/exif/files/exif-0.6.22-empty-string-check.patch
blob: 377e905940b5e66846da443e8e81bb81335f48ca (plain)
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
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 */