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

Fixed, so if geXInfo returns null, it won't throw an exception

Browse Source
This commit is contained in:
Bryan Roe
2019-03-15 12:46:57 -07:00
parent 0048acf128
commit 0637752d92
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meshcore/agentcore.c
View File

@@ -1455,14 +1455,17 @@ duk_ret_t ILibDuktape_MeshAgent_getRemoteDesktop(duk_context *ctx)
duk_push_int(ctx, console_uid);
if (duk_pcall(ctx, 1) == 0)
{
updateXAuth = Duktape_GetStringPropertyValue(ctx, -1, "xauthority", NULL);
updateDisplay = Duktape_GetStringPropertyValue(ctx, -1, "display", NULL);
if (console_uid != 0 && updateXAuth == NULL)
if (!duk_is_null(ctx, -1))
{
ILibDuktape_MeshAgent_RemoteDesktop_SendError(ptrs, "Xauthority not found! Is your DM configured to use X?");
duk_pop(ctx);
return(1);
updateXAuth = Duktape_GetStringPropertyValue(ctx, -1, "xauthority", NULL);
updateDisplay = Duktape_GetStringPropertyValue(ctx, -1, "display", NULL);
if (console_uid != 0 && updateXAuth == NULL)
{
ILibDuktape_MeshAgent_RemoteDesktop_SendError(ptrs, "Xauthority not found! Is your DM configured to use X?");
duk_pop(ctx);
return(1);
}
}
}
else