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

to fix the bug that morlenxus found, I have crashed my own computer. 

this commit fixes a rare case where a fdh can be in the delete list twice, causing a double free


SVN revision: 54702
This commit is contained in:
Mike Blumenkrantz 2010-11-18 19:56:26 +00:00
parent 12c4b5b595
commit ceec64fa76
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
legacy/ecore/src/lib/ecore/ecore_main.c
View File

@ -807,6 +807,10 @@ ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler)
"ecore_main_fd_handler_del");
return NULL;
}
if (fd_handler->delete_me)
/* FIXME: should this return NULL instead? */
return fd_handler->data;
fd_handler->delete_me = 1;
_ecore_main_fdh_poll_del(fd_handler);
fd_handlers_to_delete = eina_list_append(fd_handlers_to_delete, fd_handler);
@ -1138,8 +1142,11 @@ _ecore_main_fd_handlers_bads_rem(void)
if (!fdh->func(fdh->data, fdh))
{
ERR("Fd function err returned 0, remove it");
fdh->delete_me = 1;
fd_handlers_to_delete = eina_list_append(fd_handlers_to_delete, fdh);
if (!fdh->delete_me)
{
fdh->delete_me = 1;
fd_handlers_to_delete = eina_list_append(fd_handlers_to_delete, fdh);
}
found++;
}
fdh->references--;
@ -1147,8 +1154,12 @@ _ecore_main_fd_handlers_bads_rem(void)
else
{
ERR("Problematic fd found at %d! setting it for delete", fdh->fd);
fdh->delete_me = 1;
fd_handlers_to_delete = eina_list_append(fd_handlers_to_delete, fdh);
if (!fdh->delete_me)
{
fdh->delete_me = 1;
fd_handlers_to_delete = eina_list_append(fd_handlers_to_delete, fdh);
}
found++;
}
}
@ -1249,8 +1260,12 @@ _ecore_main_fd_handlers_call(void)
fdh->references++;
if (!fdh->func(fdh->data, fdh))
{
fdh->delete_me = 1;
fd_handlers_to_delete = eina_list_append(fd_handlers_to_delete, fdh);
if (!fdh->delete_me)
{
fdh->delete_me = 1;
fd_handlers_to_delete = eina_list_append(fd_handlers_to_delete, fdh);
}
}
fdh->references--;