diff options
| author | Pauli Nieminen <ext-pauli.nieminen@nokia.com> | 2010-07-26 15:31:03 +0300 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-09-27 09:41:07 +0200 |
| commit | 0062d94cafcea5a2fea6224904188d1435c1983f (patch) | |
| tree | 74072d6b928240e79c6f1d1570fc9ae5ecff14d3 | |
| parent | eecf91150d4c17fe73913fd6c24064c0394fb40e (diff) | |
xkb: Check if AddResource failed
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit b5c9953bbf4ffd11f1a70d058c6d3feb2bd1bca8)
| -rw-r--r-- | xkb/xkb.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -224,7 +224,8 @@ ProcXkbSelectEvents(ClientPtr client) masks = XkbFindClientResource((DevicePtr)dev,client); if (!masks){ XID id = FakeClientID(client->index); - AddResource(id,RT_XKBCLIENT,dev); + if (!AddResource(id,RT_XKBCLIENT,dev)) + return BadAlloc; masks= XkbAddClientResource((DevicePtr)dev,client,id); } if (masks) { @@ -5378,7 +5379,8 @@ ProcXkbPerClientFlags(ClientPtr client) } else if (want && (!interest)) { XID id = FakeClientID(client->index); - AddResource(id,RT_XKBCLIENT,dev); + if (!AddResource(id,RT_XKBCLIENT,dev)) + return BadAlloc; interest= XkbAddClientResource((DevicePtr)dev,client,id); if (!interest) return BadAlloc; |