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

xfree86: don't access the old input handler after freeing it 

Introduced in 323869f329

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Peter Hutterer 2013-01-09 13:58:56 +10:00
parent 205cfbd6d9
commit f4a58469a2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/common/xf86Events.c
View File

@ -619,14 +619,16 @@ InputHandlerProc
xf86SetConsoleHandler(InputHandlerProc proc, pointer data) xf86SetConsoleHandler(InputHandlerProc proc, pointer data)
{ {
static IHPtr handler = NULL; static IHPtr handler = NULL;
IHPtr old_handler = handler; InputHandlerProc old_proc = NULL;
if (old_handler) if (handler) {
xf86RemoveGeneralHandler(old_handler); old_proc = handler->ihproc;
xf86RemoveGeneralHandler(handler);
}
handler = xf86AddGeneralHandler(xf86Info.consoleFd, proc, data); handler = xf86AddGeneralHandler(xf86Info.consoleFd, proc, data);
return (old_handler) ? old_handler->ihproc : NULL; return old_proc;
} }
static void static void