am e6594658: am 8623dc75: Merge "Fix freeaddrinfo(NULL)."

* commit 'e6594658f7d36172007a2573e345d6ae0d0ac58a': Fix freeaddrinfo(NULL).
2015-01-09 02:58:56 +00:00
parent f4af806bb7 e6594658f7
commit 857e112443
2 changed files with 10 additions and 1 deletions
--- a/libc/dns/net/getaddrinfo.c
+++ b/libc/dns/net/getaddrinfo.c
@@ -324,7 +324,11 @@ freeaddrinfo(struct addrinfo *ai)
 {
 	struct addrinfo *next;

-	assert(ai != NULL);
+#if __ANDROID__
+	if (ai == NULL) return;
+#else
+	_DIAGASSERT(ai != NULL);
+#endif

 	do {
 		next = ai->ai_next;