diff options
author | 2013-11-04 21:35:55 +0000 | |
---|---|---|
committer | 2013-11-04 21:35:55 +0000 | |
commit | 12a23866fe18e800da1d361d000a359ea36696eb (patch) | |
tree | 68de0db0501417b3fb0c55c736f23c062e2fad18 /include/core/SkRRect.h | |
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 'include/core/SkRRect.h')
-rw-r--r-- | include/core/SkRRect.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/include/core/SkRRect.h b/include/core/SkRRect.h index 3c6386f1c6..402e6c6c4b 100644 --- a/include/core/SkRRect.h +++ b/include/core/SkRRect.h @@ -244,20 +244,14 @@ public: * write kSizeInMemory bytes, and that value is guaranteed to always be * a multiple of 4. Return kSizeInMemory. */ - size_t writeToMemory(void* buffer) const; + uint32_t writeToMemory(void* buffer) const; /** - * Reads the rrect from the specified buffer - * - * If the specified buffer is large enough, this will read kSizeInMemory bytes, - * and that value is guaranteed to always be a multiple of 4. - * - * @param buffer Memory to read from - * @param length Amount of memory available in the buffer - * @return number of bytes read (must be a multiple of 4) or - * 0 if there was not enough memory available + * Read the rrect from the specified buffer. This is guaranteed to always + * read kSizeInMemory bytes, and that value is guaranteed to always be + * a multiple of 4. Return kSizeInMemory. */ - size_t readFromMemory(const void* buffer, size_t length); + uint32_t readFromMemory(const void* buffer); private: SkRect fRect; |