From c465ffc20c75f6ee4656aec9649d5bc6a3bbbf26 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Tue, 17 Oct 2006 19:39:33 +0000
Subject: [PATCH] applied patch from Olaf Walkowiak which should fix #334104
 Daniel

* xpath.c: applied patch from Olaf Walkowiak which should fix #334104
Daniel
---
 ChangeLog | 4 ++++
 xpath.c   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cb8f7a4d..4cc76d3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 17 21:39:23 CEST 2006 Daniel Veillard <daniel@veillard.com>
+
+	* xpath.c: applied patch from Olaf Walkowiak which should fix #334104
+
 Tue Oct 17 18:12:34 CEST 2006 Daniel Veillard <daniel@veillard.com>
 
 	* HTMLparser.c: fixing HTML minimized attribute values to be generated
diff --git a/xpath.c b/xpath.c
index 1b7117f1..89646289 100644
--- a/xpath.c
+++ b/xpath.c
@@ -14856,7 +14856,7 @@ xmlXPathEvalExpression(const xmlChar *str, xmlXPathContextPtr ctxt) {
     pctxt = xmlXPathNewParserContext(str, ctxt);
     xmlXPathEvalExpr(pctxt);
 
-    if (*pctxt->cur != 0) {
+    if ((*pctxt->cur != 0) || (pctxt->error != XPATH_EXPRESSION_OK)) {
 	xmlXPatherror(pctxt, __FILE__, __LINE__, XPATH_EXPR_ERROR);
 	res = NULL;
     } else {