diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 23:37:16 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 23:37:16 +0000 |
| commit | 2c73263a78261b1aa7283412df634ee810835d38 (patch) | |
| tree | 1cab062e719d790a770d9d1344fbc7d10e08c5f2 | |
| parent | 73d1d93df5f98d4d63d8ff54c65e9c2dfc0d5521 (diff) | |
| download | chromium_src-2c73263a78261b1aa7283412df634ee810835d38.zip chromium_src-2c73263a78261b1aa7283412df634ee810835d38.tar.gz chromium_src-2c73263a78261b1aa7283412df634ee810835d38.tar.bz2 | |
Merge 84890 - harfbuzz: Add Behdad's patch to fix Thai crashes on Linux.
This appears to prevent some renderer crashes that are
fairly easy to trigger with Thai pages on Chrome OS.
BUG=chromium:75210,chromium-os:15103
TEST=manual: built chromeos-chrome and checked that http://www.pungame.com/sale.html and http://happy.teenee.com/game/ no longer cause crashes
Review URL: http://codereview.chromium.org/7000012
TBR=derat@chromium.org
Review URL: http://codereview.chromium.org/7000017
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84891 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | third_party/harfbuzz/chromium.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/third_party/harfbuzz/chromium.patch b/third_party/harfbuzz/chromium.patch index 0f20dfd1..0705356 100644 --- a/third_party/harfbuzz/chromium.patch +++ b/third_party/harfbuzz/chromium.patch @@ -35,3 +35,17 @@ index f3ec8e1..2b0dfde 100644 // first char in a run is never (treated as) a mark int cStart = 0; +diff --git a/src/harfbuzz-gpos.c b/src/harfbuzz-gpos.c +index 356dc01..db5ea0a 100644 +--- a/src/harfbuzz-gpos.c ++++ b/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 ) |