security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

scd: Fix switching to another APP. 

* scd/app.c (select_additional_application): Initialize card of APP.
Break after the selection.
Don't free APP if success.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2019-08-21 09:56:44 +09:00
parent b7793c3af3
commit d4f135c34b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scd/app.c
View File

@ -723,13 +723,17 @@ select_additional_application (ctrl_t ctrl, const char *name)
log_info ("error allocating app context: %s\n", gpg_strerror (err));
goto leave;
}
app->card = card;
/* Find the app and run the select. */
for (i=0; app_priority_list[i].apptype; i++)
{
if (app_priority_list[i].apptype == req_apptype
&& is_app_allowed (app_priority_list[i].name))
err = app_priority_list[i].select_func (app);
{
err = app_priority_list[i].select_func (app);
break;
}
}
if (!app_priority_list[i].apptype
|| (err && gpg_err_code (err) != GPG_ERR_OBJ_TERM_STATE))
@ -743,11 +747,12 @@ select_additional_application (ctrl_t ctrl, const char *name)
app->next = card->app;
card->app = app;
ctrl->current_apptype = app->apptype;
log_error ("added app '%s' to the card context\n", strapptype(app->apptype));
log_info ("added app '%s' to the card context\n", strapptype (app->apptype));
leave:
unlock_card (card);
xfree (app);
if (err)
xfree (app);
return err;
}
@ -990,7 +995,7 @@ maybe_switch_app (ctrl_t ctrl, card_t card)
app->next = card->app;
card->app = app;
ctrl->current_apptype = app->apptype;
log_error ("switched to '%s'\n", strapptype(app->apptype));
log_info ("switched to '%s'\n", strapptype (app->apptype));
return 0;
}