diff options
| -rw-r--r-- | dix/devices.c | 3 | ||||
| -rw-r--r-- | mi/midispcur.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/dix/devices.c b/dix/devices.c index ab8c3f9db..cf23bc6d0 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -463,7 +463,8 @@ ActivateDevice(DeviceIntPtr dev, BOOL sendevent) /* Initialize memory for sprites. */ if (IsMaster(dev) && dev->spriteInfo->spriteOwner) - pScreen->DeviceCursorInitialize(dev, pScreen); + if (!pScreen->DeviceCursorInitialize(dev, pScreen)) + ret = BadAlloc; SendDevicePresenceEvent(dev->id, DeviceAdded); if (sendevent) diff --git a/mi/midispcur.c b/mi/midispcur.c index 61e313305..16495e45f 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -742,7 +742,7 @@ miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) { pScreen = screenInfo.screens[i]; - pBuffer = malloc(sizeof(miDCBufferRec)); + pBuffer = calloc(1, sizeof(miDCBufferRec)); if (!pBuffer) goto failure; |