commit 48ce22b374c987e91584efb3665e7a835fdd14da
author Robert Phillips <robertphillips@google.com> Fri Mar 23 10:33:12 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 23 15:56:10 2018 +0000
tree f7fc956fc917ad8a7f463f98dd4febe505a37644
parent fbca7db22abf9e491044a9888880170339f88946

Add error return, upon mask creation failure, in sw_draw_with_mask_filter

Bug: 822680

Change-Id: I7296c5be4faf1f706ad1cc05198559771e324841
Reviewed-on: https://skia-review.googlesource.com/116180
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrBlurUtils.cpp

diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index b37da26..cc59c02 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -92,12 +92,18 @@
     bm.setImmutable();
 
     sk_sp<SkImage> image = SkImage::MakeFromBitmap(bm);
+    if (!image) {
+        return false;
+    }
 
     auto proxyProvider = context->contextPriv().proxyProvider();
     sk_sp<GrTextureProxy> maskProxy = proxyProvider->createTextureProxy(std::move(image),
                                                                         kNone_GrSurfaceFlags,
                                                                         1, SkBudgeted::kYes,
                                                                         SkBackingFit::kApprox);
+    if (!maskProxy) {
+        return false;
+    }
 
     return draw_mask(renderTargetContext, clipData, viewMatrix,
                      dstM.fBounds, std::move(paint), std::move(maskProxy));