diff options
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend.c | 4 | ||||
| -rw-r--r-- | Zend/zend.h | 18 | ||||
| -rw-r--r-- | Zend/zend_extensions.h | 2 | ||||
| -rw-r--r-- | Zend/zend_globals.h | 3 |
4 files changed, 13 insertions, 14 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index d52b43a9fb..b445e34090 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -760,14 +760,14 @@ ZEND_API void _zend_bailout(char *filename, uint lineno) { TSRMLS_FETCH(); - if (!EG(bailout_set)) { + if (!EG(bailout)) { zend_output_debug_string(1, "%s(%d) : Bailed out without a bailout address!", filename, lineno); exit(-1); } CG(unclean_shutdown) = 1; CG(in_compilation) = EG(in_execution) = 0; EG(current_execute_data) = NULL; - longjmp(EG(bailout), FAILURE); + longjmp(*EG(bailout), FAILURE); } END_EXTERN_C() diff --git a/Zend/zend.h b/Zend/zend.h index b9557af362..7d4ea5b52f 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -448,19 +448,19 @@ END_EXTERN_C() #define zend_try \ { \ - jmp_buf orig_bailout; \ - zend_bool orig_bailout_set=EG(bailout_set); \ + jmp_buf *orig_bailout = EG(bailout); \ + jmp_buf bailout; \ \ - EG(bailout_set) = 1; \ - memcpy(&orig_bailout, &EG(bailout), sizeof(jmp_buf)); \ - if (setjmp(EG(bailout))==0) + EG(bailout) = &bailout; \ + if (setjmp(bailout)==0) { #define zend_catch \ - else + } else { \ + EG(bailout) = orig_bailout; #define zend_end_try() \ - memcpy(&EG(bailout), &orig_bailout, sizeof(jmp_buf)); \ - EG(bailout_set) = orig_bailout_set; \ + } \ + EG(bailout) = orig_bailout; \ } -#define zend_first_try EG(bailout_set)=0; zend_try +#define zend_first_try EG(bailout)=NULL; zend_try BEGIN_EXTERN_C() ZEND_API char *get_zend_version(void); diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h index 9fa0e1fd51..2ae7bb25c0 100644 --- a/Zend/zend_extensions.h +++ b/Zend/zend_extensions.h @@ -27,7 +27,7 @@ /* The first number is the engine version and the rest is the date. * This way engine 2/3 API no. is always greater than engine 1 API no.. */ -#define ZEND_EXTENSION_API_NO 220060510 +#define ZEND_EXTENSION_API_NO 220060519 typedef struct _zend_extension_version_info { int zend_extension_api_no; diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index ea2d4f219e..d1bda5b064 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -176,7 +176,7 @@ struct _zend_executor_globals { HashTable included_files; /* files already included */ - jmp_buf bailout; + jmp_buf *bailout; int error_reporting; int orig_error_reporting; @@ -199,7 +199,6 @@ struct _zend_executor_globals { zend_bool in_execution; HashTable *in_autoload; zend_function *autoload_func; - zend_bool bailout_set; zend_bool full_tables_cleanup; /* for extended information support */ |