From bf5c55127a5063d912d0451d5bf783780d0884b3 Mon Sep 17 00:00:00 2001
From: Olga Khlopkova <o.khlopkova@corp.mail.ru>
Date: Thu, 23 Apr 2020 12:10:25 +0300
Subject: [PATCH] [routing] Fix SIGSEGV crash in
 FeaturesRoadGraph::RoadInfoCache

---
 routing/features_road_graph.cpp | 3 +++
 routing/features_road_graph.hpp | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/routing/features_road_graph.cpp b/routing/features_road_graph.cpp
index 507b4ff8d3..dbe363343e 100644
--- a/routing/features_road_graph.cpp
+++ b/routing/features_road_graph.cpp
@@ -107,6 +107,7 @@ void FeaturesRoadGraph::CrossCountryVehicleModel::Clear()
 
 IRoadGraph::RoadInfo & FeaturesRoadGraph::RoadInfoCache::Find(FeatureID const & featureId, bool & found)
 {
+  std::lock_guard lock(m_mutexCache);
   auto res = m_cache.emplace(featureId.m_mwmId, TMwmFeatureCache());
   if (res.second)
     res.first->second.Init(kPowOfTwoForFeatureCacheSize);
@@ -115,8 +116,10 @@ IRoadGraph::RoadInfo & FeaturesRoadGraph::RoadInfoCache::Find(FeatureID const &
 
 void FeaturesRoadGraph::RoadInfoCache::Clear()
 {
+  std::lock_guard lock(m_mutexCache);
   m_cache.clear();
 }
+
 FeaturesRoadGraph::FeaturesRoadGraph(DataSource const & dataSource, IRoadGraph::Mode mode,
                                      shared_ptr<VehicleModelFactoryInterface> vehicleModelFactory)
   : m_dataSource(dataSource), m_mode(mode), m_vehicleModel(vehicleModelFactory)
diff --git a/routing/features_road_graph.hpp b/routing/features_road_graph.hpp
index 9026d8bf62..07c0a4c425 100644
--- a/routing/features_road_graph.hpp
+++ b/routing/features_road_graph.hpp
@@ -17,6 +17,7 @@
 
 #include <map>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <utility>
 #include <vector>
@@ -64,6 +65,8 @@ private:
 
   private:
     using TMwmFeatureCache = base::Cache<uint32_t, RoadInfo>;
+
+    std::mutex m_mutexCache;
     std::map<MwmSet::MwmId, TMwmFeatureCache> m_cache;
   };
 
@@ -126,6 +129,7 @@ private:
 
   DataSource const & m_dataSource;
   IRoadGraph::Mode const m_mode;
+
   mutable RoadInfoCache m_cache;
   mutable CrossCountryVehicleModel m_vehicleModel;
   mutable std::map<MwmSet::MwmId, Value> m_mwmLocks;