Skip to content

fix: avoid endless loop when SCardEstablishContext is not successful #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
esskar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: avoid endless loop when SCardEstablishContext is not successful #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1064d82
fix: avoid endless loop when SCardEstablishContext is not successful
esskar Sep 13, 2024
da59714
fix: avoid sleep and while loop and fail fast instead
esskar Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pokusew/pcsclite",
"version": "0.6.0",
"version": "0.6.1",
"description": "Bindings over PC/SC to access Smart Cards",
"keywords": [
"nfc",
Expand Down
15 changes: 6 additions & 9 deletions src/pcsclite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,12 @@ PCSCLite::PCSCLite(): m_card_context(0),
postServiceCheck:
#endif // _WIN32

LONG result;
// TODO: consider removing this do-while Windows workaround that should not be needed anymore
do {
// TODO: make dwScope (now hard-coded to SCARD_SCOPE_SYSTEM) customisable
result = SCardEstablishContext(SCARD_SCOPE_SYSTEM,
NULL,
NULL,
&m_card_context);
} while(result == SCARD_E_NO_SERVICE || result == SCARD_E_SERVICE_STOPPED);
// TODO: make dwScope (now hard-coded to SCARD_SCOPE_SYSTEM) customisable
LONG result = SCardEstablishContext(SCARD_SCOPE_SYSTEM,
NULL,
NULL,
&m_card_context);

if (result != SCARD_S_SUCCESS) {
Nan::ThrowError(error_msg("SCardEstablishContext", result).c_str());
} else {
Expand Down