commit | ce78b9e1146ce204605fb179f10c842644fea61d | [log] [tgz] |
---|---|---|
author | Andreas Gampe <agampe@google.com> | Tue Jun 07 16:02:23 2016 -0700 |
committer | Andreas Gampe <agampe@google.com> | Tue Jun 07 16:02:23 2016 -0700 |
tree | 21fa53906502d3221fb8cb5f140109470555f15f | |
parent | 79cb94b8d6f6edcb10744fc81b81d38a0b2edda6 [diff] |
Frameworks/base: Fix FastPrintWriter infinite loop Check for error condition in loop. Bug: 29123428 Change-Id: I361ed27ecb8f05512d7e17f8045f3d34667d32d8
diff --git a/core/java/com/android/internal/util/FastPrintWriter.java b/core/java/com/android/internal/util/FastPrintWriter.java index e46e6b0..dc3832a 100644 --- a/core/java/com/android/internal/util/FastPrintWriter.java +++ b/core/java/com/android/internal/util/FastPrintWriter.java
@@ -345,7 +345,7 @@ if (mOutputStream != null) { CharBuffer charBuffer = CharBuffer.wrap(mText, 0, mPos); CoderResult result = mCharset.encode(charBuffer, mBytes, true); - while (true) { + while (!mIoError) { if (result.isError()) { throw new IOException(result.toString()); } else if (result.isOverflow()) {