[PATCH] agent: Fix error handling in map_supervised_sockets

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed Oct 5 06:23:11 CEST 2016


* agent/gpg-agent.c (map_supervised_sockets): the file descriptor to
  close on error is fd, not i.

Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
 agent/gpg-agent.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 1696e5a..9c7b8fc 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -758,14 +758,14 @@ map_supervised_sockets (gnupg_fd_t *r_fd,
                         {
                           log_error ("cannot listen on fd %d for %s socket\n",
                                      fd, tbl[j].label);
-                          close (i);
+                          close (fd);
                         }
                     }
                   else
                     {
                       log_error ("cannot listen on more than one %s socket\n",
                                  tbl[j].label);
-                      close (i);
+                      close (fd);
                     }
                   break;
                 }
-- 
2.9.3




More information about the Gnupg-devel mailing list