Checking structure sizes before reading them from memory to avoid overflowing the buffer's stream.

include/core/SkMatrix.h

Index: include/core/SkMatrix.h
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
index b6856d103c57fe45849b51c2d77c5d7449552afa..605e707a3441c1e6c2d7bf4345153f864a5a27c2 100644
--- a/include/core/SkMatrix.h
+++ b/include/core/SkMatrix.h
@@ -558,6 +558,10 @@ public:
         // writeTo/readFromMemory will never return a value larger than this
         kMaxFlattenSize = 9 * sizeof(SkScalar) + sizeof(uint32_t)
     };
+    // return the number of bytes of the current object's flattened representation
+    uint32_t sizeInMemory() const;

[reed1, 2013/10/24 20:51:19]

Doesn't writeToMemory(NULL) return this same value?

+    // return the number of bytes to read
+    static uint32_t SizeToRead();

[reed1, 2013/10/24 20:51:19]

This need not always be the same value for all matrices (even if it happens to
be so today).

     // return the number of bytes written, whether or not buffer is null
     uint32_t writeToMemory(void* buffer) const;
     // return the number of bytes read