diff options
| author |  Florin Malita <fmalita@chromium.org> | 2018-04-13 11:01:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-13 15:35:42 +0000 |
| commit | 21d3f9016fcf0ac182281d7fea9b2e0a69516a5d (patch) | |
| tree | 076518ac342e3607dfd57f13a966ee7c38b8dfa9 /experimental | |
| parent | d4228473a552dc2e683182c47a957977f53df581 (diff) | |
[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>
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/skottie/SkottieParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |