MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-16 00:03:45 +00:00
Code Issues Releases Wiki Activity

Added memory check before dereference

Browse Source
This commit is contained in:
Bryan Roe
2022-08-19 10:13:46 -07:00
parent 36286d9e7d
commit cd60e2bdf9
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
microscript/ILibDuktape_HttpStream.c
View File

@@ -4499,7 +4499,7 @@ ILibTransport_DoneState ILibDuktape_httpStream_webSocket_EncodedWriteSink(ILibDu
case WEBSOCKET_OPCODE_CLOSE: case WEBSOCKET_OPCODE_CLOSE:
state->closed = 1; state->closed = 1;
ILibDuktape_DuplexStream_WriteEnd(state->decodedStream); ILibDuktape_DuplexStream_WriteEnd(state->decodedStream);
if (ILibIsRunningOnChainThread(state->chain) != 0 && state->encodedStream->writableStream->pipedReadable != NULL) if (ILibMemory_CanaryOK(state) && ILibIsRunningOnChainThread(state->chain) != 0 && state->encodedStream->writableStream->pipedReadable != NULL)
{ {
duk_context *ctx = state->ctx; duk_context *ctx = state->ctx;
duk_push_heapptr(state->ctx, state->encodedStream->writableStream->pipedReadable); // [stream] duk_push_heapptr(state->ctx, state->encodedStream->writableStream->pipedReadable); // [stream]
@@ -4657,11 +4657,14 @@ void ILibDuktape_httpStream_webSocket_DecodedEndSink(ILibDuktape_DuplexStream *s
// //
// We need to call 'end' on the encoded stream, so that it can disconnect // We need to call 'end' on the encoded stream, so that it can disconnect
// //
duk_push_heapptr(state->ctx, state->ObjectPtr); // [websocket] if (ILibMemory_CanaryOK(state) && ILibMemory_CanaryOK(state->ctx))
duk_get_prop_string(state->ctx, -1, "encoded"); // [websocket][encoded] {
duk_prepare_method_call(state->ctx, -1, "end"); // [websocket][encoded][end][this] duk_push_heapptr(state->ctx, state->ObjectPtr); // [websocket]
duk_pcall_method(state->ctx, 0); duk_pop(state->ctx); // [websocket][encoded] duk_get_prop_string(state->ctx, -1, "encoded"); // [websocket][encoded]
duk_pop_2(state->ctx); // ... duk_prepare_method_call(state->ctx, -1, "end"); // [websocket][encoded][end][this]
duk_pcall_method(state->ctx, 0); duk_pop(state->ctx); // [websocket][encoded]
duk_pop_2(state->ctx); // ...
}
} }
void ILibDuktape_httpStream_webSocket_DecodedPauseSink_Chain(void *chain, void *user) void ILibDuktape_httpStream_webSocket_DecodedPauseSink_Chain(void *chain, void *user)
{ {