Possible fix for crash

Author: ccw808

resources/sockets/irctest.lua

@@ -170,7 +170,7 @@ addEventHandler("onIRCNick", root,
 addEventHandler("onIRCNotice", root,
 	function(socket, user, target, notice)
 		if socket == sock then
-			user = ircGetUserNick(user)
+			user = ircGetUserNick(user) or user
 			outputServerLog("IRC: NOTICE ("..user.." -> "..target.."): "..notice)
 		end
 	end

sockets/include/CSocket.h

@@ -36,8 +36,9 @@ class CSocket
 {
 public:
     CSocket           (lua_State *luaVM, const string& strHost, const unsigned short& usPort);
-    ~CSocket          ();
+    ~CSocket          ();                           // Delete only - Does not trigger any events
 
+    void CloseSocketWithEvent ();                   // Close socket and trigger event
     bool Send         (const string& data);
     bool DoPulse      ();
     bool IsConnected  ();

sockets/include/CSocketManager.h

@@ -12,6 +12,8 @@
 class CSocket;
 
 #include <vector>
+#include <deque>
+#include <assert.h>
 #include "ml_sockets.h"
 
 class CSocketManager
@@ -20,7 +22,7 @@ class CSocketManager
     static void DoPulse();
 
     static void SocketAdd   (CSocket*& pSocket);
-    static bool SocketRemove(CSocket*& pSocket);
+    static void SocketRemove(CSocket*& pSocket);
     static bool GetSocket   (CSocket*& pSocket, void* pUserdata);
 
     static void HandleStop  ();

sockets/include/ml_sockets.h

@@ -47,4 +47,17 @@ using namespace std;
 // Function for making sure a pointer has a value before deleting it; possibly prevents crashes
 #define SAFE_DELETE(p) { if (p) { delete (p); (p) = NULL; } }
 
+// List item removal
+template < class TL, class T >
+void ListRemove ( TL& itemList, const T& item )
+{
+    typename TL ::iterator it = itemList.begin ();
+    for ( ; it != itemList.end () ; ++it )
+        if ( item == *it )
+        {
+            itemList.erase ( it );
+            break;
+        }
+}
+
 #endif

sockets/src/CSocket.cpp

@@ -16,6 +16,7 @@ CSocket::CSocket(lua_State *luaVM, const string& strHost, const unsigned short&
     m_usPort     = usPort;
     m_pLuaVM     = luaVM;
     m_pUserdata  = NULL;
+    m_pSocket    = ERR_INVALID_SOCKET;
 
     // Prepare data for connection (cancel on failure)
     if (!ProcessTargetLocation(strHost, usPort))
@@ -51,9 +52,18 @@ CSocket::CSocket(lua_State *luaVM, const string& strHost, const unsigned short&
 }
 
 CSocket::~CSocket()
+{
+    // Close the socket, if it exists
+    if (m_pSocket != ERR_INVALID_SOCKET)
+    {
+        CloseSocket();
+    }
+}
+
+void CSocket::CloseSocketWithEvent()
 {
     // Close the socket, if it exists, and trigger the closed event
-    if (m_pSocket)
+    if (m_pSocket != ERR_INVALID_SOCKET)
     {
         CloseSocket();
         TriggerEvent("onSockClosed");
@@ -63,17 +73,21 @@ CSocket::~CSocket()
 bool CSocket::Send(const string& data)
 {
     // Make sure the socket exists
-    if (!m_pSocket)
+    if (m_pSocket == ERR_INVALID_SOCKET)
         return false;
 
+    // Pretend zero length send was ok
+    if (data.length() == 0)
+        return true;
+
     // Send the data and return whether it was successful
     return (send(m_pSocket, data.c_str(), data.length(), 0) != ERR_SEND_FAILURE);
 }
 
 bool CSocket::DoPulse()
 {
     // Make sure the socket exists before taking action
-    if (m_pSocket)
+    if (m_pSocket != ERR_INVALID_SOCKET)
     {
         // Wait for connect to complete before proceeding
         if (!m_bConnected)
@@ -134,7 +148,7 @@ bool CSocket::DoPulse()
 bool CSocket::IsConnected()
 {
     // If there's no socket, then we don't have a connection
-    if (!m_pSocket)
+    if (m_pSocket == ERR_INVALID_SOCKET)
         return false;
 
     // If there is, show whether there is a connection
@@ -210,7 +224,7 @@ void CSocket::CloseSocket()
 #endif
 
     // Unset the socket variable, so there's no mistaking there
-    m_pSocket = NULL;
+    m_pSocket = ERR_INVALID_SOCKET;
 }
 
 int CSocket::HandleConnection(const int& iError)

sockets/src/CSocketManager.cpp

@@ -10,14 +10,17 @@
 
 // Vector for holding all sockets
 vector <CSocket*> vecSockets;
+deque <CSocket*> processQueue;
+deque <CSocket*> deleteList;
 
 void CSocketManager::DoPulse()
 {
     // Loop through all sockets
-    for (unsigned int i = 0; i < vecSockets.size(); ++i)
+    processQueue = deque <CSocket*>(vecSockets.begin(), vecSockets.end());
+    while (!processQueue.empty())
     {
-        // Get the socket by the ID
-        CSocket* pSocket = vecSockets[i];
+        CSocket* pSocket = processQueue.front();
+        processQueue.pop_front();
 
         // Do a pulse at the socket
         if (!pSocket->DoPulse())
@@ -26,6 +29,14 @@ void CSocketManager::DoPulse()
             SocketRemove(pSocket);
         }
     }
+
+    // Finally cleanup sockets that were removed
+    while (!deleteList.empty())
+    {
+        CSocket* pSocket = deleteList.front();
+        deleteList.pop_front();
+        SAFE_DELETE(pSocket);
+    }
 }
 
 void CSocketManager::SocketAdd(CSocket*& pSocket)
@@ -34,26 +45,13 @@ void CSocketManager::SocketAdd(CSocket*& pSocket)
     vecSockets.push_back(pSocket);
 }
 
-bool CSocketManager::SocketRemove(CSocket*& pSocket)
+void CSocketManager::SocketRemove(CSocket*& pSocket)
 {
-    // Check if an socket was actually specified
-    if (pSocket == NULL)
-        return false;
-
-    // Loop through all sockets
-    for (unsigned int i = 0; i < vecSockets.size(); ++i)
-    {
-        // If the current is the one we're looking for...
-        if (vecSockets[i] == pSocket)
-        {
-            // Remove it from the vector and delete it, then return true
-            vecSockets.erase(vecSockets.begin() + i);
-            SAFE_DELETE(pSocket);
-            return true;
-        }
-    }
-
-    return false;
+    ListRemove(vecSockets, pSocket);
+    ListRemove(processQueue, pSocket);
+    pSocket->CloseSocketWithEvent();
+    ListRemove(deleteList, pSocket);
+    deleteList.push_back(pSocket);
 }
 
 bool CSocketManager::GetSocket(CSocket*& pSocket, void* pUserdata)
@@ -82,4 +80,11 @@ void CSocketManager::HandleStop()
     // Triggered at module stop. Simply destroys all sockets
     for (unsigned int i = 0; i < vecSockets.size(); ++i)
         SAFE_DELETE(vecSockets[i]);
+
+    for (unsigned int i = 0; i < deleteList.size(); ++i)
+        SAFE_DELETE(deleteList[i]);
+
+    vecSockets.clear();
+    processQueue.clear();
+    deleteList.clear();
 }