Changeset 2187

Timestamp:

28/05/2008 18:04:18 (4 years ago)

Author:

chris

Message:

Fix possible memory corruption while dumping stack trace due to
mismatching new []/delete.

File:

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

box/trunk/lib/common/Utils.cpp

@@ -78 +78 @@
 
         BOX_TRACE("Obtained " << size << " stack frames.");
+
+        size_t output_len = 256;
+        char*  output_buf = new char [output_len];
 
         for(i = 0; i < size; i++)
@@ -93 +96 @@
                         end - start - 1);
 
-                size_t len = 256;
-                std::auto_ptr<char> output_buf(new char [len]);
                 int status;
                 
-                if (abi::__cxa_demangle(mangled_func.c_str(), output_buf.get(),
-                        &len, &status) == NULL)
+                char* result = abi::__cxa_demangle(mangled_func.c_str(),
+                        output_buf, &output_len, &status);
+
+                if (result == NULL)
                 {
                         if (status == 0)
@@ -113 +116 @@
                         else if (status == -2)
                         {
+                                // Probably non-C++ name, don't demangle
                                 /*
                                 BOX_WARNING("Demangle failed with "
@@ -134 +138 @@
                 else
                 {
+                        output_buf = result;
                         output_frame = mangled_frame.substr(0, start + 1) +
                                 // std::string(output_buf.get()) +
-                                output_buf.get() +
-                                mangled_frame.substr(end);
+                                result + mangled_frame.substr(end);
                 }
                 #endif // HAVE_CXXABI_H
@@ -143 +147 @@
                 BOX_TRACE("Stack frame " << i << ": " << output_frame);
         }
+
+        delete [] output_buf;
 
 #include "MemLeakFindOff.h"