From 77afc559c24a6bb13efda3e3f95bce7081b68018 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 19 Nov 2018 09:03:40 +0100 Subject: external: update pdfium to 3613 Reviewed-on: https://gerrit.libreoffice.org/63547 Reviewed-by: Miklos Vajna Tested-by: Jenkins (cherry picked from commit ec11c1aee04eacb00d94a6359f959b990ddb6923) Change-Id: I99bd67f45796eb85635543a5e4563bb7477cf63e --- download.lst | 4 ++-- external/pdfium/Library_pdfium.mk | 20 +++++++++++++------- external/pdfium/UnpackedTarball_pdfium.mk | 7 ++++++- external/pdfium/build.patch.1 | 13 +++++++++++++ external/pdfium/ubsan.patch | 6 +++--- 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/download.lst b/download.lst index d33ad53761b7..af6b49800cfc 100644 --- a/download.lst +++ b/download.lst @@ -200,8 +200,8 @@ export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b633 export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz -export PDFIUM_SHA256SUM := 572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679 -export PDFIUM_TARBALL := pdfium-3550.tar.bz2 +export PDFIUM_SHA256SUM := c42cdff8e18b9369bc9383e0e8c2531b5631a2712852a26d8e7593021561de89 +export PDFIUM_TARBALL := pdfium-3613.tar.bz2 export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz export LIBPNG_SHA256SUM := 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index 8283f6dd0aa1..f7406cf6d716 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -47,9 +47,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_annotiteration \ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_baannot \ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_baannothandler \ - UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_datetime \ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_formfillenvironment \ - UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_interform \ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_pageview \ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_widget \ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_widgethandler \ @@ -81,13 +79,14 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/fpdfsdk/fpdf_view \ UnpackedTarball/pdfium/fpdfsdk/ipdfsdk_pauseadapter \ UnpackedTarball/pdfium/fpdfsdk/cpdf_annotcontext \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_interactiveform \ )) # fdrm $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ - UnpackedTarball/pdfium/core/fdrm/crypto/fx_crypt \ - UnpackedTarball/pdfium/core/fdrm/crypto/fx_crypt_aes \ - UnpackedTarball/pdfium/core/fdrm/crypto/fx_crypt_sha \ + UnpackedTarball/pdfium/core/fdrm/fx_crypt \ + UnpackedTarball/pdfium/core/fdrm/fx_crypt_aes \ + UnpackedTarball/pdfium/core/fdrm/fx_crypt_sha \ )) # formfiller @@ -185,7 +184,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_color \ UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_colorspace \ UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_colorstate \ - UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_contentmark \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_contentmarks \ UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_contentmarkitem \ UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_contentparser \ UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_docpagedata \ @@ -303,7 +302,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_formcontrol \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_formfield \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_iconfit \ - UnpackedTarball/pdfium/core/fpdfdoc/cpdf_interform \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_interactiveform \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_link \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_linklist \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_metadata \ @@ -413,6 +412,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxcrt/cfx_seekablemultistream \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssdata \ UnpackedTarball/pdfium/core/fxcrt/fx_codepage \ + UnpackedTarball/pdfium/core/fxcrt/fx_number \ UnpackedTarball/pdfium/core/fxcrt/cfx_utf8encoder \ UnpackedTarball/pdfium/core/fxcrt/cfx_readonlymemorystream \ )) @@ -468,6 +468,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxge/fx_ge_fontmap \ UnpackedTarball/pdfium/core/fxge/fx_ge_linux \ UnpackedTarball/pdfium/core/fxge/fx_ge_text \ + UnpackedTarball/pdfium/core/fxge/fx_font \ UnpackedTarball/pdfium/core/fxge/dib/cfx_dibbase \ )) @@ -546,6 +547,11 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/spin_lock \ UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_alloc \ UnpackedTarball/pdfium/third_party/base/debug/alias \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/oom_callback \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_bucket \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_oom \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_page \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_root_base \ )) # skia_shared diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk index aaaab0c25ac1..eda4fd781e8d 100644 --- a/external/pdfium/UnpackedTarball_pdfium.mk +++ b/external/pdfium/UnpackedTarball_pdfium.mk @@ -36,7 +36,12 @@ $(eval $(call gb_UnpackedTarball_set_post_action,pdfium,\ mv third_party/base/allocator/partition_allocator/page_allocator.cc third_party/base/allocator/partition_allocator/page_allocator.cpp && \ mv third_party/base/allocator/partition_allocator/partition_alloc.cc third_party/base/allocator/partition_allocator/partition_alloc.cpp && \ mv third_party/base/allocator/partition_allocator/spin_lock.cc third_party/base/allocator/partition_allocator/spin_lock.cpp && \ - mv third_party/base/debug/alias.cc third_party/base/debug/alias.cpp \ + mv third_party/base/debug/alias.cc third_party/base/debug/alias.cpp && \ + mv third_party/base/allocator/partition_allocator/oom_callback.cc third_party/base/allocator/partition_allocator/oom_callback.cpp && \ + mv third_party/base/allocator/partition_allocator/partition_bucket.cc third_party/base/allocator/partition_allocator/partition_bucket.cpp && \ + mv third_party/base/allocator/partition_allocator/partition_oom.cc third_party/base/allocator/partition_allocator/partition_oom.cpp && \ + mv third_party/base/allocator/partition_allocator/partition_page.cc third_party/base/allocator/partition_allocator/partition_page.cpp && \ + mv third_party/base/allocator/partition_allocator/partition_root_base.cc third_party/base/allocator/partition_allocator/partition_root_base.cpp \ )) # vim: set noet sw=4 ts=4: diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1 index 721c1784719d..1a223352ddf8 100644 --- a/external/pdfium/build.patch.1 +++ b/external/pdfium/build.patch.1 @@ -147,3 +147,16 @@ index 7050f695b..916afed8b 100644 }; #endif // CORE_FPDFDOC_CPDF_FILESPEC_H_ +diff --git a/core/fxcrt/fx_coordinates.cpp b/core/fxcrt/fx_coordinates.cpp +index fabde1e80..92a423cc6 100644 +--- a/core/fxcrt/fx_coordinates.cpp ++++ b/core/fxcrt/fx_coordinates.cpp +@@ -302,7 +302,7 @@ std::ostream& operator<<(std::ostream& os, const CFX_RectF& rect) { + + std::tuple CFX_Matrix::AsTuple() + const { +- return {a, b, c, d, e, f}; ++ return std::tuple(a, b, c, d, e, f); + } + + CFX_Matrix CFX_Matrix::GetInverse() const { diff --git a/external/pdfium/ubsan.patch b/external/pdfium/ubsan.patch index 91428326fc5d..9939b6e9e4b6 100644 --- a/external/pdfium/ubsan.patch +++ b/external/pdfium/ubsan.patch @@ -1,9 +1,9 @@ --- core/fxcrt/string_data_template.h +++ core/fxcrt/string_data_template.h -@@ -78,7 +78,8 @@ +@@ -76,7 +76,8 @@ class StringDataTemplate { + ASSERT(nLen >= 0); + ASSERT(offset + nLen <= m_nAllocLength); - void CopyContentsAt(size_t offset, const CharType* pStr, size_t nLen) { - ASSERT(offset >= 0 && nLen >= 0 && offset + nLen <= m_nAllocLength); - memcpy(m_String + offset, pStr, nLen * sizeof(CharType)); + if (nLen != 0) + memcpy(m_String + offset, pStr, nLen * sizeof(CharType)); -- cgit v1.2.3