Fix Bug #26976 (Can not access array elements using array indices)

return index 0 as non iterable object
update test

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index c98957196853726f296c4e428a7b7c149b5edf6a..7b4567dfc0bb8e81b53ba2333c5200d7319cac52 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -191,21 +191,17 @@ static zval * sxe_prop_dim_read(zval *object, zval *member, zend_bool elements,
                                        node = NULL;
                                }
 
-                               if (node) {
-                                       node = node->next;
-                               }
-
                                prefix = sxe->iter.nsprefix;
 
-                               while (node && nodendx < Z_TYPE_P(member)) {
+                               while (node && nodendx <= Z_LVAL_P(member)) {
                                        SKIP_TEXT(node)
                                        if (node->type == XML_ELEMENT_NODE) {
                                                if (match_ns(sxe, node, prefix)) {
                                                        if (sxe->iter.type == SXE_ITER_ELEMENT && !xmlStrcmp(node->name, sxe->iter.name)) {
-                                                               nodendx++;
-                                                               if (nodendx == Z_TYPE_P(member)) {
+                                                               if (nodendx == Z_LVAL_P(member)) {
                                                                        break;
                                                                }
+                                                               nodendx++;
                                                        }
                                                } else {
                                                        break;
@@ -246,9 +242,6 @@ static zval * sxe_property_read(zval *object, zval *member, zend_bool silent TSR
  */
 static zval * sxe_dimension_read(zval *object, zval *offset TSRMLS_DC)
 {
-       if (Z_TYPE_P(offset) == IS_LONG && Z_LVAL_P(offset) == 0) {
-               return object;
-       }
        return sxe_prop_dim_read(object, offset, 0, 1, 0 TSRMLS_CC);
 }
 /* }}} */

diff --git a/ext/simplexml/tests/015.phpt b/ext/simplexml/tests/015.phpt
index b134354d79646ed920e9e0d7597721680dfd1be3..8b9de2b0a62940a53ef310e0b82287ea66deb5eb 100644 (file)
--- a/ext/simplexml/tests/015.phpt
+++ b/ext/simplexml/tests/015.phpt
@@ -41,15 +41,15 @@ object(simplexml_element)#4 (1) {
   [0]=>
   string(3) "Joe"
 }
-object(simplexml_element)#3 (1) {
+object(simplexml_element)#4 (1) {
   [0]=>
   string(3) "Joe"
 }
-object(simplexml_element)#2 (1) {
+object(simplexml_element)#1 (1) {
   [0]=>
   string(3) "Joe"
 }
-object(simplexml_element)#2 (1) {
+object(simplexml_element)#1 (1) {
   [0]=>
   string(3) "Boe"
 }