Another 10363 instance -- this one in the eventdns.c code

This commit is contained in:
Nick Mathewson 2013-12-11 15:15:21 -05:00
parent 9dd115d6b5
commit 6d9c332757
2 changed files with 6 additions and 2 deletions

View File

@ -6,4 +6,7 @@
- Fix another possibly undefined pointer operations in tor_memmem
fallback implementation. Another case of bug #10363; bugfix on
0.1.1.1-alpha.
- Fix another possibly undefined pointer operations in the eventdns
fallback implementation. Another case of bug #10363; bugfix on
0.1.2.1-alpha.

View File

@ -842,10 +842,11 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, size_t name_out_len
}
if (label_len > 63) return -1;
if (cp != name_out) {
if (cp + 1 >= end) return -1;
if (cp >= name_out + name_out_len - 1) return -1;
*cp++ = '.';
}
if (cp + label_len >= end) return -1;
if (label_len > name_out_len ||
cp >= name_out + name_out_len - label_len) return -1;
memcpy(cp, packet + j, label_len);
cp += label_len;
j += label_len;