fix cs_mapRelay deadlock (when both ProcessGetData and Broadcast try …

…to lock cs_mapRelay and cs_vSend)
dimxy · Sep 11, 2021 · 91dfbd6 · 91dfbd6
1 parent 069a095
commit 91dfbd6
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -7446,10 +7446,18 @@ void static ProcessGetData(CNode* pfrom)
                 // Send stream from relay memory
                 bool pushed = false;
                 {
-                    LOCK(cs_mapRelay);
-                    map<CInv, CDataStream>::iterator mi = mapRelay.find(inv);
-                    if (mi != mapRelay.end()) {
-                        pfrom->PushMessage(inv.GetCommand(), (*mi).second);
+                    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+                    bool found = false;
+                    {
+                        LOCK(cs_mapRelay);
+                        map<CInv, CDataStream>::iterator mi = mapRelay.find(inv);
+                        if (mi != mapRelay.end())  {
+                            ss = ((*mi).second);
+                            found = true;
+                        }
+                    }
+                    if (found) {
+                        pfrom->PushMessage(inv.GetCommand(), ss);
                         pushed = true;
                     }
                 }