aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-15 16:49:34 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-15 16:49:34 +0000
commit35e15633805081c8978c18910cb25ed53f06f6c2 (patch)
treef6a0b4894131ccadeb93bc9ed5967f5835f0bb53
parent604a56ad4201cc66a85d7bf20efe201ec14b2c1f (diff)
Patch to fix NULL ptr dereference in 8171 on Linux
TBR=junov@google.com git-svn-id: http://skia.googlecode.com/svn/trunk@8175 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--src/core/SkPictureRecord.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index 38bbe33be5..557060d429 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -529,7 +529,9 @@ static void apply_optimization_to_bbh(PictureRecordOptType opt, SkPictureStateTr
SkBBoxHierarchy* boundingHierarchy) {
switch (opt) {
case kCollapseSaveLayer_OptType:
- stateTree->saveCollapsed();
+ if (NULL != stateTree) {
+ stateTree->saveCollapsed();
+ }
break;
case kRewind_OptType:
if (NULL != boundingHierarchy) {