gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-21 13:28:05 +01:00
Code Issues Projects Releases Wiki Activity

wmaker: make parsing on display name less prone to crash in SetupEnvironment (Coverity #50096)

Browse Source 
When creating the environment variable for the sub-process that wmaker can
create, Coverity pointed that if was possible to crash if the name of the
display did not contain the ':', which is probably ok in most case, but we
can't be sure about what it could contain in special cases.

This patch adds a proper check so, at least, it would not crash if the case
were to arise.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
This commit is contained in:
Christophe CURIS
2014-11-15 19:40:48 +01:00
committed by Carlos R. Mafra
parent 38463df102
commit de5ef8c4f1
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.c
View File

@@ -246,9 +246,22 @@ void SetupEnvironment(WScreen * scr)
int len = strlen(DisplayName) + 64;
tmp = wmalloc(len);
snprintf(tmp, len, "DISPLAY=%s", XDisplayName(DisplayName));
ptr = strchr(strchr(tmp, ':'), '.');
if (ptr)
*ptr = 0;
/* Search from the end to be compatible with ipv6 address */
ptr = strrchr(tmp, ':');
if (ptr == NULL) {
static Bool message_already_displayed = False;
if (!message_already_displayed)
wwarning(_("the display name has an unexpected syntax: \"%s\""),
XDisplayName(DisplayName));
message_already_displayed = True;
} else {
/* If found, remove the screen specification from the display variable */
ptr = strchr(ptr, '.');
if (ptr)
*ptr = 0;
}
snprintf(buf, sizeof(buf), ".%i", scr->screen);
strcat(tmp, buf);
putenv(tmp);