mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

'lcfg' must be non NULL, remove test.

Browse Source 
389        else

	CID 1452695 (#1 of 1): Dereference before null check (REVERSE_INULL)
	check_after_deref: Null-checking lcfg suggests that it may
	be null, but it has already been dereferenced on all paths
	leading to the check.

390                if (lcfg != NULL)
391                        isc_logconfig_destroy(&lcfg);
This commit is contained in:
Mark Andrews
2020-02-05 16:45:59 +11:00
parent 714594d468
commit 7ba1af0280
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/isc/log.c
View File

@@ -321,17 +321,15 @@ isc_logconfig_create(isc_log_t *lctx, isc_logconfig_t **lcfgp) {
lcfg = isc_mem_get(lctx->mctx, sizeof(*lcfg)); lcfg = isc_mem_get(lctx->mctx, sizeof(*lcfg));
{ lcfg->lctx = lctx;
lcfg->lctx = lctx; lcfg->channellists = NULL;
lcfg->channellists = NULL; lcfg->channellist_count = 0;
lcfg->channellist_count = 0; lcfg->duplicate_interval = 0;
lcfg->duplicate_interval = 0; lcfg->highest_level = level;
lcfg->highest_level = level; lcfg->tag = NULL;
lcfg->tag = NULL; lcfg->dynamic = false;
lcfg->dynamic = false; ISC_LIST_INIT(lcfg->channels);
ISC_LIST_INIT(lcfg->channels); lcfg->magic = LCFG_MAGIC;
lcfg->magic = LCFG_MAGIC;
}
/* /*
* Create the default channels: * Create the default channels:
@@ -377,18 +375,18 @@ isc_logconfig_create(isc_log_t *lctx, isc_logconfig_t **lcfgp) {
ISC_LOG_PRINTTIME); ISC_LOG_PRINTTIME);
} }
if (result == ISC_R_SUCCESS) if (result == ISC_R_SUCCESS) {
result = isc_log_createchannel(lcfg, "null", result = isc_log_createchannel(lcfg, "null",
ISC_LOG_TONULL, ISC_LOG_TONULL,
ISC_LOG_DYNAMIC, ISC_LOG_DYNAMIC,
NULL, 0); NULL, 0);
}
if (result == ISC_R_SUCCESS) if (result == ISC_R_SUCCESS) {
*lcfgp = lcfg; *lcfgp = lcfg;
} else {
else isc_logconfig_destroy(&lcfg);
if (lcfg != NULL) }
isc_logconfig_destroy(&lcfg);
return (result); return (result);
} }