Adding size parameter to read array functions

src/core/SkOrderedReadBuffer.cpp

Index: src/core/SkOrderedReadBuffer.cpp
diff --git a/src/core/SkOrderedReadBuffer.cpp b/src/core/SkOrderedReadBuffer.cpp
index d9aa8bd1d751d35c722bb05d79ddd291d0225461..06fdecd37efcd13b6f27ddb0b2b29408c9e16d8e 100644
--- a/src/core/SkOrderedReadBuffer.cpp
+++ b/src/core/SkOrderedReadBuffer.cpp
@@ -137,36 +137,51 @@ void SkOrderedReadBuffer::readPath(SkPath* path) {
     fReader.readPath(path);
 }
 
-uint32_t SkOrderedReadBuffer::readByteArray(void* value) {
-    const uint32_t length = fReader.readU32();
+size_t SkOrderedReadBuffer::readByteArray(void* value, size_t size) {
+    size_t length = fReader.readU32();
+    if (length > size) {
+        length = size;
+    }
     memcpy(value, fReader.skip(SkAlign4(length)), length);
     return length;
 }
 
-uint32_t SkOrderedReadBuffer::readColorArray(SkColor* colors) {
+size_t SkOrderedReadBuffer::readColorArray(SkColor* colors, size_t size) {
     const uint32_t count = fReader.readU32();
-    const uint32_t byteLength = count * sizeof(SkColor);
+    size_t byteLength = count * sizeof(SkColor);
+    if (byteLength > size) {
+        byteLength = size;
+    }
     memcpy(colors, fReader.skip(SkAlign4(byteLength)), byteLength);
     return count;
 }
 
-uint32_t SkOrderedReadBuffer::readIntArray(int32_t* values) {
+size_t SkOrderedReadBuffer::readIntArray(int32_t* values, size_t size) {
     const uint32_t count = fReader.readU32();
-    const uint32_t byteLength = count * sizeof(int32_t);
+    size_t byteLength = count * sizeof(int32_t);
+    if (byteLength > size) {
+        byteLength = size;
+    }
     memcpy(values, fReader.skip(SkAlign4(byteLength)), byteLength);
     return count;
 }
 
-uint32_t SkOrderedReadBuffer::readPointArray(SkPoint* points) {
+size_t SkOrderedReadBuffer::readPointArray(SkPoint* points, size_t size) {
     const uint32_t count = fReader.readU32();
-    const uint32_t byteLength = count * sizeof(SkPoint);
+    size_t byteLength = count * sizeof(SkPoint);
+    if (byteLength > size) {
+        byteLength = size;
+    }
     memcpy(points, fReader.skip(SkAlign4(byteLength)), byteLength);
     return count;
 }
 
-uint32_t SkOrderedReadBuffer::readScalarArray(SkScalar* values) {
+size_t SkOrderedReadBuffer::readScalarArray(SkScalar* values, size_t size) {
     const uint32_t count = fReader.readU32();
-    const uint32_t byteLength = count * sizeof(SkScalar);
+    size_t byteLength = count * sizeof(SkScalar);
+    if (byteLength > size) {
+        byteLength = size;
+    }
     memcpy(values, fReader.skip(SkAlign4(byteLength)), byteLength);
     return count;
 }