diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 20:49:46 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 20:49:46 +0000 |
| commit | ef74fa189b738e13295d6a96f86a6e10223505a8 (patch) | |
| tree | 3434cb996555b725b71a520a93c8781923bc04ec /src/images/SkImageRef.cpp | |
| parent | 7d0b6131918c1b8d458a95f6b5e79f92f958b78f (diff) | |
Fixed more fuzzer issues
- Added the "isAvailable" function to check how much bytes are remaining in the stream before doing potentially large mallocs. That way, we can signal a bad stream instead of crashing.
- Added data validation in SkImageInfo.cpp
- Added NULL pointer check in displacement
- Modified the fuzzer for randomized bitmap types
BUG=328934,329254
R=senorblanco@google.com, senorblanco@chromium.org, reed@google.com, sugoi@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/116773002
git-svn-id: http://skia.googlecode.com/svn/trunk@12723 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/images/SkImageRef.cpp')
| -rw-r--r-- | src/images/SkImageRef.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/images/SkImageRef.cpp b/src/images/SkImageRef.cpp index 716519f080..843f4c01f9 100644 --- a/src/images/SkImageRef.cpp +++ b/src/images/SkImageRef.cpp @@ -165,8 +165,12 @@ SkImageRef::SkImageRef(SkFlattenableReadBuffer& buffer, SkBaseMutex* mutex) fDoDither = buffer.readBool(); size_t length = buffer.getArrayCount(); - fStream = SkNEW_ARGS(SkMemoryStream, (length)); - buffer.readByteArray((void*)fStream->getMemoryBase(), length); + if (buffer.validateAvailable(length)) { + fStream = SkNEW_ARGS(SkMemoryStream, (length)); + buffer.readByteArray((void*)fStream->getMemoryBase(), length); + } else { + fStream = NULL; + } fPrev = fNext = NULL; fFactory = NULL; |