Turns out __cxa_demangle returns the size of the buffer instead of the size of

the demangled name. Fall back to strlen.

llvm-svn: 106579

1 files changed, 2 insertions, 5 deletions

diff --git a/lldb/source/Core/Mangled.cpp b/lldb/source/Core/Mangled.cpp
index cb4335bb6aa..31afa8bc54c 100644
--- a/lldb/source/Core/Mangled.cpp
+++ b/lldb/source/Core/Mangled.cpp
@@ -141,7 +141,6 @@ namespace
             return status;
         }
         const char *GetBuffer () const { return m_demangle_buf; }
-        size_t GetLength () const { return m_demangle_buf_len; }
     };
 }
 
@@ -197,11 +196,9 @@ Mangled::GetDemangledName () const
                 ::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
             {