From 882ff18654cea6e8e3a37a409a0d1bb828e152dd Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 3 Apr 2008 18:47:05 +0000 Subject: MFC: Initialize list of kld's correctly when there are no kld's and catch errors in kgdb_parse() so it returns 0 for invalid expressions. This fixes the kld loading for 6.x and 7.x. --- gnu/usr.bin/gdb/kgdb/kld.c | 1 + gnu/usr.bin/gdb/kgdb/main.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'gnu/usr.bin') 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 #include #include +#include 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); } -- cgit v1.3