Merge pull request #629 from 10110111/master

Avoid demangling C functions with names coinciding with types
eteran · Nov 20, 2017 · 941e6ab · 941e6ab
2 parents 370873e + 43a1e42
commit 941e6ab
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/plugins/BinaryInfo/demangle.h b/plugins/BinaryInfo/demangle.h
@@ -11,6 +11,8 @@
 #define DEMANGLING_SUPPORTED true
 
 inline QString demangle(const QString& mangled) {
+	if(!mangled.startsWith("_Z"))
+		return mangled; // otherwise we'll try to demangle C functions coinciding with types like "f" as "float", which is bad
 	int failed=0;
 	QStringList split=mangled.split("@"); // for cases like funcName@plt
 	std::unique_ptr<char,decltype(std::free)*> demangled(abi::__cxa_demangle(split.front().toStdString().c_str(),0,0,&failed), std::free);