summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-05-21 16:53:57 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-05-21 16:53:57 +0200
commit8f53b0f4d5318e79eff23d9b96517cb8400d9c53 (patch)
tree38687ed5c5526499cbb283dfa65ae197784e944a
parent09a3d4ef122288c47a8390a2ce61322bde65c780 (diff)
downloadrsyslog-8f53b0f4d5318e79eff23d9b96517cb8400d9c53.tar.gz
rsyslog-8f53b0f4d5318e79eff23d9b96517cb8400d9c53.tar.xz
rsyslog-8f53b0f4d5318e79eff23d9b96517cb8400d9c53.zip
bugfix: imklog went into an endless loop if a PRI value was inside
a kernel log message This is an unusual case under Linux, and a frequent one under BSD
-rw-r--r--ChangeLog5
-rw-r--r--plugins/imklog/imklog.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 76afaa4a..e355e241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+---------------------------------------------------------------------------
+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 c6fb1592..331805b3 100644
--- a/plugins/imklog/imklog.c
+++ b/plugins/imklog/imklog.c
@@ -132,7 +132,7 @@ parsePRI(uchar **ppSz, int *piPri)
++pSz;
i = 0;
while(isdigit(*pSz)) {
- i = i * 10 + *pSz - '0';
+ i = i * 10 + *pSz++ - '0';
}
if(*pSz != '>')