commit cb8c6d4be901426d2d6e9f59911baca46106b690
author Michal Vasko <mvasko@cesnet.cz> Fri Oct 16 11:58:30 2020 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Mon Oct 19 09:50:45 2020 +0200
tree 5620f5443150030cf217bb43905f0fce80e34d45
parent 7d1d091fc2b1e3993ee5cac158b3bbf05a1328e3

path BUGFIX check mandatory .. in relative leafref

src/path.c

diff --git a/src/path.c b/src/path.c
index 9c1fb16..0552e66 100644
--- a/src/path.c
+++ b/src/path.c
@@ -246,10 +246,17 @@
     if (begin == LY_PATH_BEGIN_EITHER) {
         /* is the path relative? */
         if (lyxp_next_token(NULL, exp, &tok_idx, LYXP_TOKEN_OPER_PATH)) {
-            /* '..' */
-            while ((lref == LY_PATH_LREF_TRUE) && !lyxp_next_token(NULL, exp, &tok_idx, LYXP_TOKEN_DDOT)) {
-                /* '/' */
-                LY_CHECK_ERR_GOTO(lyxp_next_token(ctx, exp, &tok_idx, LYXP_TOKEN_OPER_PATH), ret = LY_EVALID, error);
+            /* relative path check specific to leafref */
+            if (lref == LY_PATH_LREF_TRUE) {
+                /* mandatory '..' */
+                LY_CHECK_ERR_GOTO(lyxp_next_token(ctx, exp, &tok_idx, LYXP_TOKEN_DDOT), ret = LY_EVALID, error);
+
+                do {
+                    /* '/' */
+                    LY_CHECK_ERR_GOTO(lyxp_next_token(ctx, exp, &tok_idx, LYXP_TOKEN_OPER_PATH), ret = LY_EVALID, error);
+
+                    /* optional '..' */
+                } while (!lyxp_next_token(NULL, exp, &tok_idx, LYXP_TOKEN_DDOT));
             }
         }
     } else {