diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2018-12-13 09:13:39 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2018-12-14 09:08:04 +0100 |
commit | 6b84708914f9c026776b28a300ac6d278272881f (patch) | |
tree | f44f856fa3b8d105c951b250860a108c413b72e5 /external/graphite/ubsan.patch | |
parent | 744c82af55d0ef1bfae61d13e5cf32fbd83c8b6b (diff) |
graphite: update to 1.3.12
Martin Hosken thinks all patches are redundant now, so drop them.
Change-Id: I062168416a1289b7f4dd42d8ae58b7df56a37712
Reviewed-on: https://gerrit.libreoffice.org/65074
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'external/graphite/ubsan.patch')
-rw-r--r-- | external/graphite/ubsan.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/external/graphite/ubsan.patch b/external/graphite/ubsan.patch deleted file mode 100644 index 86039de4e1c8..000000000000 --- a/external/graphite/ubsan.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- src/TtfUtil.cpp -+++ src/TtfUtil.cpp -@@ -1247,7 +1247,7 @@ - void * GlyfLookup(const void * pGlyf, size_t nGlyfOffset, size_t nTableLen) - { - const uint8 * pByte = reinterpret_cast<const uint8 *>(pGlyf); -- if (nGlyfOffset + pByte < pByte || nGlyfOffset + sizeof(Sfnt::Glyph) >= nTableLen) -+ if (nGlyfOffset > nTableLen || sizeof(Sfnt::Glyph) >= nTableLen - nGlyfOffset) - return NULL; - return const_cast<uint8 *>(pByte + nGlyfOffset); - } ---- src/gr_face.cpp -+++ src/gr_face.cpp -@@ -87,7 +87,7 @@ - - Face *res = new Face(appFaceHandle, *ops); - if (res && load_face(*res, faceOptions)) -- return static_cast<gr_face *>(res); -+ return reinterpret_cast<gr_face *>(res); - - delete res; - return 0; -@@ -195,7 +195,7 @@ - - void gr_face_destroy(gr_face *face) - { -- delete face; -+ delete static_cast<Face *>(face); - } - - ---- src/gr_font.cpp -+++ src/gr_font.cpp -@@ -50,7 +50,7 @@ - if (face == 0) return 0; - - Font * const res = new Font(ppm, *face, appFontHandle, font_ops); -- return static_cast<gr_font*>(res); -+ return reinterpret_cast<gr_font*>(res); - } - - gr_font* gr_make_font_with_advance_fn(float ppm/*pixels per em*/, const void* appFontHandle/*non-NULL*/, gr_advance_fn getAdvance, const gr_face * face/*needed for scaling*/) -@@ -61,7 +61,7 @@ - - void gr_font_destroy(gr_font *font) - { -- delete font; -+ delete static_cast<Font *>(font); - } - - ---- src/inc/Code.h -+++ src/inc/Code.h -@@ -162,7 +162,7 @@ - { - if (_code && !_own) - { -- _code += dist / sizeof(instr); -+ _code += dist / int(sizeof(instr)); - _data += dist; - } - } |