From 756ea6693f0093bbdd4a4a2f536c7591ce8132de Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 14 Jan 2008 13:59:27 +0000 Subject: [PATCH] 2008-01-14 Tommi Komulainen reviewed by: Emmanuele Bassi * clutter/osx/clutter-event-osx.c (_clutter_event_osx_put): Initialize ClutterEvent structure with zeroes (#672) The 'source' member was uninitialized and being referenced in clutter_do_event leading to crash. --- ChangeLog | 10 ++++++++++ clutter/osx/clutter-event-osx.c | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67e1bd180..4091d2009 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-01-14 Tommi Komulainen + + reviewed by: Emmanuele Bassi + + * clutter/osx/clutter-event-osx.c (_clutter_event_osx_put): + Initialize ClutterEvent structure with zeroes (#672) + + The 'source' member was uninitialized and being referenced in + clutter_do_event leading to crash. + 2008-01-14 Emmanuele Bassi * tests/test-scale.c: Improve test case for scaling (#684, diff --git a/clutter/osx/clutter-event-osx.c b/clutter/osx/clutter-event-osx.c index 07b6248ee..ec08e48d0 100644 --- a/clutter/osx/clutter-event-osx.c +++ b/clutter/osx/clutter-event-osx.c @@ -231,9 +231,8 @@ clutter_event_osx_translate (NSEvent *nsevent, ClutterEvent *event) void _clutter_event_osx_put (NSEvent *nsevent) { - ClutterEvent event; - event.type = CLUTTER_NOTHING; - + ClutterEvent event = { 0, }; + if (clutter_event_osx_translate (nsevent, &event)) { g_assert (event.type != CLUTTER_NOTHING);