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

src: fix deadlock in CardReader

Browse Source 
Move the `uv_mutex_unlock` before the `uv_thread_join` as it could
perfectly lock with `CardReader::HandlerFunction` `uv_mutex_unlock`.
This commit is contained in:
Santiago Gimeno
2016-09-23 13:13:58 +02:00
parent d2054c73f3
commit c83a39e10d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cardreader.cpp
View File

@@ -316,9 +316,9 @@ NAN_METHOD(CardReader::Close) {
} while ((ret != 0) && (++ times < 5)); } while ((ret != 0) && (++ times < 5));
} }
uv_mutex_unlock(&obj->m_mutex);
assert(uv_thread_join(&obj->m_status_thread) == 0); assert(uv_thread_join(&obj->m_status_thread) == 0);
obj->m_status_thread = 0; obj->m_status_thread = 0;
uv_mutex_unlock(&obj->m_mutex);
} }
info.GetReturnValue().Set(Nan::New<Number>(result)); info.GetReturnValue().Set(Nan::New<Number>(result));