diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 01:06:44 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 01:06:44 +0000 |
commit | 05858435ee8744de863be7e5ade05e4fd6edfb46 (patch) | |
tree | 7f95cdbe087a54cb47388b1859e162195bcabdf4 /src | |
parent | facad13fa840d362a8ea40161916fe609cb52657 (diff) |
Fixing a clusterfuzz found issue
BUG=378175
R=reed@google.com, sugoi@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/306033003
git-svn-id: http://skia.googlecode.com/svn/trunk@14983 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkBitmap.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index e5cc0d7fcd..522dfb1ebb 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -1308,7 +1308,9 @@ bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) { const int height = info.height(); const size_t snugSize = snugRB * height; const size_t ramSize = ramRB * height; - SkASSERT(snugSize <= ramSize); + if (!buffer->validate(snugSize <= ramSize)) { + return false; + } char* dst = (char*)sk_malloc_throw(ramSize); buffer->readByteArray(dst, snugSize); |