From 2388866c8de62a9f9422125e2df40a8cf21727c6 Mon Sep 17 00:00:00 2001
From: Kevin Lubick <kjlubick@google.com>
Date: Wed, 21 Feb 2018 08:07:26 -0500
Subject: Check for null colorFilter in FuzzCanvas

Follow up to https://skia-review.googlesource.com/c/skia/+/108300

Bug: skia:
Change-Id: I1b8b6ff71c71388660e09b3a7e8c77a40b1a1d12
Reviewed-on: https://skia-review.googlesource.com/108960
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
---
 fuzz/FuzzCanvas.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'fuzz')

diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp
index a14468f033..9e117af66f 100644
--- a/fuzz/FuzzCanvas.cpp
+++ b/fuzz/FuzzCanvas.cpp
@@ -183,7 +183,11 @@ static sk_sp<SkColorFilter> make_fuzz_colorfilter(Fuzz* fuzz, int depth) {
         }
         case 2: {
             sk_sp<SkColorFilter> outer = make_fuzz_colorfilter(fuzz, depth - 1);
+            if (!outer) {
+                return nullptr;
+            }
             sk_sp<SkColorFilter> inner = make_fuzz_colorfilter(fuzz, depth - 1);
+            // makeComposed should be able to handle nullptr.
             return outer->makeComposed(std::move(inner));
         }
         case 3: {
-- 
cgit v1.2.3