From 528197ba2cf2b208efa4d5c8465a9044567e8d69 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Fri, 24 Apr 2015 14:43:45 +0300 Subject: [PATCH] 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 Reviewed-on: http://openocd.zylin.com/2741 Tested-by: jenkins --- src/rtos/mqx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rtos/mqx.c b/src/rtos/mqx.c index a23a95c348..0ba462c9a7 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 */ -- 2.30.2