From 760a0c9209abf4f98de8d1bc34336f2ab9e4ce2c Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Wed, 6 Jun 2018 11:54:23 -0700
Subject: [PATCH] Add missing JSON type check; bump version number.

---
 CHANGELOG.md | 4 ++++
 geojson.cpp  | 2 +-
 version.hpp  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e70f954..76226c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.29.2
+
+* Be careful to remove null attributes from prefilter/postfilter output
+
 ## 1.29.1
 
 * Add --use-source-polygon-winding and --reverse-source-polygon-winding
diff --git a/geojson.cpp b/geojson.cpp
index 6d54049..514ecbe 100644
--- a/geojson.cpp
+++ b/geojson.cpp
@@ -341,7 +341,7 @@ void parse_json(struct serialization_state *sst, json_pull *jp, int layer, std::
 		json_object *id = json_hash_get(j, "id");
 
 		json_object *geometries = json_hash_get(geometry, "geometries");
-		if (geometries != NULL) {
+		if (geometries != NULL && geometries->type == JSON_ARRAY) {
 			size_t g;
 			for (g = 0; g < geometries->length; g++) {
 				serialize_geojson_feature(sst, geometries->array[g], properties, id, layer, tippecanoe, j, layername);
diff --git a/version.hpp b/version.hpp
index a3433c9..894b19f 100644
--- a/version.hpp
+++ b/version.hpp
@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "tippecanoe v1.29.1\n"
+#define VERSION "tippecanoe v1.29.2\n"
 
 #endif