diff options
author | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
commit | 3fce787ffe938bb3e959ff0b3ec231e54d086c76 (patch) | |
tree | 198f537b43a34301bf781c67193c572f6743f925 /xorg-server/mi | |
parent | 236c69d6034b152598ce35abaf3559b0eaa89c12 (diff) | |
parent | 578938f1cdd5a06dd6fa28167d575ec980322a5d (diff) | |
download | vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.gz vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.bz2 vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/mi')
-rw-r--r-- | xorg-server/mi/mieq.c | 7 | ||||
-rw-r--r-- | xorg-server/mi/miwindow.c | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/xorg-server/mi/mieq.c b/xorg-server/mi/mieq.c index 9b6d0c901..2d5f23ea6 100644 --- a/xorg-server/mi/mieq.c +++ b/xorg-server/mi/mieq.c @@ -439,10 +439,13 @@ mieqProcessInputEvents(void) evlen = e->events->evlen; if(evlen > event_size) + { + event_size=evlen; event = xrealloc(event, evlen); + if (!event) + FatalError("[mi] No memory left for event processing.\n"); + } - if (!event) - FatalError("[mi] No memory left for event processing.\n"); memcpy(event, e->events->event, evlen); diff --git a/xorg-server/mi/miwindow.c b/xorg-server/mi/miwindow.c index 31c028482..c2333938e 100644 --- a/xorg-server/mi/miwindow.c +++ b/xorg-server/mi/miwindow.c @@ -1,3 +1,4 @@ + /*********************************************************** Copyright 1987, 1998 The Open Group |