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

GrabDevice() needs to handle NULL return value from AllocGrab() 

GrabDevice() calls AllocGrab() which can fail and return NULL.
This return value is not checked, and can cause NULL pointer dereferences.

Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Alan Coopersmith 2014-01-06 17:10:39 -08:00 committed by Peter Hutterer
parent 3a113815a0
commit 5493a67ec2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/events.c
View File

@ -5051,7 +5051,7 @@ ProcUngrabPointer(ClientPtr client)
* @param other_mode GrabModeSync or GrabModeAsync * @param other_mode GrabModeSync or GrabModeAsync
* @param status Return code to be returned to the caller. * @param status Return code to be returned to the caller.
* *
* @returns Success or BadValue. * @returns Success or BadValue or BadAlloc.
*/ */
int int
GrabDevice(ClientPtr client, DeviceIntPtr dev, GrabDevice(ClientPtr client, DeviceIntPtr dev,
@ -5132,6 +5132,8 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev,
GrabPtr tempGrab; GrabPtr tempGrab;
tempGrab = AllocGrab(NULL); tempGrab = AllocGrab(NULL);
if (tempGrab == NULL)
return BadAlloc;
tempGrab->next = NULL; tempGrab->next = NULL;
tempGrab->window = pWin; tempGrab->window = pWin;