From 3ee8b47870736f96adf6add91532acde8ff377cb Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Thu, 18 Jul 2013 17:30:25 -0400
Subject: [PATCH] [client] fix minor memory leak in getpasswd() routine caught
 by the test suite in valgrind mode

---
 client/getpasswd.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/getpasswd.c b/client/getpasswd.c
index 0db52c57..b3d4ba52 100644
--- a/client/getpasswd.c
+++ b/client/getpasswd.c
@@ -68,6 +68,9 @@ read_passwd_from_stream(FILE *stream)
 
     ptr = ARRAY_FIRST_ELT_ADR(password);
 
+    if(stream == NULL)
+        return password;
+
 #ifdef WIN32
     while((c = _getch()) != PW_CR_CHAR)
 #else
@@ -192,6 +195,9 @@ getpasswd(const char *prompt, int fd)
     _putch(PW_CR_CHAR);
     _putch(PW_LF_CHAR);
 #endif
+
+    fclose(fp);
+
     return (ptr);
 }