diff options
author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-11-25 20:23:50 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2008-12-12 11:43:32 +1000 |
commit | aeff14d5f208d02f211b8b2a1a98999624e8c2cf (patch) | |
tree | 1b62a70400d9c02e6db74c4d6d9fb6eba053f895 /dix | |
parent | fb2a8d0e59a3d187255538f6add22ec67551507a (diff) |
dix: don't alloc in ChangeMasterDeviceClasses.
We mustn't realloc as we are inside a signal handler. With
SetMinimumEventSize, this code should never be hit anyway, as the event list
should have the required memory before this code is hit.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Diffstat (limited to 'dix')
-rw-r--r-- | dix/getevents.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 2c47849be..755b494c6 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -119,25 +119,6 @@ CreateClassesChangedEvent(EventList* event, deviceClassesChangedEvent *dcce; int len = sizeof(xEvent); CARD32 ms = GetTimeInMillis(); - int namelen = 0; /* dummy */ - - /* XXX: ok, this is a bit weird. We need to alloc enough size for the - * event so it can be filled in in POE lateron. Reason being that if - * we realloc the event in POE we can get SIGABRT when we try to free - * or realloc the original pointer. - * We can only do it here as we don't have the EventList in the event - * processing any more. - */ - SizeDeviceInfo(slave, &namelen, &len); - - if (event->evlen < len) - { - event->event = realloc(event->event, len); - if (!event->event) - FatalError("[dix] Cannot allocate memory for " - "DeviceClassesChangedEvent.\n"); - event->evlen = len; - } dcce = (deviceClassesChangedEvent*)event->event; dcce->type = GenericEvent; |