diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-01-23 12:58:09 -0800 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-01-23 13:45:14 -0800 |
| commit | d4ed8d1a4474e43241e42610001403261353466f (patch) | |
| tree | d8f11a733ef28fe44e40d3dfbb6fcbe1d5a41a68 | |
| parent | f3294200c6c866e5ab031ad8346c59a76aa37249 (diff) | |
| download | qtlocation-mapboxgl-d4ed8d1a4474e43241e42610001403261353466f.tar.gz | |
[core] fix style parsing crash when a layer's paint property is not an object
| -rw-r--r-- | src/mbgl/style/conversion/layer.cpp | 3 | ||||
| -rw-r--r-- | test/fixtures/style_parser/paint-nonobject.info.json | 7 | ||||
| -rw-r--r-- | test/fixtures/style_parser/paint-nonobject.style.json | 8 |
3 files changed, 18 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); }); diff --git a/test/fixtures/style_parser/paint-nonobject.info.json b/test/fixtures/style_parser/paint-nonobject.info.json new file mode 100644 index 0000000000..c9ae97efd8 --- /dev/null +++ b/test/fixtures/style_parser/paint-nonobject.info.json @@ -0,0 +1,7 @@ +{ + "default": { + "log": [ + [1, "WARNING", "ParseStyle", "paint must be an object"] + ] + } +} diff --git a/test/fixtures/style_parser/paint-nonobject.style.json b/test/fixtures/style_parser/paint-nonobject.style.json new file mode 100644 index 0000000000..24ec89eda5 --- /dev/null +++ b/test/fixtures/style_parser/paint-nonobject.style.json @@ -0,0 +1,8 @@ +{ + "version": 8, + "layers": [{ + "id": "background", + "type": "background", + "paint": true + }] +} |