aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug87883
-rw-r--r--src/ext/eventdns.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug8788 b/changes/bug8788
new file mode 100644
index 000000000..26fb5bc4f
--- /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 8b934c443..5ac9c1230 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) {