prevent crash when expression evaluates to default, no pattern

mapbox · Sep 18, 2018 · dd7b394 · dd7b394
1 parent 68d463e
commit dd7b394
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/mapbox-gl-js b/mapbox-gl-js
diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp
@@ -302,8 +302,17 @@ class CompositeCrossFadedPaintPropertyBinder : public PaintPropertyBinder<T, std
     };
 
     void populateVertexVector(const GeometryTileFeature&, std::size_t length, const ImagePositions& patternPositions, const optional<PatternDependency>& patternDependencies) override {
-        if (!patternDependencies) return;
-        if (!patternPositions.empty()) {
+
+        if (patternDependencies->mid.empty())  {
+            // Unlike other propperties with expressions that evaluate to null, the default value for `*-pattern` properties is an empty
+            // string and will not have a valid entry in patternPositions. We still need to populate the attribute buffers to avoid crashes
+            // when we try to draw the layer because we don't know at draw time if all features were evaluated to valid pattern dependencies.
+            for (std::size_t i = zoomInVertexVector.vertexSize(); i < length; ++i) {
+                patternToVertexVector.emplace_back(Vertex { std::array<uint16_t, 4>{{0, 0, 0, 0}} });
+                zoomInVertexVector.emplace_back(Vertex2 { std::array<uint16_t, 4>{{0, 0, 0, 0}} } );
+                zoomOutVertexVector.emplace_back(Vertex2 { std::array<uint16_t, 4>{{0, 0, 0, 0}} });
+            }
+        } else if (!patternPositions.empty()) {
             const auto min = patternPositions.find(patternDependencies->min);
             const auto mid = patternPositions.find(patternDependencies->mid);
             const auto max = patternPositions.find(patternDependencies->max);
+3 −4		bench/styles/benchmarks.js
+ −		test/integration/render-tests/fill-pattern/invalid-feature-expression/expected.png
+135 −0		test/integration/render-tests/fill-pattern/invalid-feature-expression/style.json