From 5b10d008e91bbe638c58aee2d563bd9373bc8038 Mon Sep 17 00:00:00 2001
From: Yasuoka Masahiko <yasuoka@iij.ad.jp>
Date: Fri, 4 Dec 2009 10:44:46 -0800
Subject: [PATCH] Fix a crash when reading badly formatted resolve.conf

Based on patch from Yasuoka Masahiko, backported to 1.4.
---
 evdns.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evdns.c b/evdns.c
index f07ecc98..97f4de98 100644
--- a/evdns.c
+++ b/evdns.c
@@ -2704,7 +2704,7 @@ resolv_conf_parse_line(char *const start, int flags) {
 		const char *const nameserver = NEXT_TOKEN;
 		struct in_addr ina;
 
-		if (inet_aton(nameserver, &ina)) {
+		if (nameserver && inet_aton(nameserver, &ina)) {
 			/* address is valid */
 			evdns_nameserver_add(ina.s_addr);
 		}