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

* commit 'bcf861f246bb06ebba2c070af5b3222c5254970d':
  Don't call freeaddrinfo with a NULL ptr.
This commit is contained in:
Robert Greenwalt
2011-07-29 10:15:21 -07:00
committed by Android Git Automerger

View File

@@ -1860,10 +1860,12 @@ _free_nameservers_locked(struct resolv_cache_info* cache_info)
for (i = 0; i <= MAXNS; i++) { for (i = 0; i <= MAXNS; i++) {
free(cache_info->nameservers[i]); free(cache_info->nameservers[i]);
cache_info->nameservers[i] = NULL; cache_info->nameservers[i] = NULL;
if (cache_info->nsaddrinfo[i] != NULL) {
freeaddrinfo(cache_info->nsaddrinfo[i]); freeaddrinfo(cache_info->nsaddrinfo[i]);
cache_info->nsaddrinfo[i] = NULL; cache_info->nsaddrinfo[i] = NULL;
} }
} }
}
int int
_resolv_cache_get_nameserver(int n, char* addr, int addrLen) _resolv_cache_get_nameserver(int n, char* addr, int addrLen)