aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch')
-rw-r--r--package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch b/package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch
new file mode 100644
index 0000000000..92944fabe6
--- /dev/null
+++ b/package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch
@@ -0,0 +1,23 @@
+From 2c594732eb7391e7cfa817598e33e61cab71131f Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Thu, 3 Jan 2019 13:42:03 +0000
+Subject: [PATCH 22/30] File logic bug in cache-marshalling code. Introduced a
+ couple of commits back.
+
+Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+---
+ src/cache.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/src/cache.c
++++ b/src/cache.c
+@@ -742,8 +742,7 @@ int cache_recv_insert(time_t now, int fd
+ else if (flags & F_DS)
+ {
+ if (!read_write(fd, (unsigned char *)&class, sizeof(class), 1) ||
+- (flags & F_NEG) ||
+- !(addr.key.keydata = blockdata_read(fd, addr.key.keylen)))
++ (!(flags & F_NEG) && !(addr.key.keydata = blockdata_read(fd, addr.key.keylen))))
+ return 0;
+ }
+ #endif