eclipse/paho.mqtt.cpp
1
0
Fork 0
mirror of https://github.com/eclipse/paho.mqtt.cpp.git synced 2025-05-09 19:31:22 +08:00
Code Issues Releases Wiki Activity

Merge pull request #519 from sandro97git/set-callback-fix-potential-deadlock

Browse Source 
Fix potential deadlock in set_callback
This commit is contained in:
Frank Pagliughi 2025-01-03 16:29:27 -05:00 committed by GitHub
commit 461f765430
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/async_client.cpp
View File

@ -315,9 +315,10 @@ void async_client::remove_token(token* tok)
void async_client::set_callback(callback& cb) void async_client::set_callback(callback& cb)
{ {
guard g(lock_); {
userCallback_ = &cb; guard g(lock_);
userCallback_ = &cb;
}
int rc = MQTTAsync_setConnected(cli_, this, &async_client::on_connected); int rc = MQTTAsync_setConnected(cli_, this, &async_client::on_connected);
if (rc == MQTTASYNC_SUCCESS) { if (rc == MQTTASYNC_SUCCESS) {
@ -330,6 +331,7 @@ void async_client::set_callback(callback& cb)
MQTTAsync_setConnected(cli_, nullptr, nullptr); MQTTAsync_setConnected(cli_, nullptr, nullptr);
if (rc != MQTTASYNC_SUCCESS) { if (rc != MQTTASYNC_SUCCESS) {
guard g(lock_);
userCallback_ = nullptr; userCallback_ = nullptr;
throw exception(rc); throw exception(rc);
} }