dmitry Mon, 17 Aug 2009 07:40:43 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287397
Log:
Fixed bug #49269 (Ternary operator fails on Iterator object when used inside
foreach declaration). (Etienne, Dmitry)
Bug: http://bugs.php.net/49269 (Assigned) Ternary operator fails on Iterator
object when used inside foreach declaration
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
A php/php-src/branches/PHP_5_3/Zend/tests/bug49269.phpt
U php/php-src/branches/PHP_5_3/Zend/zend_vm_def.h
U php/php-src/branches/PHP_5_3/Zend/zend_vm_execute.h
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-08-17 07:40:18 UTC (rev 287396)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-08-17 07:40:43 UTC (rev 287397)
@@ -22,6 +22,8 @@
- Fixed memory leak in stream_is_local(). (Felipe, Tony)
- Fixed BC break in mime_content_type(), removes the content encoding. (Scott)
+- Fixed bug #49269 (Ternary operator fails on Iterator object when used inside
+ foreach declaration). (Etienne, Dmitry)
- Fixed bug #49193 (gdJpegGetVersionString() inside gd_compact identifies
wrong type in declaration). (Ilia)
- Fixed bug #49183 (dns_get_record does not return NAPTR records). (Pierre)
Added: php/php-src/branches/PHP_5_3/Zend/tests/bug49269.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/bug49269.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/Zend/tests/bug49269.phpt 2009-08-17 07:40:43 UTC (rev 287397)
@@ -0,0 +1,26 @@
+--TEST--
+Bug #49269 (Ternary operator fails on Iterator object when used inside foreach declaration).
+--FILE--
+<?php
+class TestObject implements Iterator
+{
+ public $n = 0;
+ function valid()
+ {
+ return ($this->n < 3);
+ }
+ function current() {return $this->n;}
+ function next() {$this->n++;}
+ function key() { }
+ function rewind() {$this->n = 0;}
+}
+
+
+$array_object = new TestObject();
+
+foreach ((true ? $array_object : $array_object) as $item) echo "$item\n";
+?>
+--EXPECT--
+0
+1
+2
Modified: php/php-src/branches/PHP_5_3/Zend/zend_vm_def.h
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_vm_def.h 2009-08-17 07:40:18 UTC (rev 287396)
+++ php/php-src/branches/PHP_5_3/Zend/zend_vm_def.h 2009-08-17 07:40:43 UTC (rev 287397)
@@ -3573,28 +3573,33 @@
ALLOC_ZVAL(tmp);
INIT_PZVAL_COPY(tmp, array_ptr);
array_ptr = tmp;
+ if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
+ ce = Z_OBJCE_P(array_ptr);
+ if (ce && ce->get_iterator) {
+ Z_DELREF_P(array_ptr);
+ }
+ }
} else if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
ce = Z_OBJCE_P(array_ptr);
if (!ce || !ce->get_iterator) {
Z_ADDREF_P(array_ptr);
}
+ } else if (OP1_TYPE == IS_CONST ||
+ ((OP1_TYPE == IS_CV || OP1_TYPE == IS_VAR) &&
+ !Z_ISREF_P(array_ptr) &&
+ Z_REFCOUNT_P(array_ptr) > 1)) {
+ zval *tmp;
+
+ ALLOC_ZVAL(tmp);
+ INIT_PZVAL_COPY(tmp, array_ptr);
+ zval_copy_ctor(tmp);
+ array_ptr = tmp;
} else {
- if ((OP1_TYPE == IS_CV || OP1_TYPE == IS_VAR) &&
- !Z_ISREF_P(array_ptr) &&
- Z_REFCOUNT_P(array_ptr) > 1) {
- zval *tmp;
-
- ALLOC_ZVAL(tmp);
- INIT_PZVAL_COPY(tmp, array_ptr);
- zval_copy_ctor(tmp);
- array_ptr = tmp;
- } else {
- Z_ADDREF_P(array_ptr);
- }
+ Z_ADDREF_P(array_ptr);
}
}
- if (OP1_TYPE != IS_TMP_VAR && ce && ce->get_iterator) {
+ if (ce && ce->get_iterator) {
iter = ce->get_iterator(ce, array_ptr, opline->extended_value & ZEND_FE_RESET_REFERENCE TSRMLS_CC);
if (iter && !EG(exception)) {
Modified: php/php-src/branches/PHP_5_3/Zend/zend_vm_execute.h
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_vm_execute.h 2009-08-17 07:40:18 UTC (rev 287396)
+++ php/php-src/branches/PHP_5_3/Zend/zend_vm_execute.h 2009-08-17 07:40:43 UTC (rev 287397)
@@ -2108,28 +2108,33 @@
ALLOC_ZVAL(tmp);
INIT_PZVAL_COPY(tmp, array_ptr);
array_ptr = tmp;
+ if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
+ ce = Z_OBJCE_P(array_ptr);
+ if (ce && ce->get_iterator) {
+ Z_DELREF_P(array_ptr);
+ }
+ }
} else if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
ce = Z_OBJCE_P(array_ptr);
if (!ce || !ce->get_iterator) {
Z_ADDREF_P(array_ptr);
}
+ } else if (IS_CONST == IS_CONST ||
+ ((IS_CONST == IS_CV || IS_CONST == IS_VAR) &&
+ !Z_ISREF_P(array_ptr) &&
+ Z_REFCOUNT_P(array_ptr) > 1)) {
+ zval *tmp;
+
+ ALLOC_ZVAL(tmp);
+ INIT_PZVAL_COPY(tmp, array_ptr);
+ zval_copy_ctor(tmp);
+ array_ptr = tmp;
} else {
- if ((IS_CONST == IS_CV || IS_CONST == IS_VAR) &&
- !Z_ISREF_P(array_ptr) &&
- Z_REFCOUNT_P(array_ptr) > 1) {
- zval *tmp;
-
- ALLOC_ZVAL(tmp);
- INIT_PZVAL_COPY(tmp, array_ptr);
- zval_copy_ctor(tmp);
- array_ptr = tmp;
- } else {
- Z_ADDREF_P(array_ptr);
- }
+ Z_ADDREF_P(array_ptr);
}
}
- if (IS_CONST != IS_TMP_VAR && ce && ce->get_iterator) {
+ if (ce && ce->get_iterator) {
iter = ce->get_iterator(ce, array_ptr, opline->extended_value & ZEND_FE_RESET_REFERENCE TSRMLS_CC);
if (iter && !EG(exception)) {
@@ -5370,28 +5375,33 @@
ALLOC_ZVAL(tmp);
INIT_PZVAL_COPY(tmp, array_ptr);
array_ptr = tmp;
+ if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
+ ce = Z_OBJCE_P(array_ptr);
+ if (ce && ce->get_iterator) {
+ Z_DELREF_P(array_ptr);
+ }
+ }
} else if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
ce = Z_OBJCE_P(array_ptr);
if (!ce || !ce->get_iterator) {
Z_ADDREF_P(array_ptr);
}
+ } else if (IS_TMP_VAR == IS_CONST ||
+ ((IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) &&
+ !Z_ISREF_P(array_ptr) &&
+ Z_REFCOUNT_P(array_ptr) > 1)) {
+ zval *tmp;
+
+ ALLOC_ZVAL(tmp);
+ INIT_PZVAL_COPY(tmp, array_ptr);
+ zval_copy_ctor(tmp);
+ array_ptr = tmp;
} else {
- if ((IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) &&
- !Z_ISREF_P(array_ptr) &&
- Z_REFCOUNT_P(array_ptr) > 1) {
- zval *tmp;
-
- ALLOC_ZVAL(tmp);
- INIT_PZVAL_COPY(tmp, array_ptr);
- zval_copy_ctor(tmp);
- array_ptr = tmp;
- } else {
- Z_ADDREF_P(array_ptr);
- }
+ Z_ADDREF_P(array_ptr);
}
}
- if (IS_TMP_VAR != IS_TMP_VAR && ce && ce->get_iterator) {
+ if (ce && ce->get_iterator) {
iter = ce->get_iterator(ce, array_ptr, opline->extended_value & ZEND_FE_RESET_REFERENCE TSRMLS_CC);
if (iter && !EG(exception)) {
@@ -8717,28 +8727,33 @@
ALLOC_ZVAL(tmp);
INIT_PZVAL_COPY(tmp, array_ptr);
array_ptr = tmp;
+ if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
+ ce = Z_OBJCE_P(array_ptr);
+ if (ce && ce->get_iterator) {
+ Z_DELREF_P(array_ptr);
+ }
+ }
} else if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
ce = Z_OBJCE_P(array_ptr);
if (!ce || !ce->get_iterator) {
Z_ADDREF_P(array_ptr);
}
+ } else if (IS_VAR == IS_CONST ||
+ ((IS_VAR == IS_CV || IS_VAR == IS_VAR) &&
+ !Z_ISREF_P(array_ptr) &&
+ Z_REFCOUNT_P(array_ptr) > 1)) {
+ zval *tmp;
+
+ ALLOC_ZVAL(tmp);
+ INIT_PZVAL_COPY(tmp, array_ptr);
+ zval_copy_ctor(tmp);
+ array_ptr = tmp;
} else {
- if ((IS_VAR == IS_CV || IS_VAR == IS_VAR) &&
- !Z_ISREF_P(array_ptr) &&
- Z_REFCOUNT_P(array_ptr) > 1) {
- zval *tmp;
-
- ALLOC_ZVAL(tmp);
- INIT_PZVAL_COPY(tmp, array_ptr);
- zval_copy_ctor(tmp);
- array_ptr = tmp;
- } else {
- Z_ADDREF_P(array_ptr);
- }
+ Z_ADDREF_P(array_ptr);
}
}
- if (IS_VAR != IS_TMP_VAR && ce && ce->get_iterator) {
+ if (ce && ce->get_iterator) {
iter = ce->get_iterator(ce, array_ptr, opline->extended_value & ZEND_FE_RESET_REFERENCE TSRMLS_CC);
if (iter && !EG(exception)) {
@@ -22559,28 +22574,33 @@
ALLOC_ZVAL(tmp);
INIT_PZVAL_COPY(tmp, array_ptr);
array_ptr = tmp;
+ if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
+ ce = Z_OBJCE_P(array_ptr);
+ if (ce && ce->get_iterator) {
+ Z_DELREF_P(array_ptr);
+ }
+ }
} else if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
ce = Z_OBJCE_P(array_ptr);
if (!ce || !ce->get_iterator) {
Z_ADDREF_P(array_ptr);
}
+ } else if (IS_CV == IS_CONST ||
+ ((IS_CV == IS_CV || IS_CV == IS_VAR) &&
+ !Z_ISREF_P(array_ptr) &&
+ Z_REFCOUNT_P(array_ptr) > 1)) {
+ zval *tmp;
+
+ ALLOC_ZVAL(tmp);
+ INIT_PZVAL_COPY(tmp, array_ptr);
+ zval_copy_ctor(tmp);
+ array_ptr = tmp;
} else {
- if ((IS_CV == IS_CV || IS_CV == IS_VAR) &&
- !Z_ISREF_P(array_ptr) &&
- Z_REFCOUNT_P(array_ptr) > 1) {
- zval *tmp;
-
- ALLOC_ZVAL(tmp);
- INIT_PZVAL_COPY(tmp, array_ptr);
- zval_copy_ctor(tmp);
- array_ptr = tmp;
- } else {
- Z_ADDREF_P(array_ptr);
- }
+ Z_ADDREF_P(array_ptr);
}
}
- if (IS_CV != IS_TMP_VAR && ce && ce->get_iterator) {
+ if (ce && ce->get_iterator) {
iter = ce->get_iterator(ce, array_ptr, opline->extended_value & ZEND_FE_RESET_REFERENCE TSRMLS_CC);
if (iter && !EG(exception)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
