github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow DISPLAY=:0 for chansrv and in other modules

Browse Source
This commit is contained in:
matt335672
2021-03-31 11:31:41 +01:00
parent ab203f9fc3
commit e7cb5bd64a
3 changed files with 50 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xrdpapi/xrdpapi.c
+7 -3
View File
@@ -120,9 +120,9 @@ WTSVirtualChannelOpenEx(unsigned int SessionId, const char *pVirtualName,
wts->display_num = get_display_num_from_display(display_text);
}
if (wts->display_num <= 0)
if (wts->display_num < 0)
{
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: fatal error; display is <= 0");
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: fatal error; invalid DISPLAY");
free(wts);
return NULL;
}
@@ -552,6 +552,10 @@ get_display_num_from_display(char *display_text)
}
else if (mode == 1)
{
if (display_text[index] < '0' || display_text[index] > '9')
{
return -1;
}
disp[disp_index] = display_text[index];
disp_index++;
}
@@ -559,5 +563,5 @@ get_display_num_from_display(char *display_text)
}
disp[disp_index] = 0;
return atoi(disp);
return (disp_index== 0) ? -1 : atoi(disp);
}