src/core/SkBitmap.cpp - Issue 92793002: Fixed bad bitmap size crashes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/core/SkBitmap.cpp

Issue 92793002: Fixed bad bitmap size crashes (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Added unit tests Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp

index 9d4aa87c857fa0bc62eb3bbf946b76e70940f70b..16afd57df3f0a10969a496d64cb4a1e6f9b4fe92 100644

--- a/src/core/SkBitmap.cpp

+++ b/src/core/SkBitmap.cpp

@@ -1568,6 +1568,10 @@ void SkBitmap::unflatten(SkFlattenableReadBuffer& buffer) {

case SERIALIZE_PIXELTYPE_REF_DATA: {

size_t offset = buffer.readUInt();

SkPixelRef* pr = buffer.readPixelRef();

+ if (!buffer.validate((NULL == pr) ||

+ (pr->getSize() >= (offset + this->getSafeSize())))) {

sugoi 2013/11/28 18:22:41 Simplified this a bit by using getSafeSize()

+ offset = 0;

+ }

SkSafeUnref(this->setPixelRef(pr, offset));

break;

}

« no previous file with comments | « include/core/SkPixelRef.h ('k') | src/core/SkBitmapDevice.cpp » ('j') | no next file with comments »