diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-03-24 21:00:50 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-11-11 10:23:10 +0100 |
| commit | 4ec2f7d07b8ca30bff342eb6fcb0ecd369ec1753 (patch) | |
| tree | 5f253c4d33445a3ad83bcefa60f3aa7c2cd9229d /external/pdfium | |
| parent | external: update pdfium to 4380 (diff) | |
| download | core-4ec2f7d07b8ca30bff342eb6fcb0ecd369ec1753.tar.gz core-4ec2f7d07b8ca30bff342eb6fcb0ecd369ec1753.zip | |
external: update pdfium to 4450
Change-Id: I93b9a32a82098a7b45e899ef29349c48276aa724
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113067
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit d56414fddd0796e63d2d3ae63260de7c6952dc70)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124992
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'external/pdfium')
| -rw-r--r-- | external/pdfium/Library_pdfium.mk | 4 | ||||
| -rw-r--r-- | external/pdfium/inc/pch/precompiled_pdfium.hxx | 5 | ||||
| -rw-r--r-- | external/pdfium/ubsan.patch | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index f08ff51a31a3..821a35858dff 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -387,7 +387,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxcrt/css/cfx_csscustomproperty \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssdeclaration \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssenumvalue \ - UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssexttextbuf \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssnumbervalue \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_csspropertyholder \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssrulecollection \ @@ -397,10 +396,11 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssstyleselector \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssstylesheet \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_csssyntaxparser \ - UnpackedTarball/pdfium/core/fxcrt/css/cfx_csstextbuf \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssvalue \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssvaluelist \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssvaluelistparser \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssinputtextbuf \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssoutputtextbuf \ UnpackedTarball/pdfium/core/fxcrt/cfx_datetime \ UnpackedTarball/pdfium/core/fxcrt/bytestring \ UnpackedTarball/pdfium/core/fxcrt/cfx_binarybuf \ diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx b/external/pdfium/inc/pch/precompiled_pdfium.hxx index 2497306fa06b..3a0b890ed5f8 100644 --- a/external/pdfium/inc/pch/precompiled_pdfium.hxx +++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx @@ -20,6 +20,7 @@ ./bin/update_pch_bisect ./external/pdfium/inc/pch/precompiled_pdfium.hxx "make external/pdfium.build" --find-conflicts */ +#include <sal/config.h> #if PCH_LEVEL >= 1 #include <agg_curves.h> #include <agg_math.h> @@ -287,8 +288,9 @@ #include <core/fxcrt/css/cfx_cssdata.h> #include <core/fxcrt/css/cfx_cssdeclaration.h> #include <core/fxcrt/css/cfx_cssenumvalue.h> -#include <core/fxcrt/css/cfx_cssexttextbuf.h> +#include <core/fxcrt/css/cfx_cssinputtextbuf.h> #include <core/fxcrt/css/cfx_cssnumbervalue.h> +#include <core/fxcrt/css/cfx_cssoutputtextbuf.h> #include <core/fxcrt/css/cfx_csspropertyholder.h> #include <core/fxcrt/css/cfx_cssrulecollection.h> #include <core/fxcrt/css/cfx_cssselector.h> @@ -297,7 +299,6 @@ #include <core/fxcrt/css/cfx_cssstyleselector.h> #include <core/fxcrt/css/cfx_cssstylesheet.h> #include <core/fxcrt/css/cfx_csssyntaxparser.h> -#include <core/fxcrt/css/cfx_csstextbuf.h> #include <core/fxcrt/css/cfx_cssvalue.h> #include <core/fxcrt/css/cfx_cssvaluelist.h> #include <core/fxcrt/css/cfx_cssvaluelistparser.h> diff --git a/external/pdfium/ubsan.patch b/external/pdfium/ubsan.patch index 8610e24f2828..cd48b3ee4803 100644 --- a/external/pdfium/ubsan.patch +++ b/external/pdfium/ubsan.patch @@ -1,8 +1,8 @@ --- core/fxcrt/string_data_template.cpp +++ core/fxcrt/string_data_template.cpp -@@ -82,7 +82,8 @@ void StringDataTemplate<CharType>::CopyContentsAt(size_t offset, - ASSERT(nLen >= 0); - ASSERT(offset + nLen <= m_nAllocLength); +@@ -83,7 +83,8 @@ void StringDataTemplate<CharType>::CopyContentsAt(size_t offset, + DCHECK(nLen >= 0); + DCHECK(offset + nLen <= m_nAllocLength); - memcpy(m_String + offset, pStr, nLen * sizeof(CharType)); + if (nLen != 0) |