[Lldb-commits] [lldb] r106579 - /lldb/trunk/source/Core/Mangled.cpp

[Benjamin Kramer]

Author: d0k
Date: Tue Jun 22 16:27:55 2010
New Revision: 106579

URL: http://llvm.org/viewvc/llvm-project?rev=106579&view=rev
Log:
Turns out __cxa_demangle returns the size of the buffer instead of the size of
the demangled name. Fall back to strlen.

Modified:
    lldb/trunk/source/Core/Mangled.cpp

Modified: lldb/trunk/source/Core/Mangled.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Mangled.cpp?rev=106579&r1=106578&r2=106579&view=diff
==============================================================================
--- lldb/trunk/source/Core/Mangled.cpp (original)
+++ lldb/trunk/source/Core/Mangled.cpp Tue Jun 22 16:27:55 2010
@@ -141,7 +141,6 @@
             return status;
         }
         const char *GetBuffer () const { return m_demangle_buf; }
-        size_t GetLength () const { return m_demangle_buf_len; }
     };
 }
 
@@ -197,11 +196,9 @@
                 ::pthread_setspecific (g_demangle_key, buf);
             }
 
-            int status = buf->Demangle (mangled);
-            if (status == 0)
+            if (buf->Demangle (mangled) == 0)
             {
-                m_demangled.SetCStringWithLength(buf->GetBuffer(),
-                                                 buf->GetLength());
+                m_demangled.SetCString(buf->GetBuffer());
             }
             else
             {