Adding size parameter to read array functions

src/core/SkValidatingReadBuffer.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkValidatingReadBuffer_DEFINED
 #define SkValidatingReadBuffer_DEFINED
 
@@ skipping 29 matching lines @@
     // common data structures
     virtual SkFlattenable* readFlattenable(SkFlattenable::Type type) SK_OVERRIDE;
     virtual void readPoint(SkPoint* point) SK_OVERRIDE;
     virtual void readMatrix(SkMatrix* matrix) SK_OVERRIDE;
     virtual void readIRect(SkIRect* rect) SK_OVERRIDE;
     virtual void readRect(SkRect* rect) SK_OVERRIDE;
     virtual void readRegion(SkRegion* region) SK_OVERRIDE;
     virtual void readPath(SkPath* path) SK_OVERRIDE;
 
     // binary data and arrays
-    virtual uint32_t readByteArray(void* value) SK_OVERRIDE;
-    virtual uint32_t readColorArray(SkColor* colors) SK_OVERRIDE;
-    virtual uint32_t readIntArray(int32_t* values) SK_OVERRIDE;
-    virtual uint32_t readPointArray(SkPoint* points) SK_OVERRIDE;
-    virtual uint32_t readScalarArray(SkScalar* values) SK_OVERRIDE;
+    virtual bool readByteArray(void* value, size_t size) SK_OVERRIDE;
+    virtual bool readColorArray(SkColor* colors, size_t size) SK_OVERRIDE;
+    virtual bool readIntArray(int32_t* values, size_t size) SK_OVERRIDE;
+    virtual bool readPointArray(SkPoint* points, size_t size) SK_OVERRIDE;
+    virtual bool readScalarArray(SkScalar* values, size_t size) SK_OVERRIDE;
 
     // helpers to get info about arrays and binary data
     virtual uint32_t getArrayCount() SK_OVERRIDE;
 
     virtual void readBitmap(SkBitmap* bitmap) SK_OVERRIDE;
     // TODO: Implement this (securely) when needed
     virtual SkTypeface* readTypeface() SK_OVERRIDE { return NULL; }
 
     virtual void validate(bool isValid) SK_OVERRIDE {

[reed1, 2013/10/30 20:22:32]

at some point, we should move all of these virtual methods into the .cpp

[sugoi1, 2013/10/31 14:16:24]

Done.

-        fError = fError || !isValid;
+        if (!fError && !isValid) {
+            // When an error is found, send the read cursor to the end of the stream
+            fReader.skip(fReader.available());
+            fError = true;
+        }
     }
 
 private:
+    template <typename T> bool readArray(T* value, size_t size);
+
     void setMemory(const void* data, size_t size);
 
     static bool IsPtrAlign4(const void* ptr) {
         return SkIsAlign4((uintptr_t)ptr);
     }
 
     SkReader32 fReader;
     bool fError;
 
     typedef SkFlattenableReadBuffer INHERITED;
 };
 
 #endif // SkValidatingReadBuffer_DEFINED