[Libreoffice-commits] core.git: download.lst external/pdfium

[Miklos Vajna (via logerrit)]

 download.lst                                   |    4 ++--
 external/pdfium/Library_pdfium.mk              |    4 ++--
 external/pdfium/inc/pch/precompiled_pdfium.hxx |    5 +++--
 external/pdfium/ubsan.patch                    |    6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit d56414fddd0796e63d2d3ae63260de7c6952dc70
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Mar 24 21:00:50 2021 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Mar 25 09:01:45 2021 +0100

    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 at collabora.com>

diff --git a/download.lst b/download.lst
index b433fb9b4848..fcb5e165473c 100644
--- a/download.lst
+++ b/download.lst
@@ -210,8 +210,8 @@ export ORCUS_SHA256SUM := c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f9
 export ORCUS_TARBALL := liborcus-0.16.1.tar.bz2
 export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
 export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
-export PDFIUM_SHA256SUM := 7676aba84cb064e5e6f3a5173284087372761d1f704b0626570fce0445de520e
-export PDFIUM_TARBALL := pdfium-4380.tar.bz2
+export PDFIUM_SHA256SUM := c95d11cf9d05fbf49831b7436d93191f85e3daba2b2b061a7f1327856fc4908f
+export PDFIUM_TARBALL := pdfium-4450.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 0e6b110f9a0e..1a0d6c814122 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 cc82c4555e3a..772d3e6590d4 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>
@@ -288,8 +289,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>
@@ -298,7 +300,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)