diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-09 02:58:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-09 02:58:56 +0000 |
| commit | 857e1124433a4946bc38f427d390ef39a2f083b1 (patch) | |
| tree | 5a19bc3f417028a83cc042125ce1f9b7f5c67ccb /libc/dns | |
| parent | f4af806bb769498d8170748c27876822e1842369 (diff) | |
| parent | e6594658f7d36172007a2573e345d6ae0d0ac58a (diff) | |
| download | bionic-857e1124433a4946bc38f427d390ef39a2f083b1.zip bionic-857e1124433a4946bc38f427d390ef39a2f083b1.tar.gz bionic-857e1124433a4946bc38f427d390ef39a2f083b1.tar.bz2 | |
am e6594658: am 8623dc75: Merge "Fix freeaddrinfo(NULL)."
* commit 'e6594658f7d36172007a2573e345d6ae0d0ac58a':
Fix freeaddrinfo(NULL).
Diffstat (limited to 'libc/dns')
| -rw-r--r-- | libc/dns/net/getaddrinfo.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 @@ 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; |