rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-18 06:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

core bugfix: rsyslog aborts when config parse error is detected

Browse Source 
In defaut settings, rsyslog tries to continue to run, but some data
structures are not properly initialized due to the config parsing error.
This causes a segfault.

In the following tracker, this is the root cause of the abort:
see also https://github.com/rsyslog/rsyslog/issues/2869
This commit is contained in:
Rainer Gerhards 2019-12-30 14:08:47 +01:00
parent 5a65b925b0
commit 13d4999601
No known key found for this signature in database
GPG Key ID: 0CB6B2A8BE80B499
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/rsconf.c
View File

@ -1308,6 +1308,7 @@ load(rsconf_t **cnf, uchar *confFile)
{
int iNbrActions = 0;
int r;
rsRetVal delayed_iRet = RS_RET_OK;
DEFiRet;
CHKiRet(rsconfConstruct(&loadConf));
@ -1331,7 +1332,8 @@ ourConf = loadConf; // TODO: remove, once ourConf is gone!
if(r == 1) {
LogError(0, RS_RET_CONF_PARSE_ERROR, "could not interpret master "
"config file '%s'.", confFile);
ABORT_FINALIZE(RS_RET_CONF_PARSE_ERROR);
/* we usually keep running with the failure, so we need to continue for now */
delayed_iRet = RS_RET_CONF_PARSE_ERROR;
} else if(r == 2) { /* file not found? */
LogError(errno, RS_RET_CONF_FILE_NOT_FOUND, "could not open config file '%s'",
confFile);
@ -1369,6 +1371,9 @@ ourConf = loadConf; // TODO: remove, once ourConf is gone!
rsconfDebugPrint(loadConf);
finalize_it:
if(iRet == RS_RET_OK && delayed_iRet != RS_RET_OK) {
iRet = delayed_iRet;
}
RETiRet;
}