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 132 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) {
+uint32_t SkValidatingReadBuffer::readByteArray(void* value, uint32_t size) {
     const uint32_t length = this->readUInt();
+    fError = fError || (size != length);
     const void* ptr = this->skip(SkAlign4(length));
     if (!fError) {
         memcpy(value, ptr, length);
         return length;
     }
     return 0;
 }
 
-uint32_t SkValidatingReadBuffer::readColorArray(SkColor* colors) {
+uint32_t SkValidatingReadBuffer::readColorArray(SkColor* colors, uint32_t size) {
     const uint32_t count = this->readUInt();
     const uint32_t byteLength = count * sizeof(SkColor);
+    fError = fError || (size != byteLength);
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(colors, ptr, byteLength);
         return count;
     }
     return 0;
 }
 
-uint32_t SkValidatingReadBuffer::readIntArray(int32_t* values) {
+uint32_t SkValidatingReadBuffer::readIntArray(int32_t* values, uint32_t size) {
     const uint32_t count = this->readUInt();
     const uint32_t byteLength = count * sizeof(int32_t);
+    fError = fError || (size != byteLength);
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(values, ptr, byteLength);
         return count;
     }
     return 0;
 }
 
-uint32_t SkValidatingReadBuffer::readPointArray(SkPoint* points) {
+uint32_t SkValidatingReadBuffer::readPointArray(SkPoint* points, uint32_t size) {
     const uint32_t count = this->readUInt();
     const uint32_t byteLength = count * sizeof(SkPoint);
+    fError = fError || (size != byteLength);
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(points, ptr, byteLength);
         return count;
     }
     return 0;
 }
 
-uint32_t SkValidatingReadBuffer::readScalarArray(SkScalar* values) {
+uint32_t SkValidatingReadBuffer::readScalarArray(SkScalar* values, uint32_t size) {
     const uint32_t count = this->readUInt();
     const uint32_t byteLength = count * sizeof(SkScalar);
+    fError = fError || (size != byteLength);
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(values, ptr, byteLength);
         return count;
     }
     return 0;
 }
 
 uint32_t SkValidatingReadBuffer::getArrayCount() {
     return *(uint32_t*)fReader.peek();
@@ skipping 46 matching lines @@
             delete obj;
             obj = NULL;
         }
     } else {
         // we must skip the remaining data
         this->skip(sizeRecorded);
         SkASSERT(false);
     }
     return obj;
 }