From 21d3f9016fcf0ac182281d7fea9b2e0a69516a5d Mon Sep 17 00:00:00 2001
From: Florin Malita <fmalita@chromium.org>
Date: Fri, 13 Apr 2018 11:01:32 -0400
Subject: [skottie] Harden json string parsing

TBR=
Change-Id: I538d1a86c1adc4a00deffc254c8bfde8d5d6794b
Reviewed-on: https://skia-review.googlesource.com/121324
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
---
 experimental/skottie/SkottieParser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'experimental')

diff --git a/experimental/skottie/SkottieParser.cpp b/experimental/skottie/SkottieParser.cpp
index a40a9ae8c0..24603bf828 100644
--- a/experimental/skottie/SkottieParser.cpp
+++ b/experimental/skottie/SkottieParser.cpp
@@ -57,7 +57,7 @@ bool Parse<SkString>(const Json::Value& jv, SkString* v) {
     if (jv.isNull() || !jv.isConvertibleTo(Json::stringValue))
         return false;
 
-    v->set(jv.asCString());
+    v->set(jv.isString() ? jv.asCString() : jv.asString().c_str());
 
     return true;
 }
-- 
cgit v1.2.3