From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 6 Dec 2015 11:20:02 +0000 (+0000)
Subject: Quiet a warning from clang.  Harlan Stenn.
X-Git-Tag: NTP_4_3_88~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbc9d4e6fc11dc81e275b21346a31f3ce8323875;p=thirdparty%2Fntp.git

Quiet a warning from clang.  Harlan Stenn.

bk: 566419e2DaFuVlyy4wFSkUUcYi4fPg
---

diff --git a/ChangeLog b/ChangeLog
index b4a8ab765..187220daa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@
 * Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.
 * Header cleanup in tests/sandbox/uglydate.c.  Harlan Stenn.
 * Header cleanup in tests/libntp/sfptostr.c.  Harlan Stenn.
+* Quiet a warning from clang.  Harlan Stenn.
 ---
 (4.2.8p4) 2015/10/21 Released by Harlan Stenn <stenn@ntp.org>
 (4.2.8p4-RC1) 2015/10/06 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/libntp/ntp_rfc2553.c b/libntp/ntp_rfc2553.c
index f231047e9..840962905 100644
--- a/libntp/ntp_rfc2553.c
+++ b/libntp/ntp_rfc2553.c
@@ -203,11 +203,12 @@ copy_addrinfo_common(
 		else
 			ai_nxt = ai_src->ai_next;
 		*ai_cpy = *ai_src;
-		REQUIRE(ai_src->ai_addrlen <= sizeof(sockaddr_u));
+		DEBUG_INSIST(ai_cpy->ai_canonname == ai_src->ai_canonname);
+		INSIST(ai_src->ai_addrlen <= sizeof(sockaddr_u));
 		memcpy(psau, ai_src->ai_addr, ai_src->ai_addrlen);
 		ai_cpy->ai_addr = &psau->sa;
 		++psau;
-		if (NULL != ai_cpy->ai_canonname) {
+		if (NULL != ai_src->ai_canonname) {
 			ai_cpy->ai_canonname = pcanon;
 			str_octets = 1 + strlen(ai_src->ai_canonname);
 			memcpy(pcanon, ai_src->ai_canonname, str_octets);