xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ndb/dns: check bad name length in convM2DNS.c:^gname()

Browse source
This commit is contained in:
cinap_lenrek 2013-11-28 23:47:49 +01:00
parent b77eda8fc7
commit ad3ba8838d
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/src/cmd/ndb/convM2DNS.c
View file

@ -226,17 +226,21 @@ gname(char *to, RR *rp, Scan *sp)
goto err; goto err;
pointer = 0; pointer = 0;
p = sp->p; p = sp->p;
if (p == nil) { if(p == nil) {
dnslog("gname: %R: nil sp->p", rp); dnslog("gname: %R: nil sp->p", rp);
goto err; goto err;
} }
toend = to + Domlen; toend = to + Domlen;
for(len = 0; *p && p < sp->ep; len += (pointer? 0: n+1)) { for(len = 0; *p && p < sp->ep; len += (pointer? 0: n+1)) {
n = 0; n = 0;
switch (*p & 0300) { switch(*p & 0300) {
case 0: /* normal label */ case 0: /* normal label */
if (p < sp->ep) if(p < sp->ep)
n = *p++ & 077; /* pick up length */ n = *p++ & 077; /* pick up length */
if(sp->ep - p <= n){
sp->err = "bad name length";
goto err;
}
if(len + n < Domlen - 1){ if(len + n < Domlen - 1){
if(n > toend - to){ if(n > toend - to){
errtoolong(rp, sp, toend - to, n, errtoolong(rp, sp, toend - to, n,