AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-9085 Fix infinite loop error in compound text converter in ICU4J

Browse Source 
X-SVN-Rev: 31299
This commit is contained in:
Michael Ow 2012-02-02 01:56:59 +00:00
parent 4fc83fb80c
commit 42208f627b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetCompoundText.java
View File

@ -1,6 +1,6 @@
/* /*
******************************************************************************* *******************************************************************************
* Copyright (C) 2010-2011, International Business Machines Corporation and * * Copyright (C) 2010-2012, International Business Machines Corporation and *
* others. All Rights Reserved. * * others. All Rights Reserved. *
******************************************************************************* *******************************************************************************
*/ */
@ -535,6 +535,9 @@ class CharsetCompoundText extends CharsetICU {
} }
if (tmpState < 0) { if (tmpState < 0) {
err = CoderResult.malformedForLength(1); err = CoderResult.malformedForLength(1);
if (this.toULength == 0) {
source.get(); /* skip over the 0x1b byte */
}
break; break;
} }

4
icu4j/main/shared/data/testdata.jar
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:b725498307fbdcaba54c87a108be02c1c1913756af500246112513f32b9901d3 oid sha256:9189e830f39d6cfb36008f3d389e784a3f0fa211ddaf01d6f4503188a2c46d55
size 719229 size 719348