summaryrefslogtreecommitdiff
path: root/Zend/zend_builtin_functions.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2014-04-30 20:28:02 +0200
committerNikita Popov <nikic@php.net>2014-05-01 09:08:29 +0200
commit5a03efe2790cc935d4d8ca723bd21ce8c079fbd4 (patch)
treed378f9fb31ab2bce4f70211df94b4403db55d5ca /Zend/zend_builtin_functions.c
parent257bf697ae9b2ae366f7f3726019c18ad92b9002 (diff)
downloadphp-git-5a03efe2790cc935d4d8ca723bd21ce8c079fbd4.tar.gz
Don't allocate zend_stack elements individually
Instead allocate a vector of elements. Size must now be specified on initialization rather than on push.
Diffstat (limited to 'Zend/zend_builtin_functions.c')
-rw-r--r--Zend/zend_builtin_functions.c6
1 files changed, 3 insertions, 3 deletions
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 */