From 80e99b7b259afa8a91b0635adcf57744f6d06d72 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Thu, 21 Nov 2024 20:37:56 -0800
Subject: [PATCH] Don't use error handler that doesn't exist

---
 miniserv.pl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/miniserv.pl b/miniserv.pl
index bfd4bbc45..14720ce24 100755
--- a/miniserv.pl
+++ b/miniserv.pl
@@ -2806,10 +2806,17 @@ local $eh = $error_handler_recurse ? undef :
 	    $config{"error_handler_".$code} ? $config{"error_handler_".$code} :
 	    $config{'error_handler'} ? $config{'error_handler'} : undef;
 print DEBUG "http_error code=$code message=$msg body=$body\n";
+if ($eh) {
+	my $found;
+	foreach my $root (@preroots, @roots) {
+		$found++ if (-e $root."/".$eh);
+		}
+	$eh = undef if (!$found);
+	}
 if ($eh) {
 	# Call a CGI program for the error
 	$page = "/$eh";
-	$querystring = "code=$_[0]&message=".&urlize($msg).
+	$querystring = "code=".&urlize($code)."&message=".&urlize($msg).
 		       "&body=".&urlize($body);
 	$error_handler_recurse++;
 	$ok_code = $code;