--- Gnu-Mach/ddb/db_sym.c	2020/09/02 04:43:14	1.1.1.2
+++ Gnu-Mach/ddb/db_sym.c	2020/09/02 04:45:45	1.1.1.3
@@ -28,12 +28,13 @@
  *	Date:	7/90
  */
 
-#include "mach_kdb.h"
 #if MACH_KDB
 
+#include <string.h>
 #include <mach/std_types.h>
-#include <kern/strings.h>
 #include <machine/db_machdep.h>
+#include <ddb/db_command.h>
+#include <ddb/db_output.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_task_thread.h>
 
@@ -97,11 +98,11 @@ db_qualify(symname, symtabname)
 	register char	*s;
 
 	s = tmp;
-	while (*s++ = *symtabname++) {
+	while ((*s++ = *symtabname++)) {
 	}
 	s[-1] = ':';
 	*s++ = ':';
-	while (*s++ = *symname++) {
+	while ((*s++ = *symname++)) {
 	}
 	return tmp;
 }
@@ -128,6 +129,8 @@ db_value_of_name(name, valuep)
 	if (sym == DB_SYM_NULL)
 	    return (FALSE);
 	db_symbol_values(0, sym, &name, valuep);
+	
+	db_free_symbol(sym);
 	return (TRUE);
 }
 
@@ -172,10 +175,11 @@ db_lookup(symstr)
 	 * Return on first match.
 	 */
 	for (i = symtab_start; i < symtab_end; i++) {
-		if (sp = X_db_lookup(&db_symtabs[i], symstr)) {
+		if ((sp = X_db_lookup(&db_symtabs[i], symstr))) {
 			db_last_symtab = &db_symtabs[i];
 			return sp;
 		}
+		db_free_symbol(sp);
 	}
 	return 0;
 }
@@ -195,7 +199,7 @@ db_sym_parse_and_lookup(func, symtab, sy
 	char		*symstr;
 {
 	register 	char *p;
-	register 	n;
+	register 	int n;
 	int	 	n_name;
 	int	 	line_number;
 	char	 	*file_name = 0;
@@ -272,11 +276,16 @@ db_name_is_ambiguous(sym_name)
 		return FALSE;
 
 	for (i = 0; i < db_nsymtab; i++) {
-		if (X_db_lookup(&db_symtabs[i], sym_name)) {
+	  	db_sym_t sp;
+		if (sp = X_db_lookup(&db_symtabs[i], sym_name)) {
 			if (found_once)
+			{
+				db_free_symbol(sp);
 				return TRUE;
+			}
 			found_once = TRUE;
 		}
+		db_free_symbol(sp);
 	}
 	return FALSE;
 }
@@ -315,6 +324,7 @@ db_search_task_symbol(val, strategy, off
 	*/
       if (ret == DB_SYM_NULL || (*offp) > 0x1000000)
 	{
+	  db_free_symbol(ret);
 	  task = db_current_task();
 	  ret = db_search_in_task_symbol(val, strategy, offp, task);
 	}
@@ -353,6 +363,7 @@ db_search_in_task_symbol(val, strategy,
 	    { /* first hit */
 	      db_last_symtab = sp;
 	      diff = newdiff;
+	      db_free_symbol(ret);
 	      ret = sym;
 	      continue;
 	    }
@@ -362,6 +373,7 @@ db_search_in_task_symbol(val, strategy,
 	    { /* closer null map match */
 	      db_last_symtab = sp;
 	      diff = newdiff;
+	      db_free_symbol(ret);
 	      ret = sym;
 	      continue;
 	    }
@@ -375,6 +387,7 @@ db_search_in_task_symbol(val, strategy,
 		 */
 	      db_last_symtab = sp;
 	      diff = newdiff;
+	      db_free_symbol(ret);
 	      ret = sym;
 	      continue;
 	    }
@@ -432,7 +445,7 @@ db_symbol_values(stab, sym, namep, value
  * not accept symbols whose value is zero (and use plain hex).
  */
 
-unsigned int	db_maxoff = 0x4000;
+unsigned long	db_maxoff = 0x4000;
 
 void
 db_task_printsym(off, strategy, task)
@@ -449,8 +462,9 @@ db_task_printsym(off, strategy, task)
 
 	cursym = db_search_task_symbol(off, strategy, &d, task);
 	db_symbol_values(0, cursym, &name, &value);
-	if (name == 0 || d >= db_maxoff || value == 0) {
+	if (name == 0 || d >= db_maxoff || value == 0 || *name == 0) {
 		db_printf("%#n", off);
+		db_free_symbol(cursym);
 		return;
 	}
 	db_printf("%s", name);
@@ -464,6 +478,7 @@ db_task_printsym(off, strategy, task)
 			db_printf("]");
 		}
 	}
+	db_free_symbol(cursym);
 }
 
 void
@@ -486,6 +501,13 @@ db_line_at_pc( sym, filename, linenum, p
 		FALSE;
 }
 
+void db_free_symbol(db_sym_t s)
+{
+	return (db_last_symtab) ?
+		X_db_free_symbol( db_last_symtab, s) :
+		FALSE;
+}
+
 /*
  * Switch into symbol-table specific routines
  */
@@ -498,6 +520,8 @@ extern boolean_t coff_db_sym_init(), cof
 extern db_sym_t coff_db_lookup(), coff_db_search_symbol();
 extern void coff_db_symbol_values();
 
+void dummy_db_free_symbol(sym_t) { }
+
 struct db_sym_switch x_db[] = {
 
 	/* BSD a.out format (really, sdb/dbx(1) symtabs) */
@@ -505,14 +529,14 @@ struct db_sym_switch x_db[] = {
 	{ 0,},
 #else	/* DB_NO_AOUT */
 	{ aout_db_sym_init, aout_db_lookup, aout_db_search_symbol,
-	  aout_db_line_at_pc, aout_db_symbol_values },
+	  aout_db_line_at_pc, aout_db_symbol_values, dummy_db_free_symbol },
 #endif	/* DB_NO_AOUT */
 
 #ifdef	DB_NO_COFF
 	{ 0,},
 #else	/* DB_NO_COFF */
 	{ coff_db_sym_init, coff_db_lookup, coff_db_search_symbol,
-	  coff_db_line_at_pc, coff_db_symbol_values },
+	  coff_db_line_at_pc, coff_db_symbol_values, dummy_db_free_symbol },
 #endif	/* DB_NO_COFF */
 
 	/* Machdep, not inited here */