kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eldbus - better fix for dbus_conn becoming null in dispatch

This commit is contained in:
Carsten Haitzler 2013-07-04 10:56:43 +09:00
parent bdd57af113
commit bf482c7742
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/eldbus/eldbus_core.c
View File

@ -756,6 +756,7 @@ static Eina_Bool
eldbus_idler(void *data) eldbus_idler(void *data)
{ {
Eldbus_Connection *conn = data; Eldbus_Connection *conn = data;
DBusConnection *dbus_conn;
DBG("Connection@%p: Dispatch status: %d", conn, DBG("Connection@%p: Dispatch status: %d", conn,
dbus_connection_get_dispatch_status(conn->dbus_conn)); dbus_connection_get_dispatch_status(conn->dbus_conn));
@ -768,12 +769,13 @@ eldbus_idler(void *data)
conn->idler = NULL; conn->idler = NULL;
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }
// make local copy of dbus_conn because something in dispatch can set
dbus_connection_ref(conn->dbus_conn); // conn->dbus_conn to NULL, thus losing our handle
dbus_conn = conn->dbus_conn;
dbus_connection_ref(dbus_conn);
DBG("Connection@%p: Dispatching", conn); DBG("Connection@%p: Dispatching", conn);
dbus_connection_dispatch(conn->dbus_conn); dbus_connection_dispatch(dbus_conn);
// add the if check as dispact may set conn->dbus_conn to NULL in a cb dbus_connection_unref(dbus_conn);
if (conn->dbus_conn) dbus_connection_unref(conn->dbus_conn);
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
} }