commit 8623dc75479f88e7ccdec708b5c7ca0abeb285d1
author Elliott Hughes <enh@google.com> Fri Jan 09 02:48:28 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 09 02:48:29 2015 +0000
tree 56b6a08a0c889fbc678cbdc2e46700e790b853b7
parent 4c47fc4ed39dff497d4c56ba864b3a3f659250f4
parent c62a4b5a7aede760b06298f4b641b5a9768f5744

Merge "Fix freeaddrinfo(NULL)."

libc/dns/net/getaddrinfo.c

diff --git a/libc/dns/net/getaddrinfo.c b/libc/dns/net/getaddrinfo.c
index f0d522a..c73c085 100644
--- a/libc/dns/net/getaddrinfo.c
+++ b/libc/dns/net/getaddrinfo.c
@@ -324,7 +324,11 @@
 {
 	struct addrinfo *next;
 
-	assert(ai != NULL);
+#if __ANDROID__
+	if (ai == NULL) return;
+#else
+	_DIAGASSERT(ai != NULL);
+#endif
 
 	do {
 		next = ai->ai_next;

tests/netdb_test.cpp

diff --git a/tests/netdb_test.cpp b/tests/netdb_test.cpp
index ab5b487..5660bbd 100644
--- a/tests/netdb_test.cpp
+++ b/tests/netdb_test.cpp
@@ -23,6 +23,11 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
+// https://code.google.com/p/android/issues/detail?id=13228
+TEST(netdb, freeaddrinfo_NULL) {
+  freeaddrinfo(NULL);
+}
+
 TEST(netdb, getaddrinfo_NULL_host) {
   // It's okay for the host argument to be NULL, as long as service isn't.
   addrinfo* ai = NULL;