From 0ea6d7150eb661f51f736ec32ce6fe3fd9922e97 Mon Sep 17 00:00:00 2001 From: mtklein Date: Tue, 7 Apr 2015 08:48:38 -0700 Subject: Fix DM -r source_options isn't always present. BUG=skia: Review URL: https://codereview.chromium.org/1067863002 --- dm/DMJsonWriter.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'dm/DMJsonWriter.cpp') diff --git a/dm/DMJsonWriter.cpp b/dm/DMJsonWriter.cpp index 4fe6924327..04ae2cea8a 100644 --- a/dm/DMJsonWriter.cpp +++ b/dm/DMJsonWriter.cpp @@ -110,12 +110,15 @@ bool JsonWriter::ReadJson(const char* path, void(*callback)(BitmapResult)) { BitmapResult br; for (unsigned i = 0; i < results.size(); i++) { const Json::Value& r = results[i]; - br.name = r["key"]["name"].asCString(); - br.config = r["key"]["config"].asCString(); - br.sourceType = r["key"]["source_type"].asCString(); - br.sourceOptions = r["key"]["source_options"].asCString(); - br.ext = r["options"]["ext"].asCString(); - br.md5 = r["md5"].asCString(); + br.name = r["key"]["name"].asCString(); + br.config = r["key"]["config"].asCString(); + br.sourceType = r["key"]["source_type"].asCString(); + br.ext = r["options"]["ext"].asCString(); + br.md5 = r["md5"].asCString(); + + if (!r["key"]["source_options"].isNull()) { + br.sourceOptions = r["key"]["source_options"].asCString(); + } callback(br); } return true; -- cgit v1.2.3