diff --git a/Common/Utils.py b/Common/Utils.py index 948fc67..61b56d9 100644 --- a/Common/Utils.py +++ b/Common/Utils.py @@ -22,8 +22,11 @@ def GetBaseOfFileContainingAddress(bv: bn.binaryninja.binaryview.BinaryView, add def DemangleName(mangled_name: str) -> str: try: - demangled_name: str = subprocess.check_output( + demangled_name = subprocess.check_output( [Config.DEMANGLER_FULL_PATH, mangled_name]) + # Linux returns demangled_name as a bytes object, need to convert to string. + if type(demangled_name) != str: + demangled_name = demangled_name.decode() except subprocess.CalledProcessError: return mangled_name diff --git a/README.MD b/README.MD index d6a9927..1e08ab0 100644 --- a/README.MD +++ b/README.MD @@ -79,7 +79,7 @@ This plugin installs as a normal binja plugin - just clone it into the plugins' Edit the Config.py file for values suitable to your environment. ## Limitations: - - Supports MSVC Only + - Supports MSVC compiled binaries Only - x86 32\64 bit architecture only - Currently no support for Multiple Virtual Inheritence (Support for this will be added in the future) diff --git a/plugin.json b/plugin.json index d0a94fd..cc55ad5 100644 --- a/plugin.json +++ b/plugin.json @@ -33,7 +33,7 @@ "ClassyPP uses an external C++ demangler - Demumble - https://github.com/nico/demumble/releases." ] }, - "version": "1.5.0", + "version": "1.6.0", "author": "CyShell", "minimumbinaryninjaversion": 3233 }