check of fScaledBitmap failed to lock

BUG=

Review URL: https://codereview.chromium.org/27530003

git-svn-id: http://skia.googlecode.com/svn/trunk@11816 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp
index 69af8b9..db446a2 100644 (file)
--- a/src/core/SkBitmapProcState.cpp
+++ b/src/core/SkBitmapProcState.cpp
@@ -159,6 +159,12 @@ bool SkBitmapProcState::possiblyScaleImage() {
                                                             fScaledBitmap);
         }
         fScaledBitmap.lockPixels(); // wonder if Resize() should have locked this
+        if (!fScaledBitmap.getPixels()) {
+            // TODO: find out how this can happen, and add a unittest to exercise
+            // inspired by BUG=chromium:295895
+            return false;
+        }
+
         fBitmap = &fScaledBitmap;
 
         // set the inv matrix type to translate-only;