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

dix: reset MD's devPrivate classes to NULL before device initialisation.

Browse Source 
XkbInitKeyboardDefviceStruct may call FatalError if it fails. FatalError then
cleans up all the devices, resulting in a segfault if the pointer is
uninitialised.
This commit is contained in:
Peter Hutterer 2007-11-16 17:23:09 +10:30
parent be3321c2e9
commit 12dd6e9911
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/devices.c
View File

@ -396,6 +396,8 @@ CoreKeyboardProc(DeviceIntPtr pDev, int what)
if (!AllocateDevicePrivate(pDev, MasterDevClassesPrivIdx) ||
!(classes = xcalloc(1, sizeof(ClassesRec))))
pDev->devPrivates[MasterDevClassesPrivIdx].ptr = NULL;
keySyms.minKeyCode = 8;
keySyms.maxKeyCode = 255;
keySyms.mapWidth = 4;
@ -495,6 +497,8 @@ CorePointerProc(DeviceIntPtr pDev, int what)
!(classes = xcalloc(1, sizeof(ClassesRec))))
return BadAlloc;
pDev->devPrivates[MasterDevClassesPrivIdx].ptr = NULL;
for (i = 1; i <= 32; i++)
map[i] = i;
InitPointerDeviceStruct((DevicePtr)pDev, map, 32,