summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-10-01 22:21:23 +0200
committerLiam <byteslice@airmail.cc>2023-10-02 01:22:08 +0200
commit38394f36d78f22ca75acf8275e86d25faecd0e8d (patch)
tree6c2710b6201abeae3cae96d8e1fa1eccbe92f8ab /src/core
parentMerge pull request #11646 from FernandoS27/stop-ignoring-your-mental-health (diff)
downloadyuzu-38394f36d78f22ca75acf8275e86d25faecd0e8d.tar
yuzu-38394f36d78f22ca75acf8275e86d25faecd0e8d.tar.gz
yuzu-38394f36d78f22ca75acf8275e86d25faecd0e8d.tar.bz2
yuzu-38394f36d78f22ca75acf8275e86d25faecd0e8d.tar.lz
yuzu-38394f36d78f22ca75acf8275e86d25faecd0e8d.tar.xz
yuzu-38394f36d78f22ca75acf8275e86d25faecd0e8d.tar.zst
yuzu-38394f36d78f22ca75acf8275e86d25faecd0e8d.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/debugger/gdbstub.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp
index e55831f27..82964f0a1 100644
--- a/src/core/debugger/gdbstub.cpp
+++ b/src/core/debugger/gdbstub.cpp
@@ -2,6 +2,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include <atomic>
+#include <codecvt>
+#include <locale>
#include <numeric>
#include <optional>
#include <thread>
@@ -12,6 +14,7 @@
#include "common/logging/log.h"
#include "common/scope_exit.h"
#include "common/settings.h"
+#include "common/string_util.h"
#include "core/arm/arm_interface.h"
#include "core/core.h"
#include "core/debugger/gdbstub.h"
@@ -68,10 +71,16 @@ static std::string EscapeGDB(std::string_view data) {
}
static std::string EscapeXML(std::string_view data) {
+ std::u32string converted = U"[Encoding error]";
+ try {
+ converted = Common::UTF8ToUTF32(data);
+ } catch (std::range_error&) {
+ }
+
std::string escaped;
escaped.reserve(data.size());
- for (char c : data) {
+ for (char32_t c : converted) {
switch (c) {
case '&':
escaped += "&amp;";
@@ -86,7 +95,11 @@ static std::string EscapeXML(std::string_view data) {
escaped += "&gt;";
break;
default:
- escaped += c;
+ if (c > 0x7f) {
+ escaped += fmt::format("&#{};", static_cast<u32>(c));
+ } else {
+ escaped += static_cast<char>(c);
+ }
break;
}
}