- Fix static analysis report to remove dead code from the

  rpz_callback_from_iterator_module function.

diff --git a/doc/Changelog b/doc/Changelog
index 25357d1a666086b401bb058f6e80d674c5a2b24a..b007a168e83955d0efa7388255343d2db0438c9c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+4 October 2022: Wouter
+       - Fix static analysis report to remove dead code from the
+         rpz_callback_from_iterator_module function.
+
 3 October 2022: George
        - Merge #760: PROXYv2 downstream support. (New proxy-protocol-port
          configuration option).

diff --git a/services/rpz.c b/services/rpz.c
index e8b734a89934678b5435f7e742cb4b6bb9ace51a..e876f3f94834d32af40389adab3f891270f414aa 100644 (file)
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -2168,18 +2168,16 @@ rpz_callback_from_iterator_module(struct module_qstate* ms, struct iter_qstate*
 
        lock_rw_unlock(&az->rpz_lock);
 
-       if(raddr == NULL && z == NULL) { return NULL; }
-       else if(raddr != NULL) {
+       if(raddr == NULL && z == NULL)
+               return NULL;
+
+       if(raddr != NULL) {
                if(z) {
                        lock_rw_unlock(&z->lock);
                }
                return rpz_apply_nsip_trigger(ms, r, raddr, a);
-       } else if(z != NULL) {
-               if(raddr) {
-                       lock_rw_unlock(&raddr->lock);
-               }
-               return rpz_apply_nsdname_trigger(ms, r, z, &match, a);
-       } else { return NULL; }
+       }
+       return rpz_apply_nsdname_trigger(ms, r, z, &match, a);
 }
 
 struct dns_msg* rpz_callback_from_iterator_cname(struct module_qstate* ms,