summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2020-05-05 14:56:08 +0200
committerJoonas Niilola <juippis@gentoo.org>2020-05-06 14:51:02 +0300
commit444d786f136ea61c25851212d25809d65a1e1fad (patch)
treed335cc5a326cf4980ceb9a54e4ad38ba61729fe4 /media-libs/libextractor
parentdev-libs/zziplib: remove unused patch(es) (diff)
downloadgentoo-444d786f136ea61c25851212d25809d65a1e1fad.tar.gz
gentoo-444d786f136ea61c25851212d25809d65a1e1fad.tar.bz2
gentoo-444d786f136ea61c25851212d25809d65a1e1fad.zip
media-libs/libextractor: remove unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-libs/libextractor')
-rw-r--r--media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch49
-rw-r--r--media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch39
2 files changed, 0 insertions, 88 deletions
diff --git a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch b/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch
deleted file mode 100644
index d0b5968606ba..000000000000
--- a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b405d707b36e0654900cba78e89f49779efea110 Mon Sep 17 00:00:00 2001
-From: Christian Grothoff <christian@grothoff.org>
-Date: Thu, 20 Dec 2018 22:47:53 +0100
-Subject: fix #5493 (out of bounds read)
-
----
- src/common/convert.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/common/convert.c b/src/common/convert.c
-index c0edf21..2be2108 100644
---- a/src/common/convert.c
-+++ b/src/common/convert.c
-@@ -36,8 +36,8 @@
- * string is returned.
- */
- char *
--EXTRACTOR_common_convert_to_utf8 (const char *input,
-- size_t len,
-+EXTRACTOR_common_convert_to_utf8 (const char *input,
-+ size_t len,
- const char *charset)
- {
- #if HAVE_ICONV
-@@ -52,7 +52,7 @@ EXTRACTOR_common_convert_to_utf8 (const char *input,
- i = input;
- cd = iconv_open ("UTF-8", charset);
- if (cd == (iconv_t) - 1)
-- return strdup (i);
-+ return strndup (i, len);
- if (len > 1024 * 1024)
- {
- iconv_close (cd);
-@@ -67,11 +67,11 @@ EXTRACTOR_common_convert_to_utf8 (const char *input,
- }
- itmp = tmp;
- finSize = tmpSize;
-- if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == SIZE_MAX)
-+ if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == ((size_t) -1))
- {
- iconv_close (cd);
- free (tmp);
-- return strdup (i);
-+ return strndup (i, len);
- }
- ret = malloc (tmpSize - finSize + 1);
- if (ret == NULL)
---
-cgit v1.1
diff --git a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch b/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch
deleted file mode 100644
index 2cd0448ba894..000000000000
--- a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 489c4a540bb2c4744471441425b8932b97a153e7 Mon Sep 17 00:00:00 2001
-From: Christian Grothoff <christian@grothoff.org>
-Date: Thu, 20 Dec 2018 23:02:28 +0100
-Subject: fix #5494
-
----
- ChangeLog | 3 ++-
- src/plugins/ole2_extractor.c | 9 +++++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c
-index 53fa1b9..a48b726 100644
---- a/src/plugins/ole2_extractor.c
-+++ b/src/plugins/ole2_extractor.c
-@@ -173,7 +173,7 @@ struct ProcContext
- EXTRACTOR_MetaDataProcessor proc;
-
- /**
-- * Closure for 'proc'.
-+ * Closure for @e proc.
- */
- void *proc_cls;
-
-@@ -213,7 +213,12 @@ process_metadata (gpointer key,
-
- if (G_VALUE_TYPE(gval) == G_TYPE_STRING)
- {
-- contents = strdup (g_value_get_string (gval));
-+ const char *gvals;
-+
-+ gvals = g_value_get_string (gval);
-+ if (NULL == gvals)
-+ return;
-+ contents = strdup (gvals);
- }
- else
- {
---
-cgit v1.1