Internal usage of ldns_fget_token_l with limit 0

diff --git a/parse.c b/parse.c
index a6f7871d98fbb3e959e4fa48032ab4fb7a6b11d2..6dd43040ce074a1bf00fea74828d7e389897f256 100644 (file)
--- 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 84dfe95ba0491b3b97793b814d69a83be36f23a6..f9ec65a559665b3cbabd307e511b57eb9d05589d 100644 (file)
--- 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;
        }