2 files changed, 10 insertions, 6 deletions

diff --git a/gnu/usr.bin/gdb/kgdb/kld.c b/gnu/usr.bin/gdb/kgdb/kld.c
index 072226fd31f1..81627b97d35a 100644
--- a/gnu/usr.bin/gdb/kgdb/kld.c
+++ b/gnu/usr.bin/gdb/kgdb/kld.c
@@ -331,6 +331,7 @@ kld_current_sos (void)
 	char *path;
 	int error;
 
+	head = NULL;
 	prev = &head;
 
 	/*
diff --git a/gnu/usr.bin/gdb/kgdb/main.c b/gnu/usr.bin/gdb/kgdb/main.c
index 5e1c9c6b2687..77627630af0f 100644
--- a/gnu/usr.bin/gdb/kgdb/main.c
+++ b/gnu/usr.bin/gdb/kgdb/main.c
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <top.h>
 #include <bfd.h>
 #include <gdbcore.h>
+#include <wrapper.h>
 
 extern void (*init_ui_hook)(char *);
 
@@ -188,13 +189,15 @@ kgdb_parse(const char *exp)
 	char *s;
 	CORE_ADDR n;
 
-	s = strdup(exp);
-	old_chain = make_cleanup(free_current_contents, &expr);
-	expr = parse_expression(s);
-	val = (expr != NULL) ? evaluate_expression(expr) : NULL;
-	n = (val != NULL) ? value_as_address(val) : 0;
+	n = 0;
+	s = xstrdup(exp);
+	old_chain = make_cleanup(xfree, s);
+	if (gdb_parse_exp_1(&s, NULL, 0, &expr) && *s == '\0') {
+		make_cleanup(free_current_contents, &expr);
+		if (gdb_evaluate_expression(expr, &val))
+		    n = value_as_address(val);
+	}
 	do_cleanups(old_chain);
-	free(s);
 	return (n);
 }