| Index: src/core/SkBitmapProcState.cpp
|
| diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp
|
| index 69af8b9061a4d5e820cdb6e0a677ba06336ade9a..db446a2445a50668ad4524894efbdd33c435d7a4 100644
|
| --- 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;
|
|
|