From 0eeec32ee3f63dcd0d945b537e820ee1b56ebeb3 Mon Sep 17 00:00:00 2001
From: Tim Ruehsen <tim.ruehsen@gmx.de>
Date: Fri, 30 May 2014 16:08:47 +0200
Subject: [PATCH] fix return value of psl_builtin() to NULL if no builtin PSL
 data available

---
 src/psl.c   |  4 ++++
 tools/psl.c | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/psl.c b/src/psl.c
index 5333020..77ed564 100644
--- a/src/psl.c
+++ b/src/psl.c
@@ -557,7 +557,11 @@ void psl_free(psl_ctx_t *psl)
  */
 const psl_ctx_t *psl_builtin(void)
 {
+#ifdef WITH_BUILTIN
 	return &_builtin_psl;
+#else
+	return NULL;
+#endif
 }
 
 /**
diff --git a/tools/psl.c b/tools/psl.c
index 718e97e..841340c 100644
--- a/tools/psl.c
+++ b/tools/psl.c
@@ -90,7 +90,8 @@ int main(int argc, const char *const *argv)
 					fprintf(stderr, "Dropped data from %s\n", psl_file);
 					psl_file = NULL;
 				}
-				psl = (psl_ctx_t *) psl_builtin();
+				if (!(psl = (psl_ctx_t *) psl_builtin()))
+					printf("No builtin PSL data available\n");
 			}
 			else if (!strcmp(*arg, "--load-psl-file") && arg < argv + argc - 1) {
 				psl_free(psl);
@@ -118,6 +119,11 @@ int main(int argc, const char *const *argv)
 			break;
 	}
 
+	if (!psl && mode != 99) {
+		printf("No PSL data available - aborting\n");
+		exit(2);
+	}
+
 	if (mode == 1) {
 		for (; arg < argv + argc; arg++)
 			printf("%s: %d\n", *arg, psl_is_public_suffix(psl, *arg));
@@ -135,7 +141,7 @@ int main(int argc, const char *const *argv)
 			printf("%s: %d\n", *arg, psl_is_cookie_domain_acceptable(psl, *arg, cookie_domain));
 	}
 	else if (mode == 99) {
-		if (psl != psl_builtin()) {
+		if (psl && psl != psl_builtin()) {
 			printf("suffixes: %d\n", psl_suffix_count(psl));
 			printf("exceptions: %d\n", psl_suffix_exception_count(psl));
 		}