summaryrefslogtreecommitdiffstats
path: root/runtime/stream.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-08-18 18:48:18 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-08-18 18:48:18 +0200
commitbfc3eaf23cae0ef8685fc25b71e701e2c4690509 (patch)
tree4abd0b0fa2a7d2bc0ad405bc126d31405bca6108 /runtime/stream.h
parent56b781e5bb1ea08b76d5dcc1d5e5eab10a40a4c6 (diff)
downloadrsyslog-bfc3eaf23cae0ef8685fc25b71e701e2c4690509.tar.gz
rsyslog-bfc3eaf23cae0ef8685fc25b71e701e2c4690509.tar.xz
rsyslog-bfc3eaf23cae0ef8685fc25b71e701e2c4690509.zip
bugfix: potential segfault in output file writer (omfile)
In async write mode, we use modular arithmetic to index the output buffer array. However, the counter variables accidently were signed, thus resulting in negative indizes after integer overflow. That in turn could lead to segfaults, but was depending on the memory layout of the instance in question (which in turn depended on a number of variables, like compile settings but also configuration). The counters are now unsigned (as they always should have been) and so the dangling mis-indexing does no longer happen. This bug potentially affected all installations, even if only some may actually have seen a segfault.
Diffstat (limited to 'runtime/stream.h')
-rw-r--r--runtime/stream.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/stream.h b/runtime/stream.h
index cb368835..64ffb6e1 100644
--- a/runtime/stream.h
+++ b/runtime/stream.h
@@ -131,8 +131,8 @@ typedef struct strm_s {
pthread_cond_t notFull;
pthread_cond_t notEmpty;
pthread_cond_t isEmpty;
- short iEnq;
- short iDeq;
+ unsigned short iEnq; /* this MUST be unsigned as we use module arithmetic (else invalid indexing happens!) */
+ unsigned short iDeq; /* this MUST be unsigned as we use module arithmetic (else invalid indexing happens!) */
short iCnt; /* current nbr of elements in buffer */
struct {
uchar *pBuf;