Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a invalid pointer crash bug 

This changes wibox_t::mouse_over to a proper reference. That way one can't
remove that widget from underneath us which would lead to an unprotected lua error.

Signed-off-by: Uli Schlachter <psychon@znc.in>
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Uli Schlachter 2009-11-21 10:54:44 +01:00 committed by Julien Danjou
parent fcee5fb828
commit b0e2bf8b95
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
event.c
View File

@ -358,11 +358,19 @@ event_handle_widget_motionnotify(void *object,
luaA_object_push(globalconf.L, *mouse_over); luaA_object_push(globalconf.L, *mouse_over);
luaA_object_emit_signal(globalconf.L, -1, "mouse::leave", 0); luaA_object_emit_signal(globalconf.L, -1, "mouse::leave", 0);
lua_pop(globalconf.L, 1); lua_pop(globalconf.L, 1);
luaA_object_unref(globalconf.L, *mouse_over);
*mouse_over = NULL;
} }
if(widget) if(widget)
{ {
/* emit mouse::enter signal on new widget and register it */ /* Get a ref on this widget so that it can't be unref'd from
* underneath us (-> invalid pointer dereference). */
luaA_object_push(globalconf.L, widget);
luaA_object_ref(globalconf.L, -1);
*mouse_over = widget; *mouse_over = widget;
/* emit mouse::enter signal on new widget */
luaA_object_push(globalconf.L, widget); luaA_object_push(globalconf.L, widget);
luaA_object_emit_signal(globalconf.L, -1, "mouse::enter", 0); luaA_object_emit_signal(globalconf.L, -1, "mouse::enter", 0);
lua_pop(globalconf.L, 1); lua_pop(globalconf.L, 1);
@ -429,7 +437,7 @@ event_handle_leavenotify(void *data __attribute__ ((unused)),
/* emit mouse::leave signal on widget the mouse was over */ /* emit mouse::leave signal on widget the mouse was over */
luaA_object_emit_signal(globalconf.L, -1, "mouse::leave", 0); luaA_object_emit_signal(globalconf.L, -1, "mouse::leave", 0);
lua_pop(globalconf.L, 1); lua_pop(globalconf.L, 1);
wibox->mouse_over = NULL; wibox_clear_mouse_over(wibox);
} }
luaA_object_push(globalconf.L, wibox); luaA_object_push(globalconf.L, wibox);

19
objects/wibox.c
View File

@ -86,7 +86,7 @@ static void
wibox_need_update(wibox_t *wibox) wibox_need_update(wibox_t *wibox)
{ {
wibox->need_update = true; wibox->need_update = true;
wibox->mouse_over = NULL; wibox_clear_mouse_over(wibox);
} }
static int static int
@ -631,6 +631,19 @@ wibox_refresh(void)
} }
} }
/** Clear the wibox' mouse_over pointer.
* \param wibox The wibox.
*/
void
wibox_clear_mouse_over(wibox_t *wibox)
{
if (wibox->mouse_over)
{
luaA_object_unref(globalconf.L, wibox->mouse_over);
wibox->mouse_over = NULL;
}
}
/** Set a wibox visible or not. /** Set a wibox visible or not.
* \param L The Lua VM state. * \param L The Lua VM state.
* \param udx The wibox. * \param udx The wibox.
@ -643,7 +656,7 @@ wibox_set_visible(lua_State *L, int udx, bool v)
if(v != wibox->visible) if(v != wibox->visible)
{ {
wibox->visible = v; wibox->visible = v;
wibox->mouse_over = NULL; wibox_clear_mouse_over(wibox);
if(wibox->screen) if(wibox->screen)
{ {
@ -686,7 +699,7 @@ wibox_detach(lua_State *L, int udx)
/* restore visibility */ /* restore visibility */
wibox->visible = v; wibox->visible = v;
wibox->mouse_over = NULL; wibox_clear_mouse_over(wibox);
wibox_wipe(wibox); wibox_wipe(wibox);

2
objects/wibox.h
View File

@ -99,5 +99,7 @@ void wibox_class_setup(lua_State *);
lua_class_t wibox_class; lua_class_t wibox_class;
void wibox_clear_mouse_over(wibox_t *);
#endif #endif
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80