MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-02-08 12:40:05 +00:00
Code Issues Releases Wiki Activity

Fixed MessagePump shutdown to wait in an alertable state, fixing a scenario where memory was leaked because an APC was never called, because the event thread was not alertable while it was waiting for the apc thread to shutdown. Also fixed an edge case crash that could occur when a dispatcher was shut down.

Browse Source
This commit is contained in:
Bryan Roe
2022-08-09 20:33:20 -07:00
parent 373b0b424d
commit 80b14d0163
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meshcore/KVM/Windows/input.c
View File

@@ -24,6 +24,11 @@ limitations under the License.
#include "microstack/ILibCrypto.h"
#include "meshcore/meshdefines.h"
#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(_MINCORE)
#define _CRTDBG_MAP_ALLOC
#include <crtdbg.h>
#endif
extern ILibQueue gPendingPackets;
extern int gRemoteMouseRenderDefault;
extern int gRemoteMouseMoved;
@@ -199,7 +204,7 @@ void CALLBACK KVMWinEventProc(
char *buffer;
CURSORINFO info = { 0 };
if (hwnd == NULL && idObject == OBJID_CURSOR)
if (hwnd == NULL && idObject == OBJID_CURSOR && CUR_APCTHREAD != NULL)
{
switch (event)
{
@@ -244,7 +249,7 @@ void KVM_StopMessagePump()
if (CUR_HWND != NULL)
{
PostMessageA(CUR_HWND, WM_QUIT, 0, 0);
if (WaitForSingleObject(CUR_WORKTHREAD, 5000) == 0) { CloseHandle(CUR_WORKTHREAD); CUR_WORKTHREAD = NULL; }
if (WaitForSingleObjectEx(CUR_WORKTHREAD, 5000, TRUE) == 0) { CloseHandle(CUR_WORKTHREAD); CUR_WORKTHREAD = NULL; }
if (CUR_APCTHREAD != NULL) { CloseHandle(CUR_APCTHREAD); CUR_APCTHREAD = NULL; }
}
}

3
microscript/ILibDuktape_GenericMarshal.c
View File

@@ -2324,6 +2324,7 @@ duk_ret_t ILibDuktape_GenericMarshal_GlobalCallback_StartDispatcher(duk_context
}
void __stdcall ILibDuktape_GenericMarshal_GlobalCallback_EndDispatcher_APC(ULONG_PTR u)
{
if (!ILibMemory_CanaryOK((void*)u)) { return; }
((Duktape_GlobalGeneric_Data*)u)->dispatch->finished = 1;
CloseHandle(((Duktape_GlobalGeneric_Data*)u)->dispatch->WorkerThreadHandle);
}
@@ -2339,7 +2340,7 @@ duk_ret_t ILibDuktape_GenericMarshal_GlobalCallback_EndDispatcher(duk_context *c
data = (Duktape_GlobalGeneric_Data*)duk_get_pointer(ctx, -1);
if (data == NULL) { return(ILibDuktape_Error(ctx, "Internal Error")); }
if (data->dispatch == NULL || data->dispatch->WorkerThreadHandle == NULL) { return(ILibDuktape_Error(ctx, "No Dispatcher")); }
if (data->dispatch == NULL || !ILibMemory_CanaryOK(data->dispatch) || data->dispatch->WorkerThreadHandle == NULL) { return(ILibDuktape_Error(ctx, "No Dispatcher")); }
data->dispatch->retValue = Duktape_GetPointerProperty(ctx, 0, "_ptr");
QueueUserAPC((PAPCFUNC)ILibDuktape_GenericMarshal_GlobalCallback_EndDispatcher_APC, data->dispatch->WorkerThreadHandle, (ULONG_PTR)data);