commit 9903d0089573acf43c8c76afe0e00db50055ac7f
author The Android Automerger <android-build@google.com> Tue Oct 21 17:43:57 2014 -0700
committer The Android Automerger <android-build@google.com> Tue Oct 21 17:43:57 2014 -0700
tree 156f905e0fcf24a0bdfdc26f4a9eb3ff96bfe92d
parent 226fe6c926409f3b64b07f0b74e92e34cc0b515e
parent b9e4fa2aa140f72f83856ec281c1e9f744c3705f

merge in lmp-release history after reset to 226fe6c926409f3b64b07f0b74e92e34cc0b515e

src/utils/SkFrontBufferedStream.cpp

diff --git a/src/utils/SkFrontBufferedStream.cpp b/src/utils/SkFrontBufferedStream.cpp
index 8cb3931..80a2bcf 100644
--- a/src/utils/SkFrontBufferedStream.cpp
+++ b/src/utils/SkFrontBufferedStream.cpp
@@ -175,7 +175,7 @@
 
     // Buffer any more data that should be buffered, and copy it to the
     // destination.
-    if (size > 0 && fBufferedSoFar < fBufferSize) {
+    if (size > 0 && fBufferedSoFar < fBufferSize && !fStream->isAtEnd()) {
         const size_t buffered = this->bufferAndWriteTo(dst, size);
 
         // Update the remaining number of bytes needed to read