瀏覽代碼

Merge remote-tracking branch 'public/bug8788'

Nick Mathewson 10 年之前
父節點
當前提交
1295490862
共有 2 個文件被更改,包括 5 次插入1 次删除
  1. 3 0
      changes/bug8788
  2. 2 1
      src/ext/eventdns.c

+ 3 - 0
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.

+ 2 - 1
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) {