diff options
| -rw-r--r-- | phpdbg.c | 11 | ||||
| -rw-r--r-- | phpdbg_win.h | 2 |
2 files changed, 6 insertions, 7 deletions
@@ -1336,6 +1336,11 @@ phpdbg_out: } #endif +#ifdef _WIN32 + } __except(phpdbg_exception_handler_win32(xp = GetExceptionInformation())) { + phpdbg_error("Access violation (Segementation fault) encountered\ntrying to abort cleanly..."); + } +#endif #ifndef ZTS /* force cleanup of auto and core globals */ zend_hash_clean(CG(auto_globals)); @@ -1373,11 +1378,7 @@ phpdbg_out: } zend_end_try(); sapi_shutdown(); -#ifdef _WIN32 - } __except(phpdbg_exception_handler_win32(xp = GetExceptionInformation())) { - // if !EXCEPTION_CONTINUE_EXECUTION - } - #endif + } if (cleaning || remote) { diff --git a/phpdbg_win.h b/phpdbg_win.h index da97c797b1..68c3052790 100644 --- a/phpdbg_win.h +++ b/phpdbg_win.h @@ -34,6 +34,4 @@ void phpdbg_win_set_mm_heap(zend_mm_heap *heap); int phpdbg_exception_handler_win32(EXCEPTION_POINTERS *xp); -int __stdcall phpdbg_watch_set_segv_handler_asm(); - #endif
\ No newline at end of file |