From 6ec957079d6cea7a8cd2d908c7d62ccdeafd6d94 Mon Sep 17 00:00:00 2001
From: Molly Lloyd <molly@mapbox.com>
Date: Fri, 14 Sep 2018 15:09:25 -0700
Subject: prevent crash when expression evaluates to default, no pattern

---
 mapbox-gl-js                                |  2 +-
 src/mbgl/renderer/paint_property_binder.hpp | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mapbox-gl-js b/mapbox-gl-js
index f66cead4b8..302a8f625b 160000
--- a/mapbox-gl-js
+++ b/mapbox-gl-js
@@ -1 +1 @@
-Subproject commit f66cead4b8f95c696d7d2636f36cafaf4a4c6bc3
+Subproject commit 302a8f625b08554b91a3466863afce71db485edb
diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp
index 391ecbb174..05611fd533 100644
--- a/src/mbgl/renderer/paint_property_binder.hpp
+++ b/src/mbgl/renderer/paint_property_binder.hpp
@@ -302,8 +302,14 @@ public:
     };
 
     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 == "")  {
+            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);
-- 
cgit v1.2.1