Fix race condition null pointer exception in unserializeBuckets

fixes #2484 cc @AndyMoreland @ansis
mapbox · Apr 26, 2016 · 5d3efa9 · 5d3efa9
1 parent c74b834
commit 5d3efa9
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/js/source/tile.js b/js/source/tile.js
@@ -165,9 +165,14 @@ Tile.prototype = {
 function unserializeBuckets(input, style) {
     var output = {};
     for (var i = 0; i < input.length; i++) {
+        var layer = style.getLayer(input[i].layerId);
+        if (!layer) continue;
+
         var bucket = Bucket.create(util.extend({
-            childLayers: input[i].childLayerIds.map(style.getLayer.bind(style)),
-            layer: style.getLayer(input[i].layerId)
+            layer: layer,
+            childLayers: input[i].childLayerIds
+                .map(style.getLayer.bind(style))
+                .filter(function(layer) { return layer; })
         }, input[i]));
         output[bucket.id] = bucket;
     }