com php-src: Fixed reference conversion: Zend/zend_operators .c

From: Date: Thu, 13 Mar 2014 18:07:14 +0000
Subject: com php-src: Fixed reference conversion: Zend/zend_operators .c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77638@lists.php.net to get a copy of this message
Commit: 5f861768d607b531e2a5c12841acb70d6ad7b1bc Author: Dmitry Stogov <dmitry@zend.com> Thu, 13 Mar 2014 22:07:14 +0400 Parents: bfdaf6e8060e6cc9ceb649a5d4b5354688ae45ef Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5f861768d607b531e2a5c12841acb70d6ad7b1bc Log: Fixed reference conversion Changed paths: M Zend/zend_operators.c Diff: diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 55e2998..fdfa5ab 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -183,7 +183,18 @@ ZEND_API double zend_string_to_double(const char *number, zend_uint length) /* { ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */ { +try_again: switch (Z_TYPE_P(op)) { + case IS_REFERENCE: + if (Z_REFCOUNT_P(op) == 1) { + zend_reference *ref = Z_REF_P(op); + ZVAL_COPY_VALUE(op, Z_REFVAL_P(op)); + efree(ref); + } else { + Z_DELREF_P(op); + ZVAL_COPY_VALUE(op, Z_REFVAL_P(op)); + } + goto try_again; case IS_STRING: { zend_string *str;

« previous php.cvs (#77638) next »