diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/exceptions.cc | 15 |
2 files changed, 19 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index f57047251..ced39b515 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2014-04-09 Corinna Vinschen <corinna@vinschen.de> + + * exceptions.cc (exception::myfault_handle): Only handle the minimum + amount of exceptions the myfault handler was designed for. + 2014-04-08 Corinna Vinschen <corinna@vinschen.de> * cygwin.sc.in: (Temporarily?) workaround serious ld bug which diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index 120d71b0e..62a30d5de 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -555,7 +555,20 @@ exception::myfault_handle (LPEXCEPTION_POINTERS ep) _cygtls& me = _my_tls; if (me.andreas) - me.andreas->leave (); /* Return from a "san" caught fault */ + { + /* Only handle the minimum amount of exceptions the myfault handler + was designed for. */ + switch (ep->ExceptionRecord->ExceptionCode) + { + case STATUS_ACCESS_VIOLATION: + case STATUS_DATATYPE_MISALIGNMENT: + case STATUS_STACK_OVERFLOW: + case STATUS_ARRAY_BOUNDS_EXCEEDED: + me.andreas->leave (); /* Return from a "san" caught fault */ + default: + break; + } + } return EXCEPTION_CONTINUE_SEARCH; } #endif /* __x86_64 */ |