From 8aea6a1d9d5a623018747844b65cf6c0dfd57192 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 14 May 2008 18:37:23 +0200 Subject: bugfix: some whitespaces where incorrectly not ignored when parsing the config file. This is now corrected. Thanks to Michael Biebl for pointing out the problem. --- ChangeLog | 3 +++ cfsysline.c | 2 ++ conf.c | 1 + 3 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1f991d93..213230a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Version 3.16.2 (rgerhards), 2008-05-14 - fixed potential segfault due to invalid call to cfsysline thanks to varmojfekoj for the patch +- bugfix: some whitespaces where incorrectly not ignored when parsing + the config file. This is now corrected. Thanks to Michael Biebl for + pointing out the problem. --------------------------------------------------------------------------- Version 3.16.1 (rgerhards), 2008-05-02 - fixed a bug in imklog which lead to startup problems (including diff --git a/cfsysline.c b/cfsysline.c index 1aebc354..d3203ccc 100644 --- a/cfsysline.c +++ b/cfsysline.c @@ -462,6 +462,8 @@ getWord(uchar **pp, cstr_t **ppStrB) CHKiRet(rsCStrConstruct(ppStrB)); + skipWhiteSpace(pp); /* skip over any whitespace */ + /* parse out the word */ p = *pp; diff --git a/conf.c b/conf.c index f87ab992..5f0dca0f 100644 --- a/conf.c +++ b/conf.c @@ -230,6 +230,7 @@ doModLoad(uchar **pp, __attribute__((unused)) void* pVal) ASSERT(pp != NULL); ASSERT(*pp != NULL); + skipWhiteSpace(pp); /* skip over any whitespace */ if(getSubString(pp, (char*) szName, sizeof(szName) / sizeof(uchar), ' ') != 0) { errmsg.LogError(NO_ERRCODE, "could not extract module name"); ABORT_FINALIZE(RS_RET_NOT_FOUND); -- cgit