diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2019-03-12 12:57:20 +0100 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-03-12 15:03:43 +0100 |
commit | f9b354784faf65ecc8024cf6d7d7aaf589f6d91f (patch) | |
tree | 51885951b3a9a731c2fba3387035bb53e2d13eb8 /external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 | |
parent | b636d57e8f6d98887b1cd11449dd9580beb7b604 (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.
Change-Id: I5e7ddabbb341f6bfefb376d552b50c4006f41906
Reviewed-on: https://gerrit.libreoffice.org/69094
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
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.1 | 27 |
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 + |