From 0c5431644d103728aa926896d9bbdf40ed8d5cc3 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:18:29 +0300
Subject: Allows parsing of invalid UTF-16 surrogates (can be encountered in
 Windows filenames) and some non-standard UTF-8 variants, makes Unicode parse
 errors more verbose.

---
 modules/mono/utils/path_utils.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'modules/mono/utils/path_utils.cpp')

diff --git a/modules/mono/utils/path_utils.cpp b/modules/mono/utils/path_utils.cpp
index 15a0b28181..a1905dfcfe 100644
--- a/modules/mono/utils/path_utils.cpp
+++ b/modules/mono/utils/path_utils.cpp
@@ -62,7 +62,8 @@ String cwd() {
 	}
 
 	String result;
-	if (result.parse_utf16(buffer.ptr())) {
+	result.parse_utf16(buffer.ptr());
+	if (result.is_empty()) {
 		return ".";
 	}
 	return result.simplify_path();
@@ -73,7 +74,7 @@ String cwd() {
 	}
 
 	String result;
-	if (result.parse_utf8(buffer)) {
+	if (result.parse_utf8(buffer) != OK) {
 		return ".";
 	}
 
@@ -114,7 +115,8 @@ String realpath(const String &p_path) {
 	::CloseHandle(hFile);
 
 	String result;
-	if (result.parse_utf16(buffer.ptr())) {
+	result.parse_utf16(buffer.ptr());
+	if (result.is_empty()) {
 		return p_path;
 	}
 
@@ -127,10 +129,10 @@ String realpath(const String &p_path) {
 	}
 
 	String result;
-	bool parse_ok = result.parse_utf8(resolved_path);
+	Error parse_ok = result.parse_utf8(resolved_path);
 	::free(resolved_path);
 
-	if (parse_ok) {
+	if (parse_ok != OK) {
 		return p_path;
 	}
 
-- 
cgit v1.2.3