From: Steven Stallion <stallion@squareup.com>
Date: Tue, 9 Oct 2018 18:48:18 +0000 (-0500)
Subject: rtos: check symbol list when updating uCOS-III
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=05e0d633bad9e8b0bdfaf16fc76ab1f9d9419d8b;p=openocd

rtos: check symbol list when updating uCOS-III

This patch corrects a crash in uCOS-III on a new GDB connection when
RTOS autodetection is not used. The crash was caused by not checking if
the symbol list had been loaded prior to updating threads.

Change-Id: I64c5133e02fe22fc8d14584cc40d87b49c935b0b
Signed-off-by: Steven Stallion <stallion@squareup.com>
Reviewed-on: http://openocd.zylin.com/4719
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
---

diff --git a/src/rtos/uCOS-III.c b/src/rtos/uCOS-III.c
index 3cd9c2ae..304d07c5 100644
--- a/src/rtos/uCOS-III.c
+++ b/src/rtos/uCOS-III.c
@@ -300,6 +300,11 @@ static int uCOS_III_update_threads(struct rtos *rtos)
 	struct uCOS_III_params *params = rtos->rtos_specific_params;
 	int retval;
 
+	if (rtos->symbols == NULL) {
+		LOG_ERROR("uCOS-III: symbol list not loaded");
+		return ERROR_FAIL;
+	}
+
 	/* free previous thread details */
 	rtos_free_threadlist(rtos);