commit 0f5b48ce284850cd500fbb48a9f7a3c68a84e659
author Nick Kralevich <nnk@google.com> Mon Jun 11 16:11:20 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 11 16:11:20 2012 -0700
tree cd2aed2eef698c5ea3367afa4d2f82628aadf7a0
parent 7c5c68f5c7b87dfb309f006673fb809c7333dcf7
parent 85b06f9365ae6776deb9fcf09f450f777ace9e34

Merge "inet_ntop: pass the size of tmp to snprintf()"

libc/inet/inet_ntop.c

diff --git a/libc/inet/inet_ntop.c b/libc/inet/inet_ntop.c
index 5748da3..c3448f1 100644
--- a/libc/inet/inet_ntop.c
+++ b/libc/inet/inet_ntop.c
@@ -75,8 +75,13 @@
 	char tmp[sizeof "255.255.255.255"];
 	int l;
 
+#if defined(ANDROID_CHANGES)
+	l = snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]);
+	if (l <= 0 || (size_t)l >= size || (size_t)l >= sizeof(tmp)) {
+#else
 	l = snprintf(tmp, size, fmt, src[0], src[1], src[2], src[3]);
 	if (l <= 0 || (size_t)l >= size) {
+#endif
 		errno = ENOSPC;
 		return (NULL);
 	}