Changeset 2221

Timestamp:

06/08/2008 19:28:10 (5 months ago)

Author:

chris

Message:

When dumping stack traces, allow libc to allocate its own memory, rather
than trying to manage a buffer ourselves, and free it with std::free
without memory leak tracing.

Files:

• box/trunk/lib/common/Utils.cpp (modified) (4 diffs)

box/trunk/lib/common/Utils.cpp

@@ -69 +69 @@
 void DumpStackBacktrace()
 {
-        void *array[10];
-        size_t size;
-        char **strings;
-        size_t i;
-
-        size = backtrace (array, 10);
-        strings = backtrace_symbols (array, size);
+        void  *array[10];
+        size_t size = backtrace (array, 10);
+        char **strings = backtrace_symbols (array, size);
 
         BOX_TRACE("Obtained " << size << " stack frames.");
 
-        size_t output_len = 256;
-        char*  output_buf = new char [output_len];
-
-        for(i = 0; i < size; i++)
+        for(size_t i = 0; i < size; i++)
         {
                 // Demangling code copied from 
@@ -98 +91 @@
                 int status;
                 
+#include "MemLeakFindOff.h"
                 char* result = abi::__cxa_demangle(mangled_func.c_str(),
-                        output_buf, &output_len, &status);
+                        NULL, NULL, &status);
+#include "MemLeakFindOn.h"
 
                 if (result == NULL)
@@ -138 +133 @@
                 else
                 {
-                        output_buf = result;
                         output_frame = mangled_frame.substr(0, start + 1) +
-                                // std::string(output_buf.get()) +
                                 result + mangled_frame.substr(end);
+#include "MemLeakFindOff.h"
+                        std::free(result);
+#include "MemLeakFindOn.h"
                 }
                 #endif // HAVE_CXXABI_H
@@ -148 +144 @@
         }
 
-        delete [] output_buf;
-
 #include "MemLeakFindOff.h"
-        free (strings);
+        std::free (strings);
 #include "MemLeakFindOn.h"
 }