From cf623e96c5b2fa5250777a4d156f5a597f0673a7 Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Fri, 6 Mar 2015 19:42:23 -0800
Subject: [PATCH] safely check points

---
 src/mbgl/map/vector_tile.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mbgl/map/vector_tile.cpp b/src/mbgl/map/vector_tile.cpp
index 5244d61a2..a42c16cd8 100644
--- a/src/mbgl/map/vector_tile.cpp
+++ b/src/mbgl/map/vector_tile.cpp
@@ -54,9 +54,10 @@ GeometryCollection VectorTileFeature::nextGeometry() {
         int32_t x, y;
 
         if (type == GeometryFeatureType::Point) {
-            current_geometry.next(x, y);
-            GeometryPoint point(x, y);
-            result.emplace_back(GeometryPoint(x, y));
+            if ((cmd = current_geometry.next(x, y)) != PBFGeometry::end) {
+                GeometryPoint point(x, y);
+                result.emplace_back(GeometryPoint(x, y));
+            }
         } else if (type == GeometryFeatureType::LineString) {
             GeometryLine line;
             while ((cmd = current_geometry.next(x, y)) != PBFGeometry::end) {