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

fixed used of uninitialized return value

This commit is contained in:
Frank Morgner 2018-06-30 01:15:57 +02:00
parent b3e3ab61c0
commit 452e1d3b96
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/libopensc/card-iasecc.c
View File

@ -2121,14 +2121,20 @@ iasecc_pin_get_policy (struct sc_card *card, struct sc_pin_cmd_data *data)
if (card->cache.valid && card->cache.current_df) {
sc_file_dup(&save_current_df, card->cache.current_df);
if (save_current_df == NULL)
LOG_TEST_GOTO_ERR(ctx, SC_ERROR_OUT_OF_MEMORY, "Cannot duplicate current DF file");
if (save_current_df == NULL) {
rv = SC_ERROR_OUT_OF_MEMORY;
sc_log(ctx, "Cannot duplicate current DF file");
goto err;
}
}
if (card->cache.valid && card->cache.current_ef) {
sc_file_dup(&save_current_ef, card->cache.current_ef);
if (save_current_ef == NULL)
LOG_TEST_GOTO_ERR(ctx, SC_ERROR_OUT_OF_MEMORY, "Cannot duplicate current EF file");
if (save_current_ef == NULL) {
rv = SC_ERROR_OUT_OF_MEMORY;
sc_log(ctx, "Cannot duplicate current EF file");
goto err;
}
}
if (!(data->pin_reference & IASECC_OBJECT_REF_LOCAL) && card->cache.valid && card->cache.current_df) {
@ -2148,8 +2154,11 @@ iasecc_pin_get_policy (struct sc_card *card, struct sc_pin_cmd_data *data)
rv = iasecc_sdo_get_data(card, &sdo);
LOG_TEST_GOTO_ERR(ctx, rv, "Cannot get SDO PIN data");
if (sdo.docp.acls_contact.size == 0)
LOG_TEST_GOTO_ERR(ctx, SC_ERROR_INVALID_DATA, "Extremely strange ... there is no ACLs");
if (sdo.docp.acls_contact.size == 0) {
rv = SC_ERROR_INVALID_DATA;
sc_log(ctx, "Extremely strange ... there is no ACLs");
goto err;
}
sc_log(ctx,
"iasecc_pin_get_policy() sdo.docp.size.size %"SC_FORMAT_LEN_SIZE_T"u",

2
src/pkcs15init/pkcs15-oberthur.c
View File

@ -182,7 +182,7 @@ cosm_erase_card(struct sc_profile *profile, struct sc_pkcs15_card *p15card)
}
sc_debug(ctx, SC_LOG_DEBUG_NORMAL, "erase file ddf %04X",df->id);
cosm_delete_file(p15card, profile, df);
rv = cosm_delete_file(p15card, profile, df);
if (rv < 0 && rv != SC_ERROR_FILE_NOT_FOUND)
goto done;