From fd10bf6ffcb925557ce37d48e55587b7332cf585 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Tue, 11 Feb 2014 10:29:25 +0000
Subject: Simplify C++ name demangling code, and its memory allocation
 tracking.

---
 lib/common/Utils.cpp | 78 ++++++++++++++++++++++------------------------------
 1 file changed, 33 insertions(+), 45 deletions(-)

(limited to 'lib/common/Utils.cpp')

diff --git a/lib/common/Utils.cpp b/lib/common/Utils.cpp
index decc80e8..a1647f11 100644
--- a/lib/common/Utils.cpp
+++ b/lib/common/Utils.cpp
@@ -83,62 +83,50 @@ void SplitString(const std::string &String, char SplitOn, std::vector<std::strin
 #ifdef SHOW_BACKTRACE_ON_EXCEPTION
 static std::string demangle(const std::string& mangled_name)
 {
+	std::string demangled_name = mangled_name;
+
 	#ifdef HAVE_CXXABI_H
+	char buffer[1024];
 	int status;
+	size_t length = sizeof(buffer);
 	
-#include "MemLeakFindOff.h"
 	char* result = abi::__cxa_demangle(mangled_name.c_str(),
-		NULL, NULL, &status);
-#include "MemLeakFindOn.h"
+		buffer, &length, &status);
 
-	if (result == NULL)
+	if (status == 0)
 	{
-		if (status == 0)
-		{
-			BOX_WARNING("Demangle failed but no error: " <<
-				mangled_name);
-		}
-		else if (status == -1)
-		{
-			BOX_WARNING("Demangle failed with "
-				"memory allocation error: " <<
-				mangled_name);
-		}
-		else if (status == -2)
-		{
-			// Probably non-C++ name, don't demangle
-			/*
-			BOX_WARNING("Demangle failed with "
-				"with invalid name: " <<
-				mangled_name);
-			*/
-		}
-		else if (status == -3)
-		{
-			BOX_WARNING("Demangle failed with "
-				"with invalid argument: " <<
-				mangled_name);
-		}
-		else
-		{
-			BOX_WARNING("Demangle failed with "
-				"with unknown error " << status <<
-				": " << mangled_name);
-		}
-
-		return std::string(mangled_name);
+		demangled_name = result;
+	}
+	else if (status == -1)
+	{
+		BOX_WARNING("Demangle failed with "
+			"memory allocation error: " <<
+			mangled_name);
+	}
+	else if (status == -2)
+	{
+		// Probably non-C++ name, don't demangle
+		/*
+		BOX_WARNING("Demangle failed with "
+			"with invalid name: " <<
+			mangled_name);
+		*/
+	}
+	else if (status == -3)
+	{
+		BOX_WARNING("Demangle failed with "
+			"with invalid argument: " <<
+			mangled_name);
 	}
 	else
 	{
-		std::string output = result;
-#include "MemLeakFindOff.h"
-		free(result);
-#include "MemLeakFindOn.h"
-		return output;
+		BOX_WARNING("Demangle failed with "
+			"with unknown error " << status <<
+			": " << mangled_name);
 	}
-	#else // !HAVE_CXXABI_H
-	return mangled_name;
 	#endif // HAVE_CXXABI_H
+
+	return demangled_name;
 }
 
 void DumpStackBacktrace()
-- 
cgit v1.2.3