stkn/node-pcsclite
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: establish context on PCSCLite constructor

Browse Source 
- Remove SCardEstablishContext from get_card_readers.
- Initialize m_status_thread to NULL so calling PCSCLite destructor does not
  crash in case the thread has not been launched. For example when
  SCardEstablish context fails
- Thanks to Ludovic Rousseau for pointing that out @
  https://github.com/santigimeno/node-pcsclite/pull/15#issuecomment-56222251.
This commit is contained in:
Santiago Gimeno
2014-09-23 13:05:51 +02:00
parent 2909f5e127
commit ec0b79562c
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/pcsclite.cpp
View File

@@ -19,8 +19,17 @@ void PCSCLite::init(Handle<Object> target) {
target->Set(NanNew("PCSCLite"), tpl->GetFunction()); target->Set(NanNew("PCSCLite"), tpl->GetFunction());
} }
PCSCLite::PCSCLite(): m_card_context(0) { PCSCLite::PCSCLite(): m_card_context(NULL),
m_status_thread(NULL) {
pthread_mutex_init(&m_mutex, NULL); pthread_mutex_init(&m_mutex, NULL);
LONG result = SCardEstablishContext(SCARD_SCOPE_SYSTEM,
NULL,
NULL,
&m_card_context);
if (result != SCARD_S_SUCCESS) {
NanThrowError(pcsc_stringify_error(result));
}
} }
PCSCLite::~PCSCLite() { PCSCLite::~PCSCLite() {
@@ -29,7 +38,9 @@ PCSCLite::~PCSCLite() {
} }
pthread_mutex_destroy(&m_mutex); pthread_mutex_destroy(&m_mutex);
pthread_cancel(m_status_thread); if (m_status_thread) {
pthread_cancel(m_status_thread);
}
} }
NAN_METHOD(PCSCLite::New) { NAN_METHOD(PCSCLite::New) {
@@ -156,14 +167,6 @@ LONG PCSCLite::get_card_readers(PCSCLite* pcsclite, AsyncResult* async_result) {
async_result->readers_name = NULL; async_result->readers_name = NULL;
async_result->readers_name_length = 0; async_result->readers_name_length = 0;
if (!pcsclite->m_card_context) {
result = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &pcsclite->m_card_context);
}
if (result != SCARD_S_SUCCESS) {
return result;
}
/* Find out ReaderNameLength */ /* Find out ReaderNameLength */
DWORD readers_name_length; DWORD readers_name_length;
result = SCardListReaders(pcsclite->m_card_context, NULL, NULL, &readers_name_length); result = SCardListReaders(pcsclite->m_card_context, NULL, NULL, &readers_name_length);