RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

rtems-debugger-threads.c: Fix three Dereference before null check errors

Browse Source 
CID 1468681: Dereference before null check in rtems_debugger_thread_continue().
CID 1468690: Dereference before null check in rtems_debugger_thread_system_resume().
CID 1468694: Dereference before null check in rtems_debugger_thread_find_index().

Closes #4241.
This commit is contained in:
Ryan Long
2021-02-12 13:50:36 -05:00
committed by Joel Sherrill
parent 3f4cdd8589
commit f65d3384dd
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cpukit/libdebugger/rtems-debugger-threads.c
View File

@@ -148,9 +148,9 @@ int
rtems_debugger_thread_find_index(rtems_id id) rtems_debugger_thread_find_index(rtems_id id)
{ {
rtems_debugger_threads* threads = rtems_debugger->threads; rtems_debugger_threads* threads = rtems_debugger->threads;
rtems_debugger_thread* current = rtems_debugger_thread_current(threads);
int r = -1; int r = -1;
if (threads != NULL) { if (threads != NULL) {
rtems_debugger_thread* current = rtems_debugger_thread_current(threads);
size_t i; size_t i;
for (i = 0; i < threads->current.level; ++i) { for (i = 0; i < threads->current.level; ++i) {
if (id == 0 || current[i].id == id) { if (id == 0 || current[i].id == id) {
@@ -347,8 +347,11 @@ rtems_debugger_thread_system_resume(bool detaching)
rtems_debugger_threads* threads = rtems_debugger->threads; rtems_debugger_threads* threads = rtems_debugger->threads;
rtems_debugger_thread* current; rtems_debugger_thread* current;
int r = 0; int r = 0;
if (threads == NULL) {
return r;
}
current = rtems_debugger_thread_current(threads); current = rtems_debugger_thread_current(threads);
if (threads != NULL && current != NULL) { if (current != NULL) {
size_t i; size_t i;
if (rtems_debugger_verbose()) if (rtems_debugger_verbose())
rtems_debugger_printf("rtems-db: sys: : resuming\n"); rtems_debugger_printf("rtems-db: sys: : resuming\n");
@@ -430,8 +433,13 @@ rtems_debugger_thread_continue_all(void)
rtems_debugger_threads* threads = rtems_debugger->threads; rtems_debugger_threads* threads = rtems_debugger->threads;
rtems_debugger_thread* current; rtems_debugger_thread* current;
int r = 0; int r = 0;
if (threads == NULL) {
r = -1;
errno = EIO;
return r;
}
current = rtems_debugger_thread_current(threads); current = rtems_debugger_thread_current(threads);
if (threads != NULL && current != NULL) { if (current != NULL) {
size_t i; size_t i;
for (i = 0; i < threads->current.level; ++i) { for (i = 0; i < threads->current.level; ++i) {
rtems_debugger_thread* thread = &current[i]; rtems_debugger_thread* thread = &current[i];