From: W.C.A. Wijngaards Date: Wed, 20 Nov 2019 13:05:54 +0000 (+0100) Subject: - Fix Unrequired Checks, reported by X41 D-Sec. X-Git-Tag: release-1.9.6rc1~37 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3907876eac7d996256431b397e5138add1ece892;p=thirdparty%2Funbound.git - Fix Unrequired Checks, reported by X41 D-Sec. --- diff --git a/doc/Changelog b/doc/Changelog index d46bf57e9..ee27e47bd 100644 --- 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 a2e39dffc..ffb668b04 100644 --- 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 11b600a51..4bd4ad045 100644 --- 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",