issue-1902: fixing use-after-free after #1818

ydb-platform · Sep 1, 2024 · 96335c8 · 96335c8
1 parent 3af0964
commit 96335c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/cloud/filestore/libs/storage/tablet/model/node_session_stat.cpp b/cloud/filestore/libs/storage/tablet/model/node_session_stat.cpp
@@ -19,7 +19,7 @@ TNodeToSessionStat::EKind TNodeToSessionStat::AddWrite(
 }
 
 void TNodeToSessionStat::Clean(
-    const TStat::iterator& nodeStatIterator,
+    TStat::iterator& nodeStatIterator,
     const TString& sessionId)
 {
     auto& nodeStat = nodeStatIterator->second;
@@ -40,14 +40,15 @@ void TNodeToSessionStat::Clean(
 
     if (nodeStat.WriteSessions.empty() && nodeStat.ReadSessions.empty()) {
         Stat.erase(nodeStatIterator);
+        nodeStatIterator = Stat.end();
     }
 }
 
 TNodeToSessionStat::EKind TNodeToSessionStat::RemoveRead(
     ui64 nodeId,
     const TString& sessionId)
 {
-    const auto& nodeStatIterator = Stat.find(nodeId);
+    auto nodeStatIterator = Stat.find(nodeId);
     if (nodeStatIterator != Stat.end()) {
         --nodeStatIterator->second.ReadSessions[sessionId];
         Clean(nodeStatIterator, sessionId);
@@ -59,7 +60,7 @@ TNodeToSessionStat::EKind TNodeToSessionStat::RemoveWrite(
     ui64 nodeId,
     const TString& sessionId)
 {
-    const auto& nodeStatIterator = Stat.find(nodeId);
+    auto nodeStatIterator = Stat.find(nodeId);
     if (nodeStatIterator != Stat.end()) {
         --nodeStatIterator->second.WriteSessions[sessionId];
         Clean(nodeStatIterator, sessionId);

diff --git a/cloud/filestore/libs/storage/tablet/model/node_session_stat.h b/cloud/filestore/libs/storage/tablet/model/node_session_stat.h
@@ -15,10 +15,6 @@ class TNodeToSessionStat
     using TStat = THashMap<ui64, TSessionStat>;
     TStat Stat;
 
-    void Clean(
-        const TStat::iterator& nodeStatIterator,
-        const TString& sessionId);
-
 public:
     enum class EKind
     {
@@ -38,6 +34,10 @@ class TNodeToSessionStat
 private:
     [[nodiscard]] EKind GetKind(
         const TStat::const_iterator& nodeStatIterator) const;
+
+    void Clean(
+        TStat::iterator& nodeStatIterator,
+        const TString& sessionId);
 };
 
 }   // namespace NCloud::NFileStore::NStorage