Unix: Don't send quit events during signal handler.
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.main
parent
8283abdb78
commit
7232e51a68
|
@ -406,6 +406,8 @@ SDL_PumpEvents(void)
|
||||||
SDL_JoystickUpdate();
|
SDL_JoystickUpdate();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
SDL_SendPendingQuit(); /* in case we had a signal handler fire, etc. */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Public functions */
|
/* Public functions */
|
||||||
|
|
|
@ -43,6 +43,8 @@ extern int SDL_QuitInit(void);
|
||||||
extern int SDL_SendQuit(void);
|
extern int SDL_SendQuit(void);
|
||||||
extern void SDL_QuitQuit(void);
|
extern void SDL_QuitQuit(void);
|
||||||
|
|
||||||
|
extern void SDL_SendPendingQuit(void);
|
||||||
|
|
||||||
/* The event filter function */
|
/* The event filter function */
|
||||||
extern SDL_EventFilter SDL_EventOK;
|
extern SDL_EventFilter SDL_EventOK;
|
||||||
extern void *SDL_EventOKParam;
|
extern void *SDL_EventOKParam;
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
*/
|
*/
|
||||||
#include "../SDL_internal.h"
|
#include "../SDL_internal.h"
|
||||||
#include "SDL_hints.h"
|
#include "SDL_hints.h"
|
||||||
|
#include "SDL_assert.h"
|
||||||
|
|
||||||
/* General quit handling code for SDL */
|
/* General quit handling code for SDL */
|
||||||
|
|
||||||
|
@ -30,8 +31,8 @@
|
||||||
#include "SDL_events.h"
|
#include "SDL_events.h"
|
||||||
#include "SDL_events_c.h"
|
#include "SDL_events_c.h"
|
||||||
|
|
||||||
|
|
||||||
static SDL_bool disable_signals = SDL_FALSE;
|
static SDL_bool disable_signals = SDL_FALSE;
|
||||||
|
static SDL_bool send_quit_pending = SDL_FALSE;
|
||||||
|
|
||||||
#ifdef HAVE_SIGNAL_H
|
#ifdef HAVE_SIGNAL_H
|
||||||
static void
|
static void
|
||||||
|
@ -40,8 +41,9 @@ SDL_HandleSIG(int sig)
|
||||||
/* Reset the signal handler */
|
/* Reset the signal handler */
|
||||||
signal(sig, SDL_HandleSIG);
|
signal(sig, SDL_HandleSIG);
|
||||||
|
|
||||||
/* Signal a quit interrupt */
|
/* Send a quit event next time the event loop pumps. */
|
||||||
SDL_SendQuit();
|
/* We can't send it in signal handler; malloc() might be interrupted! */
|
||||||
|
send_quit_pending = SDL_TRUE;
|
||||||
}
|
}
|
||||||
#endif /* HAVE_SIGNAL_H */
|
#endif /* HAVE_SIGNAL_H */
|
||||||
|
|
||||||
|
@ -136,7 +138,17 @@ SDL_QuitQuit(void)
|
||||||
int
|
int
|
||||||
SDL_SendQuit(void)
|
SDL_SendQuit(void)
|
||||||
{
|
{
|
||||||
|
send_quit_pending = SDL_FALSE;
|
||||||
return SDL_SendAppEvent(SDL_QUIT);
|
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: */
|
/* vi: set ts=4 sw=4 expandtab: */
|
||||||
|
|
Loading…
Reference in New Issue