mirror of
https://github.com/NLnetLabs/unbound.git
synced 2026-09-10 11:57:44 +02:00
Merge branch 'master' into xfr-tsig
This commit is contained in:
+10
-12
@@ -644,20 +644,22 @@ void dname_str(uint8_t* dname, char* str)
|
||||
if(!dname || !*dname) {
|
||||
*s++ = '.';
|
||||
*s = 0;
|
||||
goto out;
|
||||
return;
|
||||
}
|
||||
lablen = *dname++;
|
||||
while(lablen) {
|
||||
len += lablen+1;
|
||||
if(len >= LDNS_MAX_DOMAINLEN) {
|
||||
if ((s-str) >= (LDNS_MAX_DOMAINLEN-1))
|
||||
s = str + LDNS_MAX_DOMAINLEN - 2;
|
||||
*s++ = '&';
|
||||
*s = 0;
|
||||
return;
|
||||
}
|
||||
if(lablen > LDNS_MAX_LABELLEN) {
|
||||
*s++ = '#';
|
||||
*s = 0;
|
||||
goto out;
|
||||
}
|
||||
len += lablen+1;
|
||||
if(len >= LDNS_MAX_DOMAINLEN) {
|
||||
*s++ = '&';
|
||||
*s = 0;
|
||||
goto out;
|
||||
return;
|
||||
}
|
||||
while(lablen--) {
|
||||
if(isalnum((unsigned char)*dname)
|
||||
@@ -673,10 +675,6 @@ void dname_str(uint8_t* dname, char* str)
|
||||
lablen = *dname++;
|
||||
}
|
||||
*s = 0;
|
||||
|
||||
out:
|
||||
log_assert(s - str < LDNS_MAX_DOMAINLEN);
|
||||
return;
|
||||
}
|
||||
|
||||
int
|
||||
|
||||
Reference in New Issue
Block a user