aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2004-12-13 08:04:52 +0000
committerWerner Koch <[email protected]>2004-12-13 08:04:52 +0000
commit1037420b76a56036d81374a6881cc64a993d06b2 (patch)
tree0c5a5ac846aac01df39b87535589f93e1775df1e
parent(keys): Removed my old 621CC013 key (diff)
downloadgnupg-1037420b76a56036d81374a6881cc64a993d06b2.tar.gz
gnupg-1037420b76a56036d81374a6881cc64a993d06b2.zip
(read_passphrase_from_fd): Fixed memory leak.
Noted by Andrei Darashenka.
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/passphrase.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 9a30073f8..4f7620ba5 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-13 Werner Koch <[email protected]>
+
+ * passphrase.c (read_passphrase_from_fd): Fixed memory leak.
+ Noted by Andrei Darashenka.
+
2004-12-11 David Shaw <[email protected]>
* keyserver.c (parse_preferred_keyserver): Force preferred
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 3b1491878..9d303f43d 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -173,7 +173,10 @@ read_passphrase_from_fd( int fd )
len += 100;
pw = m_alloc_secure( len );
if( pw2 )
- memcpy(pw, pw2, i );
+ {
+ memcpy(pw, pw2, i );
+ m_free (pw2);
+ }
else
i=0;
}