summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-07-20 13:16:49 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-07-20 15:33:09 +0200
commita07fbe8e34a31fd28266cede03162258efe642c3 (patch)
tree941d1a24bb0e8c83ffb0f4d7d36e2cbef3d0acae /src
parent000539af828b0b3b0a7b0f145434b2556b5a08c3 (diff)
downloadqtlocation-mapboxgl-a07fbe8e34a31fd28266cede03162258efe642c3.tar.gz
[core] fix crash when the style JSON doesn't have an object at its root
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/style/parser.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp
index 41b23c1bae..56e6f8ad01 100644
--- a/src/mbgl/style/parser.cpp
+++ b/src/mbgl/style/parser.cpp
@@ -29,6 +29,11 @@ void Parser::parse(const std::string& json) {
return;
}
+ if (!document.IsObject()) {
+ Log::Error(Event::ParseStyle, "Style JSON must be an object");
+ return;
+ }
+
if (document.HasMember("version")) {
int version = document["version"].GetInt();
if (version != 8) {