From cf28e6b88b592c180a1da70481c37422b42892a6 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Mon, 26 Nov 2018 14:50:45 -0800
Subject: [PATCH] Make it an error, not a warning, to have missing coordinates
 for a point

---
 CHANGELOG.md  | 4 ++++
 geometry.cpp  | 5 ++++-
 read_json.cpp | 1 +
 version.hpp   | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bd6a8a..87e4621 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.32.6
+
+* Make it an error, not a warning, to have missing coordinates for a point
+
 ## 1.32.5
 
 * Use less memory on lines and polygons that are too small for the tile
diff --git a/geometry.cpp b/geometry.cpp
index 7ed514f..bebf7aa 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -1142,7 +1142,7 @@ drawvec stairstep(drawvec &geom, int z, int detail) {
 	for (size_t i = 0; i < geom.size(); i++) {
 		if (geom[i].op == VT_MOVETO) {
 			out.push_back(geom[i]);
-		} else {
+		} else if (out.size() > 0) {
 			long long x0 = out[out.size() - 1].x;
 			long long y0 = out[out.size() - 1].y;
 			long long x1 = geom[i].x;
@@ -1202,6 +1202,9 @@ drawvec stairstep(drawvec &geom, int z, int detail) {
 			}
 
 			// out.push_back(draw(VT_LINETO, xx, yy));
+		} else {
+			fprintf(stderr, "Can't happen: stairstepping lineto with no moveto\n");
+			exit(EXIT_FAILURE);
 		}
 	}
 
diff --git a/read_json.cpp b/read_json.cpp
index cdb2211..842b9ab 100644
--- a/read_json.cpp
+++ b/read_json.cpp
@@ -86,6 +86,7 @@ void parse_geometry(int t, json_object *j, drawvec &out, int op, const char *fna
 			fprintf(stderr, "%s:%d: malformed point\n", fname, line);
 			json_context(j);
 			json_context(feature);
+			exit(EXIT_FAILURE);
 		}
 	}
 
diff --git a/version.hpp b/version.hpp
index 1116251..f35254e 100644
--- a/version.hpp
+++ b/version.hpp
@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "v1.32.5"
+#define VERSION "v1.32.6"
 
 #endif