From: Marcus Boerger <helly@php.net>
Date: Sat, 25 Oct 2003 23:06:23 +0000 (+0000)
Subject: Fix test 4 with the help of Rob
X-Git-Tag: RELEASE_2_0_0RC1~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07d94c241022ba442e27f43b2cda3b895717632a;p=php

Fix test 4 with the help of Rob
---

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 16e64a344a..f7a86a3d28 100644
--- 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 a4323711db..7428a98ba7 100755
--- 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