Fix COMMIT in recursion; document backtracking verbs in assertions and

subroutines.


git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1298 2f5784b3-3f2a-0410-8824-cb99058d5e15

1 files changed, 8 insertions, 4 deletions

diff --git a/pcre_exec.c b/pcre_exec.c
index bcc2c63..79c14db 100644
--- a/pcre_exec.c
+++ b/pcre_exec.c
@@ -1863,11 +1863,15 @@ for (;;)
           }
 
         /* PCRE does not allow THEN, SKIP, PRUNE or COMMIT to escape beyond a
-        recursion; they are treated as NOMATCH. These codes are defined in a 
-        range that can be tested for. Any other return code is an error. */
+        recursion; they cause a NOMATCH for the entire recursion. These codes
+        are defined in a range that can be tested for. */
+        
+        if (rrc >= MATCH_BACKTRACK_MIN && rrc <= MATCH_BACKTRACK_MAX)
+          RRETURN(MATCH_NOMATCH); 
+ 
+        /* Any return code other than NOMATCH is an error. */
 
-        else if (rrc != MATCH_NOMATCH && 
-                 (rrc < MATCH_BACKTRACK_MIN || rrc > MATCH_BACKTRACK_MAX))
+        if (rrc != MATCH_NOMATCH)
           {
           DPRINTF(("Recursion gave error %d\n", rrc));
           if (new_recursive.offset_save != stacksave)