diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-07-20 17:01:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-07-20 17:01:53 +0800 |
| commit | 5296853fffc46aa743eefae5d12ab6b533edd4da (patch) | |
| tree | cc7221a22be5e738ea95f0924f779b619628c3c5 | |
| parent | f2fa45062e3fd831c73de039c01aa7ce6d39918e (diff) | |
| parent | cbbe17fb53886c97f04410cfd7a24e4d4fc9e92a (diff) | |
| download | php-git-5296853fffc46aa743eefae5d12ab6b533edd4da.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed typo
| -rw-r--r-- | Zend/zend_vm_def.h | 1 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 52cd979f5d..1a52041ab3 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4196,6 +4196,7 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV, JMP_ADDR) if (UNEXPECTED(Z_ISREF_P(ex))) { ex = Z_REFVAL_P(ex); } + zval_ptr_dtor(ex); ZVAL_OBJ(ex, EG(exception)); if (UNEXPECTED(EG(exception) != exception)) { GC_REFCOUNT(EG(exception))++; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 231f4e56b3..3d0bcf8a19 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -9434,6 +9434,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZE if (UNEXPECTED(Z_ISREF_P(ex))) { ex = Z_REFVAL_P(ex); } + zval_ptr_dtor(ex); ZVAL_OBJ(ex, EG(exception)); if (UNEXPECTED(EG(exception) != exception)) { GC_REFCOUNT(EG(exception))++; |