From c4906be2d46e52970bd64270ba0968e4226f5f14 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 16 Feb 2021 16:05:56 +1100 Subject: [PATCH] Silence CID 304936 Dereference before null check Removed redundant 'listener != NULL' check. 1191cleanup: CID 304936 (#1 of 1): Dereference before null check (REVERSE_INULL) check_after_deref: Null-checking listener suggests that it may be null, but it has already been dereferenced on all paths leading to the check. 1192 if (listener != NULL) { 1193 isc_refcount_decrement(&listener->refs); 1194 listener->exiting = true; 1195 free_listener(listener); 1196 } --- bin/named/controlconf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c index 871cb459b7..01918009a3 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c @@ -1189,11 +1189,9 @@ add_listener(named_controls_t *cp, controllistener_t **listenerp, return; cleanup: - if (listener != NULL) { - isc_refcount_decrement(&listener->refs); - listener->exiting = true; - free_listener(listener); - } + isc_refcount_decrement(&listener->refs); + listener->exiting = true; + free_listener(listener); if (control != NULL) { cfg_obj_log(control, named_g_lctx, ISC_LOG_WARNING,