daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unexpected data process crash bug fix

Browse Source
This commit is contained in:
Nick Peng
2019-01-30 18:56:17 +08:00
parent 8e73eea8ec
commit 05a24264aa
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/dns.c
View File

@@ -841,10 +841,11 @@ static int _dns_decode_domain(struct dns_context *context, char *output, int siz
int len = *(context->ptr); int len = *(context->ptr);
unsigned char *ptr = context->ptr; unsigned char *ptr = context->ptr;
int is_compressed = 0; int is_compressed = 0;
int ptr_jump = 0;
/*[len]string[len]string...[0]0 */ /*[len]string[len]string...[0]0 */
while (1) { while (1) {
if (ptr > context->data + context->maxsize || ptr < context->data) { if (ptr > context->data + context->maxsize || ptr < context->data || output_len >= size - 1 || ptr_jump > 4) {
return -1; return -1;
} }
@@ -877,13 +878,17 @@ static int _dns_decode_domain(struct dns_context *context, char *output, int siz
return -1; return -1;
} }
is_compressed = 1; is_compressed = 1;
ptr_jump++;
continue; continue;
} }
ptr_jump = 0;
/* change [len] to '.' */ /* change [len] to '.' */
if (output_len > 0) { if (output_len > 0) {
*output = '.'; *output = '.';
output++; output++;
output_len += 1;
} }
if (ptr > context->data + context->maxsize) { if (ptr > context->data + context->maxsize) {