Merge branch 'ss/inet-ntop'

* ss/inet-ntop: inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables
daragh · Oct 21, 2011 · 8d3c0cb · 8d3c0cb
2 parents e335304 + 185528a
commit 8d3c0cb
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/compat/inet_ntop.c b/compat/inet_ntop.c
@@ -98,7 +98,9 @@ inet_ntop6(const u_char *src, char *dst, size_t size)
 	for (i = 0; i < NS_IN6ADDRSZ; i++)
 		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
 	best.base = -1;
+	best.len = 0;
 	cur.base = -1;
+	cur.len = 0;
 	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
 		if (words[i] == 0) {
 			if (cur.base == -1)