server: fix leaking self-referential fx::Client objects

blattersturm · blattersturm · commit 25e8494d5185 · 2019-01-05T12:28:14.000+01:00
diff --git a/code/components/citizen-server-impl/src/ClientRegistry.cpp b/code/components/citizen-server-impl/src/ClientRegistry.cpp
@@ -28,7 +28,7 @@ namespace fx
 			m_clientsByNetId[weakClient.lock()->GetNetId()] = weakClient;
 		});
 
-		client->OnAssignPeer.Connect([=]()
+		client->OnAssignPeer.Connect([this, weakClient]()
 		{
 			m_clientsByPeer[weakClient.lock()->GetPeer()] = weakClient;
 
@@ -47,7 +47,7 @@ namespace fx
 
 				if (m_clientsBySlotId[slot].expired())
 				{
-					client->SetSlotId(slot);
+					weakClient.lock()->SetSlotId(slot);
 
 					m_clientsBySlotId[slot] = weakClient;
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ namespace fx`
`28`	`28`	`m_clientsByNetId[weakClient.lock()->GetNetId()] = weakClient;`
`29`	`29`	`});`
`30`	`30`
`31`		`- client->OnAssignPeer.Connect([=]()`
	`31`	`+ client->OnAssignPeer.Connect([this, weakClient]()`
`32`	`32`	`{`
`33`	`33`	`m_clientsByPeer[weakClient.lock()->GetPeer()] = weakClient;`
`34`	`34`
`@@ -47,7 +47,7 @@ namespace fx`
`47`	`47`
`48`	`48`	`if (m_clientsBySlotId[slot].expired())`
`49`	`49`	`{`
`50`		`- client->SetSlotId(slot);`
	`50`	`+ weakClient.lock()->SetSlotId(slot);`
`51`	`51`
`52`	`52`	`m_clientsBySlotId[slot] = weakClient;`
`53`	`53`