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: [PATCH] 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.
---
 common/estream.c  | 2 +-
 kbx/keybox-blob.c | 4 ++--
 tools/sockprox.c  | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/estream.c b/common/estream.c
index be791a802..6272c81f5 100644
--- a/common/estream.c
+++ b/common/estream.c
@@ -3101,7 +3101,7 @@ es_freopen (const char *ES__RESTRICT path, const char *ES__RESTRICT mode,
 	}
       else
         {
-          if (stream && path)
+          if (path)
             fname_set_internal (stream, path, 1);
           ESTREAM_UNLOCK (stream);
         }
diff --git a/kbx/keybox-blob.c b/kbx/keybox-blob.c
index a38f991a9..ebbcdf8ff 100644
--- a/kbx/keybox-blob.c
+++ b/kbx/keybox-blob.c
@@ -948,12 +948,12 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_blob, ksba_cert_t cert,
  leave:
   release_kid_list (blob->temp_kids);
   blob->temp_kids = NULL;
-  if (blob && names)
+  if (names)
     {
       for (i=0; i < blob->nuids; i++)
         xfree (names[i]);
+      xfree (names);
     }
-  xfree (names);
   if (rc)
     {
       _keybox_release_blob (blob);
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;
 }