AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid bad alloc in SkReadBuffer

Browse Source 
The fuzzer enjoyed tripping over this.

Bug: skia:
Change-Id: Ia7f4821404936266c77462232d7a64591580c2e0
Reviewed-on: https://skia-review.googlesource.com/114983
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
This commit is contained in:
Kevin Lubick 2018-03-19 09:54:11 -04:00 committed by Skia Commit-Bot
parent 2f974d4c9f
commit e3d3f65396
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/SkReadBuffer.cpp
View File

@ -283,12 +283,15 @@ sk_sp<SkImage> SkReadBuffer::readImage() {
// we used to negate the size for "custom" encoded images -- ignore that signal (Dec-2017)
size = SkAbs32(size);
if (size == 0) {
if (size < 0) {
// size == 0x80000000, possible to get here only in Release builds;
// SkAbs32() would already have asserted in Debug builds.
this->validate(false);
return nullptr;
} else if (size == 0) {
// The image could not be encoded at serialization time - return an empty placeholder.
return MakeEmptyImage(width, height);
}
if (size == 1) {
} else if (size == 1) {
// legacy check (we stopped writing this for "raw" images Nov-2017)
this->validate(false);
return nullptr;