From a71b8d17e8b0cc1ee19a75d75c1f52dc8030f68d Mon Sep 17 00:00:00 2001
From: Kevin Lubick <kjlubick@google.com>
Date: Thu, 1 Feb 2018 09:45:11 -0500
Subject: Check for nullptrs when fuzzing region_deserialize

Bug: oss-fuzz:5629
Change-Id: I1129a6a9a68c69e07ab63e2e2be1c00cf0581962
Reviewed-on: https://skia-review.googlesource.com/102482
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
---
 fuzz/oss_fuzz/FuzzRegionDeserialize.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'fuzz/oss_fuzz')

diff --git a/fuzz/oss_fuzz/FuzzRegionDeserialize.cpp b/fuzz/oss_fuzz/FuzzRegionDeserialize.cpp
index c5b37cb68e..80ee4f95ae 100644
--- a/fuzz/oss_fuzz/FuzzRegionDeserialize.cpp
+++ b/fuzz/oss_fuzz/FuzzRegionDeserialize.cpp
@@ -24,7 +24,11 @@ bool FuzzRegionDeserialize(sk_sp<SkData> bytes) {
     } else {
         region.contains(1,1);
     }
-    auto s = SkSurface::MakeRasterN32Premul(1024, 1024);
+    auto s = SkSurface::MakeRasterN32Premul(128, 128);
+    if (!s) {
+        // May return nullptr in memory-constrained fuzzing environments
+        return false;
+    }
     s->getCanvas()->drawRegion(region, SkPaint());
     SkDEBUGCODE(region.validate());
     return true;
-- 
cgit v1.2.3