[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.18-21-g3ca1f40

[by Joshua Rogers]

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 "The GNU Privacy Guard".

The branch, STABLE-BRANCH-1-4 has been updated
       via  3ca1f4098c70d322658cfaaa0d12164e6ac6d5ad (commit)
      from  da66ad5bba4215b9ddd0cb927a89aa75355632aa (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 3ca1f4098c70d322658cfaaa0d12164e6ac6d5ad
Author: Joshua Rogers <git at internot.info>
Date:   Sat Dec 20 11:38:53 2014 +1100

    scd: fix get_public_key for OpenPGPcard v1.0.
    
    * scd/app-openpgp.c (get_public_key): correctly close 'fp' upon use.
    
    --
    
    Inside the get_public_key function, 'fp' was opened using popen, but
    incorrectly closed using fclose.
    
    Debian-Bug-Id: 773474

diff --git a/g10/app-openpgp.c b/g10/app-openpgp.c
index a3a977b..b51d418 100644
--- a/g10/app-openpgp.c
+++ b/g10/app-openpgp.c
@@ -1250,7 +1250,7 @@ get_public_key (app_t app, int keyno)
 	}
 
       err = retrieve_key_material (fp, hexkeyid, &m, &mlen, &e, &elen);
-      fclose (fp);
+      pclose (fp);
       if (err)
 	{
 	  log_error ("error while retrieving key material through pipe: %s\n",

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

Summary of changes:
 g10/app-openpgp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org