diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 17:00:02 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 17:00:02 +0000 |
| commit | 01390cc66646c9722195cd989073d6bb6207ebd8 (patch) | |
| tree | 9103cc6982de4cc7f61572b2308842286f6b9ec8 /third_party/harfbuzz | |
| parent | 0526e7afcd6fbddda972ed0553d374beeea031c9 (diff) | |
| download | chromium_src-01390cc66646c9722195cd989073d6bb6207ebd8.zip chromium_src-01390cc66646c9722195cd989073d6bb6207ebd8.tar.gz chromium_src-01390cc66646c9722195cd989073d6bb6207ebd8.tar.bz2 | |
harfbuzz: Actually apply patch to fix Thai crashes. :-(
This appears to prevent some renderer crashes that are
fairly easy to trigger with Thai pages on Chrome OS.
(http://codereview.chromium.org/7000012/ previously added
this to chromium.patch, which I mistakenly assumed would get
applied on top of the source during the build process. I
guess it's instead just a record of our changes from
upstream?)
BUG=chromium:75210,chromium-os:15103
TEST=visited pungame.com/sale.html many times and checked that it no longer triggers a renderer crash
Review URL: http://codereview.chromium.org/7045021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/harfbuzz')
| -rw-r--r-- | third_party/harfbuzz/README.chromium | 11 | ||||
| -rw-r--r-- | third_party/harfbuzz/src/harfbuzz-gpos.c | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/third_party/harfbuzz/README.chromium b/third_party/harfbuzz/README.chromium index 41712c9..48a4255 100644 --- a/third_party/harfbuzz/README.chromium +++ b/third_party/harfbuzz/README.chromium @@ -1,11 +1,18 @@ Name: harfbuzz +Short Name: harfbuzz URL: http://freedesktop.org/wiki/Software/HarfBuzz -Version: unknown +Version: 0 +Date: 20091108 Revision: b0d396aa88b3cdf8cea896bfeeba197656e1cdb1 +Security Critical: yes Description: +"Harfbuzz is an OpenType text shaping engine." +Read http://behdad.org/text/ if you dare learn more. This code was taken from b0d396aa88b3cdf8cea896bfeeba197656e1cdb1 (git://anongit.freedesktop.org/harfbuzz) The patch in chromium.patch was applied on top of this; I will talk with -upstream about it. +upstream about it. (Note that chromium.patch is just a record of our +changes against upstream; you must also apply any changes that you make to +the checked-in copy of the source.) diff --git a/third_party/harfbuzz/src/harfbuzz-gpos.c b/third_party/harfbuzz/src/harfbuzz-gpos.c index 356dc01..db5ea0a 100644 --- a/third_party/harfbuzz/src/harfbuzz-gpos.c +++ b/third_party/harfbuzz/src/harfbuzz-gpos.c @@ -2976,6 +2976,9 @@ static HB_Error Lookup_MarkMarkPos( GPOS_Instance* gpi, j--; } + if ( i > buffer->in_pos ) + return HB_Err_Not_Covered; + error = _HB_OPEN_Coverage_Index( &mmp->Mark2Coverage, IN_GLYPH( j ), &mark2_index ); if ( error ) |