diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-03-29 03:18:04 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-03-29 03:18:04 +0400 |
| commit | aa791a4d72415c53233adc1a6c8e3eeb42d083ef (patch) | |
| tree | 7ebeac3f04c058bc4a3feaff9dc982623524c061 /Zend/zend_execute.c | |
| parent | 0e25e00ecf74bcc1a9e14eac25bd7d7cc4857c24 (diff) | |
| download | php-git-aa791a4d72415c53233adc1a6c8e3eeb42d083ef.tar.gz | |
Removed deprecated check
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index a7674ca8ab..b2d06238fa 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -898,13 +898,10 @@ static inline zval* zend_assign_to_variable(zval **variable_ptr_ptr, zval *value } else if (EXPECTED(!PZVAL_IS_REF(value))) { Z_ADDREF_P(value); *variable_ptr_ptr = value; - if (EXPECTED(variable_ptr != &EG(uninitialized_zval))) { - GC_REMOVE_ZVAL_FROM_BUFFER(variable_ptr); - zval_dtor(variable_ptr); - efree(variable_ptr); - } else { - Z_DELREF_P(variable_ptr); - } + ZEND_ASSERT(variable_ptr != &EG(uninitialized_zval)); + GC_REMOVE_ZVAL_FROM_BUFFER(variable_ptr); + zval_dtor(variable_ptr); + efree(variable_ptr); return value; } else { goto copy_value; |