--- trunk/src/symbol.c	2007/10/08 16:19:43	23
+++ trunk/src/symbol.c	2007/10/08 16:19:56	24
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: symbol.c,v 1.34 2006/01/14 12:51:59 debug Exp $
+ *  $Id: symbol.c,v 1.35 2006/03/22 21:39:23 debug Exp $
  *
  *  Address to symbol translation routines.
  *
@@ -37,8 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "misc.h"
-
 #include "symbol.h"
 
 
@@ -268,11 +266,18 @@
 		exit(1);
 	}
 
-	s->name = strdup(name);
+	memset(s, 0, sizeof(struct symbol));
+
+	s->name = symbol_demangle_cplusplus(name);
+
 	if (s->name == NULL) {
-		fprintf(stderr, "out of memory\n");
-		exit(1);
+		s->name = strdup(name);
+		if (s->name == NULL) {
+			fprintf(stderr, "out of memory\n");
+			exit(1);
+		}
 	}
+
 	s->addr   = addr;
 	s->len    = len;
 	s->type   = type;