diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-03-28 15:33:34 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-03-28 15:33:34 +0000 |
| commit | 1e4963f7fb25763c8ec9b9edc4c5ffdd6a0c5409 (patch) | |
| tree | c08ee4e5072738915fe43bd904d828d4a2780500 | |
| parent | 6b9369c95f8dab6571ae508311a6318bddfd7cc9 (diff) | |
| download | rsyslog-1e4963f7fb25763c8ec9b9edc4c5ffdd6a0c5409.tar.gz rsyslog-1e4963f7fb25763c8ec9b9edc4c5ffdd6a0c5409.tar.xz rsyslog-1e4963f7fb25763c8ec9b9edc4c5ffdd6a0c5409.zip | |
bugfix: regular expressions inside property replacer did not work properly
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | msg.c | 8 |
3 files changed, 9 insertions, 5 deletions
@@ -1,4 +1,8 @@ --------------------------------------------------------------------------- +Version 2.0.5 STABLE (rgerhards), 2008-??-?? +- bugfix: regular expressions inside property replacer did not work + properly +--------------------------------------------------------------------------- Version 2.0.4 STABLE (rgerhards), 2008-03-27 - bugfix: internally generated messages had "FROMHOST" property not set - bugfix: continue parsing if tag is oversize (discard oversize part) - thanks diff --git a/configure.ac b/configure.ac index 881d4179..6163078f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[2.0.4],[rsyslog@lists.adiscon.com.]) +AC_INIT([rsyslog],[2.0.5],[rsyslog@lists.adiscon.com.]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([syslogd.c]) AC_CONFIG_HEADERS([config.h]) @@ -1336,8 +1336,8 @@ char *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, #ifdef FEATURE_REGEXP /* Variables necessary for regular expression matching */ - size_t nmatch = 2; - regmatch_t pmatch[2]; + size_t nmatch = 1; + regmatch_t pmatch[1]; #endif assert(pMsg != NULL); @@ -1582,7 +1582,7 @@ char *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, int iLenBuf; char *pB; - iLenBuf = pmatch[1].rm_eo - pmatch[1].rm_so; + iLenBuf = pmatch[0].rm_eo - pmatch[0].rm_so; pB = (char *) malloc((iLenBuf + 1) * sizeof(char)); if (pB == NULL) { @@ -1593,7 +1593,7 @@ char *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, } /* Lets copy the matched substring to the buffer */ - memcpy(pB, pRes + pmatch[1].rm_so, iLenBuf); + memcpy(pB, pRes + pmatch[0].rm_so, iLenBuf); pB[iLenBuf] = '\0';/* terminate string, did not happen before */ if (*pbMustBeFreed == 1) |