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