summaryrefslogtreecommitdiff
path: root/external/poppler
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2016-10-22 10:16:56 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-08-30 23:31:06 +0200
commitd737c03051860bf4d8ce9b269625dbefedc873d9 (patch)
tree4671cded6208d5c566cd50a4afca4759a4d191e0 /external/poppler
parent7dbeab96e3d6167fc1a9cb16f425b104fcddbb2e (diff)
upload poppler 0.48.0
Change-Id: I18c49505f71ab609e5cc0e4db759152c3c1d5825 (cherry picked from commit dc522a114d24ad7c550c072d4f29f50a62260b77) Reviewed-on: https://gerrit.libreoffice.org/56252 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 2543b42096ad1be8d744eb3c9976f30add50bbb7)
Diffstat (limited to 'external/poppler')
-rw-r--r--external/poppler/UnpackedTarball_poppler.mk1
-rw-r--r--external/poppler/poppler-0.46.0-unused-private-field.patch.111
-rw-r--r--external/poppler/ubsan.patch.011
3 files changed, 0 insertions, 23 deletions
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
index efcbee7c7e0f..afad5fba13b6 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-mac-fake.patch.1 \
external/poppler/poppler-vs2013.patch.1 \
external/poppler/poppler-0.46.0-std-max.patch.1 \
- external/poppler/poppler-0.46.0-unused-private-field.patch.1 \
external/poppler/ubsan.patch.0 \
external/poppler/poppler-libjpeg.patch.1 \
))
diff --git a/external/poppler/poppler-0.46.0-unused-private-field.patch.1 b/external/poppler/poppler-0.46.0-unused-private-field.patch.1
deleted file mode 100644
index e0765fc92251..000000000000
--- a/external/poppler/poppler-0.46.0-unused-private-field.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/goo/GooString.h
-+++ b/goo/GooString.h
-@@ -175,7 +175,7 @@
- // You can tweak the final object size for different time/space tradeoffs.
- // In libc malloc(), rounding is 16 so it's best to choose a value that
- // is a multiple of 16.
-- class MemoryLayout {
-+ struct MemoryLayout {
- char c[sizeof(char*)];
- int i;
- char* s;
diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index a27f00f790d2..575cb47dc682 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -1,14 +1,3 @@
---- goo/GooString.cc
-+++ goo/GooString.cc
-@@ -161,7 +161,7 @@
- // assert(s != s1) the roundedSize condition ensures this
- if (newLength < length) {
- memcpy(s1, s, newLength);
-- } else {
-+ } else if (length != 0) {
- memcpy(s1, s, length);
- }
- if (s != sStatic)
--- poppler/Form.cc
+++ poppler/Form.cc
@@ -463,12 +463,11 @@