From a34afa8f2053d75f276d6d28dbf1a43db0fd9768 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 15 Apr 2014 16:40:48 +0200
Subject: Two minor code cleanups and one NULL deref on error fix.

* common/estream.c (es_freopen): Remove useless check for STREAM.
* kbx/keybox-blob.c (_keybox_create_x509_blob): Remove useless check
for BLOB.
* tools/sockprox.c (run_proxy): Do not fclose(NULL).
--

Found by Hans-Christoph Steiner with cppcheck.
---
 tools/sockprox.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/sockprox.c b/tools/sockprox.c
index 9ec89ce25..35935987a 100644
--- a/tools/sockprox.c
+++ b/tools/sockprox.c
@@ -443,7 +443,8 @@ run_proxy (void)
  out:
 
   pthread_attr_destroy (&thread_attr);
-  fclose (protocol_file);	/* FIXME, err checking.  */
+  if (protocol_file)
+    fclose (protocol_file);	/* FIXME, err checking.  */
 
   return err;
 }
-- 
cgit v1.2.3