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

NULL-terminate device list when synthesizing core devices. 

This fix is required for 93ca526892 to work.
This commit is contained in:
Peter Hutterer 2007-06-25 10:51:42 +09:30
parent 8e5102b9f0
commit bec4e47d12
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/common/xf86Config.c
View File

@ -1339,7 +1339,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
*devs[count - 1] = Pointer; *devs[count - 1] = Pointer;
devs[count - 1]->extraOptions = devs[count - 1]->extraOptions =
xf86addNewOption(NULL, xnfstrdup("CorePointer"), NULL); xf86addNewOption(NULL, xnfstrdup("CorePointer"), NULL);
devs[count]->identifier = NULL; devs[count] = NULL;
servlayoutp->inputs = devs; servlayoutp->inputs = devs;
} }
} }
@ -1379,7 +1379,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
*devs[count - 1] = Pointer; *devs[count - 1] = Pointer;
devs[count - 1]->extraOptions = devs[count - 1]->extraOptions =
xf86addNewOption(NULL, xnfstrdup("AlwaysCore"), NULL); xf86addNewOption(NULL, xnfstrdup("AlwaysCore"), NULL);
devs[count]->identifier = NULL; devs[count] = NULL;
servlayoutp->inputs = devs; servlayoutp->inputs = devs;
} }
} }
@ -1475,7 +1475,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
*devs[count - 1] = Keyboard; *devs[count - 1] = Keyboard;
devs[count - 1]->extraOptions = devs[count - 1]->extraOptions =
xf86addNewOption(NULL, xnfstrdup("CoreKeyboard"), NULL); xf86addNewOption(NULL, xnfstrdup("CoreKeyboard"), NULL);
devs[count]->identifier = NULL; devs[count] = NULL;
servlayoutp->inputs = devs; servlayoutp->inputs = devs;
} }
} }