diff options
author | dougb <dougb@FreeBSD.org> | 2002-11-14 10:04:51 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2002-11-14 10:04:51 +0000 |
commit | 99352105ab85a4c2fb6029b68153095eb0adcebe (patch) | |
tree | 9a860e605e6e23f7f753bc0221760c67a42f4bf4 /contrib/bind/lib/nameser | |
parent | 5c99c444aa2f12ae983573e4950c7cb6ea722f02 (diff) | |
download | FreeBSD-src-99352105ab85a4c2fb6029b68153095eb0adcebe.zip FreeBSD-src-99352105ab85a4c2fb6029b68153095eb0adcebe.tar.gz |
Import security patches from ISC for BIND version 8.3.3
Diffstat (limited to 'contrib/bind/lib/nameser')
-rw-r--r-- | contrib/bind/lib/nameser/ns_name.c | 4 | ||||
-rw-r--r-- | contrib/bind/lib/nameser/ns_samedomain.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/contrib/bind/lib/nameser/ns_name.c b/contrib/bind/lib/nameser/ns_name.c index 96c41e8..6b193f6 100644 --- a/contrib/bind/lib/nameser/ns_name.c +++ b/contrib/bind/lib/nameser/ns_name.c @@ -341,6 +341,10 @@ ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz) dn = dst; eom = dst + dstsiz; + if (dn >= eom) { + errno = EMSGSIZE; + return (-1); + } while ((n = *cp++) != 0) { if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) { /* Some kind of compression pointer. */ diff --git a/contrib/bind/lib/nameser/ns_samedomain.c b/contrib/bind/lib/nameser/ns_samedomain.c index c847924..e29a8f8 100644 --- a/contrib/bind/lib/nameser/ns_samedomain.c +++ b/contrib/bind/lib/nameser/ns_samedomain.c @@ -166,7 +166,7 @@ int ns_makecanon(const char *src, char *dst, size_t dstsize) { size_t n = strlen(src); - if (n + sizeof "." > dstsize) { + if (n + sizeof "." + 1 > dstsize) { errno = EMSGSIZE; return (-1); } |