From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Mon, 4 Apr 2005 09:43:29 +0000 (+0000)
Subject: fixed EOF check when reading resolv.conf (entered infinite loop here)
X-Git-Tag: release-0.50~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec217d577e8e01767608f5787408a550e3839397;p=thirdparty%2Fldns.git

fixed EOF check when reading resolv.conf (entered infinite loop here)
---

diff --git a/resolver.c b/resolver.c
index c383574a..ffb0c0d9 100644
--- a/resolver.c
+++ b/resolver.c
@@ -462,6 +462,7 @@ ldns_resolver_new_frm_fp(FILE *fp)
 	uint8_t expect;
 	uint8_t i;
 	ldns_rdf *tmp;
+	ssize_t gtr;
 
 	/* do this better 
 	 * expect = 
@@ -481,7 +482,8 @@ ldns_resolver_new_frm_fp(FILE *fp)
 		return NULL;
 	}
 
-	while (ldns_get_token(fp, word, LDNS_PARSE_NORMAL) != -1) {
+	gtr = ldns_get_token(fp, word, LDNS_PARSE_NORMAL);
+	while (gtr > 0) {
 		/* do something */
 		switch(expect) {
 			case RESOLV_KEYWORD:
@@ -530,6 +532,7 @@ ldns_resolver_new_frm_fp(FILE *fp)
 				expect = RESOLV_KEYWORD;
 				break;
 		}
+		gtr = ldns_get_token(fp, word, LDNS_PARSE_NORMAL);
 	}
 	return r;
 }