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

dont call pipe handler if its deleted 

SVN revision: 56251
This commit is contained in:
Carsten Haitzler 2011-01-21 06:25:36 +00:00
parent 4208f2445b
commit cea2587c3b
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
legacy/ecore/src/lib/ecore/ecore_pipe.c
View File

@ -538,7 +538,8 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
} }
else if (ret == 0) else if (ret == 0)
{ {
p->handler((void *)p->data, NULL, 0); if (!p->delete_me)
p->handler((void *)p->data, NULL, 0);
pipe_close(p->fd_read); pipe_close(p->fd_read);
p->fd_read = PIPE_FD_INVALID; p->fd_read = PIPE_FD_INVALID;
p->fd_handler = NULL; p->fd_handler = NULL;
@ -546,7 +547,8 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }
#ifndef _WIN32 #ifndef _WIN32
else if ((ret == PIPE_FD_ERROR) && ((errno == EINTR) || (errno == EAGAIN))) else if ((ret == PIPE_FD_ERROR) &&
((errno == EINTR) || (errno == EAGAIN)))
{ {
_ecore_pipe_unhandle(p); _ecore_pipe_unhandle(p);
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
@ -564,7 +566,8 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{ {
if (WSAGetLastError() != WSAEWOULDBLOCK) if (WSAGetLastError() != WSAEWOULDBLOCK)
{ {
p->handler((void *)p->data, NULL, 0); if (!p->delete_me)
p->handler((void *)p->data, NULL, 0);
pipe_close(p->fd_read); pipe_close(p->fd_read);
p->fd_read = PIPE_FD_INVALID; p->fd_read = PIPE_FD_INVALID;
p->fd_handler = NULL; p->fd_handler = NULL;
@ -586,7 +589,8 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
/* catch the non error case first */ /* catch the non error case first */
if (ret == (ssize_t)(p->len - p->already_read)) if (ret == (ssize_t)(p->len - p->already_read))
{ {
p->handler((void *)p->data, p->passed_data, p->len); if (!p->delete_me)
p->handler((void *)p->data, p->passed_data, p->len);
free(p->passed_data); free(p->passed_data);
/* reset all values to 0 */ /* reset all values to 0 */
p->passed_data = NULL; p->passed_data = NULL;
@ -601,7 +605,8 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
} }
else if (ret == 0) else if (ret == 0)
{ {
p->handler((void *)p->data, NULL, 0); if (!p->delete_me)
p->handler((void *)p->data, NULL, 0);
pipe_close(p->fd_read); pipe_close(p->fd_read);
p->fd_read = PIPE_FD_INVALID; p->fd_read = PIPE_FD_INVALID;
p->fd_handler = NULL; p->fd_handler = NULL;
@ -609,10 +614,9 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }
#ifndef _WIN32 #ifndef _WIN32
else if (ret == PIPE_FD_ERROR && (errno == EINTR || errno == EAGAIN)) else if ((ret == PIPE_FD_ERROR) &&
{ ((errno == EINTR) || (errno == EAGAIN)))
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
}
else else
{ {
ERR("An unhandled error (ret: %zd errno: %d)" ERR("An unhandled error (ret: %zd errno: %d)"
@ -626,7 +630,8 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{ {
if (WSAGetLastError() != WSAEWOULDBLOCK) if (WSAGetLastError() != WSAEWOULDBLOCK)
{ {
p->handler((void *)p->data, NULL, 0); if (!p->delete_me)
p->handler((void *)p->data, NULL, 0);
pipe_close(p->fd_read); pipe_close(p->fd_read);
p->fd_read = PIPE_FD_INVALID; p->fd_read = PIPE_FD_INVALID;
p->fd_handler = NULL; p->fd_handler = NULL;