MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-02-18 10:23:35 +00:00
Code Issues Releases Wiki Activity

1. added .msh flag for HECI debug

Browse Source 
2. Fixed _GenericMarshal crash on Windows if GlobalCallback is executed after GC
This commit is contained in:
Bryan Roe
2019-12-12 10:48:50 -08:00
parent 286075832a
commit 9661c15bc9
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meshcore/agentcore.c
View File

@@ -91,6 +91,7 @@ char exeMeshPolicyGuid[] = { 0xB9, 0x96, 0x01, 0x58, 0x80, 0x54, 0x4A, 0x19, 0xB
#define DEFAULT_IDLE_TIMEOUT 120
#define KVM_IPC_SOCKET "\xFF_KVM_IPC_SOCKET"
extern int ILibDuktape_HECI_Debug;
#ifdef _POSIX
extern char **environ;
@@ -3395,7 +3396,8 @@ void MeshServer_Connect(MeshAgentHostContainer *agent)
agent->logUpdate = ILibSimpleDataStore_Get(agent->masterDb, "logUpdate", NULL, 0);
agent->fakeUpdate = ILibSimpleDataStore_Get(agent->masterDb, "fakeUpdate", NULL, 0);
agent->controlChannelDebug = ILibSimpleDataStore_Get(agent->masterDb, "controlChannelDebug", NULL, 0);
ILibDuktape_HECI_Debug = (ILibSimpleDataStore_Get(agent->masterDb, "heciDebug", NULL, 0) != NULL);
#if defined(_LINKVM) && defined(_POSIX) && !defined(__APPLE__)
SLAVELOG = ILibSimpleDataStore_Get(agent->masterDb, "slaveKvmLog", NULL, 0);
#endif

2
microscript/ILibDuktape_GenericMarshal.c
View File

@@ -1514,6 +1514,8 @@ void ILibDuktape_GlobalGenericCallback_ProcessEx(void *chain, void *user)
int i;
//void *retVal = NULL;
Duktape_GlobalGeneric_Data *data = (Duktape_GlobalGeneric_Data*)user;
if (!ILibMemory_CanaryOK(data->emitter)) { return; }
char tmp[255];
sprintf_s(tmp, sizeof(tmp), "%ul", data->callingThread);
duk_push_heapptr(data->emitter->ctx, data->emitter->object); // [obj]