Mercurial > hg > release > icedtea6-1.7

view patches/security/20101012/6963285.patch @ 1993:1cdd796efef3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Second batch of security updates. 2010-10-11 Andrew John Hughes <ahughes@redhat.com> * patches/icedtea-timerqueue.patch: Dropped; superceded by 6623943. * Makefile.am: Add new security patches. * NEWS: List new security patches. * patches/security/20101012/6622002.patch, * patches/security/20101012/6623943.patch, * patches/security/20101012/6952017.patch, * patches/security/20101012/6952603.patch, * patches/security/20101012/6961084.patch, * patches/security/20101012/6963285.patch, * patches/security/20101012/6981426.patch, * patches/security/20101012/6990437.patch: Added.
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 11 Oct 2010 21:52:05 +0100
parents
children
line wrap: on
line source

# HG changeset patch
# User prr
# Date 1277403811 25200
# Node ID 357bb3ba18c401c03ec1b85568df80130c3368d7
# Parent  d77434402021cebc4c25b452db18bbfd2d7ccda1
6963285: Crash in ICU Opentype layout engine due to mismatch in character counts
Reviewed-by: bae, igor

diff --git a/src/share/native/sun/font/layout/LayoutEngine.cpp b/src/share/native/sun/font/layout/LayoutEngine.cpp
--- openjdk.orig/jdk/src/share/native/sun/font/layout/LayoutEngine.cpp
+++ openjdk/jdk/src/share/native/sun/font/layout/LayoutEngine.cpp
@@ -292,7 +292,7 @@ le_int32 LayoutEngine::characterProcessi
         outCharCount = canonGSUBTable->process(glyphStorage, rightToLeft, scriptTag,
             langSysTag, NULL, substitutionFilter, canonFeatureMap, canonFeatureMapCount, FALSE);
 
-        out = (rightToLeft? count - 1 : 0);
+        out = (rightToLeft? outCharCount - 1 : 0);
 
         outChars = LE_NEW_ARRAY(LEUnicode, outCharCount);
         for (i = 0; i < outCharCount; i += 1, out += dir) {