[MSAFD] Don't modify APC-owned memory

TAN-Gaming · Jan 14, 2024 · cbbf12d · cbbf12d
1 parent 0c5e18b
commit cbbf12d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 46 deletions.
diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c
@@ -2064,13 +2064,6 @@ WSPConnect(SOCKET Handle,
         return MsafdReturnWithErrno(Status, lpErrno, 0, NULL);
     }
 
-    if (APCFunction)
-    {
-        APCContext->lpConnectInfo = NULL;
-        APCContext->lpSocket = NULL;
-        /* This will be freed by the APC */
-        // HeapFree(GlobalHeap, 0, APCContext);
-    }
     if (ConnectInfo)
         HeapFree(GlobalHeap, 0, ConnectInfo);
 

diff --git a/dll/win32/msafd/misc/sndrcv.c b/dll/win32/msafd/misc/sndrcv.c
@@ -347,15 +347,6 @@ WSPRecv(SOCKET Handle,
         return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesRead);
     }
 
-    if (APCFunction)
-    {
-        APCContext->lpRecvInfo = NULL;
-        APCContext->lpCompletionRoutine = NULL;
-        APCContext->lpSocket = NULL;
-        /* This will be freed by the APC */
-        //HeapFree(GlobalHeap, 0, APCContext);
-    }
-
     /* Return the Flags */
     if (ReceiveFlags)
     {
@@ -583,15 +574,6 @@ WSPRecvFrom(SOCKET Handle,
         return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesRead);
     }
 
-    if (APCFunction)
-    {
-        APCContext->lpRecvInfo = NULL;
-        APCContext->lpCompletionRoutine = NULL;
-        APCContext->lpSocket = NULL;
-        /* This will be freed by the APC */
-        //HeapFree(GlobalHeap, 0, APCContext);
-    }
-
     if (ReceiveFlags)
     {
         /* Return the Flags */
@@ -775,15 +757,6 @@ WSPSend(SOCKET Handle,
         return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesSent);
     }
 
-    if (APCFunction)
-    {
-        APCContext->lpSendInfo = NULL;
-        APCContext->lpCompletionRoutine = NULL;
-        APCContext->lpSocket = NULL;
-        /* This will be freed by the APC */
-        //HeapFree(GlobalHeap, 0, APCContext);
-    }
-
     /* Re-enable Async Event */
     SockReenableAsyncSelectEvent(Socket, FD_WRITE);
 
@@ -981,7 +954,7 @@ WSPSendTo(SOCKET Handle,
     }
 
     NtClose(SockEvent);
-
+    HeapFree(GlobalHeap, 0, RemoteAddress);
     if (BindAddress != NULL)
     {
         HeapFree(GlobalHeap, 0, BindAddress);
@@ -992,17 +965,7 @@ WSPSendTo(SOCKET Handle,
         TRACE("Leaving (Pending)\n");
         return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesSent);
     }
-
-    if (APCFunction)
-    {
-        APCContext->lpSendInfo = NULL;
-        APCContext->lpRemoteAddress = NULL;
-        APCContext->lpCompletionRoutine = NULL;
-        APCContext->lpSocket = NULL;
-        /* This will be freed by the APC */
-        //HeapFree(GlobalHeap, 0, APCContext);
-    }
-    HeapFree(GlobalHeap, 0, RemoteAddress);
+
     SockReenableAsyncSelectEvent(Socket, FD_WRITE);
 
     TRACE("Leaving (%ld %ld)\n", Status, IOSB->Information);