diff options
| -rw-r--r-- | third_party/harfbuzz/README.google | 19 | ||||
| -rw-r--r-- | third_party/harfbuzz/src/harfbuzz-arabic.c | 4 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 25 |
3 files changed, 19 insertions, 29 deletions
diff --git a/third_party/harfbuzz/README.google b/third_party/harfbuzz/README.google index 34fbfeb..b958bde 100644 --- a/third_party/harfbuzz/README.google +++ b/third_party/harfbuzz/README.google @@ -5,7 +5,8 @@ http://freedesktop.org/wiki/Software/HarfBuzz This code was taken from cb83c38045a7dd098f8edd4530d328e999a7bbaf (git://anongit.freedesktop.org/harfbuzz) -The contrib/ directory was written by us and is in the process of getting upstreamed. Additionally, this patch was applied: +The contrib/ directory was written by us and is in the process of getting upstreamed. Additionally, these patches were applied: + diff --git a/src/harfbuzz-shaper.h b/src/harfbuzz-shaper.h index e8f5513..1577b59 100644 @@ -30,3 +31,19 @@ index e8f5513..1577b59 100644 +}; HB_Bool HB_ShapeItem(HB_ShaperItem *item); + + +http://bugs.freedesktop.org/show_bug.cgi?id=24540: +diff --git a/third_party/harfbuzz/src/harfbuzz-arabic.c b/third_party/harfbuzz/src/harfbuzz-arabic.c +index 0609232..de3c1f4 100644 +--- a/third_party/harfbuzz/src/harfbuzz-arabic.c ++++ b/third_party/harfbuzz/src/harfbuzz-arabic.c +@@ -1009,7 +1009,7 @@ static HB_Bool arabicSyriacOpenTypeShape(HB_ShaperItem *item, HB_Bool *ot_ok) + ++l; + ++properties; + } +- if (f + l < item->stringLength) { ++ if (f + l + item->item.pos < item->stringLength) { + ++l; + } + getArabicProperties(uc+f, l, props); diff --git a/third_party/harfbuzz/src/harfbuzz-arabic.c b/third_party/harfbuzz/src/harfbuzz-arabic.c index 0609232..de3c1f4 100644 --- a/third_party/harfbuzz/src/harfbuzz-arabic.c +++ b/third_party/harfbuzz/src/harfbuzz-arabic.c @@ -1009,7 +1009,7 @@ static HB_Bool arabicSyriacOpenTypeShape(HB_ShaperItem *item, HB_Bool *ot_ok) ++l; ++properties; } - if (f + l < item->stringLength) { + if (f + l + item->item.pos < item->stringLength) { ++l; } getArabicProperties(uc+f, l, props); @@ -1086,5 +1086,3 @@ HB_Bool HB_ArabicShape(HB_ShaperItem *item) HB_HeuristicPosition(item); return TRUE; } - - diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index d7d7c95..56fec8a 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -993,31 +993,6 @@ fun:main } { - bug_23450 - Memcheck:Addr2 - fun:getArabicProperties - fun:arabicSyriacOpenTypeShape - fun:HB_ArabicShape - fun:HB_ShapeItem - fun:_ZN7WebCore13TextRunWalker11shapeGlyphsEv - fun:_ZN7WebCore13TextRunWalker13nextScriptRunEv - fun:_ZN7WebCore13TextRunWalker14widthOfFullRunEv - fun:_ZNK7WebCore4Font24floatWidthForComplexTextERKNS_7TextRunEPN3WTF7HashSetIPKNS_14SimpleFontDataENS4_7PtrHashIS8_EENS4_10HashTraitsIS8_EEEE - fun:_ZNK7WebCore4Font10floatWidthERKNS_7TextRunEPN3WTF7HashSetIPKNS_14SimpleFontDataENS4_7PtrHashIS8_EENS4_10HashTraitsIS8_EEEE - fun:_ZN7WebCore13RenderListBox17updateFromElementEv - fun:_ZN7WebCore22HTMLFormControlElement11recalcStyleENS_4Node11StyleChangeE - fun:_ZN7WebCore17HTMLSelectElement11recalcStyleENS_4Node11StyleChangeE - fun:_ZN7WebCore7Element11recalcStyleENS_4Node11StyleChangeE - fun:_ZN7WebCore7Element11recalcStyleENS_4Node11StyleChangeE - fun:_ZN7WebCore8Document11recalcStyleENS_4Node11StyleChangeE - fun:_ZN7WebCore8Document19updateStyleIfNeededEv - fun:_ZN7WebCore8Document26updateStyleForAllDocumentsEv - fun:_ZN7WebCore4Node20dispatchGenericEventEN3WTF10PassRefPtrINS_5EventEEE - fun:_ZN7WebCore4Node13dispatchEventEN3WTF10PassRefPtrINS_5EventEEE - fun:_ZN7WebCore8Document15finishedParsingEv - fun:_ZN7WebCore10HTMLParser8finishedEv -} -{ bug_23310 Memcheck:Leak fun:_Znw* |