commit dfec555c7f1c25f42be209e9027ee47eabe0a7a4
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 29 10:15:21 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 29 10:15:21 2011 -0700
tree 174e38ce81bf145b294113e341184448b2f4852e
parent f6fcdb2edd522de75811c7ccd23e74677bda6856
parent bcf861f246bb06ebba2c070af5b3222c5254970d

am bcf861f2: Merge "Don\'t call freeaddrinfo with a NULL ptr."

* commit 'bcf861f246bb06ebba2c070af5b3222c5254970d':
  Don't call freeaddrinfo with a NULL ptr.

libc/netbsd/resolv/res_cache.c

diff --git a/libc/netbsd/resolv/res_cache.c b/libc/netbsd/resolv/res_cache.c
index efce7dc..20f37e1 100644
--- a/libc/netbsd/resolv/res_cache.c
+++ b/libc/netbsd/resolv/res_cache.c
@@ -1860,8 +1860,10 @@
     for (i = 0; i <= MAXNS; i++) {
         free(cache_info->nameservers[i]);
         cache_info->nameservers[i] = NULL;
-        freeaddrinfo(cache_info->nsaddrinfo[i]);
-        cache_info->nsaddrinfo[i] = NULL;
+        if (cache_info->nsaddrinfo[i] != NULL) {
+            freeaddrinfo(cache_info->nsaddrinfo[i]);
+            cache_info->nsaddrinfo[i] = NULL;
+        }
     }
 }