From a07fbe8e34a31fd28266cede03162258efe642c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Wed, 20 Jul 2016 13:16:49 +0200 Subject: [core] fix crash when the style JSON doesn't have an object at its root --- src/mbgl/style/parser.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') 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) { -- cgit v1.2.1