From 03ebae0f2ed0e5ff2c4fe284d8d3db8960ae4938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Wed, 20 Jul 2016 13:22:09 +0200
Subject: [PATCH] [core] don't crash when the version number is not a number

---
 src/mbgl/style/parser.cpp                                | 3 ++-
 test/fixtures/style_parser/version-not-number.info.json  | 7 +++++++
 test/fixtures/style_parser/version-not-number.style.json | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/style_parser/version-not-number.info.json
 create mode 100644 test/fixtures/style_parser/version-not-number.style.json

diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp
index 56e6f8ad0..2746b8af9 100644
--- 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
new file mode 100644
index 000000000..130c33417
--- /dev/null
+++ 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"]
+        ]
+    }
+}
\ No newline at end of file
diff --git a/test/fixtures/style_parser/version-not-number.style.json b/test/fixtures/style_parser/version-not-number.style.json
new file mode 100644
index 000000000..ae3ef858a
--- /dev/null
+++ b/test/fixtures/style_parser/version-not-number.style.json
@@ -0,0 +1 @@
+{"version":"8"}
\ No newline at end of file