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

proper checking of the SCardListReaders return values 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1780 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
nils 2004-04-27 17:41:02 +00:00
parent f2bd9af6cc
commit 475a29de67
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libopensc/reader-pcsc.c
View File

@ -478,11 +478,11 @@ static int pcsc_init(struct sc_context *ctx, void **reader_data)
&pcsc_ctx); &pcsc_ctx);
if (rv != SCARD_S_SUCCESS) if (rv != SCARD_S_SUCCESS)
return pcsc_ret_to_error(rv); return pcsc_ret_to_error(rv);
SCardListReaders(pcsc_ctx, NULL, NULL, rv = SCardListReaders(pcsc_ctx, NULL, NULL,
(LPDWORD) &reader_buf_size); (LPDWORD) &reader_buf_size);
if (reader_buf_size < 2) { if (rv != SCARD_S_SUCCESS || reader_buf_size < 2) {
SCardReleaseContext(pcsc_ctx); SCardReleaseContext(pcsc_ctx);
return 0; /* No readers configured */ return pcsc_ret_to_error(rv); /* No readers configured */
} }
gpriv = (struct pcsc_global_private_data *) malloc(sizeof(struct pcsc_global_private_data)); gpriv = (struct pcsc_global_private_data *) malloc(sizeof(struct pcsc_global_private_data));
if (gpriv == NULL) { if (gpriv == NULL) {
@ -493,8 +493,21 @@ static int pcsc_init(struct sc_context *ctx, void **reader_data)
*reader_data = gpriv; *reader_data = gpriv;
reader_buf = (char *) malloc(sizeof(char) * reader_buf_size); reader_buf = (char *) malloc(sizeof(char) * reader_buf_size);
SCardListReaders(pcsc_ctx, mszGroups, reader_buf, if (!reader_buf) {
(LPDWORD) &reader_buf_size); free(gpriv);
*reader_data = NULL;
SCardReleaseContext(pcsc_ctx);
return SC_ERROR_OUT_OF_MEMORY;
}
rv = SCardListReaders(pcsc_ctx, mszGroups, reader_buf,
(LPDWORD) &reader_buf_size);
if (rv != SCARD_S_SUCCESS) {
free(reader_buf);
free(gpriv);
*reader_data = NULL;
SCardReleaseContext(pcsc_ctx);
return pcsc_ret_to_error(rv);
}
p = reader_buf; p = reader_buf;
do { do {
struct sc_reader *reader = (struct sc_reader *) malloc(sizeof(struct sc_reader)); struct sc_reader *reader = (struct sc_reader *) malloc(sizeof(struct sc_reader));