diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-10 17:54:09 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-10 17:54:09 +0100 |
| commit | 6bad782f154b7f838c7371bf99c13f6dc4ec4101 (patch) | |
| tree | 1ef3380351598b2d2da91ffb3542e5543835458d | |
| parent | cdc27aea8f9be98b3f886532191c73bfbc42b8a4 (diff) | |
| download | rsyslog-6bad782f154b7f838c7371bf99c13f6dc4ec4101.tar.gz rsyslog-6bad782f154b7f838c7371bf99c13f6dc4ec4101.tar.xz rsyslog-6bad782f154b7f838c7371bf99c13f6dc4ec4101.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-- | ChangeLog | 3 | ||||
| -rw-r--r-- | runtime/stringbuf.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -20,6 +20,9 @@ Version 4.6.6 [v4-stable] (rgerhards), 2010-11-?? - bugfix: imfile utilizes 32 bit to track offset. Most importantly, this problem can not experienced on Fedora 64 bit OS (which has 64 bit long's!) +- 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 - some improvements thanks to clang's static code analyzer o overall cleanup (mostly unnecessary writes and otherwise unused stuff) o bugfix: fixed a very remote problem in msg.c which could occur when diff --git a/runtime/stringbuf.c b/runtime/stringbuf.c index 93995b38..8b2fe455 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 */ |