aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-02-24 16:38:58 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-02-24 16:38:58 +0000
commitf68c5e2f9f05b3af2bae0979ace2684b6041b6e3 (patch)
tree9d6383b5321fb1695b46cba01956a42885b81c17
parent2afbf07495e557048decb91fc16c114696752e50 (diff)
check for null-device in iterator
git-svn-id: http://skia.googlecode.com/svn/trunk@3251 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--src/core/SkCanvas.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 034486dbaa..6e061c2005 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -232,8 +232,8 @@ public:
}
}
- if (NULL != fCurrLayer) {
- const DeviceCM* rec = fCurrLayer;
+ const DeviceCM* rec = fCurrLayer;
+ if (rec && rec->fDevice) {
fMatrix = rec->fMatrix;
fClip = &((SkRasterClip*)&rec->fClip)->forceGetBW();