am ea22e420: Fix bug in SkImageDecoder.buildTileIndex()

Merge commit 'ea22e42026418b6b9919a94ff04930c978c4c777'

* commit 'ea22e42026418b6b9919a94ff04930c978c4c777':
  Fix bug in SkImageDecoder.buildTileIndex()

1 files changed, 13 insertions, 3 deletions

diff --git a/src/images/SkJpegUtility.cpp b/src/images/SkJpegUtility.cpp
index aaf87db..a3a6bcd 100644
--- a/src/images/SkJpegUtility.cpp
+++ b/src/images/SkJpegUtility.cpp
@@ -134,12 +134,22 @@ skjpeg_source_mgr::skjpeg_source_mgr(SkStream* stream, SkImageDecoder* decoder,
                                      bool copyStream, bool ownStream) : fStream(stream) {
     fDecoder = decoder;
     const void* baseAddr = stream->getMemoryBase();
+    size_t bufferSize = 4096;
+    size_t len;
     fMemoryBase = NULL;
     fUnrefStream = ownStream;
     if (copyStream) {
-        fMemoryBaseSize = stream->getLength();
-        fMemoryBase = sk_malloc_throw(fMemoryBaseSize);
-        stream->read(fMemoryBase, fMemoryBaseSize);
+        fMemoryBaseSize = 0;
+        fMemoryBase = sk_malloc_throw(bufferSize);
+        while ((len = stream->read(fMemoryBase + fMemoryBaseSize,
+                        bufferSize - fMemoryBaseSize)) != 0) {
+            fMemoryBaseSize += len;
+            if (fMemoryBaseSize == bufferSize) {
+                bufferSize *= 2;
+                fMemoryBase = sk_realloc_throw(fMemoryBase, bufferSize);
+            }
+        }
+        fMemoryBase = sk_realloc_throw(fMemoryBase, fMemoryBaseSize);
 
         init_source = skmem_init_source;
         fill_input_buffer = skmem_fill_input_buffer;