From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 7 Jun 2011 01:40:54 +0000 (+0000)
Subject: Fixed test 008
X-Git-Tag: php-5.3.7RC1~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14ed1443182ee47abd9bfa85b28c8a176de36da5;p=php

Fixed test 008
---

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 8e3dc7855d..49498aa70f 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1264,9 +1264,8 @@ SXE_METHOD(xpath)
 
 	result = retval->nodesetval;
 
-	array_init(return_value);
-
 	if (result != NULL) {
+		array_init(return_value);
 		for (i = 0; i < result->nodeNr; ++i) {
 			nodeptr = result->nodeTab[i];
 			if (nodeptr->type == XML_TEXT_NODE || nodeptr->type == XML_ELEMENT_NODE || nodeptr->type == XML_ATTRIBUTE_NODE) {
@@ -1287,6 +1286,8 @@ SXE_METHOD(xpath)
 				add_next_index_zval(return_value, value);
 			}
 		}
+	} else {
+		RETVAL_FALSE;
 	}
 
 	xmlXPathFreeObject(retval);