1 files changed, 12 insertions, 2 deletions
diff --git a/src/net.cpp b/src/net.cpp
index cb5a24f0a4..e1b0e83e99 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -777,8 +777,15 @@ static list<CNode*> vNodesDisconnected;
 
 class CNodeRef {
 public:
-    CNodeRef(CNode *pnode) : _pnode(pnode)  {_pnode->AddRef();}
-    ~CNodeRef() {_pnode->Release();}
+    CNodeRef(CNode *pnode) : _pnode(pnode) {
+        LOCK(cs_vNodes);
+        _pnode->AddRef();
+    }
+
+    ~CNodeRef() {
+        LOCK(cs_vNodes);
+        _pnode->Release();
+    }
 
     CNode& operator *() const {return *_pnode;};
     CNode* operator ->() const {return _pnode;};
@@ -786,6 +793,8 @@ public:
     CNodeRef& operator =(const CNodeRef& other)
     {
         if (this != &other) {
+            LOCK(cs_vNodes);
+
             _pnode->Release();
             _pnode = other._pnode;
             _pnode->AddRef();
@@ -796,6 +805,7 @@ public:
     CNodeRef(const CNodeRef& other):
         _pnode(other._pnode)
     {
+        LOCK(cs_vNodes);
         _pnode->AddRef();
     }
 private: