summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2018-01-23 12:58:09 -0800
committerKonstantin Käfer <mail@kkaefer.com>2018-01-23 13:45:14 -0800
commitd4ed8d1a4474e43241e42610001403261353466f (patch)
treed8f11a733ef28fe44e40d3dfbb6fcbe1d5a41a68 /src
parentf3294200c6c866e5ab031ad8346c59a76aa37249 (diff)
downloadqtlocation-mapboxgl-d4ed8d1a4474e43241e42610001403261353466f.tar.gz
[core] fix style parsing crash when a layer's paint property is not an object
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/style/conversion/layer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mbgl/style/conversion/layer.cpp b/src/mbgl/style/conversion/layer.cpp
index 8f624e3324..ad6998341d 100644
--- a/src/mbgl/style/conversion/layer.cpp
+++ b/src/mbgl/style/conversion/layer.cpp
@@ -38,6 +38,9 @@ optional<Error> setPaintProperties(Layer& layer, const Convertible& value) {
if (!paintValue) {
return {};
}
+ if (!isObject(*paintValue)) {
+ return { { "paint must be an object" } };
+ }
return eachMember(*paintValue, [&] (const std::string& k, const Convertible& v) {
return setPaintProperty(layer, k, v);
});