summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-02-10 17:50:41 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-02-10 17:50:41 +0100
commit1f66eb6efaf2c4bea18242645c85b51fe5236fb9 (patch)
tree7cf33472fc4950f4853ba9eb9209d0863312caa5
parentdf6bad70d4df6b9142f988bd4ed859555756fd15 (diff)
downloadrsyslog-1f66eb6efaf2c4bea18242645c85b51fe5236fb9.tar.gz
rsyslog-1f66eb6efaf2c4bea18242645c85b51fe5236fb9.tar.xz
rsyslog-1f66eb6efaf2c4bea18242645c85b51fe5236fb9.zip
bugfix: abort if imfile reads file line of more than 64KiB
Thanks to Peter Eisentraut for reporting and analysing this problem. bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221
-rw-r--r--ChangeLog3
-rw-r--r--runtime/stringbuf.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2960749e..15367918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
---------------------------------------------------------------------------
Version 5.7.4 [V5-BETA] (rgerhards), 2011-02-??
- added pmsnare parser module (written by David Lang)
+- bugfix: abort if imfile reads file line of more than 64KiB
+ Thanks to Peter Eisentraut for reporting and analysing this problem.
+ bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221
---------------------------------------------------------------------------
Version 5.7.3 [V5-BETA] (rgerhards), 2011-02-07
- added support for processing multi-line messages in imfile
diff --git a/runtime/stringbuf.c b/runtime/stringbuf.c
index ccf115c1..2b6815a4 100644
--- a/runtime/stringbuf.c
+++ b/runtime/stringbuf.c
@@ -156,7 +156,7 @@ rsRetVal
rsCStrExtendBuf(cstr_t *pThis, size_t iMinNeeded)
{
uchar *pNewBuf;
- unsigned short iNewSize;
+ size_t iNewSize;
DEFiRet;
/* first compute the new size needed */