commit 7a82beeba3a74f7db8f0b019ee8b7aa1c838e6df
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Wed Aug 30 10:26:45 2023 -0400
committer Sébastien Blin <sebastien.blin@savoirfairelinux.com> Wed Aug 30 10:52:59 2023 -0400
tree 08d486eef247cabae4f8ef01a010a9207b9ccfb0
parent 7fbedf9f148809d4d8c430e525b1bac7d7b209d8

pupnp: lock after dispatch

Change-Id: I4c99192c95a82f6a5a386968075cb8991c807c8d

src/upnp/protocol/natpmp/nat_pmp.cpp

diff --git a/src/upnp/protocol/natpmp/nat_pmp.cpp b/src/upnp/protocol/natpmp/nat_pmp.cpp
index 633f580..c5e8ce6 100644
--- a/src/upnp/protocol/natpmp/nat_pmp.cpp
+++ b/src/upnp/protocol/natpmp/nat_pmp.cpp
@@ -115,26 +115,26 @@
 void
 NatPmp::terminate(std::condition_variable& cv)
 {
+    if (logger_) logger_->debug("NAT-PMP: Terminate instance {}", fmt::ptr(this));
+
     initialized_ = false;
     observer_ = nullptr;
 
-    {
-        std::lock_guard<std::mutex> lock(natpmpMutex_);
-        shutdownComplete_ = true;
-        cv.notify_one();
-    }
+    std::lock_guard<std::mutex> lock(natpmpMutex_);
+    shutdownComplete_ = true;
+    cv.notify_one();
 }
 
 void
 NatPmp::terminate()
 {
-    std::unique_lock<std::mutex> lk(natpmpMutex_);
     std::condition_variable cv {};
 
     ioContext->dispatch([&] {
         terminate(cv);
     });
 
+    std::unique_lock<std::mutex> lk(natpmpMutex_);
     if (cv.wait_for(lk, std::chrono::seconds(10), [this] { return shutdownComplete_; })) {
         if (logger_) logger_->debug("NAT-PMP: Shutdown completed");
     } else {