summaryrefslogtreecommitdiff
path: root/external/pdfium/ubsan.patch
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2023-12-12 20:16:40 +0100
committerMiklos Vajna <vmiklos@collabora.com>2023-12-13 16:19:37 +0100
commitba39aecc5e885f6bac30d4ba079913d0227a30c1 (patch)
tree1f17c4117f4ecbc579e19d6e7aad4347c2985a1d /external/pdfium/ubsan.patch
parent09c94e2edf06cb8b4c57a29cea205b92ec903924 (diff)
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
Diffstat (limited to 'external/pdfium/ubsan.patch')
-rw-r--r--external/pdfium/ubsan.patch12
1 files changed, 0 insertions, 12 deletions
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);