diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-04 21:35:55 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-04 21:35:55 +0000 |
commit | 12a23866fe18e800da1d361d000a359ea36696eb (patch) | |
tree | 68de0db0501417b3fb0c55c736f23c062e2fad18 /tests/MatrixTest.cpp | |
parent | 1e4c4fea1179324ce003d3c838ba135f3d21d943 (diff) |
Revert "Checking structure sizes before reading them from memory to avoid overflowing the buffer's stream."
This reverts commit 6bc22e8ef1ea70a1b58409aa21254358c50f149a.
git-svn-id: http://skia.googlecode.com/svn/trunk@12124 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/MatrixTest.cpp')
-rw-r--r-- | tests/MatrixTest.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp index e9886941eb..07eacb6f44 100644 --- a/tests/MatrixTest.cpp +++ b/tests/MatrixTest.cpp @@ -112,19 +112,18 @@ static void test_matrix_recttorect(skiatest::Reporter* reporter) { static void test_flatten(skiatest::Reporter* reporter, const SkMatrix& m) { // add 100 in case we have a bug, I don't want to kill my stack in the test - static const size_t kBufferSize = SkMatrix::kMaxFlattenSize + 100; - char buffer[kBufferSize]; - size_t size1 = m.writeToMemory(NULL); - size_t size2 = m.writeToMemory(buffer); + char buffer[SkMatrix::kMaxFlattenSize + 100]; + uint32_t size1 = m.writeToMemory(NULL); + uint32_t size2 = m.writeToMemory(buffer); REPORTER_ASSERT(reporter, size1 == size2); REPORTER_ASSERT(reporter, size1 <= SkMatrix::kMaxFlattenSize); SkMatrix m2; - size_t size3 = m2.readFromMemory(buffer, kBufferSize); + uint32_t size3 = m2.readFromMemory(buffer); REPORTER_ASSERT(reporter, size1 == size3); REPORTER_ASSERT(reporter, are_equal(reporter, m, m2)); - char buffer2[kBufferSize]; + char buffer2[SkMatrix::kMaxFlattenSize + 100]; size3 = m2.writeToMemory(buffer2); REPORTER_ASSERT(reporter, size1 == size3); REPORTER_ASSERT(reporter, memcmp(buffer, buffer2, size1) == 0); |