enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

connman agent msg handling - be more clean to try avoid possible seg 

As this was reported with no reproduction method - like a "one off" I
can't be sure this is it and fixes it, but looking for agent->msg and
it becoming a wild crazy pointer. So either it was left there from
long ago and has since been forgotten bhy asan and is thus wild, or ..
memory was scribbled over with junk. in the latter case... who knows.
in the former, this may fix that.

@fix
This commit is contained in:
Carsten Haitzler 2020-12-17 10:16:55 +00:00
parent 0f738dad29
commit 32c37d084c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,7 @@ _dialog_del_cb(void *data)
// FIXME need to mark cs->pending_connect = NULL;
eldbus_message_unref(agent->msg);
agent->msg = NULL;
agent->dialog = NULL;
}
@ -396,10 +397,13 @@ _agent_request_input(const Eldbus_Service_Interface *iface,
/* Discard previous requests */
// if msg is the current agent msg? eek.
if (agent->msg == msg) return NULL;
if (agent->msg == msg)
{
ERR("agent->msg == msg -> this should not be happening?");
return NULL;
}
if (agent->msg)
eldbus_message_unref(agent->msg);
if (agent->msg) eldbus_message_unref(agent->msg);
agent->msg = eldbus_message_ref((Eldbus_Message *)msg);
EINA_LIST_FOREACH(ctxt->instances, l, inst)
@ -526,6 +530,9 @@ void
econnman_agent_del(E_Connman_Agent *agent)
{
EINA_SAFETY_ON_NULL_RETURN(agent);
if (agent->msg) eldbus_message_unref(agent->msg);
agent->msg = NULL;
eldbus_service_object_unregister(agent->iface);
agent->iface = NULL;
free(agent);
}