Commit: aa791a4d72415c53233adc1a6c8e3eeb42d083ef Author: Dmitry Stogov <dmi...@zend.com> Fri, 29 Mar 2013 03:18:04 +0400 Parents: 0e25e00ecf74bcc1a9e14eac25bd7d7cc4857c24 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aa791a4d72415c53233adc1a6c8e3eeb42d083ef Log: Removed deprecated check Changed paths: M Zend/zend_execute.c Diff: diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index a7674ca..b2d0623 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; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
