Merge pull request #298 from theonemcdonald/cm-waitpid-segv-fix

Fix potential segfault in `clixon_process_waitpid`
This commit is contained in:
Olof Hagsand 2022-02-08 09:14:49 +01:00 committed by GitHub
commit a96610f300
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -931,7 +931,9 @@ clixon_process_waitpid(clicon_handle h)
pid_t wpid; pid_t wpid;
clicon_debug(1, "%s", __FUNCTION__); clicon_debug(1, "%s", __FUNCTION__);
pe = _proc_entry_list; if (_proc_entry_list == NULL)
goto ok;
if ((pe = _proc_entry_list) != NULL)
do { do {
clicon_debug(1, "%s %s(%d) %s op:%s", __FUNCTION__, clicon_debug(1, "%s %s(%d) %s op:%s", __FUNCTION__,
pe->pe_name, pe->pe_pid, pe->pe_name, pe->pe_pid,
@ -984,6 +986,7 @@ clixon_process_waitpid(clicon_handle h)
} }
pe = NEXTQ(process_entry_t *, pe); pe = NEXTQ(process_entry_t *, pe);
} while (pe && pe != _proc_entry_list); } while (pe && pe != _proc_entry_list);
ok:
retval = 0; retval = 0;
done: done:
clicon_debug(1, "%s retval:%d", __FUNCTION__, retval); clicon_debug(1, "%s retval:%d", __FUNCTION__, retval);