From 5a03efe2790cc935d4d8ca723bd21ce8c079fbd4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 30 Apr 2014 20:28:02 +0200 Subject: Don't allocate zend_stack elements individually Instead allocate a vector of elements. Size must now be specified on initialization rather than on push. --- Zend/zend_builtin_functions.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Zend/zend_builtin_functions.c') diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 80f3818d17..d858fe7982 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1484,8 +1484,8 @@ ZEND_FUNCTION(set_error_handler) if (Z_TYPE(EG(user_error_handler)) != IS_UNDEF) { RETVAL_ZVAL(&EG(user_error_handler), 1, 0); - zend_stack_push(&EG(user_error_handlers_error_reporting), &EG(user_error_handler_error_reporting), sizeof(EG(user_error_handler_error_reporting))); - zend_stack_push(&EG(user_error_handlers), &EG(user_error_handler), sizeof(zval)); + zend_stack_push(&EG(user_error_handlers_error_reporting), &EG(user_error_handler_error_reporting)); + zend_stack_push(&EG(user_error_handlers), &EG(user_error_handler)); } if (Z_TYPE_P(error_handler) == IS_NULL) { /* unset user-defined handler */ @@ -1550,7 +1550,7 @@ ZEND_FUNCTION(set_exception_handler) if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) { RETVAL_ZVAL(&EG(user_exception_handler), 1, 0); - zend_stack_push(&EG(user_exception_handlers), &EG(user_exception_handler), sizeof(zval)); + zend_stack_push(&EG(user_exception_handlers), &EG(user_exception_handler)); } if (Z_TYPE_P(exception_handler) == IS_NULL) { /* unset user-defined handler */ -- cgit v1.2.1