Merge commit 'niels/dnscrash'

This commit is contained in:
Nick Mathewson 2009-12-04 13:49:27 -05:00
commit 2b7abf038f

View File

@ -3293,7 +3293,8 @@ resolv_conf_parse_line(struct evdns_base *base, char *const start, int flags) {
if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) {
const char *const nameserver = NEXT_TOKEN;
evdns_base_nameserver_ip_add(base, nameserver);
if (nameserver)
evdns_base_nameserver_ip_add(base, nameserver);
} else if (!strcmp(first_token, "domain") && (flags & DNS_OPTION_SEARCH)) {
const char *const domain = NEXT_TOKEN;
if (domain) {