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

dix: protect from allocation failure 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-02-24 13:51:40 +01:00 committed by Enrico Weigelt, metux IT consult .
parent 6dac1cd970
commit f909106adb
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dix/devices.c
View File

@ -285,6 +285,10 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab; dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab; dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
dev->deviceGrab.sync.event = calloc(1, sizeof(InternalEvent)); dev->deviceGrab.sync.event = calloc(1, sizeof(InternalEvent));
if (!(dev->deviceGrab.sync.event)) {
free(dev);
return NULL;
}
dev->sendEventsProc = XTestDeviceSendEvents; dev->sendEventsProc = XTestDeviceSendEvents;
@ -1704,6 +1708,8 @@ InitTouchClassDeviceStruct(DeviceIntPtr device, unsigned int max_touches,
device->touch = touch; device->touch = touch;
device->last.touches = calloc(max_touches, sizeof(*device->last.touches)); device->last.touches = calloc(max_touches, sizeof(*device->last.touches));
if (!(device->last.touches))
goto err;
device->last.num_touches = touch->num_touches; device->last.num_touches = touch->num_touches;
for (i = 0; i < touch->num_touches; i++) for (i = 0; i < touch->num_touches; i++)
TouchInitDDXTouchPoint(device, &device->last.touches[i]); TouchInitDDXTouchPoint(device, &device->last.touches[i]);
@ -2800,8 +2806,8 @@ AllocDevicePair(ClientPtr client, const char *name,
DeviceIntPtr *keybd, DeviceIntPtr *keybd,
DeviceProc ptr_proc, DeviceProc keybd_proc, Bool master) DeviceProc ptr_proc, DeviceProc keybd_proc, Bool master)
{ {
DeviceIntPtr pointer; DeviceIntPtr pointer = NULL;
DeviceIntPtr keyboard; DeviceIntPtr keyboard = NULL;
char *dev_name; char *dev_name;
*ptr = *keybd = NULL; *ptr = *keybd = NULL;
@ -2809,15 +2815,12 @@ AllocDevicePair(ClientPtr client, const char *name,
XkbInitPrivates(); XkbInitPrivates();
pointer = AddInputDevice(client, ptr_proc, TRUE); pointer = AddInputDevice(client, ptr_proc, TRUE);
if (!pointer) if (!pointer)
return BadAlloc; goto badalloc;
if (asprintf(&dev_name, "%s pointer", name) == -1) { if (asprintf(&dev_name, "%s pointer", name) == -1)
RemoveDevice(pointer, FALSE); goto badalloc;
return BadAlloc;
}
pointer->name = dev_name; pointer->name = dev_name;
pointer->public.processInputProc = ProcessOtherEvent; pointer->public.processInputProc = ProcessOtherEvent;
@ -2833,18 +2836,12 @@ AllocDevicePair(ClientPtr client, const char *name,
pointer->type = (master) ? MASTER_POINTER : SLAVE; pointer->type = (master) ? MASTER_POINTER : SLAVE;
keyboard = AddInputDevice(client, keybd_proc, TRUE); keyboard = AddInputDevice(client, keybd_proc, TRUE);
if (!keyboard) { if (!keyboard)
RemoveDevice(pointer, FALSE); goto badalloc;
return BadAlloc; if (asprintf(&dev_name, "%s keyboard", name) == -1)
} goto badalloc;
if (asprintf(&dev_name, "%s keyboard", name) == -1) {
RemoveDevice(keyboard, FALSE);
RemoveDevice(pointer, FALSE);
return BadAlloc;
}
keyboard->name = dev_name; keyboard->name = dev_name;
keyboard->public.processInputProc = ProcessOtherEvent; keyboard->public.processInputProc = ProcessOtherEvent;
@ -2863,6 +2860,8 @@ AllocDevicePair(ClientPtr client, const char *name,
if (IsMaster(pointer)) { if (IsMaster(pointer)) {
pointer->unused_classes = calloc(1, sizeof(ClassesRec)); pointer->unused_classes = calloc(1, sizeof(ClassesRec));
keyboard->unused_classes = calloc(1, sizeof(ClassesRec)); keyboard->unused_classes = calloc(1, sizeof(ClassesRec));
if (!pointer->unused_classes || !keyboard->unused_classes)
goto badalloc;
} }
*ptr = pointer; *ptr = pointer;
@ -2870,6 +2869,12 @@ AllocDevicePair(ClientPtr client, const char *name,
*keybd = keyboard; *keybd = keyboard;
return Success; return Success;
badalloc:
// safe to call them even with NULL pointer
RemoveDevice(keyboard, FALSE);
RemoveDevice(pointer, FALSE);
return BadAlloc;
} }
/** /**