diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-21 16:55:11 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-21 16:55:11 +0200 |
| commit | d25586126f5202e91a637b6f4aa89dd4b88b6e9e (patch) | |
| tree | 3a958a2eb9fdaa6bfa5faf452952e5c96c1c23fe | |
| parent | 297384275f264ff4073838fe2006dc5180fd5a5b (diff) | |
| parent | 8f53b0f4d5318e79eff23d9b96517cb8400d9c53 (diff) | |
| download | rsyslog-d25586126f5202e91a637b6f4aa89dd4b88b6e9e.tar.gz rsyslog-d25586126f5202e91a637b6f4aa89dd4b88b6e9e.tar.xz rsyslog-d25586126f5202e91a637b6f4aa89dd4b88b6e9e.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | plugins/imklog/imklog.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -59,6 +59,10 @@ Version 3.19.0 (rgerhards), 2008-05-06 - -c option no longer must be the first option - thanks to varmjofekoj for the patch --------------------------------------------------------------------------- +Version 3.17.3 (rgerhards), 2008-05-?? +- bugfix: imklog went into an endless loop if a PRI value was inside + a kernel log message (unusual case under Linux, frequent under BSD) +--------------------------------------------------------------------------- Version 3.17.2 (rgerhards), 2008-05-04 - this version is the new beta, based on 3.17.1 devel feature set - merged in imklog bug fix from v3-stable (3.16.1) diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c index 5bd99d9e..3faed2fe 100644 --- a/plugins/imklog/imklog.c +++ b/plugins/imklog/imklog.c @@ -136,7 +136,7 @@ parsePRI(uchar **ppSz, int *piPri) ++pSz; i = 0; while(isdigit(*pSz)) { - i = i * 10 + *pSz - '0'; + i = i * 10 + *pSz++ - '0'; } if(*pSz != '>') |