aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar brianosman <brianosman@google.com>2016-11-22 12:03:53 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-11-22 12:03:53 -0800
commit818d8a99e8484db29c71cc509dc1969cc786ffd1 (patch)
tree7817ba4841e51fd822b69cdb51e370e5a5ddf072
parente8eed323ef7ea1c3c7057d49f3306b8ff41676e8 (diff)
Handle nullptr from asTextureRef
This can fail, if the special image dimensions are larger than the maximum allowable render target dimensions. BUG=chromium:666519 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2520043003 Review-Url: https://codereview.chromium.org/2520043003
-rw-r--r--src/image/SkImage.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 485bd24632..e0436815a7 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -352,6 +352,9 @@ sk_sp<SkImage> SkImage::makeWithFilter(const SkImageFilter* filter, const SkIRec
if (result->isTextureBacked()) {
GrContext* context = result->getContext();
sk_sp<GrTexture> texture = result->asTextureRef(context);
+ if (!texture) {
+ return nullptr;
+ }
fullSize = SkIRect::MakeWH(texture->width(), texture->height());
}
#endif