torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug8788'

Browse Source
This commit is contained in:
Nick Mathewson
2014-03-05 12:17:31 -05:00
parent 27d231ca13 24add404ac
commit 1295490862
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug8788
+3
View File
@@ -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.
src/ext/eventdns.c
+2 -1
View File
@@ -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) {