diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-04-01 22:27:29 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-04-01 22:27:29 +0800 |
| commit | 5b1bb41c0b125fe9964abaa1d523ce2ba1823cf6 (patch) | |
| tree | 4979b725879f5599319abc4ac1818989ef7f0123 /Zend | |
| parent | 034e8ec02e263f5908b469bba1285e26c0a67bc4 (diff) | |
| download | php-git-5b1bb41c0b125fe9964abaa1d523ce2ba1823cf6.tar.gz | |
Fixed bug #71930 (_zval_dtor_func: Assertion `(arr)->gc.refcount <= 1' failed)
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/tests/bug71930.phpt | 30 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
2 files changed, 32 insertions, 2 deletions
diff --git a/Zend/tests/bug71930.phpt b/Zend/tests/bug71930.phpt new file mode 100644 index 0000000000..4604b88493 --- /dev/null +++ b/Zend/tests/bug71930.phpt @@ -0,0 +1,30 @@ +--TEST-- +Bug #71930 (_zval_dtor_func: Assertion `(arr)->gc.refcount <= 1' failed) +--SKIPIF-- +<?php +if (!extension_loaded("curl")) { + die("skip Require a resource which is able to hold a callbck"); +} +?> +--FILE-- +<?php + +class A { + public static function dummy() { + } +} + +$a = array(); +$a[] = "A"; +$a[] = "dummy"; + +$ch1 = curl_init(); +curl_setopt($ch1, CURLOPT_HEADERFUNCTION, $a); + +set_error_handler($a); +set_error_handler(function()use($ch1){}); +set_error_handler(function(){}); +?> +okey +--EXPECT-- +okey diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 650f0a1e52..bdb9bb7bd5 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -295,8 +295,8 @@ void shutdown_executor(void) /* {{{ */ } zend_stack_clean(&EG(user_error_handlers_error_reporting), NULL, 1); - zend_stack_clean(&EG(user_error_handlers), (void (*)(void *))ZVAL_DESTRUCTOR, 1); - zend_stack_clean(&EG(user_exception_handlers), (void (*)(void *))ZVAL_DESTRUCTOR, 1); + zend_stack_clean(&EG(user_error_handlers), (void (*)(void *))ZVAL_PTR_DTOR, 1); + zend_stack_clean(&EG(user_exception_handlers), (void (*)(void *))ZVAL_PTR_DTOR, 1); } zend_end_try(); zend_try { |