[core] don't crash when the version number is not a number

mapbox · Jul 20, 2016 · 03ebae0 · 03ebae0
1 parent a07fbe8
commit 03ebae0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp
@@ -35,7 +35,8 @@ void Parser::parse(const std::string& json) {
     }
 
     if (document.HasMember("version")) {
-        int version = document["version"].GetInt();
+        const JSValue& versionValue = document["version"];
+        const int version = versionValue.IsNumber() ? versionValue.GetInt() : 0;
         if (version != 8) {
             Log::Warning(Event::ParseStyle, "current renderer implementation only supports style spec version 8; using an outdated style will cause rendering errors");
         }

diff --git a/test/fixtures/style_parser/version-not-number.info.json b/test/fixtures/style_parser/version-not-number.info.json
@@ -0,0 +1,7 @@
+{
+    "default": {
+        "log": [
+            [1, "WARNING", "ParseStyle", "current renderer implementation only supports style spec version 8; using an outdated style will cause rendering errors"]
+        ]
+    }
+}
diff --git a/test/fixtures/style_parser/version-not-number.style.json b/test/fixtures/style_parser/version-not-number.style.json
@@ -0,0 +1 @@
+{"version":"8"}