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

replace static buffer with dynamically allocated buffer. 

patch by Tomasz Lemiech to fix a problem with setec cards.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2983 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aj 2006-07-05 19:45:53 +00:00
parent 7dd7df4e7c
commit 6287cf4d9b
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libopensc/pkcs15.c
View File

@ -486,7 +486,7 @@ void sc_pkcs15_card_clear(sc_pkcs15_card_t *p15card)
static int sc_pkcs15_bind_internal(sc_pkcs15_card_t *p15card)
{
unsigned char buf[SC_MAX_APDU_BUFFER_SIZE];
unsigned char *buf;
int err, ok = 0;
size_t len;
sc_path_t tmppath;
@ -566,10 +566,13 @@ static int sc_pkcs15_bind_internal(sc_pkcs15_card_t *p15card)
goto end;
}
/* XXX: fix buffer overflow. Silently truncate ODF if it
* is too large. --okir */
if ((len = p15card->file_odf->size) > sizeof(buf))
len = sizeof(buf);
if ((len = p15card->file_odf->size) == 0) {
sc_error(card->ctx, "EF(ODF) is empty\n");
goto end;
}
buf = malloc(len);
if(buf == NULL)
return SC_ERROR_OUT_OF_MEMORY;
err = sc_read_binary(card, 0, buf, len, 0);
if (err < 0)
goto end;
@ -583,6 +586,7 @@ static int sc_pkcs15_bind_internal(sc_pkcs15_card_t *p15card)
sc_error(card->ctx, "Unable to parse ODF\n");
goto end;
}
free(buf);
if (card->ctx->debug) {
sc_pkcs15_df_t *df;
@ -613,8 +617,13 @@ static int sc_pkcs15_bind_internal(sc_pkcs15_card_t *p15card)
if (err)
goto end;
if ((len = p15card->file_tokeninfo->size) > sizeof(buf))
len = sizeof(buf);
if ((len = p15card->file_tokeninfo->size) == 0) {
sc_error(card->ctx, "EF(TokenInfo) is empty\n");
goto end;
}
buf = malloc(len);
if(buf == NULL)
return SC_ERROR_OUT_OF_MEMORY;
err = sc_read_binary(card, 0, buf, len, 0);
if (err < 0)
goto end;
@ -637,6 +646,8 @@ static int sc_pkcs15_bind_internal(sc_pkcs15_card_t *p15card)
ok = 1;
end:
if(buf != NULL)
free(buf);
if (!ok) {
sc_pkcs15_card_clear(p15card);
return err;