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

minor cleanup & preparation for 4.5.4

Browse Source
This commit is contained in:
Rainer Gerhards 2009-09-29 09:50:39 +02:00
parent d15eb7fa83
commit 8bab264ba1
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,5 @@
---------------------------------------------------------------------------
Version 4.5.4 [v4-beta] (rgerhards), 2009-09-??
Version 4.5.4 [v4-beta] (rgerhards), 2009-09-29
- bugfix: potential segfault in stream writer on destruction
Most severely affected omfile. The problem was that some buffers were
freed before the asynchronous writer thread was shut down. So the

9
runtime/stream.c
View File

@ -677,11 +677,9 @@ CODESTARTobjDestruct(strm)
/* Note: mutex will be unlocked in stopWriter! */
d_pthread_mutex_lock(&pThis->mut);
dbgprintf("XXX: destruct stream 1 %p\n", pThis);
if(pThis->tOperationsMode != STREAMMODE_READ)
strmFlush(pThis);
dbgprintf("XXX: destruct stream 2 %p\n", pThis);
if(pThis->bAsyncWrite) {
stopWriter(pThis);
pthread_mutex_destroy(&pThis->mut);
@ -694,7 +692,6 @@ dbgprintf("XXX: destruct stream 2 %p\n", pThis);
} else {
free(pThis->pIOBuf);
}
dbgprintf("XXX: destruct stream 3 (doing close) %p\n", pThis);
/* Finally, we can free the resources.
* IMPORTANT: we MUST free this only AFTER the ansyncWriter has been stopped, else
@ -850,7 +847,6 @@ doAsyncWriteInternal(strm_t *pThis, size_t lenBuf)
DEFiRet;
ISOBJ_TYPE_assert(pThis, strm);
dbgprintf("XXX: doAsyncWriteInternal: strm %p, len %ld\n", pThis, (long) lenBuf);
while(pThis->iCnt >= STREAM_ASYNC_NUMBUFS)
d_pthread_cond_wait(&pThis->notFull, &pThis->mut);
@ -1065,13 +1061,10 @@ doZipWrite(strm_t *pThis, uchar *pBuf, size_t lenBuf)
z_stream zstrm;
int zRet; /* zlib return state */
bool bzInitDone = FALSE;
static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
DEFiRet;
assert(pThis != NULL);
assert(pBuf != NULL);
//pthread_mutex_lock(&mut);
/* allocate deflate state */
zstrm.zalloc = Z_NULL;
zstrm.zfree = Z_NULL;
@ -1110,8 +1103,6 @@ finalize_it:
}
}
//pthread_mutex_unlock(&mut);
RETiRet;
}