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 323273d131a25d80a84d0aa671aea023f1c9f501..bf556717a60995a6f6e537433320f761f89383a6 100644
--- a/src/core/SkValidatingReadBuffer.cpp
+++ b/src/core/SkValidatingReadBuffer.cpp
@@ -149,8 +149,9 @@ void SkValidatingReadBuffer::readPath(SkPath* path) {
     }
 }
 
-uint32_t SkValidatingReadBuffer::readByteArray(void* value) {
+size_t SkValidatingReadBuffer::readByteArray(void* value, size_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);
@@ -159,9 +160,10 @@ uint32_t SkValidatingReadBuffer::readByteArray(void* value) {
     return 0;
 }
 
-uint32_t SkValidatingReadBuffer::readColorArray(SkColor* colors) {
+size_t SkValidatingReadBuffer::readColorArray(SkColor* colors, size_t size) {
     const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(SkColor);
+    const size_t byteLength = count * sizeof(SkColor);
+    fError = fError || (size != byteLength);
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(colors, ptr, byteLength);
@@ -170,9 +172,10 @@ uint32_t SkValidatingReadBuffer::readColorArray(SkColor* colors) {
     return 0;
 }
 
-uint32_t SkValidatingReadBuffer::readIntArray(int32_t* values) {
+size_t SkValidatingReadBuffer::readIntArray(int32_t* values, size_t size) {
     const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(int32_t);
+    const size_t byteLength = count * sizeof(int32_t);
+    fError = fError || (size != byteLength);
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(values, ptr, byteLength);
@@ -181,9 +184,10 @@ uint32_t SkValidatingReadBuffer::readIntArray(int32_t* values) {
     return 0;
 }
 
-uint32_t SkValidatingReadBuffer::readPointArray(SkPoint* points) {
+size_t SkValidatingReadBuffer::readPointArray(SkPoint* points, size_t size) {
     const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(SkPoint);
+    const size_t byteLength = count * sizeof(SkPoint);
+    fError = fError || (size != byteLength);
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(points, ptr, byteLength);
@@ -192,9 +196,10 @@ uint32_t SkValidatingReadBuffer::readPointArray(SkPoint* points) {
     return 0;
 }
 
-uint32_t SkValidatingReadBuffer::readScalarArray(SkScalar* values) {
+size_t SkValidatingReadBuffer::readScalarArray(SkScalar* values, size_t size) {
     const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(SkScalar);
+    const size_t byteLength = count * sizeof(SkScalar);
+    fError = fError || (size != byteLength);
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(values, ptr, byteLength);