From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 13 Jan 2013 10:10:50 +0000 (+0100)
Subject: check for conf.error_handler before using it
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=commitdiff_plain;h=bb64de8897d9de5c964d021d05999bd4ca5cb36a;ds=sidebyside

check for conf.error_handler before using it
---

diff --git a/file.c b/file.c
index a6350eb..b2e6ade 100644
--- a/file.c
+++ b/file.c
@@ -699,10 +699,12 @@ void uh_handle_request(struct client *cl)
 	if (__handle_file_request(cl, url))
 		return;
 
-	error_handler = alloca(strlen(conf.error_handler) + 1);
-	strcpy(error_handler, conf.error_handler);
-	if (__handle_file_request(cl, error_handler))
-		return;
+	if (conf.error_handler) {
+		error_handler = alloca(strlen(conf.error_handler) + 1);
+		strcpy(error_handler, conf.error_handler);
+		if (__handle_file_request(cl, error_handler))
+			return;
+	}
 
 	uh_client_error(cl, 404, "Not Found", "The requested URL %s was not found on this server.", url);
 }