giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OpenPGP: clean up with pgp_finish() 

Use pgp_finish() wherever possible to clean up.

Signed-off-by: Peter Marschall <peter@adpm.de>

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5487 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
martin 2011-05-23 17:32:31 +00:00
parent 9aa7342000
commit 101cf28766
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libopensc/card-openpgp.c
View File

@ -154,13 +154,14 @@ pgp_init(sc_card_t *card)
priv = calloc (1, sizeof *priv);
if (!priv)
return SC_ERROR_OUT_OF_MEMORY;
card->drv_data = priv;
priv->mf = calloc(1, sizeof(struct blob));
if (!priv->mf) {
free(priv);
pgp_finish(card);
return SC_ERROR_OUT_OF_MEMORY;
}
card->drv_data = priv;
card->cla = 0x00;
/* Is this correct? */
@ -181,9 +182,7 @@ pgp_init(sc_card_t *card)
sc_format_path("D276:0001:2401", &aid);
aid.type = SC_PATH_TYPE_DF_NAME;
if ((r = iso_ops->select_file(card, &aid, &file)) < 0) {
free(priv->mf);
free(priv);
card->drv_data = NULL;
pgp_finish(card);
return r;
}