From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Tue, 7 Jan 2020 05:51:35 +0000 (-0500)
Subject: bgpd: avoid memcmp(NULL, NULL)
X-Git-Tag: frr-7.2.1~4^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6ce6a18636950898e15eee644949c82ed3820ef5;p=matthieu%2Ffrr.git

bgpd: avoid memcmp(NULL, NULL)

Undefined behavior

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

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 47ecfce41e..53e6acc424 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -152,8 +152,9 @@ static bool cluster_hash_cmp(const void *p1, const void *p2)
 	const struct cluster_list *cluster2 = p2;
 
 	return (cluster1->length == cluster2->length
-		&& memcmp(cluster1->list, cluster2->list, cluster1->length)
-			   == 0);
+		&& (cluster1->list == cluster2->list
+		    || memcmp(cluster1->list, cluster2->list, cluster1->length)
+			       == 0));
 }
 
 static void cluster_free(struct cluster_list *cluster)