commit 9c7dee353cdfc7d69620b702018e793b485c6351
author Michal Vasko <mvasko@cesnet.cz> Mon Jul 09 09:12:59 2018 +0200
committer Michal Vasko <mvasko@cesnet.cz> Mon Jul 09 09:12:59 2018 +0200
tree cc13e910adefff8d49f82dbd485579ecbd97f91e
parent f77877617535c402cf0ae7c5b68407c48e40d0eb

parser BUGFIX always precompile patter if cache is enabled

Fixes #536

src/parser_yin.c

diff --git a/src/parser_yin.c b/src/parser_yin.c
index c40a07a..c980dab 100644
--- a/src/parser_yin.c
+++ b/src/parser_yin.c
@@ -1429,24 +1429,22 @@
             LY_TREE_FOR(yin->child, node) {
                 GETVAL(ctx, value, node, "value");
 
-                if (!(ctx->models.flags & LY_CTX_TRUSTED)) {
-                    if (in_grp) {
-                        /* in grouping, just check the pattern syntax */
-                        if (lyp_check_pattern(ctx, value, NULL)) {
-                            goto error;
-                        }
+                if (in_grp) {
+                    /* in grouping, just check the pattern syntax */
+                    if (!(ctx->models.flags & LY_CTX_TRUSTED) && lyp_check_pattern(ctx, value, NULL)) {
+                        goto error;
                     }
-#ifdef LY_ENABLED_CACHE
-                    else {
-                        /* outside grouping, check syntax and precompile pattern for later use by libpcre */
-                        if (lyp_precompile_pattern(ctx, value,
-                                (pcre**)&type->info.str.patterns_pcre[type->info.str.pat_count * 2],
-                                (pcre_extra**)&type->info.str.patterns_pcre[type->info.str.pat_count * 2 + 1])) {
-                            goto error;
-                        }
-                    }
-#endif
                 }
+#ifdef LY_ENABLED_CACHE
+                else {
+                    /* outside grouping, check syntax and precompile pattern for later use by libpcre */
+                    if (lyp_precompile_pattern(ctx, value,
+                            (pcre **)&type->info.str.patterns_pcre[type->info.str.pat_count * 2],
+                            (pcre_extra **)&type->info.str.patterns_pcre[type->info.str.pat_count * 2 + 1])) {
+                        goto error;
+                    }
+                }
+#endif
                 restr = &type->info.str.patterns[type->info.str.pat_count]; /* shortcut */
                 type->info.str.pat_count++;