Adding size parameter to read array functions

src/core/SkValidatingReadBuffer.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkErrorInternals.h"
 #include "SkValidatingReadBuffer.h"
@@ skipping 131 matching lines @@
 }
 
 void SkValidatingReadBuffer::readPath(SkPath* path) {
     const size_t size = path->readFromMemory(fReader.peek());
     fError = fError || (SkAlign4(size) != size);
     if (!fError) {
         (void)this->skip(size);
     }
 }
 
-uint32_t SkValidatingReadBuffer::readByteArray(void* value) {
-    const uint32_t length = this->readUInt();
+bool SkValidatingReadBuffer::readByteArray(void* value, size_t size) {
+    const uint32_t length = this->getArrayCount();
+    fError = fError || (size != length);
+    (void)this->skip(sizeof(uint32_t)); // Skip array count

[sugoi1, 2013/10/30 18:14:32]

Here, the reason why I changed readUInt() for :
1 ) getArrayCount()
2 ) error check
3 ) skip
is that if an error is set at step 2, then skip will not move the cursor

     const void* ptr = this->skip(SkAlign4(length));
     if (!fError) {
         memcpy(value, ptr, length);
-        return length;
+        return true;
     }
-    return 0;
+    return false;
 }
 
-uint32_t SkValidatingReadBuffer::readColorArray(SkColor* colors) {
-    const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(SkColor);
+bool SkValidatingReadBuffer::readColorArray(SkColor* colors, size_t size) {
+    const uint32_t count = this->getArrayCount();
+    const size_t byteLength = count * sizeof(SkColor);
+    fError = fError || (size != byteLength);
+    (void)this->skip(sizeof(uint32_t)); // Skip array count
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(colors, ptr, byteLength);
-        return count;
+        return true;
     }
-    return 0;
+    return false;
 }
 
-uint32_t SkValidatingReadBuffer::readIntArray(int32_t* values) {
-    const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(int32_t);
+bool SkValidatingReadBuffer::readIntArray(int32_t* values, size_t size) {
+    const uint32_t count = this->getArrayCount();
+    const size_t byteLength = count * sizeof(int32_t);
+    fError = fError || (size != byteLength);
+    (void)this->skip(sizeof(uint32_t)); // Skip array count
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(values, ptr, byteLength);
-        return count;
+        return true;
     }
-    return 0;
+    return false;
 }
 
-uint32_t SkValidatingReadBuffer::readPointArray(SkPoint* points) {
-    const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(SkPoint);
+bool SkValidatingReadBuffer::readPointArray(SkPoint* points, size_t size) {
+    const uint32_t count = this->getArrayCount();
+    const size_t byteLength = count * sizeof(SkPoint);
+    fError = fError || (size != byteLength);
+    (void)this->skip(sizeof(uint32_t)); // Skip array count
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(points, ptr, byteLength);
-        return count;
+        return true;
     }
-    return 0;
+    return false;
 }
 
-uint32_t SkValidatingReadBuffer::readScalarArray(SkScalar* values) {
-    const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(SkScalar);
+bool SkValidatingReadBuffer::readScalarArray(SkScalar* values, size_t size) {
+    const uint32_t count = this->getArrayCount();
+    const size_t byteLength = count * sizeof(SkScalar);
+    fError = fError || (size != byteLength);
+    (void)this->skip(sizeof(uint32_t)); // Skip array count
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(values, ptr, byteLength);
-        return count;
+        return true;
     }
-    return 0;
+    return false;
 }
 
 uint32_t SkValidatingReadBuffer::getArrayCount() {
     return *(uint32_t*)fReader.peek();
 }
 
 void SkValidatingReadBuffer::readBitmap(SkBitmap* bitmap) {
     const int width = this->readInt();
     const int height = this->readInt();
     const size_t length = this->readUInt();
@@ skipping 40 matching lines @@
             delete obj;
             obj = NULL;
         }
     } else {
         // we must skip the remaining data
         this->skip(sizeRecorded);
         SkASSERT(false);
     }
     return obj;
 }