Fix test 4 with the help of Rob

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 16e64a344adc9859b67bd3834af67c2028d6a2c9..f7a86a3d2814150a31e65e339bb7fbe03f2f2a01 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -410,7 +410,12 @@ sxe_properties_get(zval *object TSRMLS_DC)
                _get_base_node_value(sxe, node, &value TSRMLS_CC);
                
                name = (char *) node->name;
-               namelen = xmlStrlen(node->name) + 1;
+               if (!name) {
+                       name = "CDATA";
+                       namelen = sizeof("CDATA");
+               } else {
+                       namelen = xmlStrlen(node->name) + 1;
+               }
 
                h = zend_hash_func(name, namelen);
                if (zend_hash_quick_find(rv, name, namelen, h, (void **) &data_ptr) == SUCCESS) {

diff --git a/ext/simplexml/tests/004.phpt b/ext/simplexml/tests/004.phpt
index a4323711dbe755baf9b2c2b18c29790c38872f50..7428a98ba7a0a8fe7122027046c24ccf8b7fd8c4 100755 (executable)
--- a/ext/simplexml/tests/004.phpt
+++ b/ext/simplexml/tests/004.phpt
@@ -23,13 +23,12 @@ simplexml_element Object
 
             [elem2] => simplexml_element Object
                 (
-                    [elem3] => simplexml_element Object
+                    [CDATA] => simplexml_element Object
                         (
-                            [included-entity] => simplexml_element Object
-                                (
-                                    [included-entity] => This is text included from an entity
-                                )
+                        )
 
+                    [elem3] => simplexml_element Object
+                        (
                             [elem4] => simplexml_element Object
                                 (
                                     [test] => simplexml_element Object