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

Add missing check for NULL return from allocate_rfd().

Browse Source
This commit is contained in:
Simon Kelley
2020-11-15 22:13:25 +00:00
parent 1eb6cedb03
commit 824461192c
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/forward.c
View File

@@ -823,7 +823,6 @@ void reply_query(int fd, int family, time_t now)
int is_sign; int is_sign;
#ifdef HAVE_DNSSEC #ifdef HAVE_DNSSEC
/* For DNSSEC originated queries, just retry the query to the same server. */
if (forward->flags & (FREC_DNSKEY_QUERY | FREC_DS_QUERY)) if (forward->flags & (FREC_DNSKEY_QUERY | FREC_DS_QUERY))
{ {
struct server *start; struct server *start;
@@ -849,6 +848,8 @@ void reply_query(int fd, int family, time_t now)
} }
fd = -1;
if (start->sfd) if (start->sfd)
fd = start->sfd->fd; fd = start->sfd->fd;
else else
@@ -856,19 +857,21 @@ void reply_query(int fd, int family, time_t now)
if (start->addr.sa.sa_family == AF_INET6) if (start->addr.sa.sa_family == AF_INET6)
{ {
/* may have changed family */ /* may have changed family */
if (!forward->rfd6) if (forward->rfd6 || (forward->rfd6 = allocate_rfd(AF_INET6)))
forward->rfd6 = allocate_rfd(AF_INET6);
fd = forward->rfd6->fd; fd = forward->rfd6->fd;
} }
else else
{ {
/* may have changed family */ /* may have changed family */
if (!forward->rfd4) if (forward->rfd4 || (forward->rfd4 = allocate_rfd(AF_INET)))
forward->rfd4 = allocate_rfd(AF_INET);
fd = forward->rfd4->fd; fd = forward->rfd4->fd;
} }
} }
/* Can't get socket. */
if (fd == -1)
return;
#ifdef HAVE_DUMPFILE #ifdef HAVE_DUMPFILE
dump_packet(DUMP_SEC_QUERY, (void *)header, (size_t)plen, NULL, &start->addr); dump_packet(DUMP_SEC_QUERY, (void *)header, (size_t)plen, NULL, &start->addr);
#endif #endif
@@ -2311,7 +2314,6 @@ struct frec *get_new_frec(time_t now, int *wait, struct frec *force)
return f; /* OK if malloc fails and this is NULL */ return f; /* OK if malloc fails and this is NULL */
} }
/* crc is all-ones if not known. */
static struct frec *lookup_frec(unsigned short id, int fd, int family, void *hash) static struct frec *lookup_frec(unsigned short id, int fd, int family, void *hash)
{ {
struct frec *f; struct frec *f;