diff options
| author | David Tardon <dtardon@redhat.com> | 2016-10-22 10:16:56 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-10-23 09:57:43 +0200 |
| commit | dc522a114d24ad7c550c072d4f29f50a62260b77 (patch) | |
| tree | 2d4e47fd411f31cd3f0b1a247bf3c8bc8a02b4cd /external | |
| parent | 928776b734c6aa188151bbce048d5bef4486dce7 (diff) | |
upload poppler 0.48.0
Change-Id: I18c49505f71ab609e5cc0e4db759152c3c1d5825
Diffstat (limited to 'external')
| -rw-r--r-- | external/poppler/UnpackedTarball_poppler.mk | 1 | ||||
| -rw-r--r-- | external/poppler/poppler-0.46.0-unused-private-field.patch.1 | 11 | ||||
| -rw-r--r-- | external/poppler/ubsan.patch.0 | 11 |
3 files changed, 0 insertions, 23 deletions
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index 4de2242a56dc..a0b6595ca0c6 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 \ )) 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 @@ |