[Pkg-gnupg-commit] [gnupg2] 22/166: scd: Fix APP reference counting.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

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>
---
 scd/app.c     | 1 -
 scd/command.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git