From aa5da735fa27cdb60f55f94bbd2149727c9c0728 Mon Sep 17 00:00:00 2001
From: Ben Wagner <bungeman@google.com>
Date: Wed, 28 Mar 2018 13:36:02 -0400
Subject: Check that paint is not null in OveridePaintFilterCanvas.

SkCanvas::drawPicture may provide nullptr for a paint.

BUG=skia:7756

Change-Id: I46651f7e8f0d859a7e75206d93ed1f3b3c0a4bac
Reviewed-on: https://skia-review.googlesource.com/116902
Reviewed-by: Yuqian Li <liyuqian@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
---
 tools/viewer/Viewer.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 8aff1cedb0..f4b03065e2 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -868,6 +868,9 @@ public:
         : SkPaintFilterCanvas(canvas), fPaint(paint), fPaintOverrides(fields)
     { }
     bool onFilter(SkTCopyOnFirstWrite<SkPaint>* paint, Type) const override {
+        if (*paint == nullptr) {
+            return true;
+        }
         if (fPaintOverrides->fHinting) {
             paint->writable()->setHinting(fPaint->getHinting());
         }
-- 
cgit v1.2.3