From ce0b8d618da77fef0088067d19f5d36a13e74cbc Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Sat, 14 Jan 2023 05:12:41 +0000 Subject: Move demangle impl to cpp --- src/common/demangle.cpp | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/common/demangle.cpp (limited to 'src/common/demangle.cpp') diff --git a/src/common/demangle.cpp b/src/common/demangle.cpp new file mode 100644 index 000000000..17abdb85e --- /dev/null +++ b/src/common/demangle.cpp @@ -0,0 +1,33 @@ +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/demangle.h" + +namespace llvm { +char* itaniumDemangle(const char* mangled_name, char* buf, size_t* n, int* status); +} + +namespace Common { + +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'; + }; + + char* demangled = nullptr; + if (is_itanium(mangled)) { + demangled = llvm::itaniumDemangle(mangled.c_str(), nullptr, nullptr, nullptr); + } + + if (!demangled) { + return mangled; + } + + std::string ret = demangled; + std::free(demangled); + return ret; +} + +} // namespace Common -- cgit v1.2.3 From 42b16bb33ab0a0bb5b8e4032753fbe67bc85844f Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Sat, 14 Jan 2023 19:53:55 +0000 Subject: Be careful of mangled out of bounds read --- src/common/demangle.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/common/demangle.cpp') diff --git a/src/common/demangle.cpp b/src/common/demangle.cpp index 17abdb85e..f4246f666 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 Common -- cgit v1.2.3