summaryrefslogtreecommitdiffstats
path: root/icu/src/main/java
diff options
context:
space:
mode:
authorAndy Stadler <nobody@android.com>2009-05-11 14:03:58 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-11 14:03:58 -0700
commit0347eb1f2bc3a86a2cd7ba4166d7b3eae4479c78 (patch)
tree4c17d4a36a4d8cad787eefdb280e457ae6e342d1 /icu/src/main/java
parent43f11e509433970a5f33a6e5edd9b90089fa7d88 (diff)
downloadlibcore-0347eb1f2bc3a86a2cd7ba4166d7b3eae4479c78.zip
libcore-0347eb1f2bc3a86a2cd7ba4166d7b3eae4479c78.tar.gz
libcore-0347eb1f2bc3a86a2cd7ba4166d7b3eae4479c78.tar.bz2
AI 148694: Manually copied from cupcake_dcm CL 148669-p9. When resetting the
mode of the encoder, clear the leftover input & output buffers. This claims to fix buffer overwriting we're seeing during account sync and message download. BUG=1822859 Automated import of CL 148694
Diffstat (limited to 'icu/src/main/java')
-rw-r--r--icu/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/icu/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java b/icu/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
index 0fdb2c5..51d67ac 100644
--- a/icu/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
+++ b/icu/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
@@ -197,6 +197,10 @@ public final class CharsetEncoderICU extends CharsetEncoder {
data[INVALID_CHARS] = 0;
data[INPUT_HELD] = 0;
savedInputHeldLen = 0;
+ // BEGIN android-added
+ output = null;
+ input = null;
+ // END android-added
}
/**