[git] GPGME - branch, master, updated. gpgme-1.4.3-25-g62711e5

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  62711e5614e44e65a7c7bb7d21493d09d3081271 (commit)
      from  85a07ca7e3dffdefc8ae74beebb59e47a6e6bd1b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 62711e5614e44e65a7c7bb7d21493d09d3081271
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Apr 15 16:40:48 2014 +0200

    w32: Fix another memleak on error.
    
    * src/w32-io.c (create_reader): free CTX.
    --
    
    Found by Hans-Christoph Steiner with cppcheck.

diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index a8eab3a..ce9e349 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -901,6 +901,10 @@ build_argv (engine_gpg_t gpg, const char *pgmname)
 					       close_notify_handler,
 					       gpg))
 	      {
+                /* We leak fd_data_map and the fds.  This is not easy
+                   to avoid and given that we reach this here only
+                   after a malloc failure for a small object, it is
+                   probably better not to do anything.  */
 		return gpg_error (GPG_ERR_GENERAL);
 	      }
 	    /* If the data_type is FD, we have to do a dup2 here.  */
diff --git a/src/w32-io.c b/src/w32-io.c
index d00b8db..42961e3 100644
--- a/src/w32-io.c
+++ b/src/w32-io.c
@@ -425,6 +425,7 @@ create_reader (int fd)
   if (fd < 0 || fd >= MAX_SLAFD || !fd_table[fd].used)
     {
       TRACE_SYSERR (EIO);
+      free (ctx);
       return NULL;
     }
   TRACE_LOG4 ("fd=%d -> handle=%p socket=%d dupfrom=%d",

-----------------------------------------------------------------------

Summary of changes:
 src/engine-gpg.c |    4 ++++
 src/w32-io.c     |    1 +
 2 files changed, 5 insertions(+)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org