adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
const char *owner, int ol,
const typeinfo *typei, adns_queryflags flags) {
- int ll, c, nlabs;
+ int ll, c, nbytes;
byte label[255], *rqp;
const char *p, *pe;
adns_status st;
MKQUERY_START(vb);
p= owner; pe= owner+ol;
- nlabs= 0;
+ nbytes= 0;
while (p!=pe) {
ll= 0;
while (p!=pe && (c= *p++)!='.') {
label[ll++]= c;
}
if (!ll) return adns_s_querydomaininvalid;
- if (nlabs++ > 63) return adns_s_querydomaintoolong;
+ if (ll > 63) return adns_s_querydomaintoolong;
+ nbytes+= ll+1;
+ if (nbytes > 254) return adns_s_querydomaintoolong;
MKQUERY_ADDB(ll);
memcpy(rqp,label,ll); rqp+= ll;
}