Fixed crash when resource stops with open sockets (by ccw808)

Author: Unknown

modules/sockets/include/CSocket.h

@@ -37,12 +37,13 @@ class CSocket
     CSocket           (lua_State *luaVM, const string& strHost, const unsigned short& usPort);
     ~CSocket          ();                           // Delete only - Does not trigger any events
 
-    void CloseSocketWithEvent ();                   // Close socket and trigger event
+    void CloseSocketWithEvent (bool bTriggerCloseEvent);    // Close socket and optionally trigger event
     bool Send         (const string& data);
     bool DoPulse      ();
     bool IsConnected  ();
 
     void* GetUserdata ();
+    lua_State* GetLuaVM()                   { return m_pLuaVM; }
     static int GetTotalOpenSocketCount ();
 
 private:

modules/sockets/include/CSocketManager.h

@@ -19,10 +19,14 @@ class CSocketManager
 {
 public:
     static void DoPulse();
-    
+    static void ResourceStopped( lua_State * luaVM );
+
     static void SocketAdd   (CSocket*& pSocket);
-    static void SocketRemove(CSocket*& pSocket);
+    static void SocketRemove(CSocket*& pSocket, bool bTriggerCloseEvent=true);
     static bool GetSocket   (CSocket*& pSocket, void* pUserdata);
+    static bool GetSocketByLuaVM(CSocket*& pSocket, lua_State * luaVM);
 
     static void HandleStop  ();
 };
+
+#endif

modules/sockets/src/CSocket.cpp

@@ -64,13 +64,14 @@ CSocket::~CSocket()
     }
 }
 
-void CSocket::CloseSocketWithEvent()
+void CSocket::CloseSocketWithEvent(bool bTriggerCloseEvent)
 {
     // Close the socket, if it exists, and trigger the closed event
     if (m_pSocket != ERR_INVALID_SOCKET)
     {
         CloseSocket();
-        TriggerEvent("onSockClosed");
+        if ( bTriggerCloseEvent )
+            TriggerEvent("onSockClosed");
     }
 }
 

modules/sockets/src/CSocketManager.cpp

@@ -39,17 +39,29 @@ void CSocketManager::DoPulse()
     }
 }
 
+
+void CSocketManager::ResourceStopped( lua_State * luaVM )
+{
+    // Enusure all sockets using luaVM are closed
+    CSocket* pSocket;
+    while( GetSocketByLuaVM( pSocket, luaVM ) )
+    {
+        SocketRemove( pSocket, false );
+    }
+}
+
+
 void CSocketManager::SocketAdd(CSocket*& pSocket)
 {
     // Add the socket to the loop stuff
     vecSockets.push_back(pSocket);
 }
 
-void CSocketManager::SocketRemove(CSocket*& pSocket)
+void CSocketManager::SocketRemove(CSocket*& pSocket, bool bTriggerCloseEvent)
 {
     ListRemove(vecSockets, pSocket);
     ListRemove(processQueue, pSocket);
-    pSocket->CloseSocketWithEvent();
+    pSocket->CloseSocketWithEvent(bTriggerCloseEvent);
     ListRemove(deleteList, pSocket);
     deleteList.push_back(pSocket);
 }
@@ -75,6 +87,24 @@ bool CSocketManager::GetSocket(CSocket*& pSocket, void* pUserdata)
     return false;
 }
 
+
+bool CSocketManager::GetSocketByLuaVM(CSocket*& pSocket, lua_State * luaVM)
+{
+    // Loop through all sockets
+    for (unsigned int i = 0; i < vecSockets.size(); ++i)
+    {
+        // Compare the current socket's luaVM with the one we're looking for
+        if (vecSockets[i]->GetLuaVM() == luaVM)
+        {
+            // If it's the one we want, assign pSocket to it and return true
+            pSocket = vecSockets[i];
+            return true;
+        }
+    }
+
+    return false;
+}
+
 void CSocketManager::HandleStop()
 {
     // Triggered at module stop. Simply destroys all sockets