- Fix Unrequired Checks, reported by X41 D-Sec.

diff --git a/doc/Changelog b/doc/Changelog
index d46bf57e96aac4aec8a8728ddf0993f9f833d615..ee27e47bd74c47f4ec142f9f12ec204fe45796d1 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -33,6 +33,7 @@
        - Fix compile with --enable-alloc-checks, reported by X41 D-Sec.
        - Fix Terminating Quotes not Written, reported by X41 D-Sec.
        - Fix Useless memset() in validator, reported by X41 D-Sec.
+       - Fix Unrequired Checks, reported by X41 D-Sec.
 
 19 November 2019: Wouter
        - Fix CVE-2019-18934, shell execution in ipsecmod.

diff --git a/util/netevent.c b/util/netevent.c
index a2e39dffcc797db98e9c34169741daefc1a0474f..ffb668b04fdb627bf09d7747dc5e2ba180625946 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -3191,7 +3191,7 @@ comm_point_drop_reply(struct comm_reply* repinfo)
 {
        if(!repinfo)
                return;
-       log_assert(repinfo && repinfo->c);
+       log_assert(repinfo->c);
        log_assert(repinfo->c->type != comm_tcp_accept);
        if(repinfo->c->type == comm_udp)
                return;

diff --git a/validator/autotrust.c b/validator/autotrust.c
index 11b600a511f428ae938664469d2235b4cec705cb..4bd4ad045df65ff84dfe110f7684ca52cdaa4698 100644 (file)
--- a/validator/autotrust.c
+++ b/validator/autotrust.c
@@ -2261,7 +2261,7 @@ autr_debug_print_ta(struct autr_ta* ta)
                log_info("out of memory in debug_print_ta");
                return;
        }
-       if(str && str[0]) str[strlen(str)-1]=0; /* remove newline */
+       if(str[0]) str[strlen(str)-1]=0; /* remove newline */
        ctime_r(&ta->last_change, buf);
        if(buf[0]) buf[strlen(buf)-1]=0; /* remove newline */
        log_info("[%s] %s ;;state:%d ;;pending_count:%d%s%s last:%s",