MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-19 09:43:20 +00:00
Code Issues Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Bryan Roe
2019-01-11 12:18:36 -08:00
parent 820aecc7ec
commit ca7b441cf8
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
microscript/ILibDuktape_Debugger.c
View File

@@ -583,7 +583,7 @@ duk_ret_t ILibDuktape_Debugger_JSAttach_promise(duk_context *ctx)
#endif #endif
struct sockaddr_in6 *local_int; struct sockaddr_in6 *local_int;
struct sockaddr_in6 localBounded; struct sockaddr_in6 localBounded;
int localBoundedSize = sizeof(struct sockaddr_in6); int localBoundedSize = sizeof(struct sockaddr_in);
duk_push_heap_stash(ctx); // [stash] duk_push_heap_stash(ctx); // [stash]
if (duk_has_prop_string(ctx, -1, ILibDuktape_Debugger_AttachOptions)) if (duk_has_prop_string(ctx, -1, ILibDuktape_Debugger_AttachOptions))
@@ -624,11 +624,17 @@ duk_ret_t ILibDuktape_Debugger_JSAttach_promise(duk_context *ctx)
duk_call_method(ctx, 1); duk_call_method(ctx, 1);
return(0); return(0);
} }
bind(listenerSocket, (struct sockaddr*)local_int, sizeof(struct sockaddr_in6)); if (bind(listenerSocket, (struct sockaddr*)local_int, sizeof(struct sockaddr_in)) != 0) { return(ILibDuktape_Error(ctx, "BIND error")); }
#if defined(WINSOCK2) #if defined(WINSOCK2)
getsockname(listenerSocket, (struct sockaddr*)&localBounded, (int*)&localBoundedSize); getsockname(listenerSocket, (struct sockaddr*)&localBounded, (int*)&localBoundedSize);
#else #else
getsockname(listenerSocket, (struct sockaddr*)&localBounded, (socklen_t*)&localBoundedSize); if (getsockname(listenerSocket, (struct sockaddr*)&localBounded, (socklen_t*)&localBoundedSize) != 0)
{
localBoundedSize = (int)sizeof(struct sockaddr_in);
if (getsockname(listenerSocket, (struct sockaddr*)&localBounded, (socklen_t*)&localBoundedSize) != 0)
{
}
}
#endif #endif
transport = (int)ntohs(localBounded.sin6_port); transport = (int)ntohs(localBounded.sin6_port);
@@ -709,6 +715,8 @@ void ILibDuktape_Debugger_SetScriptEx(void *chain, void *user)
if (ILibMemory_CanaryOK(user)) if (ILibMemory_CanaryOK(user))
{ {
duk_push_global_object(DebugWebEngine_Context); duk_push_global_object(DebugWebEngine_Context);
if (!duk_has_prop_string(DebugWebEngine_Context, -1, "_scriptTokens"))
{
duk_push_lstring(DebugWebEngine_Context, ILibMemory_Extra(user), ILibMemory_ExtraSize(user)); duk_push_lstring(DebugWebEngine_Context, ILibMemory_Extra(user), ILibMemory_ExtraSize(user));
duk_put_prop_string(DebugWebEngine_Context, -2, "_scriptPath"); duk_put_prop_string(DebugWebEngine_Context, -2, "_scriptPath");
duk_pop(DebugWebEngine_Context); duk_pop(DebugWebEngine_Context);
@@ -723,6 +731,7 @@ void ILibDuktape_Debugger_SetScriptEx(void *chain, void *user)
duk_swap_top(DebugWebEngine_Context, -2); // [g][tokens] duk_swap_top(DebugWebEngine_Context, -2); // [g][tokens]
duk_put_prop_string(DebugWebEngine_Context, -2, "_scriptTokens"); // [g] duk_put_prop_string(DebugWebEngine_Context, -2, "_scriptTokens"); // [g]
} }
}
duk_pop(DebugWebEngine_Context); duk_pop(DebugWebEngine_Context);
ILibMemory_Free(user); ILibMemory_Free(user);
} }