The-Homebrew-Cloud/Ryujinx-SDL
2
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-09-22 15:08:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unix: Don't send quit events during signal handler.

Browse Source 
Make note to send it, and send next time we SDL_PumpEvents().

Otherwise, we might be trying to use malloc() to push a new event on the
queue while a signal is interrupting malloc() elsewhere, usually causing a
crash.

Fixes Bugzilla #2870.
This commit is contained in:
Ryan C. Gordon 2015-06-08 01:52:43 -04:00
parent 8283abdb78
commit 7232e51a68
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/events/SDL_events.c
View File

@ -406,6 +406,8 @@ SDL_PumpEvents(void)
SDL_JoystickUpdate();
}
#endif
SDL_SendPendingQuit(); /* in case we had a signal handler fire, etc. */
}
/* Public functions */

2
src/events/SDL_events_c.h
View File

@ -43,6 +43,8 @@ extern int SDL_QuitInit(void);
extern int SDL_SendQuit(void);
extern void SDL_QuitQuit(void);
extern void SDL_SendPendingQuit(void);
/* The event filter function */
extern SDL_EventFilter SDL_EventOK;
extern void *SDL_EventOKParam;

18
src/events/SDL_quit.c
View File

@ -20,6 +20,7 @@
*/
#include "../SDL_internal.h"
#include "SDL_hints.h"
#include "SDL_assert.h"
/* General quit handling code for SDL */
@ -30,8 +31,8 @@
#include "SDL_events.h"
#include "SDL_events_c.h"
static SDL_bool disable_signals = SDL_FALSE;
static SDL_bool send_quit_pending = SDL_FALSE;
#ifdef HAVE_SIGNAL_H
static void
@ -40,8 +41,9 @@ SDL_HandleSIG(int sig)
/* Reset the signal handler */
signal(sig, SDL_HandleSIG);
/* Signal a quit interrupt */
SDL_SendQuit();
/* Send a quit event next time the event loop pumps. */
/* We can't send it in signal handler; malloc() might be interrupted! */
send_quit_pending = SDL_TRUE;
}
#endif /* HAVE_SIGNAL_H */
@ -136,7 +138,17 @@ SDL_QuitQuit(void)
int
SDL_SendQuit(void)
{
send_quit_pending = SDL_FALSE;
return SDL_SendAppEvent(SDL_QUIT);
}
void
SDL_SendPendingQuit(void)
{
if (send_quit_pending) {
SDL_SendQuit();
SDL_assert(!send_quit_pending);
}
}
/* vi: set ts=4 sw=4 expandtab: */