X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fdebug%2Fdemangle.cpp;h=5c348514fd9bffa57ec0d7cbf6acb4539d198880;hp=460410e49569f501ed4792929650c62068cdf243;hb=20e1beb546c26eae3b1a61ab2051108a7dca221f;hpb=0fa00d18f607f329d2b2a979e1d4339e233817fa

diff --git a/source/debug/demangle.cpp b/source/debug/demangle.cpp
index 460410e..5c34851 100644
--- a/source/debug/demangle.cpp
+++ b/source/debug/demangle.cpp
@@ -5,6 +5,7 @@ Copyright © 2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <cstdlib>
 #include <cxxabi.h>
 #include "demangle.h"
 
@@ -18,8 +19,15 @@ string demangle(const string &sym)
 #ifdef __GNUC__
 	int status;
 	char *dm=abi::__cxa_demangle(sym.c_str(), 0, 0, &status);
-	string result(dm);
+	
+	string result;
+	if(status==0)
+		result=dm;
+	else
+		result=sym;
+	
 	free(dm);
+
 	return result;
 #else
 	return sym;