summaryrefslogtreecommitdiff
path: root/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2019-03-12 12:57:20 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-08-30 23:32:04 +0200
commit7f310986e1482a0fd49cf673316b31bde8f8e348 (patch)
treeafb06e6de79d6788506632beab48c28c382fb432 /external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
parentc8da61dfa979db2b97f3df2f24d8fe9122447472 (diff)
poppler: upgrade to release 0.74.0
Fixes CVE-2019-7310. Add patch to fix CVE-2019-9200 too. CVE-2018-20662 looks irrelevant because we don't build pdfunite tool. Reviewed-on: https://gerrit.libreoffice.org/69094 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit f9b354784faf65ecc8024cf6d7d7aaf589f6d91f) Change-Id: I5e7ddabbb341f6bfefb376d552b50c4006f41906
Diffstat (limited to 'external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1')
-rw-r--r--external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.127
1 files changed, 27 insertions, 0 deletions
diff --git a/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 b/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
new file mode 100644
index 000000000000..b459a0a0bef7
--- /dev/null
+++ b/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
@@ -0,0 +1,27 @@
+From f4136a6353162db249f63ddb0f20611622ab61b4 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 27 Feb 2019 19:43:22 +0100
+Subject: [PATCH] ImageStream::getLine: fix crash on broken files
+
+Fixes #728
+---
+ poppler/Stream.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/poppler/Stream.cc b/poppler/Stream.cc
+index 33537b0e..a41435ab 100644
+--- a/poppler/Stream.cc
++++ b/poppler/Stream.cc
+@@ -496,6 +496,9 @@ unsigned char *ImageStream::getLine() {
+ }
+
+ int readChars = str->doGetChars(inputLineSize, inputLine);
++ if (unlikely(readChars == -1)) {
++ readChars = 0;
++ }
+ for ( ; readChars < inputLineSize; readChars++) inputLine[readChars] = EOF;
+ if (nBits == 1) {
+ unsigned char *p = inputLine;
+--
+2.20.1
+