rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-16 20:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

core: fix potential race

Browse Source 
This fixes a potential race that valgrind's helgrind found on some
very few occasions, and right now only on CentOS 7. However, it
looks like the variable was actually not correctly protected.

see also https://github.com/rsyslog/rsyslog/issues/2012
This commit is contained in:
Rainer Gerhards 2017-12-16 14:24:12 +01:00
parent f6678ab4c3
commit 2254fe214e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
threads.c
View File

@ -77,9 +77,12 @@ static rsRetVal thrdDestruct(thrdInfo_t *pThis)
DEFiRet;
assert(pThis != NULL);
pthread_mutex_lock(&pThis->mutThrd);
if(pThis->bIsActive == 1) {
pthread_mutex_unlock(&pThis->mutThrd);
thrdTerminate(pThis);
} else {
pthread_mutex_unlock(&pThis->mutThrd);
pthread_join(pThis->thrdID, NULL);
}
@ -120,8 +123,8 @@ thrdTerminateNonCancel(thrdInfo_t *pThis)
pthread_kill(pThis->thrdID, SIGTTIN);
ret = d_pthread_cond_timedwait(&pThis->condThrdTerm, &pThis->mutThrd, &tTimeout);
if(ret == ETIMEDOUT) {
DBGPRINTF("input thread term: timeout expired waiting on thread %s termination - canceling\n",
pThis->name);
DBGPRINTF("input thread term: timeout expired waiting on thread %s "
"termination - canceling\n", pThis->name);
pthread_cancel(pThis->thrdID);
break;
} else if(ret != 0) {