From 37b82e32324d0911aba897880c28b2fdedc3ec9a Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Thu, 12 Sep 2013 20:00:46 -0400 Subject: [PATCH] Do not allocate so much memory on the stack. Instead, allocate a smaller amount and grow as necessary. BUG:10697851 Change-Id: Iec57a8a374a4a76a3770e241cf561d58f3c8e1dc --- .../CreateJavaOutputStreamAdaptor.cpp | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp b/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp index 2d06b681f73da..f773f59688fb2 100644 --- a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp +++ b/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp @@ -159,17 +159,26 @@ SkStream* CreateJavaInputStreamAdaptor(JNIEnv* env, jobject stream, } -static SkMemoryStream* adaptor_to_mem_stream(SkStream* adaptor) { - SkASSERT(adaptor != NULL); - SkDynamicMemoryWStream wStream; - const int bufferSize = 256 * 1024; // 256 KB, same as ViewStateSerializer. - uint8_t buffer[bufferSize]; - do { - size_t bytesRead = adaptor->read(buffer, bufferSize); - wStream.write(buffer, bytesRead); - } while (!adaptor->isAtEnd()); - SkAutoTUnref data(wStream.copyToData()); - return new SkMemoryStream(data.get()); +static SkMemoryStream* adaptor_to_mem_stream(SkStream* stream) { + SkASSERT(stream != NULL); + size_t bufferSize = 4096; + size_t streamLen = 0; + size_t len; + char* data = (char*)sk_malloc_throw(bufferSize); + + while ((len = stream->read(data + streamLen, + bufferSize - streamLen)) != 0) { + streamLen += len; + if (streamLen == bufferSize) { + bufferSize *= 2; + data = (char*)sk_realloc_throw(data, bufferSize); + } + } + data = (char*)sk_realloc_throw(data, streamLen); + + SkMemoryStream* streamMem = new SkMemoryStream(); + streamMem->setMemoryOwned(data, streamLen); + return streamMem; } SkStreamRewindable* CopyJavaInputStream(JNIEnv* env, jobject stream,