mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-14 04:16:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix incdec of ref object properties

Browse Source 
This fixes a number of infinite loops in the Symfony testsuite. It
took an obscene amount of time to track this down :/
This commit is contained in:
Nikita Popov 2014-05-26 17:58:10 +02:00
parent 40256e0f9c
commit ec7b5e0b19
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zend/zend_operators.c
View File

@ -2086,6 +2086,7 @@ static void increment_string(zval *str) /* {{{ */
ZEND_API int increment_function(zval *op1) /* {{{ */
{
try_again:
switch (Z_TYPE_P(op1)) {
case IS_LONG:
if (Z_LVAL_P(op1) == LONG_MAX) {
@ -2141,6 +2142,9 @@ ZEND_API int increment_function(zval *op1) /* {{{ */
return res;
}
return FAILURE;
case IS_REFERENCE:
op1 = Z_REFVAL_P(op1);
goto try_again;
default:
return FAILURE;
}
@ -2153,6 +2157,7 @@ ZEND_API int decrement_function(zval *op1) /* {{{ */
long lval;
double dval;
try_again:
switch (Z_TYPE_P(op1)) {
case IS_LONG:
if (Z_LVAL_P(op1) == LONG_MIN) {
@ -2200,6 +2205,9 @@ ZEND_API int decrement_function(zval *op1) /* {{{ */
return res;
}
return FAILURE;
case IS_REFERENCE:
op1 = Z_REFVAL_P(op1);
goto try_again;
default:
return FAILURE;
}