commit 24e58341fbcd904fdf81d86e5a7703e254d63e35
author Mike Reed <reed@google.com> Mon Sep 03 14:59:39 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Sep 03 19:39:50 2018 +0000
tree 4e6c3ca78974d11fccf12986970f3b4140c0476e
parent 2c55d8f5eeb01009159d0d2e39ff5a86c2765f09

check if stream failed

If so, index might be uninitialized, so don't use it

Bug: skia:
Change-Id: Icccf6c796cf73317f10c80d6f7523479662c401f
Reviewed-on: https://skia-review.googlesource.com/151221
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/core/SkTypeface.cpp

diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index 77cfa19..434d56b 100644
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -271,6 +271,9 @@
 std::unique_ptr<SkFontData> SkTypeface::onMakeFontData() const {
     int index;
     std::unique_ptr<SkStreamAsset> stream(this->onOpenStream(&index));
+    if (!stream) {
+        return nullptr;
+    }
     return skstd::make_unique<SkFontData>(std::move(stream), index, nullptr, 0);
 };