Update pdfium to 6179

- Remove ubsan.patch, upstream switched to FXSYS_memset() in this
function, which does a similar length check as our patch did.

Change-Id: Ib418cd8e642d2be9f448c92f25f85bec25e34598
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160627
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 918515d6fc6e2eaa000c4a997d604b7b00b492e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160644

4 files changed, 4 insertions, 15 deletions

diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk
index 488c890da6ef..fc0903d873d1 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -442,6 +442,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fxge/dib/cfx_scanlinecompositor \
     UnpackedTarball/pdfium/core/fxge/dib/cstretchengine \
     UnpackedTarball/pdfium/core/fxge/dib/fx_dib \
+    UnpackedTarball/pdfium/core/fxge/dib/blend \
     UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitDingbats \
     UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitFixed \
     UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitFixedBold \
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk
index 79e93d24d439..924bbe23a8b8 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -8,7 +8,6 @@
 #
 
 pdfium_patches :=
-pdfium_patches += ubsan.patch
 # Fixes build on our baseline.
 pdfium_patches += build.patch.1
 # Avoids Windows 8 build dependency.
diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx b/external/pdfium/inc/pch/precompiled_pdfium.hxx
index 64795df4054d..c58757bc605d 100644
--- a/external/pdfium/inc/pch/precompiled_pdfium.hxx
+++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx
@@ -334,7 +334,6 @@
 #include <core/fxcrt/pauseindicator_iface.h>
 #include <core/fxcrt/retain_ptr.h>
 #include <core/fxcrt/scoped_set_insertion.h>
-#include <core/fxcrt/small_buffer.h>
 #include <core/fxcrt/span_util.h>
 #include <core/fxcrt/stl_util.h>
 #include <core/fxcrt/string_data_template.h>
@@ -375,6 +374,7 @@
 #include <core/fxge/cfx_substfont.h>
 #include <core/fxge/cfx_textrenderoptions.h>
 #include <core/fxge/cfx_unicodeencoding.h>
+#include <core/fxge/dib/blend.h>
 #include <core/fxge/dib/cfx_bitmapcomposer.h>
 #include <core/fxge/dib/cfx_bitmapstorer.h>
 #include <core/fxge/dib/cfx_cmyk_to_srgb.h>
@@ -458,6 +458,7 @@
 #include <public/fpdf_text.h>
 #include <public/fpdf_transformpage.h>
 #include <public/fpdfview.h>
+#include <third_party/abseil-cpp/absl/container/inlined_vector.h>
 #include <third_party/abseil-cpp/absl/types/optional.h>
 #include <third_party/abseil-cpp/absl/types/variant.h>
 #include <third_party/agg23/agg_clip_liang_barsky.h>
@@ -478,8 +479,8 @@
 #include <third_party/base/debug/alias.h>
 #include <third_party/base/memory/aligned_memory.h>
 #include <third_party/base/memory/ptr_util.h>
-#include <third_party/base/no_destructor.h>
 #include <third_party/base/notreached.h>
+#include <third_party/base/numerics/clamped_math.h>
 #include <third_party/base/numerics/safe_conversions.h>
 #include <third_party/base/numerics/safe_math.h>
 #endif // PCH_LEVEL >= 3
diff --git a/external/pdfium/ubsan.patch b/external/pdfium/ubsan.patch
deleted file mode 100644
index 039505eda9cf..000000000000
--- a/external/pdfium/ubsan.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- core/fxge/cfx_glyphcache.cpp
-+++ core/fxge/cfx_glyphcache.cpp
-@@ -183,7 +183,8 @@ std::unique_ptr<CFX_GlyphBitmap> CFX_GlyphCache::RenderGlyph(
-       }
-     }
-   } else {
--    memset(pDestBuf, 0, dest_pitch * bmheight);
-+    if (dest_pitch != 0 && bmheight != 0)
-+      memset(pDestBuf, 0, dest_pitch * bmheight);
-     int rowbytes = std::min(abs(src_pitch), dest_pitch);
-     for (int row = 0; row < bmheight; row++)
-       memcpy(pDestBuf + row * dest_pitch, pSrcBuf + row * src_pitch, rowbytes);