diff options
| author | Matthew Gregan <[email protected]> | 2022-03-02 18:54:12 +1300 |
|---|---|---|
| committer | Matthew Gregan <[email protected]> | 2022-03-03 09:55:24 +1300 |
| commit | 11c0214f40cc7ddba2b8894ca49e871d230b47ad (patch) | |
| tree | 1ce0c87a1ca8dee821fa956b88400510ce13c50c | |
| parent | 3a04ed2946e796a15bd37d1900be42244d685bbf (diff) | |
| download | cubeb-11c0214f40cc7ddba2b8894ca49e871d230b47ad.tar.gz cubeb-11c0214f40cc7ddba2b8894ca49e871d230b47ad.zip | |
wasapi: Protect access to cubeb context members.
| -rw-r--r-- | src/cubeb_wasapi.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/cubeb_wasapi.cpp b/src/cubeb_wasapi.cpp index 9e7026a..01a41c8 100644 --- a/src/cubeb_wasapi.cpp +++ b/src/cubeb_wasapi.cpp @@ -257,6 +257,7 @@ class monitor_device_notifications; struct cubeb { cubeb_ops const * ops = &wasapi_ops; + owned_critical_section lock; cubeb_strings * device_ids; /* Device enumerator to get notifications when the device collection change. */ @@ -757,6 +758,8 @@ intern_device_id(cubeb * ctx, wchar_t const * id) { XASSERT(id); + auto_lock lock(ctx->lock); + char const * tmp = wstr_to_utf8(id); if (!tmp) { return nullptr; @@ -1495,6 +1498,7 @@ get_endpoint(com_ptr<IMMDevice> & device, LPCWSTR devid) HRESULT register_collection_notification_client(cubeb * context) { + context->lock.assert_current_thread_owns(); XASSERT(!context->device_collection_enumerator && !context->collection_notification_client); HRESULT hr = CoCreateInstance( @@ -1523,6 +1527,7 @@ register_collection_notification_client(cubeb * context) HRESULT unregister_collection_notification_client(cubeb * context) { + context->lock.assert_current_thread_owns(); XASSERT(context->device_collection_enumerator && context->collection_notification_client); HRESULT hr = context->device_collection_enumerator @@ -1653,6 +1658,7 @@ wasapi_init(cubeb ** context, char const * context_name) cubeb * ctx = new cubeb(); ctx->ops = &wasapi_ops; + auto_lock lock(ctx->lock); if (cubeb_strings_init(&ctx->device_ids) != CUBEB_OK) { delete ctx; return CUBEB_ERROR; @@ -1727,6 +1733,7 @@ stop_and_join_render_thread(cubeb_stream * stm) void wasapi_destroy(cubeb * context) { + auto_lock lock(context->lock); XASSERT(!context->device_collection_enumerator && !context->collection_notification_client); @@ -3344,6 +3351,7 @@ wasapi_register_device_collection_changed( cubeb_device_collection_changed_callback collection_changed_callback, void * user_ptr) { + auto_lock lock(context->lock); if (devtype == CUBEB_DEVICE_TYPE_UNKNOWN) { return CUBEB_ERROR_INVALID_PARAMETER; } |