diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2005-11-28 17:34:23 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2005-11-28 17:34:23 (GMT) |
| commit | b45b315855f5523d2aa5c3ad685c2c9530d42229 (patch) | |
| tree | 6af726e7f3dbff8523ac64a0bead87e427fb59f5 | |
| parent | 3a9a3e7864a6c04f2dce5522dfa7af434a97f9a8 (diff) | |
| download | cpython-b45b315855f5523d2aa5c3ad685c2c9530d42229.zip cpython-b45b315855f5523d2aa5c3ad685c2c9530d42229.tar.gz cpython-b45b315855f5523d2aa5c3ad685c2c9530d42229.tar.bz2 | |
Patch #1350409: Port signal handling to VS 2005.
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Python/pythonrun.c | 17 |
3 files changed, 20 insertions, 0 deletions
@@ -113,6 +113,7 @@ David Chaum Nicolas Chauvat Michael Chermside Albert Chin-A-Young +Adal Chiriliuc Tom Christiansen Vadim Chugunov David Cinege @@ -12,6 +12,8 @@ What's New in Python 2.5 alpha 1? Core and builtins ----------------- +- Patch #1350409: Work around signal handling bug in Visual Studio 2005. + - Bug #1281408: Py_BuildValue now works correct even with unsigned longs and long longs. diff --git a/Python/pythonrun.c b/Python/pythonrun.c index ad837d2..0b14f8b 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1615,6 +1615,23 @@ PyOS_getsig(int sig) return context.sa_handler; #else PyOS_sighandler_t handler; +/* Special signal handling for the secure CRT in Visual Studio 2005 */ +#if defined(_MSC_VER) && _MSC_VER >= 1400 + switch (sig) { + /* Only these signals are valid */ + case SIGINT: + case SIGILL: + case SIGFPE: + case SIGSEGV: + case SIGTERM: + case SIGBREAK: + case SIGABRT: + break; + /* Don't call signal() with other values or it will assert */ + default: + return SIG_ERR; + } +#endif /* _MSC_VER && _MSC_VER >= 1400 */ handler = signal(sig, SIG_IGN); if (handler != SIG_ERR) signal(sig, handler); |