MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-01-08 19:44:06 +00:00
Code Issues Releases Wiki Activity

Fixed Windows Handle leak

Browse Source
This commit is contained in:
Bryan Roe
2022-07-25 09:42:49 -07:00
parent 687f79d8d1
commit 7cffca38f5
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

7
microscript/ILibDuktape_net.c
View File

@@ -433,7 +433,6 @@ duk_ret_t ILibDuktape_net_socket_connect(duk_context *ctx)
ILibDuktape_net_WindowsIPC *winIPC = (ILibDuktape_net_WindowsIPC*)Duktape_PushBuffer(ctx, sizeof(ILibDuktape_net_WindowsIPC));
duk_put_prop_string(ctx, -2, ILibDuktape_net_WindowsIPC_Buffer);
winIPC->overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
winIPC->read_overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
winIPC->write_overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
winIPC->ctx = ctx;
@@ -1261,6 +1260,8 @@ BOOL ILibDuktape_net_server_IPC_ConnectSink(void *chain, HANDLE event, ILibWaitH
ILibDuktape_net_WindowsIPC *winIPC = (ILibDuktape_net_WindowsIPC*)user;
if (winIPC->mServer != NULL)
{
if (winIPC->overlapped.hEvent != NULL) { CloseHandle(winIPC->overlapped.hEvent); winIPC->overlapped.hEvent = NULL; }
duk_push_heapptr(winIPC->ctx, winIPC->mServer); // [server]
duk_get_prop_string(winIPC->ctx, -1, ILibDuktape_net_ConcurrencyArray); // [server][array]
int maxCount = Duktape_GetIntPropertyValue(winIPC->ctx, -2, ILibDuktape_net_ConcurrencyMaxSize, 0);
@@ -1730,6 +1731,10 @@ duk_ret_t ILibDuktape_net_server_close(duk_context *ctx)
CloseHandle(winIPC->mPipeHandle);
winIPC->mPipeHandle = NULL;
ILibChain_RemoveWaitHandle(duk_ctx_chain(ctx), winIPC->overlapped.hEvent);
if (winIPC->overlapped.hEvent != NULL) { CloseHandle(winIPC->overlapped.hEvent); winIPC->overlapped.hEvent = NULL; }
if (winIPC->read_overlapped.hEvent != NULL) { CloseHandle(winIPC->read_overlapped.hEvent); winIPC->read_overlapped.hEvent = NULL; }
if (winIPC->write_overlapped.hEvent != NULL) { CloseHandle(winIPC->write_overlapped.hEvent); winIPC->write_overlapped.hEvent = NULL; }
}
else
{

1
modules/win-dispatcher.js
View File

@@ -57,6 +57,7 @@ function dispatch(options)
this._control.write(h);
this._control.write(d);
};
s.on('end', function () { }); // DO NOT DELETE this line
});
ret._ipc.once('connection', function onConnect(s)
{

1
modules/win-registry.js
View File

@@ -150,6 +150,7 @@ function windows_registry()
result.values.push(achValue.Wide2UTF8);
}
}
this._AdvApi.RegCloseKey(h.Deref());
return (result);
}