From 42208f627b5bd1b245968ea670482d2dab7ac658 Mon Sep 17 00:00:00 2001 From: Michael Ow Date: Thu, 2 Feb 2012 01:56:59 +0000 Subject: [PATCH] ICU-9085 Fix infinite loop error in compound text converter in ICU4J X-SVN-Rev: 31299 --- .../charset/src/com/ibm/icu/charset/CharsetCompoundText.java | 5 ++++- icu4j/main/shared/data/testdata.jar | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetCompoundText.java b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetCompoundText.java index 5e33e5dd4dd..0a54addacc5 100644 --- a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetCompoundText.java +++ b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetCompoundText.java @@ -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. * ******************************************************************************* */ @@ -535,6 +535,9 @@ class CharsetCompoundText extends CharsetICU { } if (tmpState < 0) { err = CoderResult.malformedForLength(1); + if (this.toULength == 0) { + source.get(); /* skip over the 0x1b byte */ + } break; } diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 003e5aa6f3a..9c26e1693fe 100755 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b725498307fbdcaba54c87a108be02c1c1913756af500246112513f32b9901d3 -size 719229 +oid sha256:9189e830f39d6cfb36008f3d389e784a3f0fa211ddaf01d6f4503188a2c46d55 +size 719348