2
0

0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch 823 B

1234567891011121314151617181920212223
  1. From 2c594732eb7391e7cfa817598e33e61cab71131f Mon Sep 17 00:00:00 2001
  2. From: Simon Kelley <[email protected]>
  3. Date: Thu, 3 Jan 2019 13:42:03 +0000
  4. Subject: [PATCH 22/30] File logic bug in cache-marshalling code. Introduced a
  5. couple of commits back.
  6. Signed-off-by: Kevin Darbyshire-Bryant <[email protected]>
  7. ---
  8. src/cache.c | 3 +--
  9. 1 file changed, 1 insertion(+), 2 deletions(-)
  10. --- a/src/cache.c
  11. +++ b/src/cache.c
  12. @@ -742,8 +742,7 @@ int cache_recv_insert(time_t now, int fd
  13. else if (flags & F_DS)
  14. {
  15. if (!read_write(fd, (unsigned char *)&class, sizeof(class), 1) ||
  16. - (flags & F_NEG) ||
  17. - !(addr.key.keydata = blockdata_read(fd, addr.key.keylen)))
  18. + (!(flags & F_NEG) && !(addr.key.keydata = blockdata_read(fd, addr.key.keylen))))
  19. return 0;
  20. }
  21. #endif