use SkData::NewUninitialized

src/core/SkStream.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkStream.h"
@@ skipping 48 matching lines @@
         return this->readU16();
     } else if (SK_BYTE_SENTINEL_FOR_U32 == byte) {
         return this->readU32();
     } else {
         return byte;
     }
 }
 
 SkData* SkStream::readData() {
     size_t size = this->readU32();
-    if (0 == size) {
-        return SkData::NewEmpty();
-    } else {
-        SkData* data = SkData::NewUninitialized(size);
-        this->read(data->writable_data(), size);
-        return data;
+    return size ? this->readIntoData(size) : SkData::NewEmpty();
+}
+
+SkData* SkStream::readIntoData(size_t size) {
+    SkAutoDataUnref data(SkData::NewUninitialized(size));
+    if (this->read(data->writable_data(), size) != size) {
+        return NULL;
     }
+    return data.detach();
 }
 
 //////////////////////////////////////////////////////////////////////////////////////
 
 SkWStream::~SkWStream()
 {
 }
 
 void SkWStream::newline()
 {
@@ skipping 797 matching lines @@
     void* dst = storage->reset(length);
     tempStream.copyTo(dst);
     return length;
 }
 
 // Declared in SkStreamPriv.h:
 SkData* SkCopyStreamToData(SkStream* stream) {
     SkASSERT(stream != NULL);
 
     if (stream->hasLength()) {
-        const size_t length = stream->getLength();
-        SkData* data = SkData::NewUninitialized(length);
-        if (stream->read(data->writable_data(), length) != length) {
-            data->unref();
-            data = NULL;
-        }
-        return data;
+        return stream->readIntoData(stream->getLength());
     }
 
     SkDynamicMemoryWStream tempStream;
     const size_t bufferSize = 4096;
     char buffer[bufferSize];
     do {
         size_t bytesRead = stream->read(buffer, bufferSize);
         tempStream.write(buffer, bytesRead);
     } while (!stream->isAtEnd());
     return tempStream.copyToData();
 }
 
 SkStreamRewindable* SkStreamRewindableFromSkStream(SkStream* stream) {
     if (!stream) {
         return NULL;
     }
     SkAutoTUnref<SkStreamRewindable> dupStream(stream->duplicate());
     if (dupStream) {
         return dupStream.detach();
     }
     stream->rewind();
     if (stream->hasLength()) {
         size_t length = stream->getLength();
         if (stream->hasPosition()) {  // If stream has length, but can't rewind.
             length -= stream->getPosition();
         }
-        SkAutoTUnref<SkData> data(SkData::NewUninitialized(length));
-        SkDEBUGCODE(size_t read =) stream->read(data->writable_data(), length);
-        SkASSERT(length == read);
+        SkAutoTUnref<SkData> data(stream->readIntoData(length));
         return SkNEW_ARGS(SkMemoryStream, (data.get()));
     }
     SkDynamicMemoryWStream tempStream;
     const size_t bufferSize = 4096;
     char buffer[bufferSize];
     do {
         size_t bytesRead = stream->read(buffer, bufferSize);
         tempStream.write(buffer, bytesRead);
     } while (!stream->isAtEnd());
     return tempStream.detachAsStream();  // returns a SkBlockMemoryStream,
                                          // cheaper than copying to SkData
 }