diff options
| author | Chandler Latour <chandler.latour@gmail.com> | 2013-01-08 12:01:10 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-08 12:01:10 +0100 |
| commit | 3b0f635bd579c4cc00e189871e77ef120a6c6a4d (patch) | |
| tree | 697444240b88859c2dc9b6779e23a7326bd81e32 | |
| parent | 9fb9fa03a2cfeab700f8c3c893f08d1a60d3f75e (diff) | |
| download | rsyslog-3b0f635bd579c4cc00e189871e77ef120a6c6a4d.tar.gz rsyslog-3b0f635bd579c4cc00e189871e77ef120a6c6a4d.tar.bz2 rsyslog-3b0f635bd579c4cc00e189871e77ef120a6c6a4d.zip | |
bugfix: doGetFileCreateMode() had invalid validity check ;)
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | grammar/rainerscript.c | 10 |
2 files changed, 7 insertions, 5 deletions
@@ -20,6 +20,8 @@ Version 7.2.5 [v7-stable] 2013-01-?? 2013-01-03]. - bugfix: compile errors in im3195 Thanks to Martin Körper for the patch +- bugfix: doGetFileCreateMode() had invalid validity check ;) + Thanks to Chandler Latour for the patch. ---------------------------------------------------------------------------- Version 7.2.4 [v7-stable] 2012-12-07 - enhance: permit RFC3339 timestamp in local log socket messages diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index c5f2148e..0584d6a9 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -463,17 +463,17 @@ doGetFileCreateMode(struct nvlst *valnode, struct cnfparamdescr *param, if(es_strlen(valnode->val.d.estr) == 4) { c = es_getBufAddr(valnode->val.d.estr); - if(!( (c[0] == '0') - && (c[1] >= '0' && c[1] <= '7') - && (c[2] >= '0' && c[2] <= '7') - && (c[3] >= '0' && c[3] <= '7') ) ) { + if( (c[0] == '0') + && (c[1] >= '0' && c[1] <= '7') + && (c[2] >= '0' && c[2] <= '7') + && (c[3] >= '0' && c[3] <= '7') ) { fmtOK = 1; } } if(fmtOK) { val->val.datatype = 'N'; - val->val.d.n = (c[1]-'0') * 64 + (c[2]-'0') * 8 + (c[3]-'0');; + val->val.d.n = (c[1]-'0') * 64 + (c[2]-'0') * 8 + (c[3]-'0'); } else { cstr = es_str2cstr(valnode->val.d.estr, NULL); parser_errmsg("file modes need to be specified as " |