diff options
| author | des <des@FreeBSD.org> | 2014-07-29 20:57:38 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-07-29 20:57:38 +0000 |
| commit | fe6d9379787eb938c503444ce243caa89cc7b08c (patch) | |
| tree | 5cc01e837e3c2f3dfb21ef0136ca69be1f957059 /contrib/ldns/parse.c | |
| parent | 1f52ac9340be3979c9bf100fe65c551bcd870cc6 (diff) | |
| download | FreeBSD-src-fe6d9379787eb938c503444ce243caa89cc7b08c.zip FreeBSD-src-fe6d9379787eb938c503444ce243caa89cc7b08c.tar.gz | |
MFH (r266114, r266138): upgrade to latest ldns and unbound
MFH (r266139-r266143, r266145, r266149, r266150): fix props
MFH (r266179, r266180, r266193, r266238, r266777): misc cleanup
MFH (r266863): create and use /var/unbound/conf.d
MFH (r268839): import unblock-lan-zones patch from upstream
MFH (r268840): fix reverse lookups on private networks
MFH (r268883): avoid spamming source tree during build
PR: 190739 (for r268883)
Diffstat (limited to 'contrib/ldns/parse.c')
| -rw-r--r-- | contrib/ldns/parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/ldns/parse.c b/contrib/ldns/parse.c index 8849eff..710c4e7 100644 --- a/contrib/ldns/parse.c +++ b/contrib/ldns/parse.c @@ -135,7 +135,7 @@ ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *li if (c != '\0' && c != '\n') { i++; } - if (limit > 0 && i >= limit) { + if (limit > 0 && (i >= limit || (size_t)(t-token) >= limit)) { *t = '\0'; return -1; } @@ -308,7 +308,7 @@ ldns_bget_token(ldns_buffer *b, char *token, const char *delim, size_t limit) } i++; - if (limit > 0 && i >= limit) { + if (limit > 0 && (i >= limit || (size_t)(t-token) >= limit)) { *t = '\0'; return -1; } |
