enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

fix super hard to reproduce race condition with ecore-con clients 

SVN revision: 76223
This commit is contained in:
Mike Blumenkrantz 2012-09-06 07:34:00 +00:00
parent 3fe669e66d
commit bf8f20a3f6
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/ecore/ChangeLog
View File

@ -909,3 +909,7 @@
2012-09-05 Mike Blumenkrantz
* Fix crash that could occur in ecore_con_ssl with privkeys and certificates on failure
2012-09-06 Mike Blumenkrantz
* Fix race condition in ecore-con where events could sometimes be sent for freed clients

23
legacy/ecore/src/lib/ecore_con/ecore_con.c
View File

@ -1882,6 +1882,15 @@ _ecore_con_svr_tcp_handler(void *data,
error:
if (cl->fd_handler) ecore_main_fd_handler_del(cl->fd_handler);
if (cl->fd >= 0) close(cl->fd);
{
Ecore_Event *ev;
EINA_LIST_FREE(cl->event_count, ev)
{
svr->event_count = eina_list_remove(svr->event_count, ev);
ecore_event_del(ev);
}
}
free(cl);
if (clerr || errno) ecore_con_event_server_error(svr, clerr ?: strerror(errno));
return ECORE_CALLBACK_RENEW;
@ -2545,15 +2554,15 @@ _ecore_con_event_client_error_free(Ecore_Con_Server *svr, Ecore_Con_Event_Client
{
if (e->client)
{
e->client->host_server->event_count = eina_list_remove(e->client->host_server->event_count, e);
if ((!e->client->event_count) && (e->client->delete_me))
_ecore_con_client_free(e->client);
if (e->client->host_server)
if (eina_list_data_find(svr->clients, e->client))
{
e->client->host_server->event_count = eina_list_remove(e->client->host_server->event_count, e);
if ((!svr->event_count) && (svr->delete_me))
_ecore_con_server_free(svr);
e->client->event_count = eina_list_remove(e->client->event_count, e);
if ((!e->client->event_count) && (e->client->delete_me))
_ecore_con_client_free(e->client);
}
svr->event_count = eina_list_remove(svr->event_count, e);
if ((!svr->event_count) && (svr->delete_me))
_ecore_con_server_free(svr);
}
free(e->error);
ecore_con_event_client_error_free(e);