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

check result of sc_file_dup + some cleanup 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2499 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
nils 2005-08-19 17:56:56 +00:00
parent f317e2966a
commit f855074c27
5 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libopensc/card-jcop.c
View File

@ -217,7 +217,9 @@ static int jcop_select_file(sc_card_t *card, const sc_path_t *path,
if (path->len == 2 && memcmp(path->value, "\x3F\x00", 2) == 0) {
drvdata->selected=SELECT_MF;
if (file) {
sc_file_dup(file, drvdata->virtmf);
sc_file_dup(file, drvdata->virtmf);
if (*file == NULL)
return SC_ERROR_OUT_OF_MEMORY;
}
return 0;
}
@ -228,7 +230,9 @@ static int jcop_select_file(sc_card_t *card, const sc_path_t *path,
memcmp(path->value, "\x2F\x00", 2) == 0)) {
drvdata->selected=SELECT_EFDIR;
if (file) {
sc_file_dup(file, drvdata->virtdir);
sc_file_dup(file, drvdata->virtdir);
if (*file == NULL)
return SC_ERROR_OUT_OF_MEMORY;
}
return 0;
}

8
src/libopensc/pkcs15.c
View File

@ -1113,8 +1113,14 @@ int sc_pkcs15_add_df(struct sc_pkcs15_card *p15card,
return SC_ERROR_OUT_OF_MEMORY;
newdf->path = *path;
newdf->type = type;
if (file != NULL)
if (file != NULL) {
sc_file_dup(&newdf->file, file);
if (newdf->file == NULL) {
free(newdf);
return SC_ERROR_OUT_OF_MEMORY;
}
}
if (p15card->df_list == NULL) {
p15card->df_list = newdf;
return 0;

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

@ -312,6 +312,8 @@ gpk_init_pinfile(struct sc_profile *profile, sc_card_t *card,
user_attempts[1] = sc_profile_get_pin_retries(profile, SC_PKCS15INIT_USER_PUK);
sc_file_dup(&pinfile, file);
if (pinfile == NULL)
return SC_ERROR_OUT_OF_MEMORY;
/* Create the PIN file. */
acl = sc_file_get_acl_entry(pinfile, SC_AC_OP_WRITE);

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

@ -533,7 +533,7 @@ cosm_old_generate_key(struct sc_profile *profile, sc_card_t *card,
path.len -= 2;
if ((rv = sc_profile_get_file_by_path(profile, &path, &tmpf)))
goto failed;
else if ((rv = sc_pkcs15init_authenticate(profile, card, tmpf,
else if ((rv = sc_pkcs15init_authenticate(profile, card, tmpf,
SC_AC_OP_CRYPTO)) < 0)
goto failed;
else if ((rv = sc_pkcs15init_authenticate(profile, card, tmpf,
@ -545,6 +545,10 @@ cosm_old_generate_key(struct sc_profile *profile, sc_card_t *card,
/* In the private key DF create the temporary public RSA file. */
sc_debug(card->ctx, "ready to create public key\n");
sc_file_dup(&tmpf, prkf);
if (tmpf == NULL) {
rv = SC_ERROR_OUT_OF_MEMORY;
goto failed;
}
tmpf->type = SC_FILE_TYPE_INTERNAL_EF;
tmpf->ef_structure = SC_CARDCTL_OBERTHUR_KEY_RSA_PUBLIC;
tmpf->id = 0x1012;

37
src/pkcs15init/profile.c
View File

@ -465,6 +465,8 @@ sc_profile_get_file_in(sc_profile_t *profile,
if ((fi = sc_profile_find_file(profile, path, name)) == NULL)
return SC_ERROR_FILE_NOT_FOUND;
sc_file_dup(ret, fi->file);
if (*ret == NULL)
return SC_ERROR_OUT_OF_MEMORY;
return 0;
}
@ -477,6 +479,8 @@ sc_profile_get_file(struct sc_profile *profile,
if ((fi = sc_profile_find_file(profile, NULL, name)) == NULL)
return SC_ERROR_FILE_NOT_FOUND;
sc_file_dup(ret, fi->file);
if (*ret == NULL)
return SC_ERROR_OUT_OF_MEMORY;
return 0;
}
@ -501,6 +505,8 @@ sc_profile_get_file_by_path(struct sc_profile *profile,
if ((fi = sc_profile_find_file_by_path(profile, path)) == NULL)
return SC_ERROR_FILE_NOT_FOUND;
sc_file_dup(ret, fi->file);
if (*ret == NULL)
return SC_ERROR_OUT_OF_MEMORY;
return 0;
}
@ -516,6 +522,8 @@ sc_profile_add_file(sc_profile_t *profile, const char *name, sc_file_t *file)
return SC_ERROR_FILE_NOT_FOUND;
}
sc_file_dup(&file, file);
if (file == NULL)
return SC_ERROR_OUT_OF_MEMORY;
add_file(profile, name, file, parent);
return 0;
}
@ -550,6 +558,8 @@ sc_profile_instantiate_template(sc_profile_t *profile,
&& sc_compare_path(&fi->inst_path, base_path)
&& !strcmp(fi->ident, file_name)) {
sc_file_dup(ret, fi->file);
if (*ret == NULL)
return SC_ERROR_OUT_OF_MEMORY;
return 0;
}
}
@ -599,6 +609,8 @@ sc_profile_instantiate_template(sc_profile_t *profile,
return SC_ERROR_OBJECT_NOT_FOUND;
}
sc_file_dup(ret, match->file);
if (*ret == NULL)
return SC_ERROR_OUT_OF_MEMORY;
return 0;
}
@ -615,7 +627,16 @@ sc_profile_instantiate_file(sc_profile_t *profile, file_info *ft,
fi->instance = fi;
fi->parent = parent;
fi->ident = strdup(ft->ident);
if (fi->ident == NULL) {
free(fi);
return NULL;
}
sc_file_dup(&fi->file, ft->file);
if (fi->file == NULL) {
free(fi->ident);
free(fi);
return NULL;
}
fi->file->path = parent->file->path;
fi->file->id += skew;
sc_append_file_id(&fi->file->path, fi->file->id);
@ -1394,7 +1415,7 @@ find_macro(sc_profile_t *profile, const char *name)
*/
static struct command key_commands[] = {
{ "value", 1, 1, do_key_value },
{ NULL }
{ NULL, 0, 0, NULL }
};
/*
@ -1418,7 +1439,7 @@ static struct command ci_commands[] = {
static struct block ci_blocks[] = {
{ "key", process_key, key_commands, NULL },
{ NULL }
{ NULL, NULL, NULL, NULL }
};
/*
@ -1479,7 +1500,7 @@ static struct block root_blocks[] = {
{ "macros", process_macros, NULL, NULL },
{ "pkcs15", process_block, p15_commands, NULL },
{ NULL, NULL , NULL }
{ NULL, NULL, NULL, NULL }
};
static struct block root_ops = {
@ -1689,7 +1710,7 @@ get_authid(struct state *cur, const char *value,
unsigned int *type, unsigned int *num)
{
char temp[16];
int n;
size_t n;
if (isdigit((int) *value)) {
*num = 0;
@ -1806,11 +1827,11 @@ expr_fail(struct num_exp_ctx *ctx)
}
static void
expr_put(struct num_exp_ctx *ctx, char c)
expr_put(struct num_exp_ctx *ctx, int c)
{
if (ctx->j >= (int)sizeof(ctx->word))
expr_fail(ctx);
ctx->word[ctx->j++] = c;
ctx->word[ctx->j++] = (char)c;
}
static char *
@ -1872,12 +1893,12 @@ expr_unget(struct num_exp_ctx *ctx, char *s)
}
static void
expr_expect(struct num_exp_ctx *ctx, char c)
expr_expect(struct num_exp_ctx *ctx, int c)
{
char *tok;
tok = expr_get(ctx);
if (tok[0] != c || tok[1])
if (tok[0] != (char)c || tok[1])
expr_fail(ctx);
}