From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 3 Jun 2015 12:48:04 +0000 (+0200)
Subject: CCL: slightly different point of error return
X-Git-Tag: v5.14.2~7
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=ba058997e52b990c7fa140301a1970be96ab6a4b

CCL: slightly different point of error return

Ensure that parser has advanced in any case.
---

diff --git a/src/cclfind.c b/src/cclfind.c
index b108b74..f4dbaa4 100644
--- a/src/cclfind.c
+++ b/src/cclfind.c
@@ -632,14 +632,12 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
                 }
         }
         if (!p)
-        {
             p = ccl_term_one_use(cclp, 0 /* attr: no use */, qa, no, len,
                                  is_phrase, auto_group);
-            if (!p)
-                return 0;
-        }
         for (i = 0; i < no; i++)
             ADVANCE;
+        if (!p)
+            return 0;
         /* make the top node point to us.. */
         if (p_top)
         {