VERY experimental Nintendo Switch 2 emulator
C++
Be careful of mangled out of bounds read
Kelebek18fea4c21b2eb
diff --git a/src/common/demangle.cpp b/src/common/demangle.cppindex 17abdb85e1..f4246f6668 100644--- a/src/common/demangle.cpp+++ b/src/common/demangle.cpp@@ -2,6 +2,7 @@// SPDX-License-Identifier: GPL-2.0-or-later#include "common/demangle.h"+#include "common/scope_exit.h"namespace llvm {char* itaniumDemangle(const char* mangled_name, char* buf, size_t* n, int* status);@@ -13,10 +14,16 @@ std::string DemangleSymbol(const std::string& mangled) {auto is_itanium = [](const std::string& name) -> bool {// A valid Itanium encoding requires 1-4 leading underscores, followed by 'Z'.auto pos = name.find_first_not_of('_');- return pos > 0 && pos <= 4 && name[pos] == 'Z';+ return pos > 0 && pos <= 4 && pos < name.size() && name[pos] == 'Z';};+ if (mangled.empty()) {+ return mangled;+ }+char* demangled = nullptr;+ SCOPE_EXIT({ std::free(demangled); });+if (is_itanium(mangled)) {demangled = llvm::itaniumDemangle(mangled.c_str(), nullptr, nullptr, nullptr);}@@ -24,10 +31,7 @@ std::string DemangleSymbol(const std::string& mangled) {if (!demangled) {return mangled;}-- std::string ret = demangled;- std::free(demangled);- return ret;+ return demangled;}} // namespace Commondiff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cppindex a34200539e..8aa7b96419 100644--- a/src/core/arm/arm_interface.cpp+++ b/src/core/arm/arm_interface.cpp@@ -1,10 +1,6 @@// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#ifndef _MSC_VER-#include <cxxabi.h>-#endif-#include <map>#include <optional>