Avoid nullptr deference when deserializing SkPicture

Avoid resetting SkAutoSTArray values to negatives.

Additionally, clean up some misc logs that aren't helpful.

Bug: skia:7405
Change-Id: Ied353a4e415e2efd5ab8180e7f6c681248dd9134
Reviewed-on: https://skia-review.googlesource.com/93240
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Kevin Lubick <kjlubick@google.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 05bad67397..1c8d0f9b49 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -135,6 +135,9 @@ sk_sp<SkPicture> SkPicture::Forwardport(const SkPictInfo& info,
     if (!data) {
         return nullptr;
     }
+    if (!data->opData()) {
+        return nullptr;
+    }
     SkPicturePlayback playback(data);
     SkPictureRecorder r;
     playback.draw(r.beginRecording(info.fCullRect), nullptr/*no callback*/, buffer);