aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-11-22 19:54:07 +0000
committerWerner Koch <[email protected]>2017-11-22 19:54:47 +0000
commitea28ea18f3ee6c9f5e69986f39848398b58e242e (patch)
treee9fa094bad034fb7459c9480f82e14b410c2d60a
parentscd: Enable card removal check after select_application. (diff)
downloadgnupg-ea28ea18f3ee6c9f5e69986f39848398b58e242e.tar.gz
gnupg-ea28ea18f3ee6c9f5e69986f39848398b58e242e.zip
gpg: Fix memory leaking for long inputs via --command-fd.
* g10/cpr.c (do_get_from_fd): Free the old buffer. -- If the received input is longer than 200 characters we used to leak the previous allocated buffer. GnuPG-bug-id: 3528 Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--g10/cpr.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/g10/cpr.c b/g10/cpr.c
index 154872013..a7fd1aaba 100644
--- a/g10/cpr.c
+++ b/g10/cpr.c
@@ -425,11 +425,17 @@ do_get_from_fd ( const char *keyword, int hidden, int getbool )
{
if (i >= len-1 )
{
+ /* On the first iteration allocate a new buffer. If that
+ * buffer is too short at further iterations do a poor man's
+ * realloc. */
char *save = string;
len += 100;
string = hidden? xmalloc_secure ( len ) : xmalloc ( len );
if (save)
- memcpy (string, save, i );
+ {
+ memcpy (string, save, i);
+ xfree (save);
+ }
else
i = 0;
}