Adding size parameter to read array functions

src/core/SkValidatingReadBuffer.cpp

Index: src/core/SkValidatingReadBuffer.cpp
diff --git a/src/core/SkValidatingReadBuffer.cpp b/src/core/SkValidatingReadBuffer.cpp
index a0e1a4179f2cd18ff431203aa8b1091102a68ec7..f324b477e997435dfaef06c197c6f1a66fc37e0c 100644
--- a/src/core/SkValidatingReadBuffer.cpp
+++ b/src/core/SkValidatingReadBuffer.cpp
@@ -150,8 +150,9 @@ void SkValidatingReadBuffer::readPath(SkPath* path) {
     }
 }
 
-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);
@@ -160,9 +161,10 @@ uint32_t SkValidatingReadBuffer::readByteArray(void* value) {
     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);
@@ -171,9 +173,10 @@ uint32_t SkValidatingReadBuffer::readColorArray(SkColor* colors) {
     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);
@@ -182,9 +185,10 @@ uint32_t SkValidatingReadBuffer::readIntArray(int32_t* values) {
     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);
@@ -193,9 +197,10 @@ uint32_t SkValidatingReadBuffer::readPointArray(SkPoint* points) {
     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);