diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 16:51:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 16:51:53 +0200 |
| commit | 1d16216aa326296673cc8520a8df351c4d492dfe (patch) | |
| tree | 5b91d1d5d13b69e128fa13809fb32a01ad99614b /tools/syslogd.c | |
| parent | a86e42028afeba1daca262b590bfd49d9c393b90 (diff) | |
| download | rsyslog-1d16216aa326296673cc8520a8df351c4d492dfe.tar.gz rsyslog-1d16216aa326296673cc8520a8df351c4d492dfe.tar.xz rsyslog-1d16216aa326296673cc8520a8df351c4d492dfe.zip | |
streamlined regex patch
- abided to code conventions
- fixed a potential segfault when regex library can not
be loaded
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index c7f36b45..d5429855 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -429,11 +429,11 @@ selectorDestruct(void *pVal) rsCStrDestruct(&pThis->f_filterData.prop.pCSPropName); if(pThis->f_filterData.prop.pCSCompValue != NULL) rsCStrDestruct(&pThis->f_filterData.prop.pCSCompValue); + if(pThis->f_filterData.prop.regex_cache != NULL) + rsCStrRegexDestruct(&pThis->f_filterData.prop.regex_cache); } else if(pThis->f_filter_type == FILTER_EXPR) { if(pThis->f_filterData.f_expr != NULL) expr.Destruct(&pThis->f_filterData.f_expr); - if(pThis->regex_cache != NULL) - rsRegexDestruct(&pThis->regex_cache); } llDestroy(&pThis->llActList); @@ -1080,7 +1080,7 @@ static rsRetVal shouldProcessThisMessage(selector_t *f, msg_t *pMsg, int *bProce //TODO REGEX: this needs to be merged with new functionality below //rgerhards, 2009-04-02 if(rsCStrSzStrMatchRegexCache(f->f_filterData.prop.pCSCompValue, - (unsigned char*) pszPropVal, &f->regex_cache) == 0) + (unsigned char*) pszPropVal, &f->f_filterData.prop.regex_cache) == 0) bRet = 1; break; case FIOP_EREREGEX: |