From 65623351203658c8ac2850ca7d259bfd50e7d416 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Tue, 15 Nov 2022 22:00:20 +0000
Subject: [PATCH] CrashDump: fixed failure to generate crash report when error
 messages contain invalid characters

closes #2986
---
 src/crash/CrashDump.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/crash/CrashDump.php b/src/crash/CrashDump.php
index e724ea217..b715ce5d3 100644
--- a/src/crash/CrashDump.php
+++ b/src/crash/CrashDump.php
@@ -43,6 +43,7 @@ use function get_loaded_extensions;
 use function json_encode;
 use function ksort;
 use function max;
+use function mb_scrub;
 use function mb_strtoupper;
 use function microtime;
 use function ob_end_clean;
@@ -196,12 +197,14 @@ class CrashDump{
 				$error["message"] = substr($error["message"], 0, $pos);
 			}
 		}
+		$error["message"] = mb_scrub($error["message"], 'UTF-8');
 
 		if(isset($lastError)){
 			if(isset($lastError["trace"])){
 				$lastError["trace"] = Utils::printableTrace($lastError["trace"]);
 			}
 			$this->data->lastError = $lastError;
+			$this->data->lastError["message"] = mb_scrub($this->data->lastError["message"], 'UTF-8');
 		}
 
 		$this->data->error = $error;