frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: drop unneeded strdup for modulepath/logfile 

The destination variable is never freed, thus we even plug some memory
leaks.

v2: Rebase against updated xf86CheckPrivs() helper.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov 2016-05-02 23:47:22 +01:00 committed by Adam Jackson
parent 032b1d79b7
commit 66fdeb880a
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/xfree86/common/xf86Init.c
View File

@ -1121,26 +1121,16 @@ ddxProcessArgument(int argc, char **argv, int i)
/* First the options that are not allowed with elevated privileges */ /* First the options that are not allowed with elevated privileges */
if (!strcmp(argv[i], "-modulepath")) { if (!strcmp(argv[i], "-modulepath")) {
char *mp;
CHECK_FOR_REQUIRED_ARGUMENT(); CHECK_FOR_REQUIRED_ARGUMENT();
xf86CheckPrivs(argv[i], argv[i + 1]); xf86CheckPrivs(argv[i], argv[i + 1]);
mp = strdup(argv[i + 1]); xf86ModulePath = argv[i + 1];
if (!mp)
FatalError("Can't allocate memory for ModulePath\n");
xf86ModulePath = mp;
xf86ModPathFrom = X_CMDLINE; xf86ModPathFrom = X_CMDLINE;
return 2; return 2;
} }
if (!strcmp(argv[i], "-logfile")) { if (!strcmp(argv[i], "-logfile")) {
char *lf;
CHECK_FOR_REQUIRED_ARGUMENT(); CHECK_FOR_REQUIRED_ARGUMENT();
xf86CheckPrivs(argv[i], argv[i + 1]); xf86CheckPrivs(argv[i], argv[i + 1]);
lf = strdup(argv[i + 1]); xf86LogFile = argv[i + 1];
if (!lf)
FatalError("Can't allocate memory for LogFile\n");
xf86LogFile = lf;
xf86LogFileFrom = X_CMDLINE; xf86LogFileFrom = X_CMDLINE;
return 2; return 2;
} }