From 2654e43ca2eaa8d93268c9ec85ac2dd968e5fb94 Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Fri, 16 Dec 2011 16:25:02 +0400 Subject: lib: fix type-punning in ip_masklen() ip_masklen() was likely to return incorrect results after being compiled with -fstrict-aliasing (-O2, -O3, -Os) --- lib/prefix.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lib/prefix.c') diff --git a/lib/prefix.c b/lib/prefix.c index 7d31af2f..580ba31a 100644 --- a/lib/prefix.c +++ b/lib/prefix.c @@ -2592,8 +2592,13 @@ masklen2ip (const int masklen, struct in_addr *netmask) u_char ip_masklen (struct in_addr netmask) { - u_int16_t * int16 = (u_int16_t *) &netmask.s_addr; - return map64kto17_nbo[int16[0]] + map64kto17_nbo[int16[1]]; + union + { + u_int32_t int32; + u_int16_t int16[2]; + } u; + u.int32 = netmask.s_addr; + return map64kto17_nbo[u.int16[0]] + map64kto17_nbo[u.int16[1]]; } /* Apply mask to IPv4 prefix (network byte order). */ -- cgit v1.2.1