From 9ff407156894a5f0b9db1f5438901b5a2e0b80b9 Mon Sep 17 00:00:00 2001 From: Matthias Blaicher Date: Tue, 9 Oct 2012 10:25:00 +0200 Subject: [PATCH] rtos: Don't crash on qSymbol GDB packet when no RTOS is configured Commit 43902905bbc8fdc9d764f3843d697161d9b5fd92 fixed a bug but also introduced a regression. The RTOS GDB packet handler is always called, not only when an RTOS is actually configured, so it is important to check if an RTOS has been configured or not before actually processing the qSymbol packet. Change-Id: I1aed54f6c2817e1ebf99ddcda051df4554ea5a3a Signed-off-by: Peter Stuge Reviewed-on: http://openocd.zylin.com/907 Tested-by: jenkins --- src/rtos/rtos.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c index 9002f1a8c..ed559c391 100644 --- a/src/rtos/rtos.c +++ b/src/rtos/rtos.c @@ -194,6 +194,9 @@ int rtos_qsymbol(struct connection *connection, char *packet, int packet_size) reply_len = sprintf(reply, "OK"); + if (!os) + goto done; + if (sscanf(packet, "qSymbol:%" SCNx64 ":", &addr)) hex_to_str(cur_sym, strchr(packet + 8, ':') + 1); else if (target->rtos_auto_detect && !rtos_try_next(target)) -- 2.30.2