Checking structure sizes before reading them from memory to avoid overflowing the buffer's stream.
BUG=
R=reed@google.com
Committed: https://code.google.com/p/skia/source/detail?r=12114
Review URL: https://codereview.chromium.org/41253002
git-svn-id: http://skia.googlecode.com/svn/trunk@12119 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index d2c6925..f047ec1 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -9,140 +9,202 @@
#include "SkValidatingReadBuffer.h"
#include "Test.h"
-static void Tests(skiatest::Reporter* reporter) {
- {
- static const uint32_t arraySize = 512;
- unsigned char data[arraySize] = {0};
- SkOrderedWriteBuffer writer(1024);
- writer.setFlags(SkOrderedWriteBuffer::kValidation_Flag);
+static const uint32_t kArraySize = 64;
+
+template<typename T>
+static void TestAlignment(T* testObj, skiatest::Reporter* reporter) {
+ // Test memory read/write functions directly
+ unsigned char dataWritten[1024];
+ size_t bytesWrittenToMemory = testObj->writeToMemory(dataWritten);
+ REPORTER_ASSERT(reporter, SkAlign4(bytesWrittenToMemory) == bytesWrittenToMemory);
+ size_t bytesReadFromMemory = testObj->readFromMemory(dataWritten, bytesWrittenToMemory);
+ REPORTER_ASSERT(reporter, SkAlign4(bytesReadFromMemory) == bytesReadFromMemory);
+}
+
+template<typename T> struct SerializationUtils {
+};
+
+template<> struct SerializationUtils<SkMatrix> {
+ static void Write(SkOrderedWriteBuffer& writer, const SkMatrix* matrix) {
+ writer.writeMatrix(*matrix);
+ }
+ static void Read(SkValidatingReadBuffer& reader, SkMatrix* matrix) {
+ reader.readMatrix(matrix);
+ }
+};
+
+template<> struct SerializationUtils<SkPath> {
+ static void Write(SkOrderedWriteBuffer& writer, const SkPath* path) {
+ writer.writePath(*path);
+ }
+ static void Read(SkValidatingReadBuffer& reader, SkPath* path) {
+ reader.readPath(path);
+ }
+};
+
+template<> struct SerializationUtils<SkRegion> {
+ static void Write(SkOrderedWriteBuffer& writer, const SkRegion* region) {
+ writer.writeRegion(*region);
+ }
+ static void Read(SkValidatingReadBuffer& reader, SkRegion* region) {
+ reader.readRegion(region);
+ }
+};
+
+template<> struct SerializationUtils<unsigned char> {
+ static void Write(SkOrderedWriteBuffer& writer, unsigned char* data, uint32_t arraySize) {
writer.writeByteArray(data, arraySize);
- uint32_t bytesWritten = writer.bytesWritten();
- // This should write the length (in 4 bytes) and the array
- REPORTER_ASSERT(reporter, (4 + arraySize) == bytesWritten);
-
- unsigned char dataWritten[1024];
- writer.writeToMemory(dataWritten);
-
- // Make sure this fails when it should
- SkValidatingReadBuffer buffer(dataWritten, bytesWritten);
- unsigned char dataRead[arraySize];
- bool success = buffer.readByteArray(dataRead, 256);
- // This should have failed, since 256 < sizeInBytes
- REPORTER_ASSERT(reporter, !success);
-
- // Make sure this succeeds when it should
- SkValidatingReadBuffer buffer2(dataWritten, bytesWritten);
- success = buffer2.readByteArray(dataRead, arraySize);
- // This should have succeeded, since there are enough bytes to read this
- REPORTER_ASSERT(reporter, success);
}
+ static bool Read(SkValidatingReadBuffer& reader, unsigned char* data, uint32_t arraySize) {
+ return reader.readByteArray(data, arraySize);
+ }
+};
- {
- static const uint32_t arraySize = 64;
- SkColor data[arraySize];
- SkOrderedWriteBuffer writer(1024);
- writer.setFlags(SkOrderedWriteBuffer::kValidation_Flag);
+template<> struct SerializationUtils<SkColor> {
+ static void Write(SkOrderedWriteBuffer& writer, SkColor* data, uint32_t arraySize) {
writer.writeColorArray(data, arraySize);
- uint32_t bytesWritten = writer.bytesWritten();
- // This should write the length (in 4 bytes) and the array
- REPORTER_ASSERT(reporter, (4 + arraySize * sizeof(SkColor)) == bytesWritten);
-
- unsigned char dataWritten[1024];
- writer.writeToMemory(dataWritten);
-
- // Make sure this fails when it should
- SkValidatingReadBuffer buffer(dataWritten, bytesWritten);
- SkColor dataRead[arraySize];
- bool success = buffer.readColorArray(dataRead, 32);
- // This should have failed, since 256 < sizeInBytes
- REPORTER_ASSERT(reporter, !success);
-
- // Make sure this succeeds when it should
- SkValidatingReadBuffer buffer2(dataWritten, bytesWritten);
- success = buffer2.readColorArray(dataRead, arraySize);
- // This should have succeeded, since there are enough bytes to read this
- REPORTER_ASSERT(reporter, success);
}
+ static bool Read(SkValidatingReadBuffer& reader, SkColor* data, uint32_t arraySize) {
+ return reader.readColorArray(data, arraySize);
+ }
+};
- {
- static const uint32_t arraySize = 64;
- int32_t data[arraySize];
- SkOrderedWriteBuffer writer(1024);
- writer.setFlags(SkOrderedWriteBuffer::kValidation_Flag);
+template<> struct SerializationUtils<int32_t> {
+ static void Write(SkOrderedWriteBuffer& writer, int32_t* data, uint32_t arraySize) {
writer.writeIntArray(data, arraySize);
- uint32_t bytesWritten = writer.bytesWritten();
- // This should write the length (in 4 bytes) and the array
- REPORTER_ASSERT(reporter, (4 + arraySize * sizeof(int32_t)) == bytesWritten);
-
- unsigned char dataWritten[1024];
- writer.writeToMemory(dataWritten);
-
- // Make sure this fails when it should
- SkValidatingReadBuffer buffer(dataWritten, bytesWritten);
- int32_t dataRead[arraySize];
- bool success = buffer.readIntArray(dataRead, 32);
- // This should have failed, since 256 < sizeInBytes
- REPORTER_ASSERT(reporter, !success);
-
- // Make sure this succeeds when it should
- SkValidatingReadBuffer buffer2(dataWritten, bytesWritten);
- success = buffer2.readIntArray(dataRead, arraySize);
- // This should have succeeded, since there are enough bytes to read this
- REPORTER_ASSERT(reporter, success);
}
+ static bool Read(SkValidatingReadBuffer& reader, int32_t* data, uint32_t arraySize) {
+ return reader.readIntArray(data, arraySize);
+ }
+};
- {
- static const uint32_t arraySize = 64;
- SkPoint data[arraySize];
- SkOrderedWriteBuffer writer(1024);
- writer.setFlags(SkOrderedWriteBuffer::kValidation_Flag);
+template<> struct SerializationUtils<SkPoint> {
+ static void Write(SkOrderedWriteBuffer& writer, SkPoint* data, uint32_t arraySize) {
writer.writePointArray(data, arraySize);
- uint32_t bytesWritten = writer.bytesWritten();
- // This should write the length (in 4 bytes) and the array
- REPORTER_ASSERT(reporter, (4 + arraySize * sizeof(SkPoint)) == bytesWritten);
+ }
+ static bool Read(SkValidatingReadBuffer& reader, SkPoint* data, uint32_t arraySize) {
+ return reader.readPointArray(data, arraySize);
+ }
+};
- unsigned char dataWritten[1024];
- writer.writeToMemory(dataWritten);
+template<> struct SerializationUtils<SkScalar> {
+ static void Write(SkOrderedWriteBuffer& writer, SkScalar* data, uint32_t arraySize) {
+ writer.writeScalarArray(data, arraySize);
+ }
+ static bool Read(SkValidatingReadBuffer& reader, SkScalar* data, uint32_t arraySize) {
+ return reader.readScalarArray(data, arraySize);
+ }
+};
- // Make sure this fails when it should
- SkValidatingReadBuffer buffer(dataWritten, bytesWritten);
- SkPoint dataRead[arraySize];
- bool success = buffer.readPointArray(dataRead, 32);
- // This should have failed, since 256 < sizeInBytes
- REPORTER_ASSERT(reporter, !success);
+template<typename T>
+static void TestObjectSerialization(T* testObj, skiatest::Reporter* reporter) {
+ SkOrderedWriteBuffer writer(1024);
+ writer.setFlags(SkOrderedWriteBuffer::kValidation_Flag);
+ SerializationUtils<T>::Write(writer, testObj);
+ size_t bytesWritten = writer.bytesWritten();
+ REPORTER_ASSERT(reporter, SkAlign4(bytesWritten) == bytesWritten);
- // Make sure this succeeds when it should
- SkValidatingReadBuffer buffer2(dataWritten, bytesWritten);
- success = buffer2.readPointArray(dataRead, arraySize);
- // This should have succeeded, since there are enough bytes to read this
- REPORTER_ASSERT(reporter, success);
+ unsigned char dataWritten[1024];
+ writer.writeToMemory(dataWritten);
+
+ // Make sure this fails when it should (test with smaller size, but still multiple of 4)
+ SkValidatingReadBuffer buffer(dataWritten, bytesWritten - 4);
+ const unsigned char* peekBefore = static_cast<const unsigned char*>(buffer.skip(0));
+ SerializationUtils<T>::Read(buffer, testObj);
+ const unsigned char* peekAfter = static_cast<const unsigned char*>(buffer.skip(0));
+ // This should have failed, since the buffer is too small to read a matrix from it
+ REPORTER_ASSERT(reporter, peekBefore == peekAfter);
+
+ // Make sure this succeeds when it should
+ SkValidatingReadBuffer buffer2(dataWritten, bytesWritten);
+ peekBefore = static_cast<const unsigned char*>(buffer2.skip(0));
+ SerializationUtils<T>::Read(buffer2, testObj);
+ peekAfter = static_cast<const unsigned char*>(buffer2.skip(0));
+ // This should have succeeded, since there are enough bytes to read this
+ REPORTER_ASSERT(reporter, static_cast<size_t>(peekAfter - peekBefore) == bytesWritten);
+
+ TestAlignment(testObj, reporter);
+}
+
+template<typename T>
+static void TestArraySerialization(T* data, skiatest::Reporter* reporter) {
+ SkOrderedWriteBuffer writer(1024);
+ writer.setFlags(SkOrderedWriteBuffer::kValidation_Flag);
+ SerializationUtils<T>::Write(writer, data, kArraySize);
+ size_t bytesWritten = writer.bytesWritten();
+ // This should write the length (in 4 bytes) and the array
+ REPORTER_ASSERT(reporter, (4 + kArraySize * sizeof(T)) == bytesWritten);
+
+ unsigned char dataWritten[1024];
+ writer.writeToMemory(dataWritten);
+
+ // Make sure this fails when it should
+ SkValidatingReadBuffer buffer(dataWritten, bytesWritten);
+ T dataRead[kArraySize];
+ bool success = SerializationUtils<T>::Read(buffer, dataRead, kArraySize / 2);
+ // This should have failed, since the provided size was too small
+ REPORTER_ASSERT(reporter, !success);
+
+ // Make sure this succeeds when it should
+ SkValidatingReadBuffer buffer2(dataWritten, bytesWritten);
+ success = SerializationUtils<T>::Read(buffer2, dataRead, kArraySize);
+ // This should have succeeded, since there are enough bytes to read this
+ REPORTER_ASSERT(reporter, success);
+}
+
+static void Tests(skiatest::Reporter* reporter) {
+ // Test matrix serialization
+ {
+ SkMatrix matrix = SkMatrix::I();
+ TestObjectSerialization(&matrix, reporter);
+ }
+
+ // Test path serialization
+ {
+ SkPath path;
+ TestObjectSerialization(&path, reporter);
}
+ // Test region serialization
{
- static const uint32_t arraySize = 64;
- SkScalar data[arraySize];
- SkOrderedWriteBuffer writer(1024);
- writer.setFlags(SkOrderedWriteBuffer::kValidation_Flag);
- writer.writeScalarArray(data, arraySize);
- uint32_t bytesWritten = writer.bytesWritten();
- // This should write the length (in 4 bytes) and the array
- REPORTER_ASSERT(reporter, (4 + arraySize * sizeof(SkScalar)) == bytesWritten);
+ SkRegion region;
+ TestObjectSerialization(®ion, reporter);
+ }
- unsigned char dataWritten[1024];
- writer.writeToMemory(dataWritten);
+ // Test rrect serialization
+ {
+ SkRRect rrect;
+ TestAlignment(&rrect, reporter);
+ }
- // Make sure this fails when it should
- SkValidatingReadBuffer buffer(dataWritten, bytesWritten);
- SkScalar dataRead[arraySize];
- bool success = buffer.readScalarArray(dataRead, 32);
- // This should have failed, since 256 < sizeInBytes
- REPORTER_ASSERT(reporter, !success);
+ // Test readByteArray
+ {
+ unsigned char data[kArraySize] = {0};
+ TestArraySerialization(data, reporter);
+ }
- // Make sure this succeeds when it should
- SkValidatingReadBuffer buffer2(dataWritten, bytesWritten);
- success = buffer2.readScalarArray(dataRead, arraySize);
- // This should have succeeded, since there are enough bytes to read this
- REPORTER_ASSERT(reporter, success);
+ // Test readColorArray
+ {
+ SkColor data[kArraySize];
+ TestArraySerialization(data, reporter);
+ }
+
+ // Test readIntArray
+ {
+ int32_t data[kArraySize];
+ TestArraySerialization(data, reporter);
+ }
+
+ // Test readPointArray
+ {
+ SkPoint data[kArraySize];
+ TestArraySerialization(data, reporter);
+ }
+
+ // Test readScalarArray
+ {
+ SkScalar data[kArraySize];
+ TestArraySerialization(data, reporter);
}
}