commit b4bcba23f64b71105514875f165a63d4cc720609
author Nick Wellnhofer <wellnhofer@aevum.de> Mon Aug 05 00:15:11 2013 +0200
committer Nick Wellnhofer <wellnhofer@aevum.de> Mon Aug 05 00:15:11 2013 +0200
tree 66136415c5616c61da816702e674af6f5c4dc6a5
parent ff76eb28c75451bc56e3b93f44dac155ca29e7f5

Fix XPath '//' optimization with predicates

My attempt to optimize XPath expressions containing '//' caused a
regression reported in bug #695699. This commit disables the
optimization for expressions of the form '//foo[predicate]'.

xpath.c

diff --git a/xpath.c b/xpath.c
index fc9eabb..09adb00 100644
--- a/xpath.c
+++ b/xpath.c
@@ -14724,8 +14724,9 @@
     * internal representation.
     */
 
-    if ((op->ch1 != -1) &&
-        (op->op == XPATH_OP_COLLECT /* 11 */))
+    if ((op->op == XPATH_OP_COLLECT /* 11 */) &&
+        (op->ch1 != -1) &&
+        (op->ch2 == -1 /* no predicate */))
     {
         xmlXPathStepOpPtr prevop = &comp->steps[op->ch1];