andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: parser: Never use constant strings for driver names (fixes #17438)

Browse Source 
When the parser sees the "keyboard" driver, it automatically (and
 silently) replaces it with the constant string "kbd".
Everybody else uses malloc'd memory for the driver name, so input
 device closure assumes it can use free.
Free val.str, so this crash doesn't turn into a memory leak. Whew.

Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Jesse Adkins 2010-08-04 23:39:14 -07:00 committed by Peter Hutterer
parent 619ca32202
commit bce12f2956
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xfree86/parser/Input.c
View File

@ -59,6 +59,7 @@
#include <xorg-config.h>
#endif
#include "os.h"
#include "xf86Parser.h"
#include "xf86tokens.h"
#include "Configint.h"
@ -102,8 +103,10 @@ xf86parseInputSection (void)
case DRIVER:
if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
Error (QUOTE_MSG, "Driver");
if (strcmp(val.str, "keyboard") == 0)
ptr->inp_driver = "kbd";
if (strcmp(val.str, "keyboard") == 0) {
ptr->inp_driver = strdup("kbd");
free(val.str);
}
else
ptr->inp_driver = val.str;
break;

6
hw/xfree86/parser/InputClass.c
View File

@ -111,8 +111,10 @@ xf86parseInputClassSection(void)
case DRIVER:
if (xf86getSubToken(&(ptr->comment)) != STRING)
Error(QUOTE_MSG, "Driver");
if (strcmp(val.str, "keyboard") == 0)
ptr->driver = "kbd";
if (strcmp(val.str, "keyboard") == 0) {
ptr->driver = strdup("kbd");
free(val.str);
}
else
ptr->driver = val.str;
break;