Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible problems with case-encode bigmap array allocation.

Browse Source
This commit is contained in:
Simon Kelley
2025-02-20 22:59:04 +00:00
parent 717ff6adc3
commit 2c9ed7f425
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/forward.c
View File

@@ -391,6 +391,7 @@ static void forward_query(int udpfd, union mysockaddr *udpaddr,
header->id = ntohs(forward->new_id); header->id = ntohs(forward->new_id);
forward->frec_src.encode_bitmap = option_bool(OPT_NO_0x20) ? 0 : rand32(); forward->frec_src.encode_bitmap = option_bool(OPT_NO_0x20) ? 0 : rand32();
forward->frec_src.encode_bigmap = NULL;
p = (unsigned char *)(header+1); p = (unsigned char *)(header+1);
if (!extract_name(header, plen, &p, (char *)&forward->frec_src.encode_bitmap, EXTR_NAME_FLIP, 1)) if (!extract_name(header, plen, &p, (char *)&forward->frec_src.encode_bitmap, EXTR_NAME_FLIP, 1))
goto reply; goto reply;
@@ -1040,6 +1041,7 @@ static void dnssec_validate(struct frec *forward, struct dns_header *header,
new->flags |= flags; new->flags |= flags;
new->forwardall = 0; new->forwardall = 0;
new->frec_src.encode_bitmap = 0; new->frec_src.encode_bitmap = 0;
new->frec_src.encode_bigmap = NULL;
forward->next_dependent = NULL; forward->next_dependent = NULL;
new->dependent = forward; /* to find query awaiting new one. */ new->dependent = forward; /* to find query awaiting new one. */
@@ -3042,7 +3044,7 @@ static void free_frec(struct frec *f)
struct frec_src *last; struct frec_src *last;
/* add back to freelist if not the record builtin to every frec, /* add back to freelist if not the record builtin to every frec,
also free any bigmaps they's been decorated with. */ also free any bigmaps they've been decorated with. */
for (last = f->frec_src.next; last && last->next; last = last->next) for (last = f->frec_src.next; last && last->next; last = last->next)
if (last->encode_bigmap) if (last->encode_bigmap)
{ {
@@ -3052,6 +3054,12 @@ static void free_frec(struct frec *f)
if (last) if (last)
{ {
/* final link in the chain loses bigmap too. */
if (last->encode_bigmap)
{
free(last->encode_bigmap);
last->encode_bigmap = NULL;
}
last->next = daemon->free_frec_src; last->next = daemon->free_frec_src;
daemon->free_frec_src = f->frec_src.next; daemon->free_frec_src = f->frec_src.next;
} }