From 79a68894b4f63d1684996718f7411e4163d76bba Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 4 Sep 2007 13:20:07 +0000 Subject: applied patch form varmojfekoj to fix some mem leaks and a check to make sure that an empty string (NULL) returned by the CStr class does not cause a program abort. --- syslogd.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'syslogd.c') diff --git a/syslogd.c b/syslogd.c index 65af51e8..8824cc04 100644 --- a/syslogd.c +++ b/syslogd.c @@ -1844,6 +1844,18 @@ static rsRetVal selectorDestruct(void *pVal) assert(pThis != NULL); + if(pThis->pCSHostnameComp != NULL) + rsCStrDestruct(pThis->pCSHostnameComp); + if(pThis->pCSProgNameComp != NULL) + rsCStrDestruct(pThis->pCSProgNameComp); + + if(pThis->f_filter_type == FILTER_PROP) { + if(pThis->f_filterData.prop.pCSPropName != NULL) + rsCStrDestruct(pThis->f_filterData.prop.pCSPropName); + if(pThis->f_filterData.prop.pCSCompValue != NULL) + rsCStrDestruct(pThis->f_filterData.prop.pCSCompValue); + } + llDestroy(&pThis->llActList); free(pThis); @@ -4807,7 +4819,6 @@ static rsRetVal cflineProcessHostSelector(uchar **pline) if(pDfltHostnameCmp != NULL) { if((iRet = rsCStrSetSzStr(pDfltHostnameCmp, NULL)) != RS_RET_OK) return(iRet); - pDfltHostnameCmp = NULL; } } else { dbgprintf("setting BSD-like hostname filter to '%s'\n", *pline); @@ -4852,7 +4863,6 @@ static rsRetVal cflineProcessTagSelector(uchar **pline) if(pDfltProgNameCmp != NULL) { if((iRet = rsCStrSetSzStr(pDfltProgNameCmp, NULL)) != RS_RET_OK) return(iRet); - pDfltProgNameCmp = NULL; } } else { dbgprintf("setting programname filter to '%s'\n", *pline); -- cgit v1.2.3