From 764a8ac17c3834bb5eb20e993d5a6bc90f9f6caa Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Wed, 6 Sep 2017 15:26:19 -0700
Subject: [PATCH] Use 32-bit offsets in the string pool search tree to reduce
 its size

---
 CHANGELOG.md |  4 ++++
 memfile.hpp  |  2 +-
 pool.cpp     | 12 +++++++++++-
 pool.hpp     |  6 +++---
 version.hpp  |  2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf72849..bec0274 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.24.1
+
+* Limit the size and depth of the string pool for better performance
+
 ## 1.24.0
 
 * Add feature filters using the Mapbox GL Style Specification filter syntax
diff --git a/memfile.hpp b/memfile.hpp
index 1d9f45f..bf74a3e 100644
--- a/memfile.hpp
+++ b/memfile.hpp
@@ -6,7 +6,7 @@ struct memfile {
 	char *map;
 	long long len;
 	long long off;
-	long long tree;
+	unsigned long tree;
 };
 
 struct memfile *memfile_open(int fd);
diff --git a/pool.cpp b/pool.cpp
index 94bd1d9..aa23919 100644
--- a/pool.cpp
+++ b/pool.cpp
@@ -35,7 +35,7 @@ int swizzlecmp(const char *a, const char *b) {
 }
 
 long long addpool(struct memfile *poolfile, struct memfile *treefile, const char *s, char type) {
-	long long *sp = &treefile->tree;
+	unsigned long *sp = &treefile->tree;
 	size_t depth = 0;
 
 	// In typical data, traversal depth generally stays under 2.5x
@@ -95,6 +95,16 @@ long long addpool(struct memfile *poolfile, struct memfile *treefile, const char
 		exit(EXIT_FAILURE);
 	}
 
+	if (off >= LONG_MAX || treefile->off >= LONG_MAX) {
+		// Tree or pool is bigger than 2GB
+		static bool warned = false;
+		if (!warned) {
+			fprintf(stderr, "Warning: string pool is very large.\n");
+			warned = true;
+		}
+		return off;
+	}
+
 	struct stringpool tsp;
 	tsp.left = 0;
 	tsp.right = 0;
diff --git a/pool.hpp b/pool.hpp
index e2648b1..f79c4ae 100644
--- a/pool.hpp
+++ b/pool.hpp
@@ -2,9 +2,9 @@
 #define POOL_HPP
 
 struct stringpool {
-	long long left;
-	long long right;
-	long long off;
+	unsigned long left;
+	unsigned long right;
+	unsigned long off;
 };
 
 long long addpool(struct memfile *poolfile, struct memfile *treefile, const char *s, char type);
diff --git a/version.hpp b/version.hpp
index 32ce84e..d97cd50 100644
--- a/version.hpp
+++ b/version.hpp
@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "tippecanoe v1.24.0\n"
+#define VERSION "tippecanoe v1.24.1\n"
 
 #endif