diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:07:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:07:22 +0200 |
| commit | fd4a54698cee48da073622f7d6ac49c94ccb1808 (patch) | |
| tree | b16110018cd3a21a19561f45376403e1e8815cfb /runtime/stream.c | |
| parent | 88ff647aef4c6db3c444c6d080f9886350ca9584 (diff) | |
| parent | 87a01476e2a63ab7b6740b6b4182281d271ef382 (diff) | |
| download | rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.tar.gz rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.tar.bz2 rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
tools/omfwd.c
Diffstat (limited to 'runtime/stream.c')
| -rw-r--r-- | runtime/stream.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/runtime/stream.c b/runtime/stream.c index 24dbcc09..ae716815 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -259,6 +259,7 @@ static rsRetVal strmOpenFile(strm_t *pThis) if(pThis->fd != -1) ABORT_FINALIZE(RS_RET_OK); + pThis->pszCurrFName = NULL; /* used to prevent mem leak in case of error */ if(pThis->pszFName == NULL) ABORT_FINALIZE(RS_RET_FILE_PREFIX_MISSING); @@ -290,6 +291,16 @@ static rsRetVal strmOpenFile(strm_t *pThis) (pThis->tOperationsMode == STREAMMODE_READ) ? "READ" : "WRITE", pThis->fd); finalize_it: + if(iRet != RS_RET_OK) { + if(pThis->pszCurrFName != NULL) { + free(pThis->pszCurrFName); + pThis->pszCurrFName = NULL; /* just to prevent mis-adressing down the road... */ + } + if(pThis->fd != -1) { + close(pThis->fd); + pThis->fd = -1; + } + } RETiRet; } |