rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 19:50:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

timezone() object: remove potential invalid use of NULL

Browse Source 
this could only happen during config processing.

We have added checks to make clang static analyzer happy, but more
importantly we have flagged these parameters as mandatory inside
the config parameter block.
This commit is contained in:
Rainer Gerhards 2015-12-05 17:40:18 +01:00
parent 3c22bfcd65
commit f9da28386c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
runtime/glbl.c
View File

@ -164,8 +164,8 @@ static struct cnfparamblk paramblk =
};
static struct cnfparamdescr timezonecnfparamdescr[] = {
{ "id", eCmdHdlrString, 0 },
{ "offset", eCmdHdlrGetWord, 0 }
{ "id", eCmdHdlrString, CNFPARAM_REQUIRED},
{ "offset", eCmdHdlrGetWord, CNFPARAM_REQUIRED }
};
static struct cnfparamblk timezonepblk =
{ CNFPARAMBLK_VERSION,
@ -885,8 +885,17 @@ glblProcessTimezone(struct cnfobj *o)
}
}
/* note: the following two checks for NULL are not strictly necessary
* as these are required parameters for the config block. But we keep
* them to make the clang static analyzer happy, which also helps
* guard against logic errors.
*/
if(offset == NULL) {
parser_errmsg("offset parameter missing, timezone config ignored");
parser_errmsg("offset parameter missing (logic error?), timezone config ignored");
goto done;
}
if(id == NULL) {
parser_errmsg("id parameter missing (logic error?), timezone config ignored");
goto done;
}