enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

e/connman: avoid double free on dialog delete 

SVN revision: 76577
This commit is contained in:
Bruno Dilly 2012-09-13 06:24:49 +00:00
parent c2bbda53ee
commit e89801c6ec
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/connman/agent.c
View File

@ -39,14 +39,6 @@ struct _E_Connman_Agent
Eina_Bool canceled:1; Eina_Bool canceled:1;
}; };
void
_dialog_del(E_Dialog *dialog)
{
EINA_SAFETY_ON_NULL_RETURN(dialog);
e_object_del(E_OBJECT(dialog));
free(dialog);
}
static void static void
_dict_append_basic(DBusMessageIter *dict, const char *key, void *val) _dict_append_basic(DBusMessageIter *dict, const char *key, void *val)
{ {
@ -288,7 +280,7 @@ _agent_release(E_DBus_Object *obj, DBusMessage *msg)
if (agent->dialog) if (agent->dialog)
{ {
_dialog_del(agent->dialog); e_object_del(E_OBJECT(agent->dialog));
agent->dialog = NULL; agent->dialog = NULL;
} }
@ -407,7 +399,7 @@ _agent_request_input(E_DBus_Object *obj, DBusMessage *msg)
econnman_popup_del(inst); econnman_popup_del(inst);
if (agent->dialog) if (agent->dialog)
_dialog_del(agent->dialog); e_object_del(E_OBJECT(agent->dialog));
agent->dialog = _dialog_new(agent); agent->dialog = _dialog_new(agent);
EINA_SAFETY_ON_NULL_GOTO(agent->dialog, err); EINA_SAFETY_ON_NULL_GOTO(agent->dialog, err);
@ -476,7 +468,7 @@ _agent_cancel(E_DBus_Object *obj, DBusMessage *msg)
if (agent->dialog) if (agent->dialog)
{ {
_dialog_del(agent->dialog); e_object_del(E_OBJECT(agent->dialog));
agent->dialog = NULL; agent->dialog = NULL;
} }