From: Willem Toorop <willem@nlnetlabs.nl>
Date: Mon, 15 Mar 2021 19:30:10 +0000 (+0100)
Subject: Internal usage of ldns_fget_token_l with limit 0
X-Git-Tag: 1.8.0-rc.1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f85e471fbf3c6354fb65371805f547bc470cc44c;p=thirdparty%2Fldns.git

Internal usage of ldns_fget_token_l with limit 0
---

diff --git a/parse.c b/parse.c
index a6f7871d..6dd43040 100644
--- a/parse.c
+++ b/parse.c
@@ -216,6 +216,8 @@ tokenread:
 ssize_t
 ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *line_nr)
 {
+	if (limit == 0)
+		limit = LDNS_MAX_LINELEN;
 	if (ldns_fget_token_l_st(f, &token, &limit, true, delim, line_nr))
 		return -1;
 	else
diff --git a/resolver.c b/resolver.c
index 84dfe95b..f9ec65a5 100644
--- a/resolver.c
+++ b/resolver.c
@@ -780,7 +780,7 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
         if(!line_nr) line_nr = &lnr;
 
 	if(!fp) {
-		myfp = fopen("/etc/resolv.conf", "r");
+		myfp = fopen(LDNS_RESOLV_CONF, "r");
 		if(!myfp)
 			return LDNS_STATUS_FILE_ERR;
 	}