From: Mark Andrews <marka@isc.org>
Date: Tue, 26 Mar 2013 23:59:34 +0000 (+1100)
Subject: assign to a int before calling setsockopt
X-Git-Tag: v9.10.0a1~448^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36279f1ce1b35b1c52b6772c565d0d30781a1c0d;p=thirdparty%2Fbind9.git

assign to a int before calling setsockopt
---

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 77c06fd80c9..b7b62e5c2b4 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -5969,22 +5969,21 @@ isc__socket_ipv6only(isc_socket_t *sock0, isc_boolean_t yes) {
 
 static void
 setdscp(isc__socket_t *sock, isc_dscp_t dscp) {
-
-	sock->dscp = dscp;
-
 #if defined(IP_TOS) || defined(IPV6_TCLASS)
-	dscp <<= 2;
+	int value = dscp << 2;
 #endif
 
+	sock->dscp = dscp;
+
 #ifdef IP_TOS
 	if (sock->pf == AF_INET) {
 		if (setsockopt(sock->fd, IPPROTO_IP, IP_TOS,
-			       (void *)&dscp, sizeof(int)) < 0) {
+			       (void *)&value, sizeof(value)) < 0) {
 			char strbuf[ISC_STRERRORSIZE];
 			isc__strerror(errno, strbuf, sizeof(strbuf));
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "setsockopt(%d, IP_TOS, %.02x) "
-					 "%s: %s", sock->fd, dscp >> 2,
+					 "%s: %s", sock->fd, value >> 2,
 					 isc_msgcat_get(isc_msgcat,
 							ISC_MSGSET_GENERAL,
 							ISC_MSG_FAILED,
@@ -5996,7 +5995,7 @@ setdscp(isc__socket_t *sock, isc_dscp_t dscp) {
 #ifdef IPV6_TCLASS
 	if (sock->pf == AF_INET6) {
 		if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_TCLASS,
-			       (void *)&dscp, sizeof(int)) < 0) {
+			       (void *)&value, sizeof(value)) < 0) {
 			char strbuf[ISC_STRERRORSIZE];
 			isc__strerror(errno, strbuf, sizeof(strbuf));
 			UNEXPECTED_ERROR(__FILE__, __LINE__,