--- trunk/src/symbol.c	2007/10/08 16:17:48	2
+++ trunk/src/symbol.c	2007/10/08 16:18:27	10
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: symbol.c,v 1.23 2005/03/20 11:11:48 debug Exp $
+ *  $Id: symbol.c,v 1.26 2005/06/21 16:22:52 debug Exp $
  *
  *  Address to symbol translation routines.
  *
@@ -205,6 +205,18 @@
 		exit(1);
 	}
 
+	if (name == NULL) {
+		fprintf(stderr, "add_symbol_name(): name = NULL\n");
+		exit(1);
+	}
+
+	if (name[0] == '\0')
+		return;
+
+	/*  TODO: Maybe this should be optional?  */
+	if (name[0] == '$')
+		return;
+
 	if ((addr >> 32) == 0 && (addr & 0x80000000ULL))
 		addr |= 0xffffffff00000000ULL;
 
@@ -262,8 +274,8 @@
 		memset(b4, 0, sizeof(b4));
 		fscanf(f, "%s %s\n", b1,b2);
 		if (strlen(b2) < 2 && !(b2[0]>='0' && b2[0]<='9')) {
-			strcpy(b3, b2);
-			strcpy(b2, "0");
+			strlcpy(b3, b2, sizeof(b3));
+			strlcpy(b2, "0", sizeof(b2));
 			fscanf(f, "%s\n", b4);
 		} else {
 			fscanf(f, "%s %s\n", b3,b4);