29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
|
From f162d344c03bc9db125084a8f05c9cd7c0c1f4de Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matthias Andree <matthias.andree@gmx.de>
|
||
|
|
Date: Sun, 29 Dec 2024 22:02:21 +0100
|
||
|
|
Subject: [PATCH] cache: Fix potential NULL deref in arcane situations.
|
||
|
|
|
||
|
|
Reference:https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=f162d344c03bc9db125084a8f05c9cd7c0c1f4de
|
||
|
|
Conflict:NA
|
||
|
|
|
||
|
|
---
|
||
|
|
src/cache.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/cache.c b/src/cache.c
|
||
|
|
index 4395fee..f2aecca 100644
|
||
|
|
--- a/src/cache.c
|
||
|
|
+++ b/src/cache.c
|
||
|
|
@@ -479,7 +479,7 @@ static struct crec *cache_scan_free(char *name, union all_addr *addr, unsigned s
|
||
|
|
if ((crecp->flags & F_FORWARD) && hostname_isequal(cache_get_name(crecp), name))
|
||
|
|
{
|
||
|
|
int rrmatch = 0;
|
||
|
|
- if (crecp->flags & flags & F_RR)
|
||
|
|
+ if (addr && (crecp->flags & flags & F_RR))
|
||
|
|
{
|
||
|
|
unsigned short rrc = (crecp->flags & F_KEYTAG) ? crecp->addr.rrblock.rrtype : crecp->addr.rrdata.rrtype;
|
||
|
|
unsigned short rra = (flags & F_KEYTAG) ? addr->rrblock.rrtype : addr->rrdata.rrtype;
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|