[git] GnuPG - branch, master, updated. gnupg-2.1.18-22-g9b06633

[by NIIBE Yutaka]

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, master has been updated
       via  9b06633c811e8815c07d744f20b45405cb082367 (commit)
      from  bb5ceb78c333129a44c0144f2cf49b17ede898f1 (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 9b06633c811e8815c07d744f20b45405cb082367
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Jan 26 19:32:51 2017 +0900

    scd: Fix APP reference counting.
    
    * scd/app.c (scd_update_reader_status_file): Don't call another
    release_application_internal.
    * scd/command.c (open_card_with_request): Don't require APPTYPE !=
    NULL.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app.c b/scd/app.c
index 88a3801..b10a452 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -1049,7 +1049,6 @@ scd_update_reader_status_file (void)
                 {
                   log_debug ("Removal of a card: %d\n", a->slot);
                   apdu_close_reader (a->slot);
-                  release_application_internal (a);
                   deallocate_app (a);
                 }
               else
diff --git a/scd/command.c b/scd/command.c
index 8c7ca20..26f8630 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -221,7 +221,7 @@ open_card_with_request (ctrl_t ctrl, const char *apptype, const char *serialno)
   /* If we are already initialized for one specific application we
      need to check that the client didn't requested a specific
      application different from the one in use before we continue. */
-  if (apptype && ctrl->app_ctx)
+  if (ctrl->app_ctx)
     return check_application_conflict (apptype, ctrl->app_ctx);
 
   if (serialno)

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

Summary of changes:
 scd/app.c     | 1 -
 scd/command.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)


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