From: Paul Fertser <fercerpav@gmail.com>
Date: Fri, 24 Apr 2015 11:43:45 +0000 (+0300)
Subject: rtos/mqx: prevent crash with -rtos auto
X-Git-Tag: v0.9.0-rc1~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=528197ba2cf2b208efa4d5c8465a9044567e8d69;p=openocd

rtos/mqx: prevent crash with -rtos auto

Since mqx comes last in the list, with the auto option its
update_threads is called even though it wasn't detected.

This check should be removed from all the rtos helpers and moved to
the generic code, but better do it later all in one go.

Change-Id: If24ab42a58a468d90e9f12028d4c2fb76a9bc2e8
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2741
Tested-by: jenkins
---

diff --git a/src/rtos/mqx.c b/src/rtos/mqx.c
index a23a95c3..0ba462c9 100644
--- a/src/rtos/mqx.c
+++ b/src/rtos/mqx.c
@@ -292,6 +292,12 @@ static int mqx_update_threads(
 	uint16_t task_queue_size = 0;
 	uint32_t active_td_addr = 0;
 
+	if (!rtos->rtos_specific_params)
+		return -3;
+
+	if (!rtos->symbols)
+		return -4;
+
 	/* clear old data */
 	rtos_free_threadlist(rtos);
 	/* check scheduler */