mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

channels/smartcard: Fix race in channel cleanup

Browse Source
This commit is contained in:
Martin Fleisz 2021-01-21 10:10:44 +01:00 committed by akallabeth
parent d7566f5f5a
commit b092ab3b85
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/smartcard/client/smartcard_main.c
View File

@ -209,6 +209,7 @@ static void smartcard_release_all_contexts(SMARTCARD_DEVICE* smartcard)
* Call SCardCancel on existing contexts, unblocking all outstanding SCardGetStatusChange calls. * Call SCardCancel on existing contexts, unblocking all outstanding SCardGetStatusChange calls.
*/ */
ListDictionary_Lock(smartcard->rgSCardContextList);
if (ListDictionary_Count(smartcard->rgSCardContextList) > 0) if (ListDictionary_Count(smartcard->rgSCardContextList) > 0)
{ {
pKeys = NULL; pKeys = NULL;
@ -232,11 +233,17 @@ static void smartcard_release_all_contexts(SMARTCARD_DEVICE* smartcard)
free(pKeys); free(pKeys);
} }
ListDictionary_Unlock(smartcard->rgSCardContextList);
/* Put thread to sleep so that PC/SC can process the cancel requests. This fixes a race
* condition that sometimes caused the pc/sc daemon to crash on MacOS (_xpc_api_misuse) */
Sleep(100);
/** /**
* Call SCardReleaseContext on remaining contexts and remove them from rgSCardContextList. * Call SCardReleaseContext on remaining contexts and remove them from rgSCardContextList.
*/ */
ListDictionary_Lock(smartcard->rgSCardContextList);
if (ListDictionary_Count(smartcard->rgSCardContextList) > 0) if (ListDictionary_Count(smartcard->rgSCardContextList) > 0)
{ {
pKeys = NULL; pKeys = NULL;
@ -269,6 +276,7 @@ static void smartcard_release_all_contexts(SMARTCARD_DEVICE* smartcard)
free(pKeys); free(pKeys);
} }
ListDictionary_Unlock(smartcard->rgSCardContextList);
} }
static UINT smartcard_free_(SMARTCARD_DEVICE* smartcard) static UINT smartcard_free_(SMARTCARD_DEVICE* smartcard)