gandc/zapret2
Template
1
0
Fork 0
mirror of https://github.com/bol-van/zapret2.git synced 2026-03-14 06:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfqws2: dns_extract_name OOB fixes

Browse Source
This commit is contained in:
bol-van
2026-02-23 22:47:14 +03:00
parent 340261da72
commit 7073e1fd77
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nfq2/desync.c
View File

@@ -1648,9 +1648,12 @@ static const uint8_t *dns_extract_name(const uint8_t *a, const uint8_t *b, const
{ {
size_t nl, off; size_t nl, off;
const uint8_t *p; const uint8_t *p;
bool bptr = (*a & 0xC0)==0xC0; bool bptr;
uint8_t x,y; uint8_t x,y;
if (!name_size) return NULL;
bptr = (*a & 0xC0)==0xC0;
if (bptr) if (bptr)
{ {
if (a+1>=e) return NULL; if (a+1>=e) return NULL;
@@ -1665,12 +1668,17 @@ static const uint8_t *dns_extract_name(const uint8_t *a, const uint8_t *b, const
if (p>=e) return NULL; if (p>=e) return NULL;
for (nl=0; *p ;) for (nl=0; *p ;)
{ {
if (nl)
{
if (nl>=name_size) return NULL;
name[nl++] = '.';
}
// do not support mixed ptr+real // do not support mixed ptr+real
if ((*p & 0xC0) || (p+*p+1)>=e || (*p+1)>=(name_size-nl)) return NULL; if ((*p & 0xC0) || (p+*p+1)>=e || (*p+1)>=(name_size-nl)) return NULL;
if (nl) name[nl++] = '.';
for(y=*p++,x=0 ; x<y ; x++,p++) name[nl+x] = tolower(*p); for(y=*p++,x=0 ; x<y ; x++,p++) name[nl+x] = tolower(*p);
nl += y; nl += y;
} }
if (nl>=name_size) return NULL;
name[nl] = 0; name[nl] = 0;
return bptr ? a+2 : p+1; return bptr ? a+2 : p+1;
} }