From 370febcd37a648b325918da2889c7c3f7d1c8754 Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 7 Jun 2011 01:40:54 +0000
Subject: [PATCH] Fixed test 008

---
 ext/simplexml/simplexml.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 1d74853cd9c..2ec0ca4ab8a 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1294,9 +1294,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) {
@@ -1317,6 +1316,8 @@ SXE_METHOD(xpath)
 				add_next_index_zval(return_value, value);
 			}
 		}
+	} else {
+		RETVAL_FALSE;
 	}
 
 	xmlXPathFreeObject(retval);