fix(oceanic): Crash when updating clearances

The map was being cleared during update which in turn caused issues if the map was being accessed for tag items. Fixes #455
VATSIM-UK · Apr 3, 2022 · c69ebae · c69ebae
1 parent 67e96bc
commit c69ebae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/plugin/oceanic/OceanicEventHandler.cpp b/src/plugin/oceanic/OceanicEventHandler.cpp
@@ -42,6 +42,7 @@ namespace UKControllerPlugin::Oceanic {
             }
 
             // Loop the clearances and update local data
+            auto lock = std::lock_guard(this->clearanceMapMutex);
             this->clearances.clear();
             for (const nlohmann::json& clearance : clearanceData) {
                 if (!NattrakClearanceValid(clearance)) {
@@ -86,11 +87,13 @@ namespace UKControllerPlugin::Oceanic {
 
     auto OceanicEventHandler::CountClearances() const -> size_t
     {
+        auto lock = std::lock_guard(this->clearanceMapMutex);
         return this->clearances.size();
     }
 
     auto OceanicEventHandler::GetClearanceForCallsign(const std::string& callsign) const -> const Clearance&
     {
+        auto lock = std::lock_guard(this->clearanceMapMutex);
         auto clearance = this->clearances.find(callsign);
         return clearance == this->clearances.cend() ? this->invalidClearance : clearance->second;
     }
@@ -121,6 +124,7 @@ namespace UKControllerPlugin::Oceanic {
         const std::string& context,
         const POINT& mousePos)
     {
+        auto lock = std::lock_guard(this->clearanceMapMutex);
         auto storedClearance = this->clearances.find(flightplan.GetCallsign());
         this->currentlySelectedClearance = storedClearance != this->clearances.cend()
                                                ? storedClearance->second
@@ -134,6 +138,7 @@ namespace UKControllerPlugin::Oceanic {
 
     void OceanicEventHandler::SetTagItemData(Tag::TagData& tagData)
     {
+        auto lock = std::lock_guard(this->clearanceMapMutex);
         auto clearance = this->clearances.find(tagData.GetFlightplan().GetCallsign());
 
         if (clearance == this->clearances.cend()) {

diff --git a/src/plugin/oceanic/OceanicEventHandler.h b/src/plugin/oceanic/OceanicEventHandler.h
@@ -92,5 +92,8 @@ namespace UKControllerPlugin::Oceanic {
         static const int CLEARANCE_ENTRY_POINT_TAG_ITEM_ID = 121;
         static const int CLEARANCE_TRACK_TAG_ITEM_ID = 122;
         static const int CLEARANCE_ENTRY_ESTIMATE_TAG_ITEM_ID = 123;
+
+        // Protects the map during updates
+        mutable std::mutex clearanceMapMutex;
     };
 } // namespace UKControllerPlugin::Oceanic