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

patch from vtorri fixing rare segv condition in main loop 

SVN revision: 75206
This commit is contained in:
Mike Blumenkrantz 2012-08-13 10:32:20 +00:00
parent fe00bc661a
commit dc2f7beced
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/ecore/ChangeLog
View File

@ -858,3 +858,6 @@
* Fix ecore fork reset function to allow for callbacks to be * Fix ecore fork reset function to allow for callbacks to be
attached so ecore-evas can reset evas async fd on fork. attached so ecore-evas can reset evas async fd on fork.
2012-08-13 Vincent Torri
* Fix segmentation fault when fd_set pointers are NULL on Windows

1
legacy/ecore/NEWS
View File

@ -29,6 +29,7 @@ Fixes:
- Force cancel of all running Ecore_Thread on shutdown. - Force cancel of all running Ecore_Thread on shutdown.
- Make Ecore_Thread work reliably when called without a running main loop. - Make Ecore_Thread work reliably when called without a running main loop.
- Correctly shutdown Ecore_Thread. - Correctly shutdown Ecore_Thread.
- Fix usage of FD_SET and al. when fd_set pointers are NULL (Windows)
* ecore_x * ecore_x
- Fix unitialized Ecore_X_Atom use. - Fix unitialized Ecore_X_Atom use.

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

@ -1941,12 +1941,21 @@ _ecore_main_win32_select(int nfds __UNUSED__,
long network_event; long network_event;
network_event = 0; network_event = 0;
if (FD_ISSET(fdh->fd, readfds)) if (readfds)
network_event |= FD_READ; {
if (FD_ISSET(fdh->fd, writefds)) if (FD_ISSET(fdh->fd, readfds))
network_event |= FD_WRITE; network_event |= FD_READ;
if (FD_ISSET(fdh->fd, exceptfds)) }
network_event |= FD_OOB; if (writefds)
{
if (FD_ISSET(fdh->fd, writefds))
network_event |= FD_WRITE;
}
if (exceptfds)
{
if (FD_ISSET(fdh->fd, exceptfds))
network_event |= FD_OOB;
}
if (network_event) if (network_event)
{ {
@ -1986,9 +1995,12 @@ _ecore_main_win32_select(int nfds __UNUSED__,
result = MsgWaitForMultipleObjects(objects_nbr, (const HANDLE *)objects, EINA_FALSE, result = MsgWaitForMultipleObjects(objects_nbr, (const HANDLE *)objects, EINA_FALSE,
timeout, QS_ALLINPUT); timeout, QS_ALLINPUT);
FD_ZERO(readfds); if (readfds)
FD_ZERO(writefds); FD_ZERO(readfds);
FD_ZERO(exceptfds); if (writefds)
FD_ZERO(writefds);
if (exceptfds)
FD_ZERO(exceptfds);
/* The result tells us the type of event we have. */ /* The result tells us the type of event we have. */
if (result == WAIT_FAILED) if (result == WAIT_FAILED)
@ -2021,11 +2033,11 @@ _ecore_main_win32_select(int nfds __UNUSED__,
WSAEnumNetworkEvents(sockets[result], objects[result], &network_event); WSAEnumNetworkEvents(sockets[result], objects[result], &network_event);
if (network_event.lNetworkEvents & FD_READ) if ((network_event.lNetworkEvents & FD_READ) && readfds)
FD_SET(sockets[result], readfds); FD_SET(sockets[result], readfds);
if (network_event.lNetworkEvents & FD_WRITE) if ((network_event.lNetworkEvents & FD_WRITE) && writefds)
FD_SET(sockets[result], writefds); FD_SET(sockets[result], writefds);
if (network_event.lNetworkEvents & FD_OOB) if ((network_event.lNetworkEvents & FD_OOB) && exceptfds)
FD_SET(sockets[result], exceptfds); FD_SET(sockets[result], exceptfds);
res = 1; res = 1;