From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 14 Mar 2019 15:43:22 +0000 (+0000)
Subject: vrrpd: make useless assert useful
X-Git-Tag: base_7.2~330^2~27
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e1a32d76375fb992d21be9b47742a7a3736dc1ca;p=mirror%2Ffrr.git

vrrpd: make useless assert useful

Assert would always come back true due to improper placement.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/vrrpd/vrrp_packet.c b/vrrpd/vrrp_packet.c
index 102750eafe..fcbea8f695 100644
--- a/vrrpd/vrrp_packet.c
+++ b/vrrpd/vrrp_packet.c
@@ -112,13 +112,14 @@ ssize_t vrrp_pkt_adver_build(struct vrrp_pkt **pkt, struct ipaddr *src,
 	size_t addrsz = 0;
 
 	assert(version >= 2 && version <= 3);
-	assert(!(version == 2 && v6));
 
 	if (numip > 0) {
 		v6 = IS_IPADDR_V6(ips[0]);
 		addrsz = IPADDRSZ(ips[0]);
 	}
 
+	assert(!(version == 2 && v6));
+
 	size_t pktsize = VRRP_PKT_SIZE(v6 ? AF_INET6 : AF_INET, version, numip);
 	*pkt = XCALLOC(MTYPE_VRRP_PKT, pktsize);