[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - external/poppler

[David Tardon]

 external/poppler/0001-really-disable-JPEG2000-import.patch.1 |   35 +++++++++++
 external/poppler/UnpackedTarball_poppler.mk                  |    1 
 2 files changed, 36 insertions(+)

New commits:
commit 37f8fd94ee19119c8f1896a7b651874caac19964
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 25 16:14:36 2017 +0200

    disable use of poppler's internal JPEG2000 codec
    
    Change-Id: I7789d91f26577b08d88fc53460466798fc267e24
    Reviewed-on: https://gerrit.libreoffice.org/38029
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/poppler/0001-really-disable-JPEG2000-import.patch.1 b/external/poppler/0001-really-disable-JPEG2000-import.patch.1
new file mode 100644
index 000000000000..b23e29de0348
--- /dev/null
+++ b/external/poppler/0001-really-disable-JPEG2000-import.patch.1
@@ -0,0 +1,35 @@
+From 728c4d962ec0d2b1a6b2684aff8319ff9f91dbbc Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Thu, 25 May 2017 16:12:20 +0200
+Subject: [PATCH] really disable JPEG2000 import
+
+---
+ poppler/Stream.cc | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/poppler/Stream.cc b/poppler/Stream.cc
+index 4a9babe4..ea119cb4 100644
+--- a/poppler/Stream.cc
++++ b/poppler/Stream.cc
+@@ -76,8 +76,6 @@
+ 
+ #ifdef ENABLE_LIBOPENJPEG
+ #include "JPEG2000Stream.h"
+-#else
+-#include "JPXStream.h"
+ #endif
+ 
+ #ifdef __DJGPP__
+@@ -348,7 +346,8 @@ Stream *Stream::makeFilter(char *name, Stream *str, Object *params, int recursio
+     globals.free();
+     obj.free();
+   } else if (!strcmp(name, "JPXDecode")) {
+-    str = new JPXStream(str);
++    error(errSyntaxError, getPos(), "Unknown filter '{0:s}'", name);
++    str = new EOFStream(str);
+   } else if (!strcmp(name, "Crypt")) {
+     if (str->getKind() == strCrypt) {
+       str = str->getBaseStream();
+-- 
+2.13.0
+
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
index f72c040c513b..86080d4e802a 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
 	external/poppler/poppler-mac-fake.patch.1 \
 	external/poppler/ubsan.patch.0 \
 	external/poppler/poppler-libjpeg.patch.1 \
+	external/poppler/0001-really-disable-JPEG2000-import.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4: