From 6ddd5db4805e6bc1d1db2facb3d70f705523778f Mon Sep 17 00:00:00 2001
From: Chris Miles <akkadius1@gmail.com>
Date: Wed, 14 Dec 2022 22:20:00 -0600
Subject: [PATCH] [Quests] Improve Quest Error Handling - Add back in process
 based syntax validation (#2646)

---
 zone/embperl.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/zone/embperl.cpp b/zone/embperl.cpp
index da03ca70f..bdbe5d70e 100644
--- a/zone/embperl.cpp
+++ b/zone/embperl.cpp
@@ -214,7 +214,6 @@ void Embperl::init_eval_file(void)
 			"} else {"
 			// we 'my' $filename,$mtime,$package,$sub to prevent them from changing our state up here.
 			"	eval(\"package $package; my(\\$filename,\\$mtime,\\$package,\\$sub); \\$isloaded = 1; require './$filename'; \");"
-			"	die $@ if ($@ && $@ !~ /did not return a true value/); "
 			//  " print $@ if $@;"
 /*				"local *FH;open FH, $filename or die \"open '$filename' $!\";"
 				"local($/) = undef;my $sub = <FH>;close FH;"
@@ -275,6 +274,25 @@ int Embperl::dosub(const char * subname, const std::vector<std::string> * args,
 	FREETMPS;
 	LEAVE;
 
+	// not sure why we pass this as blind args, strange
+	// check for syntax errors
+	if (args && !args->empty()) {
+		const std::string &filename = args->back();
+		std::string sub = subname;
+		if (sub == "main::eval_file" && !filename.empty() && File::Exists(filename)) {
+			BenchTimer benchmark;
+			std::string syntax_error = Process::execute(
+				fmt::format("perl -c {} 2>&1", filename)
+			);
+			LogQuests("Perl eval [{}] took [{}]", filename, benchmark.elapsed());
+			syntax_error = Strings::Trim(syntax_error);
+			if (!Strings::Contains(syntax_error, "syntax OK")) {
+				syntax_error += SvPVX(ERRSV);
+				throw syntax_error;
+			}
+		}
+	}
+
 	if (error.length() > 0) {
 		std::string errmsg = "Perl runtime error: ";
 		errmsg += SvPVX(ERRSV);