diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-01-10 09:17:28 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-01-10 14:35:13 +0100 |
commit | e1026e267b4b1b0b0bd645c6bc212d6fa71544f8 (patch) | |
tree | 1a6f7615b928ede745684a592d55a7eea915a93c /external/pdfium/ubsan.patch | |
parent | d9bde4c6af35beca7be6da93834fc56a6c1bf753 (diff) |
pdfium: update to 3312
Change-Id: I3e81c097870264bfcdd8c14407dcb95f5b153793
Reviewed-on: https://gerrit.libreoffice.org/47689
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external/pdfium/ubsan.patch')
-rw-r--r-- | external/pdfium/ubsan.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/external/pdfium/ubsan.patch b/external/pdfium/ubsan.patch index 7e4e2e9276a8..56f47840ae88 100644 --- a/external/pdfium/ubsan.patch +++ b/external/pdfium/ubsan.patch @@ -23,16 +23,16 @@ --- core/fxge/cfx_facecache.cpp +++ core/fxge/cfx_facecache.cpp -@@ -223,7 +223,8 @@ std::unique_ptr<CFX_GlyphBitmap> CFX_FaceCache::RenderGlyph( +@@ -183,7 +183,8 @@ std::unique_ptr<CFX_GlyphBitmap> CFX_FaceCache::RenderGlyph( } } } else { - memset(pDestBuf, 0, dest_pitch * bmheight); + if (dest_pitch != 0 && bmheight != 0) + memset(pDestBuf, 0, dest_pitch * bmheight); - if (anti_alias == FXFT_RENDER_MODE_MONO && - FXFT_Get_Bitmap_PixelMode(FXFT_Get_Glyph_Bitmap(m_Face)) == - FXFT_PIXEL_MODE_MONO) { + 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); --- third_party/agg23/agg_rasterizer_scanline_aa.h +++ third_party/agg23/agg_rasterizer_scanline_aa.h @@ -349,14 +349,14 @@ public: |