chiark / gitweb /
Import gnupg2_2.1.18-8~deb9u1.debian.tar.bz2
[gnupg2.git] / patches / 0067-dirmngr-Fix-possible-null-reference.patch
1 From: NIIBE Yutaka <gniibe@fsij.org>
2 Date: Wed, 12 Apr 2017 15:58:11 +0900
3 Subject: dirmngr: Fix possible null reference.
4
5 * dirmngr/dns.c (dns_error_t dns_trace_fput): Check NULL.
6
7 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
8 (cherry picked from commit 7ae1857c90ab43ad9e31f0fb6dbd37f25cc37278)
9 ---
10  dirmngr/dns.c | 5 +++--
11  1 file changed, 3 insertions(+), 2 deletions(-)
12
13 diff --git a/dirmngr/dns.c b/dirmngr/dns.c
14 index 869e7ed..ebfd4c3 100644
15 --- a/dirmngr/dns.c
16 +++ b/dirmngr/dns.c
17 @@ -4594,8 +4594,9 @@ dns_error_t dns_trace_fput(const struct dns_trace_event *te, const void *data, s
18  
19         if (fwrite(&tmp, 1, headsize, fp) < headsize)
20                 return errno;
21 -       if (fwrite(data, 1, datasize, fp) < datasize)
22 -               return errno;
23 +       if (data)
24 +               if (fwrite(data, 1, datasize, fp) < datasize)
25 +                       return errno;
26         if (fflush(fp))
27                 return errno;
28