diff options
| author | Bryce Harrington <bryce@canonical.com> | 2011-02-16 16:55:57 -0800 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-04-07 08:36:58 +1000 |
| commit | ff066dc75b6b8eb3f957d00f57011197a588cec6 (patch) | |
| tree | 0de0e447afa01163767aa1542afbffcd796b3c3b | |
| parent | 1a2fab98104468b5f17d54c206213af5b0226bfd (diff) | |
Check for OOM condition in XISendDeviceHierarchyEvent
When system is out of memory, calloc can fail returning a NULL pointer.
Check for this before dereferencing it, and bail out if it fails.
Ref.: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/720445
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 649269d40667cfb387cb5286dd3519dd68f7dd80)
| -rw-r--r-- | Xi/xichangehierarchy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index b9cdedf77..21c74ed7a 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -70,6 +70,8 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES]) ev = calloc(1, sizeof(xXIHierarchyEvent) + MAXDEVICES * sizeof(xXIHierarchyInfo)); + if (!ev) + return; ev->type = GenericEvent; ev->extension = IReqCode; ev->evtype = XI_HierarchyChanged; |