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

fixed error checking bug for foreground/background MSH values

Browse Source
This commit is contained in:
Bryan Roe
2022-02-16 20:23:10 -08:00
parent 4056245637
commit 9311ef3fd4
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
meshservice/ServiceMain.c
View File

@@ -1005,16 +1005,28 @@ COLORREF GDIP_RGB(COLORREF c)
uint32_t ColorFromMSH(char *c)
{
uint32_t ret = RGB(0, 54, 105);
size_t len = strnlen_s(c, 12);
parser_result *pr = ILibParseString(c, 0, len, ",", 1);
if (pr->NumResults == 3)
if (c != NULL)
{
pr->FirstResult->data[pr->FirstResult->datalength] = 0;
pr->FirstResult->NextResult->data[pr->FirstResult->NextResult->datalength] = 0;
pr->LastResult->data[pr->LastResult->datalength] = 0;
ret = RGB(atoi(pr->FirstResult->data), atoi(pr->FirstResult->NextResult->data), atoi(pr->LastResult->data));
size_t len = strnlen_s(c, 14);
if (c[len] == 0)
{
parser_result *pr = ILibParseString(c, 0, len, ",", 1);
if (pr->NumResults == 3)
{
pr->FirstResult->data[pr->FirstResult->datalength] = 0;
pr->FirstResult->NextResult->data[pr->FirstResult->NextResult->datalength] = 0;
pr->LastResult->data[pr->LastResult->datalength] = 0;
if (atoi(pr->FirstResult->data) >= 0 && atoi(pr->FirstResult->data) <= UINT8_MAX
&& atoi(pr->FirstResult->NextResult->data) >= 0 && atoi(pr->FirstResult->NextResult->data) <= UINT8_MAX
&& atoi(pr->LastResult->data) >= 0 && atoi(pr->LastResult->data) <= UINT8_MAX)
{
ret = RGB(atoi(pr->FirstResult->data), atoi(pr->FirstResult->NextResult->data), atoi(pr->LastResult->data));
}
}
ILibDestructParserResults(pr);
}
}
ILibDestructParserResults(pr);
return(ret);
}
@@ -1182,8 +1194,8 @@ INT_PTR CALLBACK DialogHandler(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
RECT r;
GetWindowRect(GetDlgItem(hDlg, IDC_IMAGE), &r);
char *bkcolor = Duktape_GetStringPropertyValue(g_dialogCtx, -1, "bkcolor", "0,54,105");
char *fgcolor = Duktape_GetStringPropertyValue(g_dialogCtx, -1, "fgcolor", "255,255,255");
char *bkcolor = Duktape_GetStringPropertyValue(g_dialogCtx, -1, "background", "0,54,105");
char *fgcolor = Duktape_GetStringPropertyValue(g_dialogCtx, -1, "foreground", "255,255,255");
gBKCOLOR = ColorFromMSH(bkcolor);
gFGCOLOR = ColorFromMSH(fgcolor);