diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-05 12:17:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-05 12:17:31 -0500 |
| commit | 12954908623a285606ec7522168cd2ac7e799525 (patch) | |
| tree | 230de9088fb58509168acc96b27cc6ae70ae7a58 | |
| parent | 27d231ca130b48e0963aaab7307109f7eafcc5c9 (diff) | |
| parent | 24add404ac08df59d0b5d68c6762b869bee63bac (diff) | |
| download | tor-12954908623a285606ec7522168cd2ac7e799525.tar.gz tor-12954908623a285606ec7522168cd2ac7e799525.zip | |
Merge remote-tracking branch 'public/bug8788'
| -rw-r--r-- | changes/bug8788 | 3 | ||||
| -rw-r--r-- | src/ext/eventdns.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug8788 b/changes/bug8788 new file mode 100644 index 0000000000..26fb5bc4f3 --- /dev/null +++ b/changes/bug8788 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Avoid crashing on a malformed resolv.conf file when running a + server using Libevent 1. Fixes bug 8788; bugfix on 0.1.1.23. diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c index 8b934c4430..5ac9c1230c 100644 --- a/src/ext/eventdns.c +++ b/src/ext/eventdns.c @@ -3014,7 +3014,8 @@ resolv_conf_parse_line(char *const start, int flags) { if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) { const char *const nameserver = NEXT_TOKEN; - evdns_nameserver_ip_add(nameserver); + if (nameserver) + evdns_nameserver_ip_add(nameserver); } else if (!strcmp(first_token, "domain") && (flags & DNS_OPTION_SEARCH)) { const char *const domain = NEXT_TOKEN; if (domain) { |