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

Handle possibly NULL deref in comparison

Browse Source 
Committed on behalf of groby@chromium.org

OCL=http://codereview.appspot.com/4633058/
CID=16790,16789

Review URL: http://codereview.appspot.com/4654049

git-svn-id: http://skia.googlecode.com/svn/trunk@1666 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
vandebo@chromium.org 2011-06-21 20:45:51 +00:00
parent 6aab8e3df7
commit e03c652478
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/SkClipStack.cpp
View File

@ -184,8 +184,10 @@ SkClipStack::B2FIter::B2FIter() {
bool operator==(const SkClipStack::B2FIter::Clip& a,
const SkClipStack::B2FIter::Clip& b) {
return a.fOp == b.fOp &&
((a.fRect == NULL && b.fRect == NULL) || *a.fRect == *b.fRect) &&
((a.fPath == NULL && b.fPath == NULL) || *a.fPath == *b.fPath);
((a.fRect == NULL && b.fRect == NULL) ||
(a.fRect != NULL && b.fRect != NULL && *a.fRect == *b.fRect)) &&
((a.fPath == NULL && b.fPath == NULL) ||
(a.fPath != NULL && b.fPath != NULL && *a.fPath == *b.fPath));
}
bool operator!=(const SkClipStack::B2FIter::Clip& a,