/[pcre]/code/trunk/pcre_exec.c
ViewVC logotype

Diff of /code/trunk/pcre_exec.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

<
revision 455 by ph10, Sat Sep 26 19:12:32 2009 UTC revision 625 by ph10, Wed Jul 20 16:46:19 2011 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2009 University of Cambridge             Copyright (c) 1997-2011 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 57  possible. There are also some static sup Line 57  possible. There are also some static sup
57  #undef min  #undef min
58  #undef max  #undef max
59    
60  /* Flag bits for the match() function */  /* Values for setting in md->match_function_type to indicate two special types
61    of call to match(). We do it this way to save on using another stack variable,
62    as stack usage is to be discouraged. */
63    
64  #define match_condassert     0x01  /* Called to check a condition assertion */  #define MATCH_CONDASSERT     1  /* Called to check a condition assertion */
65  #define match_cbegroup       0x02  /* Could-be-empty unlimited repeat group */  #define MATCH_CBEGROUP       2  /* Could-be-empty unlimited repeat group */
66    
67  /* Non-error returns from the match() function. Error returns are externally  /* Non-error returns from the match() function. Error returns are externally
68  defined PCRE_ERROR_xxx codes, which are all negative. */  defined PCRE_ERROR_xxx codes, which are all negative. */
# Line 71  defined PCRE_ERROR_xxx codes, which are Line 73  defined PCRE_ERROR_xxx codes, which are
73  /* Special internal returns from the match() function. Make them sufficiently  /* Special internal returns from the match() function. Make them sufficiently
74  negative to avoid the external error codes. */  negative to avoid the external error codes. */
75    
76  #define MATCH_COMMIT       (-999)  #define MATCH_ACCEPT       (-999)
77  #define MATCH_PRUNE        (-998)  #define MATCH_COMMIT       (-998)
78  #define MATCH_SKIP         (-997)  #define MATCH_KETRPOS      (-997)
79  #define MATCH_THEN         (-996)  #define MATCH_ONCE         (-996)
80    #define MATCH_PRUNE        (-995)
81    #define MATCH_SKIP         (-994)
82    #define MATCH_SKIP_ARG     (-993)
83    #define MATCH_THEN         (-992)
84    
85    /* This is a convenience macro for code that occurs many times. */
86    
87    #define MRRETURN(ra) \
88      { \
89      md->mark = markptr; \
90      RRETURN(ra); \
91      }
92    
93  /* Maximum number of ints of offset to save on the stack for recursive calls.  /* Maximum number of ints of offset to save on the stack for recursive calls.
94  If the offset vector is bigger, malloc is used. This should be a multiple of 3,  If the offset vector is bigger, malloc is used. This should be a multiple of 3,
# Line 89  static const char rep_max[] = { 0, 0, 0, Line 103  static const char rep_max[] = { 0, 0, 0,
103    
104    
105    
106  #ifdef DEBUG  #ifdef PCRE_DEBUG
107  /*************************************************  /*************************************************
108  *        Debugging function to print chars       *  *        Debugging function to print chars       *
109  *************************************************/  *************************************************/
# Line 122  while (length-- > 0) Line 136  while (length-- > 0)
136  *          Match a back-reference                *  *          Match a back-reference                *
137  *************************************************/  *************************************************/
138    
139  /* If a back reference hasn't been set, the length that is passed is greater  /* Normally, if a back reference hasn't been set, the length that is passed is
140  than the number of characters left in the string, so the match fails.  negative, so the match always fails. However, in JavaScript compatibility mode,
141    the length passed is zero. Note that in caseless UTF-8 mode, the number of
142    subject bytes matched may be different to the number of reference bytes.
143    
144  Arguments:  Arguments:
145    offset      index into the offset vector    offset      index into the offset vector
146    eptr        points into the subject    eptr        pointer into the subject
147    length      length to be matched    length      length of reference to be matched (number of bytes)
148    md          points to match data block    md          points to match data block
149    ims         the ims flags    caseless    TRUE if caseless
150    
151  Returns:      TRUE if matched  Returns:      < 0 if not matched, otherwise the number of subject bytes matched
152  */  */
153    
154  static BOOL  static int
155  match_ref(int offset, register USPTR eptr, int length, match_data *md,  match_ref(int offset, register USPTR eptr, int length, match_data *md,
156    unsigned long int ims)    BOOL caseless)
157  {  {
158  USPTR p = md->start_subject + md->offset_vector[offset];  USPTR eptr_start = eptr;
159    register USPTR p = md->start_subject + md->offset_vector[offset];
160    
161  #ifdef DEBUG  #ifdef PCRE_DEBUG
162  if (eptr >= md->end_subject)  if (eptr >= md->end_subject)
163    printf("matching subject <null>");    printf("matching subject <null>");
164  else  else
# Line 154  pchars(p, length, FALSE, md); Line 171  pchars(p, length, FALSE, md);
171  printf("\n");  printf("\n");
172  #endif  #endif
173    
174  /* Always fail if not enough characters left */  /* Always fail if reference not set (and not JavaScript compatible). */
175    
176  if (length > md->end_subject - eptr) return FALSE;  if (length < 0) return -1;
177    
178  /* Separate the caseless case for speed. In UTF-8 mode we can only do this  /* Separate the caseless case for speed. In UTF-8 mode we can only do this
179  properly if Unicode properties are supported. Otherwise, we can check only  properly if Unicode properties are supported. Otherwise, we can check only
180  ASCII characters. */  ASCII characters. */
181    
182  if ((ims & PCRE_CASELESS) != 0)  if (caseless)
183    {    {
184  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
185  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
186    if (md->utf8)    if (md->utf8)
187      {      {
188      USPTR endptr = eptr + length;      /* Match characters up to the end of the reference. NOTE: the number of
189      while (eptr < endptr)      bytes matched may differ, because there are some characters whose upper and
190        lower case versions code as different numbers of bytes. For example, U+023A
191        (2 bytes in UTF-8) is the upper case version of U+2C65 (3 bytes in UTF-8);
192        a sequence of 3 of the former uses 6 bytes, as does a sequence of two of
193        the latter. It is important, therefore, to check the length along the
194        reference, not along the subject (earlier code did this wrong). */
195    
196        USPTR endptr = p + length;
197        while (p < endptr)
198        {        {
199        int c, d;        int c, d;
200          if (eptr >= md->end_subject) return -1;
201        GETCHARINC(c, eptr);        GETCHARINC(c, eptr);
202        GETCHARINC(d, p);        GETCHARINC(d, p);
203        if (c != d && c != UCD_OTHERCASE(d)) return FALSE;        if (c != d && c != UCD_OTHERCASE(d)) return -1;
204        }        }
205      }      }
206    else    else
# Line 183  if ((ims & PCRE_CASELESS) != 0) Line 209  if ((ims & PCRE_CASELESS) != 0)
209    
210    /* The same code works when not in UTF-8 mode and in UTF-8 mode when there    /* The same code works when not in UTF-8 mode and in UTF-8 mode when there
211    is no UCP support. */    is no UCP support. */
212        {
213    while (length-- > 0)      if (eptr + length > md->end_subject) return -1;
214      { if (md->lcc[*p++] != md->lcc[*eptr++]) return FALSE; }      while (length-- > 0)
215          { if (md->lcc[*p++] != md->lcc[*eptr++]) return -1; }
216        }
217    }    }
218    
219  /* In the caseful case, we can just compare the bytes, whether or not we  /* In the caseful case, we can just compare the bytes, whether or not we
220  are in UTF-8 mode. */  are in UTF-8 mode. */
221    
222  else  else
223    { while (length-- > 0) if (*p++ != *eptr++) return FALSE; }    {
224      if (eptr + length > md->end_subject) return -1;
225      while (length-- > 0) if (*p++ != *eptr++) return -1;
226      }
227    
228  return TRUE;  return eptr - eptr_start;
229  }  }
230    
231    
# Line 245  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM Line 276  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
276         RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,         RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
277         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
278         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
279         RM51,  RM52, RM53, RM54 };         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
280           RM61,  RM62, RM63 };
281    
282  /* These versions of the macros use the stack, as normal. There are debugging  /* These versions of the macros use the stack, as normal. There are debugging
283  versions and production versions. Note that the "rw" argument of RMATCH isn't  versions and production versions. Note that the "rw" argument of RMATCH isn't
284  actuall used in this definition. */  actually used in this definition. */
285    
286  #ifndef NO_RECURSE  #ifndef NO_RECURSE
287  #define REGISTER register  #define REGISTER register
288    
289  #ifdef DEBUG  #ifdef PCRE_DEBUG
290  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
291    { \    { \
292    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
293    rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1); \    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1); \
294    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
295    }    }
296  #define RRETURN(ra) \  #define RRETURN(ra) \
# Line 267  actuall used in this definition. */ Line 299  actuall used in this definition. */
299    return ra; \    return ra; \
300    }    }
301  #else  #else
302  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
303    rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1)    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1)
304  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
305  #endif  #endif
306    
# Line 281  argument of match(), which never changes Line 313  argument of match(), which never changes
313    
314  #define REGISTER  #define REGISTER
315    
316  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\  #define RMATCH(ra,rb,rc,rd,re,rw)\
317    {\    {\
318    heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\
319      if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
320    frame->Xwhere = rw; \    frame->Xwhere = rw; \
321    newframe->Xeptr = ra;\    newframe->Xeptr = ra;\
322    newframe->Xecode = rb;\    newframe->Xecode = rb;\
323    newframe->Xmstart = mstart;\    newframe->Xmstart = mstart;\
324      newframe->Xmarkptr = markptr;\
325    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
326    newframe->Xims = re;\    newframe->Xeptrb = re;\
   newframe->Xeptrb = rf;\  
   newframe->Xflags = rg;\  
327    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
328    newframe->Xprevframe = frame;\    newframe->Xprevframe = frame;\
329    frame = newframe;\    frame = newframe;\
# Line 303  argument of match(), which never changes Line 335  argument of match(), which never changes
335    
336  #define RRETURN(ra)\  #define RRETURN(ra)\
337    {\    {\
338    heapframe *newframe = frame;\    heapframe *oldframe = frame;\
339    frame = newframe->Xprevframe;\    frame = oldframe->Xprevframe;\
340    (pcre_stack_free)(newframe);\    (pcre_stack_free)(oldframe);\
341    if (frame != NULL)\    if (frame != NULL)\
342      {\      {\
343      rrc = ra;\      rrc = ra;\
# Line 325  typedef struct heapframe { Line 357  typedef struct heapframe {
357    USPTR Xeptr;    USPTR Xeptr;
358    const uschar *Xecode;    const uschar *Xecode;
359    USPTR Xmstart;    USPTR Xmstart;
360      USPTR Xmarkptr;
361    int Xoffset_top;    int Xoffset_top;
   long int Xims;  
362    eptrblock *Xeptrb;    eptrblock *Xeptrb;
   int Xflags;  
363    unsigned int Xrdepth;    unsigned int Xrdepth;
364    
365    /* Function local variables */    /* Function local variables */
# Line 349  typedef struct heapframe { Line 380  typedef struct heapframe {
380    BOOL Xcondition;    BOOL Xcondition;
381    BOOL Xprev_is_word;    BOOL Xprev_is_word;
382    
   unsigned long int Xoriginal_ims;  
   
383  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
384    int Xprop_type;    int Xprop_type;
385    int Xprop_value;    int Xprop_value;
386    int Xprop_fail_result;    int Xprop_fail_result;
   int Xprop_category;  
   int Xprop_chartype;  
   int Xprop_script;  
387    int Xoclength;    int Xoclength;
388    uschar Xocchars[8];    uschar Xocchars[8];
389  #endif  #endif
# Line 408  immediately. The second one is used when Line 434  immediately. The second one is used when
434  the subject. */  the subject. */
435    
436  #define CHECK_PARTIAL()\  #define CHECK_PARTIAL()\
437    if (md->partial != 0 && eptr >= md->end_subject && eptr > mstart)\    if (md->partial != 0 && eptr >= md->end_subject && \
438      {\        eptr > md->start_used_ptr) \
439      md->hitend = TRUE;\      { \
440      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);\      md->hitend = TRUE; \
441        if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \
442      }      }
443    
444  #define SCHECK_PARTIAL()\  #define SCHECK_PARTIAL()\
445    if (md->partial && eptr > mstart)\    if (md->partial != 0 && eptr > md->start_used_ptr) \
446      {\      { \
447      md->hitend = TRUE;\      md->hitend = TRUE; \
448      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);\      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \
449      }      }
450    
451    
# Line 432  Arguments: Line 459  Arguments:
459     ecode       pointer to current position in compiled code     ecode       pointer to current position in compiled code
460     mstart      pointer to the current match start position (can be modified     mstart      pointer to the current match start position (can be modified
461                   by encountering \K)                   by encountering \K)
462       markptr     pointer to the most recent MARK name, or NULL
463     offset_top  current top pointer     offset_top  current top pointer
464     md          pointer to "static" info for the match     md          pointer to "static" info for the match
    ims         current /i, /m, and /s options  
465     eptrb       pointer to chain of blocks containing eptr at start of     eptrb       pointer to chain of blocks containing eptr at start of
466                   brackets - for testing for empty matches                   brackets - for testing for empty matches
    flags       can contain  
                  match_condassert - this is an assertion condition  
                  match_cbegroup - this is the start of an unlimited repeat  
                    group that can match an empty string  
467     rdepth      the recursion depth     rdepth      the recursion depth
468    
469  Returns:       MATCH_MATCH if matched            )  these values are >= 0  Returns:       MATCH_MATCH if matched            )  these values are >= 0
470                 MATCH_NOMATCH if failed to match  )                 MATCH_NOMATCH if failed to match  )
471                   a negative MATCH_xxx value for PRUNE, SKIP, etc
472                 a negative PCRE_ERROR_xxx value if aborted by an error condition                 a negative PCRE_ERROR_xxx value if aborted by an error condition
473                   (e.g. stopped by repeated call or recursion limit)                   (e.g. stopped by repeated call or recursion limit)
474  */  */
475    
476  static int  static int
477  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,
478    int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,    const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,
479    int flags, unsigned int rdepth)    unsigned int rdepth)
480  {  {
481  /* These variables do not need to be preserved over recursion in this function,  /* These variables do not need to be preserved over recursion in this function,
482  so they can be ordinary variables in all cases. Mark some of them with  so they can be ordinary variables in all cases. Mark some of them with
# Line 464  register unsigned int c;   /* Character Line 488  register unsigned int c;   /* Character
488  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */
489    
490  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
491    BOOL caseless;
492  int condcode;  int condcode;
493    
494  /* When recursion is not being used, all "local" variables that have to be  /* When recursion is not being used, all "local" variables that have to be
# Line 472  heap storage. Set up the top-level frame Line 497  heap storage. Set up the top-level frame
497  heap whenever RMATCH() does a "recursion". See the macro definitions above. */  heap whenever RMATCH() does a "recursion". See the macro definitions above. */
498    
499  #ifdef NO_RECURSE  #ifdef NO_RECURSE
500  heapframe *frame = (pcre_stack_malloc)(sizeof(heapframe));  heapframe *frame = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));
501    if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
502  frame->Xprevframe = NULL;            /* Marks the top level */  frame->Xprevframe = NULL;            /* Marks the top level */
503    
504  /* Copy in the original argument variables */  /* Copy in the original argument variables */
# Line 480  frame->Xprevframe = NULL;            /* Line 506  frame->Xprevframe = NULL;            /*
506  frame->Xeptr = eptr;  frame->Xeptr = eptr;
507  frame->Xecode = ecode;  frame->Xecode = ecode;
508  frame->Xmstart = mstart;  frame->Xmstart = mstart;
509    frame->Xmarkptr = markptr;
510  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
 frame->Xims = ims;  
511  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
 frame->Xflags = flags;  
512  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
513    
514  /* This is where control jumps back to to effect "recursion" */  /* This is where control jumps back to to effect "recursion" */
# Line 495  HEAP_RECURSE: Line 520  HEAP_RECURSE:
520  #define eptr               frame->Xeptr  #define eptr               frame->Xeptr
521  #define ecode              frame->Xecode  #define ecode              frame->Xecode
522  #define mstart             frame->Xmstart  #define mstart             frame->Xmstart
523    #define markptr            frame->Xmarkptr
524  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
 #define ims                frame->Xims  
525  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
 #define flags              frame->Xflags  
526  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
527    
528  /* Ditto for the local variables */  /* Ditto for the local variables */
# Line 520  HEAP_RECURSE: Line 544  HEAP_RECURSE:
544  #define condition          frame->Xcondition  #define condition          frame->Xcondition
545  #define prev_is_word       frame->Xprev_is_word  #define prev_is_word       frame->Xprev_is_word
546    
 #define original_ims       frame->Xoriginal_ims  
   
547  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
548  #define prop_type          frame->Xprop_type  #define prop_type          frame->Xprop_type
549  #define prop_value         frame->Xprop_value  #define prop_value         frame->Xprop_value
550  #define prop_fail_result   frame->Xprop_fail_result  #define prop_fail_result   frame->Xprop_fail_result
 #define prop_category      frame->Xprop_category  
 #define prop_chartype      frame->Xprop_chartype  
 #define prop_script        frame->Xprop_script  
551  #define oclength           frame->Xoclength  #define oclength           frame->Xoclength
552  #define occhars            frame->Xocchars  #define occhars            frame->Xocchars
553  #endif  #endif
# Line 558  i, and fc and c, can be the same variabl Line 577  i, and fc and c, can be the same variabl
577  #define fi i  #define fi i
578  #define fc c  #define fc c
579    
580    /* Many of the following variables are used only in small blocks of the code.
581    My normal style of coding would have declared them within each of those blocks.
582    However, in order to accommodate the version of this code that uses an external
583    "stack" implemented on the heap, it is easier to declare them all here, so the
584    declarations can be cut out in a block. The only declarations within blocks
585    below are for variables that do not have to be preserved over a recursive call
586    to RMATCH(). */
587    
588    #ifdef SUPPORT_UTF8
589    const uschar *charptr;
590    #endif
591    const uschar *callpat;
592    const uschar *data;
593    const uschar *next;
594    USPTR         pp;
595    const uschar *prev;
596    USPTR         saved_eptr;
597    
598  #ifdef SUPPORT_UTF8                /* Many of these variables are used only  */  recursion_info new_recursive;
599  const uschar *charptr;             /* in small blocks of the code. My normal */  
600  #endif                             /* style of coding would have declared    */  BOOL cur_is_word;
 const uschar *callpat;             /* them within each of those blocks.      */  
 const uschar *data;                /* However, in order to accommodate the   */  
 const uschar *next;                /* version of this code that uses an      */  
 USPTR         pp;                  /* external "stack" implemented on the    */  
 const uschar *prev;                /* heap, it is easier to declare them all */  
 USPTR         saved_eptr;          /* here, so the declarations can be cut   */  
                                    /* out in a block. The only declarations  */  
 recursion_info new_recursive;      /* within blocks below are for variables  */  
                                    /* that do not have to be preserved over  */  
 BOOL cur_is_word;                  /* a recursive call to RMATCH().          */  
601  BOOL condition;  BOOL condition;
602  BOOL prev_is_word;  BOOL prev_is_word;
603    
 unsigned long int original_ims;  
   
604  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
605  int prop_type;  int prop_type;
606  int prop_value;  int prop_value;
607  int prop_fail_result;  int prop_fail_result;
 int prop_category;  
 int prop_chartype;  
 int prop_script;  
608  int oclength;  int oclength;
609  uschar occhars[8];  uschar occhars[8];
610  #endif  #endif
# Line 603  int stacksave[REC_STACK_SAVE_MAX]; Line 624  int stacksave[REC_STACK_SAVE_MAX];
624  eptrblock newptrb;  eptrblock newptrb;
625  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
626    
627    /* To save space on the stack and in the heap frame, I have doubled up on some
628    of the local variables that are used only in localised parts of the code, but
629    still need to be preserved over recursive calls of match(). These macros define
630    the alternative names that are used. */
631    
632    #define allow_zero    cur_is_word
633    #define cbegroup      condition
634    #define code_offset   codelink
635    #define condassert    condition
636    #define matched_once  prev_is_word
637    
638  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
639  variables. */  variables. */
640    
# Line 622  TAIL_RECURSE: Line 654  TAIL_RECURSE:
654  /* OK, now we can get on with the real code of the function. Recursive calls  /* OK, now we can get on with the real code of the function. Recursive calls
655  are specified by the macro RMATCH and RRETURN is used to return. When  are specified by the macro RMATCH and RRETURN is used to return. When
656  NO_RECURSE is *not* defined, these just turn into a recursive call to match()  NO_RECURSE is *not* defined, these just turn into a recursive call to match()
657  and a "return", respectively (possibly with some debugging if DEBUG is  and a "return", respectively (possibly with some debugging if PCRE_DEBUG is
658  defined). However, RMATCH isn't like a function call because it's quite a  defined). However, RMATCH isn't like a function call because it's quite a
659  complicated macro. It has to be used in one particular way. This shouldn't,  complicated macro. It has to be used in one particular way. This shouldn't,
660  however, impact performance when true recursion is being used. */  however, impact performance when true recursion is being used. */
# Line 639  haven't exceeded the recursive call limi Line 671  haven't exceeded the recursive call limi
671  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);
672  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
673    
 original_ims = ims;    /* Save for resetting on ')' */  
   
674  /* At the start of a group with an unlimited repeat that may match an empty  /* At the start of a group with an unlimited repeat that may match an empty
675  string, the match_cbegroup flag is set. When this is the case, add the current  string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is
676  subject pointer to the chain of such remembered pointers, to be checked when we  done this way to save having to use another function argument, which would take
677  hit the closing ket, in order to break infinite loops that match no characters.  up space on the stack. See also MATCH_CONDASSERT below.
678  When match() is called in other circumstances, don't add to the chain. The  
679  match_cbegroup flag must NOT be used with tail recursion, because the memory  When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
680  block that is used is on the stack, so a new one may be required for each  such remembered pointers, to be checked when we hit the closing ket, in order
681  match(). */  to break infinite loops that match no characters. When match() is called in
682    other circumstances, don't add to the chain. The MATCH_CBEGROUP feature must
683    NOT be used with tail recursion, because the memory block that is used is on
684    the stack, so a new one may be required for each match(). */
685    
686  if ((flags & match_cbegroup) != 0)  if (md->match_function_type == MATCH_CBEGROUP)
687    {    {
688    newptrb.epb_saved_eptr = eptr;    newptrb.epb_saved_eptr = eptr;
689    newptrb.epb_prev = eptrb;    newptrb.epb_prev = eptrb;
690    eptrb = &newptrb;    eptrb = &newptrb;
691      md->match_function_type = 0;
692    }    }
693    
694  /* Now start processing the opcodes. */  /* Now start processing the opcodes. */
# Line 666  for (;;) Line 700  for (;;)
700    
701    switch(op)    switch(op)
702      {      {
703        case OP_MARK:
704        markptr = ecode + 2;
705        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
706          eptrb, RM55);
707    
708        /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
709        argument, and we must check whether that argument matches this MARK's
710        argument. It is passed back in md->start_match_ptr (an overloading of that
711        variable). If it does match, we reset that variable to the current subject
712        position and return MATCH_SKIP. Otherwise, pass back the return code
713        unaltered. */
714    
715        if (rrc == MATCH_SKIP_ARG &&
716            strcmp((char *)markptr, (char *)(md->start_match_ptr)) == 0)
717          {
718          md->start_match_ptr = eptr;
719          RRETURN(MATCH_SKIP);
720          }
721    
722        if (md->mark == NULL) md->mark = markptr;
723        RRETURN(rrc);
724    
725      case OP_FAIL:      case OP_FAIL:
726      RRETURN(MATCH_NOMATCH);      MRRETURN(MATCH_NOMATCH);
727    
728        /* COMMIT overrides PRUNE, SKIP, and THEN */
729    
730        case OP_COMMIT:
731        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
732          eptrb, RM52);
733        if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
734            rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
735            rrc != MATCH_THEN)
736          RRETURN(rrc);
737        MRRETURN(MATCH_COMMIT);
738    
739        /* PRUNE overrides THEN */
740    
741      case OP_PRUNE:      case OP_PRUNE:
742      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
743        ims, eptrb, flags, RM51);        eptrb, RM51);
744      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
745        MRRETURN(MATCH_PRUNE);
746    
747        case OP_PRUNE_ARG:
748        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
749          eptrb, RM56);
750        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
751        md->mark = ecode + 2;
752      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
753    
754      case OP_COMMIT:      /* SKIP overrides PRUNE and THEN */
     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,  
       ims, eptrb, flags, RM52);  
     if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
     RRETURN(MATCH_COMMIT);  
755    
756      case OP_SKIP:      case OP_SKIP:
757      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
758        ims, eptrb, flags, RM53);        eptrb, RM53);
759      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
760          RRETURN(rrc);
761      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
762      RRETURN(MATCH_SKIP);      MRRETURN(MATCH_SKIP);
763    
764        case OP_SKIP_ARG:
765        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
766          eptrb, RM57);
767        if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
768          RRETURN(rrc);
769    
770        /* Pass back the current skip name by overloading md->start_match_ptr and
771        returning the special MATCH_SKIP_ARG return code. This will either be
772        caught by a matching MARK, or get to the top, where it is treated the same
773        as PRUNE. */
774    
775        md->start_match_ptr = ecode + 2;
776        RRETURN(MATCH_SKIP_ARG);
777    
778        /* For THEN (and THEN_ARG) we pass back the address of the bracket or
779        the alt that is at the start of the current branch. This makes it possible
780        to skip back past alternatives that precede the THEN within the current
781        branch. */
782    
783      case OP_THEN:      case OP_THEN:
784      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
785        ims, eptrb, flags, RM54);        eptrb, RM54);
786        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
787        md->start_match_ptr = ecode - GET(ecode, 1);
788        MRRETURN(MATCH_THEN);
789    
790        case OP_THEN_ARG:
791        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],
792          offset_top, md, eptrb, RM58);
793      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
794        md->start_match_ptr = ecode - GET(ecode, 1);
795        md->mark = ecode + LINK_SIZE + 2;
796      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
797    
798      /* Handle a capturing bracket. If there is space in the offset vector, save      /* Handle a capturing bracket, other than those that are possessive with an
799      the current subject position in the working slot at the top of the vector.      unlimited repeat. If there is space in the offset vector, save the current
800      We mustn't change the current values of the data slot, because they may be      subject position in the working slot at the top of the vector. We mustn't
801      set from a previous iteration of this group, and be referred to by a      change the current values of the data slot, because they may be set from a
802      reference inside the group.      previous iteration of this group, and be referred to by a reference inside
803        the group. A failure to match might occur after the group has succeeded,
804      If the bracket fails to match, we need to restore this value and also the      if something later on doesn't match. For this reason, we need to restore
805      values of the final offsets, in case they were set by a previous iteration      the working value and also the values of the final offsets, in case they
806      of the same bracket.      were set by a previous iteration of the same bracket.
807    
808      If there isn't enough space in the offset vector, treat this as if it were      If there isn't enough space in the offset vector, treat this as if it were
809      a non-capturing bracket. Don't worry about setting the flag for the error      a non-capturing bracket. Don't worry about setting the flag for the error
# Line 713  for (;;) Line 814  for (;;)
814      number = GET2(ecode, 1+LINK_SIZE);      number = GET2(ecode, 1+LINK_SIZE);
815      offset = number << 1;      offset = number << 1;
816    
817  #ifdef DEBUG  #ifdef PCRE_DEBUG
818      printf("start bracket %d\n", number);      printf("start bracket %d\n", number);
819      printf("subject=");      printf("subject=");
820      pchars(eptr, 16, TRUE, md);      pchars(eptr, 16, TRUE, md);
# Line 728  for (;;) Line 829  for (;;)
829        save_capture_last = md->capture_last;        save_capture_last = md->capture_last;
830    
831        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
832        md->offset_vector[md->offset_end - number] = eptr - md->start_subject;        md->offset_vector[md->offset_end - number] =
833            (int)(eptr - md->start_subject);
834    
835        flags = (op == OP_SCBRA)? match_cbegroup : 0;        for (;;)
       do  
836          {          {
837            if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
838          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
839            ims, eptrb, flags, RM1);            eptrb, RM1);
840          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);          if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
841            if (rrc != MATCH_NOMATCH &&
842                (rrc != MATCH_THEN || md->start_match_ptr != ecode))
843              RRETURN(rrc);
844          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
845          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
846            if (*ecode != OP_ALT) break;
847          }          }
       while (*ecode == OP_ALT);  
848    
849        DPRINTF(("bracket %d failed\n", number));        DPRINTF(("bracket %d failed\n", number));
   
850        md->offset_vector[offset] = save_offset1;        md->offset_vector[offset] = save_offset1;
851        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
852        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
853    
854        RRETURN(MATCH_NOMATCH);        /* At this point, rrc will be one of MATCH_ONCE, MATCH_NOMATCH, or
855          MATCH_THEN. */
856    
857          if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;
858          RRETURN(((rrc == MATCH_ONCE)? MATCH_ONCE:MATCH_NOMATCH));
859        }        }
860    
861      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
# Line 761  for (;;) Line 869  for (;;)
869      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
870      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
871    
872      /* Non-capturing bracket. Loop for all the alternatives. When we get to the      /* Non-capturing or atomic group, except for possessive with unlimited
873      final alternative within the brackets, we would return the result of a      repeat. Loop for all the alternatives. When we get to the final alternative
874      recursive call to match() whatever happened. We can reduce stack usage by      within the brackets, we used to return the result of a recursive call to
875      turning this into a tail recursion, except in the case when match_cbegroup      match() whatever happened so it was possible to reduce stack usage by
876      is set.*/      turning this into a tail recursion, except in the case of a possibly empty
877        group. However, now that there is the possiblity of (*THEN) occurring in
878        the final alternative, this optimization is no longer possible.
879    
880        MATCH_ONCE is returned when the end of an atomic group is successfully
881        reached, but subsequent matching fails. It passes back up the tree (causing
882        captured values to be reset) until the original atomic group level is
883        reached. This is tested by comparing md->once_target with the start of the
884        group. At this point, the return is converted into MATCH_NOMATCH so that
885        previous backup points can be taken. */
886    
887        case OP_ONCE:
888      case OP_BRA:      case OP_BRA:
889      case OP_SBRA:      case OP_SBRA:
890      DPRINTF(("start non-capturing bracket\n"));      DPRINTF(("start non-capturing bracket\n"));
891      flags = (op >= OP_SBRA)? match_cbegroup : 0;  
892      for (;;)      for (;;)
893        {        {
894        if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */        if (op >= OP_SBRA || op == OP_ONCE) md->match_function_type = MATCH_CBEGROUP;
895          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,
896            RM2);
897          if (rrc != MATCH_NOMATCH &&
898              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
899          {          {
900          if (flags == 0)    /* Not a possibly empty group */          if (rrc == MATCH_ONCE)
901            {            {
902            ecode += _pcre_OP_lengths[*ecode];            const uschar *scode = ecode;
903            DPRINTF(("bracket 0 tail recursion\n"));            if (*scode != OP_ONCE)           /* If not at start, find it */
904            goto TAIL_RECURSE;              {
905                while (*scode == OP_ALT) scode += GET(scode, 1);
906                scode -= GET(scode, 1);
907                }
908              if (md->once_target == scode) rrc = MATCH_NOMATCH;
909            }            }
910            RRETURN(rrc);
911            }
912          ecode += GET(ecode, 1);
913          if (*ecode != OP_ALT) break;
914          }
915        if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;
916        RRETURN(MATCH_NOMATCH);
917    
918          /* Possibly empty group; can't use tail recursion. */      /* Handle possessive capturing brackets with an unlimited repeat. We come
919        here from BRAZERO with allow_zero set TRUE. The offset_vector values are
920        handled similarly to the normal case above. However, the matching is
921        different. The end of these brackets will always be OP_KETRPOS, which
922        returns MATCH_KETRPOS without going further in the pattern. By this means
923        we can handle the group by iteration rather than recursion, thereby
924        reducing the amount of stack needed. */
925    
926        case OP_CBRAPOS:
927        case OP_SCBRAPOS:
928        allow_zero = FALSE;
929    
930          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,      POSSESSIVE_CAPTURE:
931            eptrb, flags, RM48);      number = GET2(ecode, 1+LINK_SIZE);
932          RRETURN(rrc);      offset = number << 1;
933    
934    #ifdef PCRE_DEBUG
935        printf("start possessive bracket %d\n", number);
936        printf("subject=");
937        pchars(eptr, 16, TRUE, md);
938        printf("\n");
939    #endif
940    
941        if (offset < md->offset_max)
942          {
943          matched_once = FALSE;
944          code_offset = ecode - md->start_code;
945    
946          save_offset1 = md->offset_vector[offset];
947          save_offset2 = md->offset_vector[offset+1];
948          save_offset3 = md->offset_vector[md->offset_end - number];
949          save_capture_last = md->capture_last;
950    
951          DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
952    
953          /* Each time round the loop, save the current subject position for use
954          when the group matches. For MATCH_MATCH, the group has matched, so we
955          restart it with a new subject starting position, remembering that we had
956          at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
957          usual. If we haven't matched any alternatives in any iteration, check to
958          see if a previous iteration matched. If so, the group has matched;
959          continue from afterwards. Otherwise it has failed; restore the previous
960          capture values before returning NOMATCH. */
961    
962          for (;;)
963            {
964            md->offset_vector[md->offset_end - number] =
965              (int)(eptr - md->start_subject);
966            if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
967            RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
968              eptrb, RM63);
969            if (rrc == MATCH_KETRPOS)
970              {
971              offset_top = md->end_offset_top;
972              eptr = md->end_match_ptr;
973              ecode = md->start_code + code_offset;
974              save_capture_last = md->capture_last;
975              matched_once = TRUE;
976              continue;
977              }
978            if (rrc != MATCH_NOMATCH &&
979                (rrc != MATCH_THEN || md->start_match_ptr != ecode))
980              RRETURN(rrc);
981            md->capture_last = save_capture_last;
982            ecode += GET(ecode, 1);
983            if (*ecode != OP_ALT) break;
984          }          }
985    
986        /* For non-final alternatives, continue the loop for a NOMATCH result;        if (!matched_once)
987        otherwise return. */          {
988            md->offset_vector[offset] = save_offset1;
989            md->offset_vector[offset+1] = save_offset2;
990            md->offset_vector[md->offset_end - number] = save_offset3;
991            }
992    
993          if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;
994          if (allow_zero || matched_once)
995            {
996            ecode += 1 + LINK_SIZE;
997            break;
998            }
999    
1000          RRETURN(MATCH_NOMATCH);
1001          }
1002    
1003        /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
1004        as a non-capturing bracket. */
1005    
1006        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1007        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1008    
1009        DPRINTF(("insufficient capture room: treat as non-capturing\n"));
1010    
1011        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1012        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1013    
1014        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,      /* Non-capturing possessive bracket with unlimited repeat. We come here
1015          eptrb, flags, RM2);      from BRAZERO with allow_zero = TRUE. The code is similar to the above,
1016        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      without the capturing complication. It is written out separately for speed
1017        and cleanliness. */
1018    
1019        case OP_BRAPOS:
1020        case OP_SBRAPOS:
1021        allow_zero = FALSE;
1022    
1023        POSSESSIVE_NON_CAPTURE:
1024        matched_once = FALSE;
1025        code_offset = ecode - md->start_code;
1026    
1027        for (;;)
1028          {
1029          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1030          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
1031            eptrb, RM48);
1032          if (rrc == MATCH_KETRPOS)
1033            {
1034            offset_top = md->end_offset_top;
1035            eptr = md->end_match_ptr;
1036            ecode = md->start_code + code_offset;
1037            matched_once = TRUE;
1038            continue;
1039            }
1040          if (rrc != MATCH_NOMATCH &&
1041              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1042            RRETURN(rrc);
1043        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1044          if (*ecode != OP_ALT) break;
1045        }        }
1046    
1047        if (matched_once || allow_zero)
1048          {
1049          ecode += 1 + LINK_SIZE;
1050          break;
1051          }
1052        RRETURN(MATCH_NOMATCH);
1053    
1054      /* Control never reaches here. */      /* Control never reaches here. */
1055    
1056      /* Conditional group: compilation checked that there are no more than      /* Conditional group: compilation checked that there are no more than
1057      two branches. If the condition is false, skipping the first branch takes us      two branches. If the condition is false, skipping the first branch takes us
1058      past the end if there is only one branch, but that's OK because that is      past the end if there is only one branch, but that's OK because that is
1059      exactly what going to the ket would do. As there is only one branch to be      exactly what going to the ket would do. */
     obeyed, we can use tail recursion to avoid using another stack frame. */  
1060    
1061      case OP_COND:      case OP_COND:
1062      case OP_SCOND:      case OP_SCOND:
1063      codelink= GET(ecode, 1);      codelink = GET(ecode, 1);
1064    
1065      /* Because of the way auto-callout works during compile, a callout item is      /* Because of the way auto-callout works during compile, a callout item is
1066      inserted between OP_COND and an assertion condition. */      inserted between OP_COND and an assertion condition. */
# Line 821  for (;;) Line 1074  for (;;)
1074          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[LINK_SIZE+2];
1075          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1076          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
1077          cb.subject_length   = md->end_subject - md->start_subject;          cb.subject_length   = (int)(md->end_subject - md->start_subject);
1078          cb.start_match      = mstart - md->start_subject;          cb.start_match      = (int)(mstart - md->start_subject);
1079          cb.current_position = eptr - md->start_subject;          cb.current_position = (int)(eptr - md->start_subject);
1080          cb.pattern_position = GET(ecode, LINK_SIZE + 3);          cb.pattern_position = GET(ecode, LINK_SIZE + 3);
1081          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);
1082          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1083          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last;
1084          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1085          if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
1086          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1087          }          }
1088        ecode += _pcre_OP_lengths[OP_CALLOUT];        ecode += _pcre_OP_lengths[OP_CALLOUT];
# Line 839  for (;;) Line 1092  for (;;)
1092    
1093      /* Now see what the actual condition is */      /* Now see what the actual condition is */
1094    
1095      if (condcode == OP_RREF)         /* Recursion test */      if (condcode == OP_RREF || condcode == OP_NRREF)    /* Recursion test */
1096        {        {
1097        offset = GET2(ecode, LINK_SIZE + 2);     /* Recursion group number*/        if (md->recursive == NULL)                /* Not recursing => FALSE */
1098        condition = md->recursive != NULL &&          {
1099          (offset == RREF_ANY || offset == md->recursive->group_num);          condition = FALSE;
1100        ecode += condition? 3 : GET(ecode, 1);          ecode += GET(ecode, 1);
1101            }
1102          else
1103            {
1104            int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
1105            condition =  (recno == RREF_ANY || recno == md->recursive->group_num);
1106    
1107            /* If the test is for recursion into a specific subpattern, and it is
1108            false, but the test was set up by name, scan the table to see if the
1109            name refers to any other numbers, and test them. The condition is true
1110            if any one is set. */
1111    
1112            if (!condition && condcode == OP_NRREF && recno != RREF_ANY)
1113              {
1114              uschar *slotA = md->name_table;
1115              for (i = 0; i < md->name_count; i++)
1116                {
1117                if (GET2(slotA, 0) == recno) break;
1118                slotA += md->name_entry_size;
1119                }
1120    
1121              /* Found a name for the number - there can be only one; duplicate
1122              names for different numbers are allowed, but not vice versa. First
1123              scan down for duplicates. */
1124    
1125              if (i < md->name_count)
1126                {
1127                uschar *slotB = slotA;
1128                while (slotB > md->name_table)
1129                  {
1130                  slotB -= md->name_entry_size;
1131                  if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
1132                    {
1133                    condition = GET2(slotB, 0) == md->recursive->group_num;
1134                    if (condition) break;
1135                    }
1136                  else break;
1137                  }
1138    
1139                /* Scan up for duplicates */
1140    
1141                if (!condition)
1142                  {
1143                  slotB = slotA;
1144                  for (i++; i < md->name_count; i++)
1145                    {
1146                    slotB += md->name_entry_size;
1147                    if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
1148                      {
1149                      condition = GET2(slotB, 0) == md->recursive->group_num;
1150                      if (condition) break;
1151                      }
1152                    else break;
1153                    }
1154                  }
1155                }
1156              }
1157    
1158            /* Chose branch according to the condition */
1159    
1160            ecode += condition? 3 : GET(ecode, 1);
1161            }
1162        }        }
1163    
1164      else if (condcode == OP_CREF)    /* Group used test */      else if (condcode == OP_CREF || condcode == OP_NCREF)  /* Group used test */
1165        {        {
1166        offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */        offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */
1167        condition = offset < offset_top && md->offset_vector[offset] >= 0;        condition = offset < offset_top && md->offset_vector[offset] >= 0;
1168    
1169          /* If the numbered capture is unset, but the reference was by name,
1170          scan the table to see if the name refers to any other numbers, and test
1171          them. The condition is true if any one is set. This is tediously similar
1172          to the code above, but not close enough to try to amalgamate. */
1173    
1174          if (!condition && condcode == OP_NCREF)
1175            {
1176            int refno = offset >> 1;
1177            uschar *slotA = md->name_table;
1178    
1179            for (i = 0; i < md->name_count; i++)
1180              {
1181              if (GET2(slotA, 0) == refno) break;
1182              slotA += md->name_entry_size;
1183              }
1184    
1185            /* Found a name for the number - there can be only one; duplicate names
1186            for different numbers are allowed, but not vice versa. First scan down
1187            for duplicates. */
1188    
1189            if (i < md->name_count)
1190              {
1191              uschar *slotB = slotA;
1192              while (slotB > md->name_table)
1193                {
1194                slotB -= md->name_entry_size;
1195                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
1196                  {
1197                  offset = GET2(slotB, 0) << 1;
1198                  condition = offset < offset_top &&
1199                    md->offset_vector[offset] >= 0;
1200                  if (condition) break;
1201                  }
1202                else break;
1203                }
1204    
1205              /* Scan up for duplicates */
1206    
1207              if (!condition)
1208                {
1209                slotB = slotA;
1210                for (i++; i < md->name_count; i++)
1211                  {
1212                  slotB += md->name_entry_size;
1213                  if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
1214                    {
1215                    offset = GET2(slotB, 0) << 1;
1216                    condition = offset < offset_top &&
1217                      md->offset_vector[offset] >= 0;
1218                    if (condition) break;
1219                    }
1220                  else break;
1221                  }
1222                }
1223              }
1224            }
1225    
1226          /* Chose branch according to the condition */
1227    
1228        ecode += condition? 3 : GET(ecode, 1);        ecode += condition? 3 : GET(ecode, 1);
1229        }        }
1230    
# Line 861  for (;;) Line 1235  for (;;)
1235        }        }
1236    
1237      /* The condition is an assertion. Call match() to evaluate it - setting      /* The condition is an assertion. Call match() to evaluate it - setting
1238      the final argument match_condassert causes it to stop at the end of an      md->match_function_type to MATCH_CONDASSERT causes it to stop at the end of
1239      assertion. */      an assertion. */
1240    
1241      else      else
1242        {        {
1243        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,        md->match_function_type = MATCH_CONDASSERT;
1244            match_condassert, RM3);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);
1245        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
1246          {          {
1247            if (md->end_offset_top > offset_top)
1248              offset_top = md->end_offset_top;  /* Captures may have happened */
1249          condition = TRUE;          condition = TRUE;
1250          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
1251          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1252          }          }
1253        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)        else if (rrc != MATCH_NOMATCH &&
1254                  (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1255          {          {
1256          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
1257          }          }
# Line 886  for (;;) Line 1263  for (;;)
1263        }        }
1264    
1265      /* We are now at the branch that is to be obeyed. As there is only one,      /* We are now at the branch that is to be obeyed. As there is only one,
1266      we can use tail recursion to avoid using another stack frame, except when      we used to use tail recursion to avoid using another stack frame, except
1267      match_cbegroup is required for an unlimited repeat of a possibly empty      when there was unlimited repeat of a possibly empty group. However, that
1268      group. If the second alternative doesn't exist, we can just plough on. */      strategy no longer works because of the possibilty of (*THEN) being
1269        encountered in the branch. A recursive call to match() is always required,
1270        unless the second alternative doesn't exist, in which case we can just
1271        plough on. */
1272    
1273      if (condition || *ecode == OP_ALT)      if (condition || *ecode == OP_ALT)
1274        {        {
1275        ecode += 1 + LINK_SIZE;        if (op == OP_SCOND) md->match_function_type = MATCH_CBEGROUP;
1276        if (op == OP_SCOND)        /* Possibly empty group */        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
1277          {        if (rrc == MATCH_THEN && md->start_match_ptr == ecode)
1278          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, match_cbegroup, RM49);          rrc = MATCH_NOMATCH;
1279          RRETURN(rrc);        RRETURN(rrc);
         }  
       else                       /* Group must match something */  
         {  
         flags = 0;  
         goto TAIL_RECURSE;  
         }  
1280        }        }
1281      else                         /* Condition false & no alternative */      else                         /* Condition false & no alternative */
1282        {        {
1283        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1284        }        }
1285      break;      break;
1286    
1287    
1288      /* Before OP_ACCEPT there may be any number of OP_CLOSE opcodes,      /* Before OP_ACCEPT there may be any number of OP_CLOSE opcodes,
1289      to close any currently open capturing brackets. */      to close any currently open capturing brackets. */
1290    
1291      case OP_CLOSE:      case OP_CLOSE:
1292      number = GET2(ecode, 1);      number = GET2(ecode, 1);
1293      offset = number << 1;      offset = number << 1;
1294    
1295  #ifdef DEBUG  #ifdef PCRE_DEBUG
1296        printf("end bracket %d at *ACCEPT", number);        printf("end bracket %d at *ACCEPT", number);
1297        printf("\n");        printf("\n");
1298  #endif  #endif
# Line 928  for (;;) Line 1302  for (;;)
1302        {        {
1303        md->offset_vector[offset] =        md->offset_vector[offset] =
1304          md->offset_vector[md->offset_end - number];          md->offset_vector[md->offset_end - number];
1305        md->offset_vector[offset+1] = eptr - md->start_subject;        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1306        if (offset_top <= offset) offset_top = offset + 2;        if (offset_top <= offset) offset_top = offset + 2;
1307        }        }
1308      ecode += 3;      ecode += 3;
1309      break;      break;
1310    
1311    
1312      /* End of the pattern, either real or forced. If we are in a top-level      /* End of the pattern, either real or forced. */
     recursion, we should restore the offsets appropriately and continue from  
     after the call. */  
1313    
     case OP_ACCEPT:  
1314      case OP_END:      case OP_END:
1315      if (md->recursive != NULL && md->recursive->group_num == 0)      case OP_ACCEPT:
1316        {      case OP_ASSERT_ACCEPT:
       recursion_info *rec = md->recursive;  
       DPRINTF(("End of pattern in a (?0) recursion\n"));  
       md->recursive = rec->prevrec;  
       memmove(md->offset_vector, rec->offset_save,  
         rec->saved_max * sizeof(int));  
       offset_top = rec->offset_top;  
       mstart = rec->save_start;  
       ims = original_ims;  
       ecode = rec->after_call;  
       break;  
       }  
1317    
1318      /* Otherwise, if we have matched an empty string, fail if PCRE_NOTEMPTY is      /* If we have matched an empty string, fail if not in an assertion and not
1319      set, or if PCRE_NOTEMPTY_ATSTART is set and we have matched at the start of      in a recursion if either PCRE_NOTEMPTY is set, or if PCRE_NOTEMPTY_ATSTART
1320      the subject. In both cases, backtracking will then try other alternatives,      is set and we have matched at the start of the subject. In both cases,
1321      if any. */      backtracking will then try other alternatives, if any. */
1322    
1323      if (eptr == mstart &&      if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
1324          (md->notempty ||           md->recursive == NULL &&
1325            (md->notempty_atstart &&           (md->notempty ||
1326              mstart == md->start_subject + md->start_offset)))             (md->notempty_atstart &&
1327        RRETURN(MATCH_NOMATCH);               mstart == md->start_subject + md->start_offset)))
1328          MRRETURN(MATCH_NOMATCH);
1329    
1330      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
1331    
1332      md->end_match_ptr = eptr;           /* Record where we ended */      md->end_match_ptr = eptr;           /* Record where we ended */
1333      md->end_offset_top = offset_top;    /* and how many extracts were taken */      md->end_offset_top = offset_top;    /* and how many extracts were taken */
1334      md->start_match_ptr = mstart;       /* and the start (\K can modify) */      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
     RRETURN(MATCH_MATCH);  
1335    
1336      /* Change option settings */      /* For some reason, the macros don't work properly if an expression is
1337        given as the argument to MRRETURN when the heap is in use. */
1338    
1339      case OP_OPT:      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1340      ims = ecode[1];      MRRETURN(rrc);
     ecode += 2;  
     DPRINTF(("ims set to %02lx\n", ims));  
     break;  
1341    
1342      /* Assertion brackets. Check the alternative branches in turn - the      /* Assertion brackets. Check the alternative branches in turn - the
1343      matching won't pass the KET for an assertion. If any one branch matches,      matching won't pass the KET for an assertion. If any one branch matches,
1344      the assertion is true. Lookbehind assertions have an OP_REVERSE item at the      the assertion is true. Lookbehind assertions have an OP_REVERSE item at the
1345      start of each branch to move the current point backwards, so the code at      start of each branch to move the current point backwards, so the code at
1346      this level is identical to the lookahead case. */      this level is identical to the lookahead case. When the assertion is part
1347        of a condition, we want to return immediately afterwards. The caller of
1348        this incarnation of the match() function will have set MATCH_CONDASSERT in
1349        md->match_function type, and one of these opcodes will be the first opcode
1350        that is processed. We use a local variable that is preserved over calls to
1351        match() to remember this case. */
1352    
1353      case OP_ASSERT:      case OP_ASSERT:
1354      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1355        if (md->match_function_type == MATCH_CONDASSERT)
1356          {
1357          condassert = TRUE;
1358          md->match_function_type = 0;
1359          }
1360        else condassert = FALSE;
1361    
1362      do      do
1363        {        {
1364        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
1365          RM4);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1366        if (rrc == MATCH_MATCH) break;          {
1367        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);          mstart = md->start_match_ptr;   /* In case \K reset it */
1368            break;
1369            }
1370          if (rrc != MATCH_NOMATCH &&
1371              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1372            RRETURN(rrc);
1373        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1374        }        }
1375      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1376      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);  
1377        if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);
1378    
1379      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1380    
1381      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);
1382    
1383      /* Continue from after the assertion, updating the offsets high water      /* Continue from after the assertion, updating the offsets high water
1384      mark, since extracts may have been taken during the assertion. */      mark, since extracts may have been taken during the assertion. */
# Line 1012  for (;;) Line 1388  for (;;)
1388      offset_top = md->end_offset_top;      offset_top = md->end_offset_top;
1389      continue;      continue;
1390    
1391      /* Negative assertion: all branches must fail to match */      /* Negative assertion: all branches must fail to match. Encountering SKIP,
1392        PRUNE, or COMMIT means we must assume failure without checking subsequent
1393        branches. */
1394    
1395      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1396      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1397        if (md->match_function_type == MATCH_CONDASSERT)
1398          {
1399          condassert = TRUE;
1400          md->match_function_type = 0;
1401          }
1402        else condassert = FALSE;
1403    
1404      do      do
1405        {        {
1406        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1407          RM5);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);
1408        if (rrc == MATCH_MATCH) RRETURN(MATCH_NOMATCH);        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1409        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);          {
1410            do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1411            break;
1412            }
1413          if (rrc != MATCH_NOMATCH &&
1414              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1415            RRETURN(rrc);
1416        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1417        }        }
1418      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1419    
1420      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1421    
1422      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1423      continue;      continue;
# Line 1044  for (;;) Line 1435  for (;;)
1435        while (i-- > 0)        while (i-- > 0)
1436          {          {
1437          eptr--;          eptr--;
1438          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);          if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);
1439          BACKCHAR(eptr);          BACKCHAR(eptr);
1440          }          }
1441        }        }
# Line 1055  for (;;) Line 1446  for (;;)
1446    
1447        {        {
1448        eptr -= GET(ecode, 1);        eptr -= GET(ecode, 1);
1449        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);        if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);
1450        }        }
1451    
1452      /* Save the earliest consulted character, then skip to next op code */      /* Save the earliest consulted character, then skip to next op code */
# Line 1076  for (;;) Line 1467  for (;;)
1467        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1468        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1469        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
1470        cb.subject_length   = md->end_subject - md->start_subject;        cb.subject_length   = (int)(md->end_subject - md->start_subject);
1471        cb.start_match      = mstart - md->start_subject;        cb.start_match      = (int)(mstart - md->start_subject);
1472        cb.current_position = eptr - md->start_subject;        cb.current_position = (int)(eptr - md->start_subject);
1473        cb.pattern_position = GET(ecode, 2);        cb.pattern_position = GET(ecode, 2);
1474        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
1475        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1476        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last;
1477        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1478        if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
1479        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1480        }        }
1481      ecode += 2 + 2*LINK_SIZE;      ecode += 2 + 2*LINK_SIZE;
# Line 1094  for (;;) Line 1485  for (;;)
1485      offset data is the offset to the starting bracket from the start of the      offset data is the offset to the starting bracket from the start of the
1486      whole pattern. (This is so that it works from duplicated subpatterns.)      whole pattern. (This is so that it works from duplicated subpatterns.)
1487    
1488      If there are any capturing brackets started but not finished, we have to      The state of the capturing groups is preserved over recursion, and
1489      save their starting points and reinstate them after the recursion. However,      re-instated afterwards. We don't know how many are started and not yet
1490      we don't know how many such there are (offset_top records the completed      finished (offset_top records the completed total) so we just have to save
1491      total) so we just have to save all the potential data. There may be up to      all the potential data. There may be up to 65535 such values, which is too
1492      65535 such values, which is too large to put on the stack, but using malloc      large to put on the stack, but using malloc for small numbers seems
1493      for small numbers seems expensive. As a compromise, the stack is used when      expensive. As a compromise, the stack is used when there are no more than
1494      there are no more than REC_STACK_SAVE_MAX values to store; otherwise malloc      REC_STACK_SAVE_MAX values to store; otherwise malloc is used.
     is used. A problem is what to do if the malloc fails ... there is no way of  
     returning to the top level with an error. Save the top REC_STACK_SAVE_MAX  
     values on the stack, and accept that the rest may be wrong.  
1495    
1496      There are also other values that have to be saved. We use a chained      There are also other values that have to be saved. We use a chained
1497      sequence of blocks that actually live on the stack. Thanks to Robin Houston      sequence of blocks that actually live on the stack. Thanks to Robin Houston
1498      for the original version of this logic. */      for the original version of this logic. It has, however, been hacked around
1499        a lot, so he is not to blame for the current way it works. */
1500    
1501      case OP_RECURSE:      case OP_RECURSE:
1502        {        {
# Line 1120  for (;;) Line 1509  for (;;)
1509        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1510        md->recursive = &new_recursive;        md->recursive = &new_recursive;
1511    
1512        /* Find where to continue from afterwards */        /* Where to continue from afterwards */
1513    
1514        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       new_recursive.after_call = ecode;  
1515    
1516        /* Now save the offset data. */        /* Now save the offset data */
1517    
1518        new_recursive.saved_max = md->offset_end;        new_recursive.saved_max = md->offset_end;
1519        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
# Line 1136  for (;;) Line 1524  for (;;)
1524            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));
1525          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1526          }          }
   
1527        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1528              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
       new_recursive.save_start = mstart;  
       new_recursive.offset_top = offset_top;  
       mstart = eptr;  
1529    
1530        /* OK, now we can do the recursion. For each top-level alternative we        /* OK, now we can do the recursion. After processing each alternative,
1531        restore the offset and recursion data. */        restore the offset data. If there were nested recursions, md->recursive
1532          might be changed, so reset it before looping. */
1533    
1534        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1535        flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;        cbegroup = (*callpat >= OP_SBRA);
1536        do        do
1537          {          {
1538            if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1539          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
1540            md, ims, eptrb, flags, RM6);            md, eptrb, RM6);
1541          if (rrc == MATCH_MATCH)          memcpy(md->offset_vector, new_recursive.offset_save,
1542                new_recursive.saved_max * sizeof(int));
1543            if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1544            {            {
1545            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
1546            md->recursive = new_recursive.prevrec;            md->recursive = new_recursive.prevrec;
1547            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1548              (pcre_free)(new_recursive.offset_save);              (pcre_free)(new_recursive.offset_save);
1549            RRETURN(MATCH_MATCH);  
1550              /* Set where we got to in the subject, and reset the start in case
1551              it was changed by \K. This *is* propagated back out of a recursion,
1552              for Perl compatibility. */
1553    
1554              eptr = md->end_match_ptr;
1555              mstart = md->start_match_ptr;
1556              goto RECURSION_MATCHED;        /* Exit loop; end processing */
1557            }            }
1558          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)          else if (rrc != MATCH_NOMATCH &&
1559                    (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1560            {            {
1561            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1562            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
# Line 1169  for (;;) Line 1565  for (;;)
1565            }            }
1566    
1567          md->recursive = &new_recursive;          md->recursive = &new_recursive;
         memcpy(md->offset_vector, new_recursive.offset_save,  
             new_recursive.saved_max * sizeof(int));  
1568          callpat += GET(callpat, 1);          callpat += GET(callpat, 1);
1569          }          }
1570        while (*callpat == OP_ALT);        while (*callpat == OP_ALT);
# Line 1179  for (;;) Line 1573  for (;;)
1573        md->recursive = new_recursive.prevrec;        md->recursive = new_recursive.prevrec;
1574        if (new_recursive.offset_save != stacksave)        if (new_recursive.offset_save != stacksave)
1575          (pcre_free)(new_recursive.offset_save);          (pcre_free)(new_recursive.offset_save);
1576        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
1577        }        }
     /* Control never reaches here */  
   
     /* "Once" brackets are like assertion brackets except that after a match,  
     the point in the subject string is not moved back. Thus there can never be  
     a move back into the brackets. Friedl calls these "atomic" subpatterns.  
     Check the alternative branches in turn - the matching won't pass the KET  
     for this kind of subpattern. If any one branch matches, we carry on as at  
     the end of a normal bracket, leaving the subject pointer. */  
   
     case OP_ONCE:  
     prev = ecode;  
     saved_eptr = eptr;  
   
     do  
       {  
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM7);  
       if (rrc == MATCH_MATCH) break;  
       if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);  
       ecode += GET(ecode,1);  
       }  
     while (*ecode == OP_ALT);  
1578    
1579      /* If hit the end of the group (which could be repeated), fail */      RECURSION_MATCHED:
1580        break;
     if (*ecode != OP_ONCE && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);  
   
     /* Continue as from after the assertion, updating the offsets high water  
     mark, since extracts may have been taken. */  
   
     do ecode += GET(ecode, 1); while (*ecode == OP_ALT);  
   
     offset_top = md->end_offset_top;  
     eptr = md->end_match_ptr;  
   
     /* For a non-repeating ket, just continue at this level. This also  
     happens for a repeating ket if no characters were matched in the group.  
     This is the forcible breaking of infinite loops as implemented in Perl  
     5.005. If there is an options reset, it will get obeyed in the normal  
     course of events. */  
   
     if (*ecode == OP_KET || eptr == saved_eptr)  
       {  
       ecode += 1+LINK_SIZE;  
       break;  
       }  
   
     /* The repeating kets try the rest of the pattern or restart from the  
     preceding bracket, in the appropriate order. The second "call" of match()  
     uses tail recursion, to avoid using another stack frame. We need to reset  
     any options that changed within the bracket before re-running it, so  
     check the next opcode. */  
   
     if (ecode[1+LINK_SIZE] == OP_OPT)  
       {  
       ims = (ims & ~PCRE_IMS) | ecode[4];  
       DPRINTF(("ims set to %02lx at group repeat\n", ims));  
       }  
   
     if (*ecode == OP_KETRMIN)  
       {  
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM8);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode = prev;  
       flags = 0;  
       goto TAIL_RECURSE;  
       }  
     else  /* OP_KETRMAX */  
       {  
       RMATCH(eptr, prev, offset_top, md, ims, eptrb, match_cbegroup, RM9);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode += 1 + LINK_SIZE;  
       flags = 0;  
       goto TAIL_RECURSE;  
       }  
     /* Control never gets here */  
1581    
1582      /* An alternation is the end of a branch; scan along to find the end of the      /* An alternation is the end of a branch; scan along to find the end of the
1583      bracketed group and go to there. */      bracketed group and go to there. */
# Line 1271  for (;;) Line 1593  for (;;)
1593      optional ones preceded by BRAZERO or BRAMINZERO. */      optional ones preceded by BRAZERO or BRAMINZERO. */
1594    
1595      case OP_BRAZERO:      case OP_BRAZERO:
1596        {      next = ecode + 1;
1597        next = ecode+1;      RMATCH(eptr, next, offset_top, md, eptrb, RM10);
1598        RMATCH(eptr, next, offset_top, md, ims, eptrb, 0, RM10);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1599        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      do next += GET(next, 1); while (*next == OP_ALT);
1600        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1601      break;      break;
1602    
1603      case OP_BRAMINZERO:      case OP_BRAMINZERO:
1604        {      next = ecode + 1;
1605        next = ecode+1;      do next += GET(next, 1); while (*next == OP_ALT);
1606        do next += GET(next, 1); while (*next == OP_ALT);      RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, eptrb, RM11);
1607        RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0, RM11);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1608        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      ecode++;
       ecode++;  
       }  
1609      break;      break;
1610    
1611      case OP_SKIPZERO:      case OP_SKIPZERO:
1612        {      next = ecode+1;
1613        next = ecode+1;      do next += GET(next,1); while (*next == OP_ALT);
1614        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1615      break;      break;
1616    
1617        /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
1618        here; just jump to the group, with allow_zero set TRUE. */
1619    
1620        case OP_BRAPOSZERO:
1621        op = *(++ecode);
1622        allow_zero = TRUE;
1623        if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
1624          goto POSSESSIVE_NON_CAPTURE;
1625    
1626      /* End of a group, repeated or non-repeating. */      /* End of a group, repeated or non-repeating. */
1627    
1628      case OP_KET:      case OP_KET:
1629      case OP_KETRMIN:      case OP_KETRMIN:
1630      case OP_KETRMAX:      case OP_KETRMAX:
1631        case OP_KETRPOS:
1632      prev = ecode - GET(ecode, 1);      prev = ecode - GET(ecode, 1);
1633    
1634      /* If this was a group that remembered the subject start, in order to break      /* If this was a group that remembered the subject start, in order to break
1635      infinite repeats of empty string matches, retrieve the subject start from      infinite repeats of empty string matches, retrieve the subject start from
1636      the chain. Otherwise, set it NULL. */      the chain. Otherwise, set it NULL. */
1637    
1638      if (*prev >= OP_SBRA)      if (*prev >= OP_SBRA || *prev == OP_ONCE)
1639        {        {
1640        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
1641        eptrb = eptrb->epb_prev;              /* Backup to previous group */        eptrb = eptrb->epb_prev;              /* Backup to previous group */
# Line 1318  for (;;) Line 1644  for (;;)
1644    
1645      /* If we are at the end of an assertion group, stop matching and return      /* If we are at the end of an assertion group, stop matching and return
1646      MATCH_MATCH, but record the current high water mark for use by positive      MATCH_MATCH, but record the current high water mark for use by positive
1647      assertions. Do this also for the "once" (atomic) groups. */      assertions. We also need to record the match start in case it was changed
1648        by \K. */
1649    
1650      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
1651          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT)
         *prev == OP_ONCE)  
1652        {        {
1653        md->end_match_ptr = eptr;      /* For ONCE */        md->end_match_ptr = eptr;      /* For ONCE */
1654        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1655        RRETURN(MATCH_MATCH);        md->start_match_ptr = mstart;
1656          MRRETURN(MATCH_MATCH);
1657        }        }
1658    
1659      /* For capturing groups we have to check the group number back at the start      /* For capturing groups we have to check the group number back at the start
1660      and if necessary complete handling an extraction by setting the offsets and      and if necessary complete handling an extraction by setting the offsets and
1661      bumping the high water mark. Note that whole-pattern recursion is coded as      bumping the high water mark. Whole-pattern recursion is coded as a recurse
1662      a recurse into group 0, so it won't be picked up here. Instead, we catch it      into group 0, so it won't be picked up here. Instead, we catch it when the
1663      when the OP_END is reached. Other recursion is handled here. */      OP_END is reached. Other recursion is handled here. We just have to record
1664        the current subject position and start match pointer and give a MATCH
1665        return. */
1666    
1667      if (*prev == OP_CBRA || *prev == OP_SCBRA)      if (*prev == OP_CBRA || *prev == OP_SCBRA ||
1668            *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
1669        {        {
1670        number = GET2(prev, 1+LINK_SIZE);        number = GET2(prev, 1+LINK_SIZE);
1671        offset = number << 1;        offset = number << 1;
1672    
1673  #ifdef DEBUG  #ifdef PCRE_DEBUG
1674        printf("end bracket %d", number);        printf("end bracket %d", number);
1675        printf("\n");        printf("\n");
1676  #endif  #endif
1677    
1678          /* Handle a recursively called group. */
1679    
1680          if (md->recursive != NULL && md->recursive->group_num == number)
1681            {
1682            md->end_match_ptr = eptr;
1683            md->start_match_ptr = mstart;
1684            RRETURN(MATCH_MATCH);
1685            }
1686    
1687          /* Deal with capturing */
1688    
1689        md->capture_last = number;        md->capture_last = number;
1690        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
1691          {          {
1692            /* If offset is greater than offset_top, it means that we are
1693            "skipping" a capturing group, and that group's offsets must be marked
1694            unset. In earlier versions of PCRE, all the offsets were unset at the
1695            start of matching, but this doesn't work because atomic groups and
1696            assertions can cause a value to be set that should later be unset.
1697            Example: matching /(?>(a))b|(a)c/ against "ac". This sets group 1 as
1698            part of the atomic group, but this is not on the final matching path,
1699            so must be unset when 2 is set. (If there is no group 2, there is no
1700            problem, because offset_top will then be 2, indicating no capture.) */
1701    
1702            if (offset > offset_top)
1703              {
1704              register int *iptr = md->offset_vector + offset_top;
1705              register int *iend = md->offset_vector + offset;
1706              while (iptr < iend) *iptr++ = -1;
1707              }
1708    
1709            /* Now make the extraction */
1710    
1711          md->offset_vector[offset] =          md->offset_vector[offset] =
1712            md->offset_vector[md->offset_end - number];            md->offset_vector[md->offset_end - number];
1713          md->offset_vector[offset+1] = eptr - md->start_subject;          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1714          if (offset_top <= offset) offset_top = offset + 2;          if (offset_top <= offset) offset_top = offset + 2;
1715          }          }
1716          }
1717    
1718        /* Handle a recursively called group. Restore the offsets      /* For an ordinary non-repeating ket, just continue at this level. This
1719        appropriately and continue from after the call. */      also happens for a repeating ket if no characters were matched in the
1720        group. This is the forcible breaking of infinite loops as implemented in
1721        Perl 5.005. For a non-repeating atomic group, establish a backup point by
1722        processing the rest of the pattern at a lower level. If this results in a
1723        NOMATCH return, pass MATCH_ONCE back to the original OP_ONCE level, thereby
1724        bypassing intermediate backup points, but resetting any captures that
1725        happened along the way. */
1726    
1727        if (md->recursive != NULL && md->recursive->group_num == number)      if (*ecode == OP_KET || eptr == saved_eptr)
1728          {
1729          if (*prev == OP_ONCE)
1730          {          {
1731          recursion_info *rec = md->recursive;          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
1732          DPRINTF(("Recursion (%d) succeeded - continuing\n", number));          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1733          md->recursive = rec->prevrec;          md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1734          mstart = rec->save_start;          RRETURN(MATCH_ONCE);
         memcpy(md->offset_vector, rec->offset_save,  
           rec->saved_max * sizeof(int));  
         offset_top = rec->offset_top;  
         ecode = rec->after_call;  
         ims = original_ims;  
         break;  
1735          }          }
1736          ecode += 1 + LINK_SIZE;    /* Carry on at this level */
1737          break;
1738        }        }
1739    
1740      /* For both capturing and non-capturing groups, reset the value of the ims      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
1741      flags, in case they got changed during the group. */      and return the MATCH_KETRPOS. This makes it possible to do the repeats one
1742        at a time from the outer level, thus saving stack. */
     ims = original_ims;  
     DPRINTF(("ims reset to %02lx\n", ims));  
   
     /* For a non-repeating ket, just continue at this level. This also  
     happens for a repeating ket if no characters were matched in the group.  
     This is the forcible breaking of infinite loops as implemented in Perl  
     5.005. If there is an options reset, it will get obeyed in the normal  
     course of events. */  
1743    
1744      if (*ecode == OP_KET || eptr == saved_eptr)      if (*ecode == OP_KETRPOS)
1745        {        {
1746        ecode += 1 + LINK_SIZE;        md->end_match_ptr = eptr;
1747        break;        md->end_offset_top = offset_top;
1748          RRETURN(MATCH_KETRPOS);
1749        }        }
1750    
1751      /* The repeating kets try the rest of the pattern or restart from the      /* The normal repeating kets try the rest of the pattern or restart from
1752      preceding bracket, in the appropriate order. In the second case, we can use      the preceding bracket, in the appropriate order. In the second case, we can
1753      tail recursion to avoid using another stack frame, unless we have an      use tail recursion to avoid using another stack frame, unless we have an
1754      unlimited repeat of a group that can match an empty string. */      an atomic group or an unlimited repeat of a group that can match an empty
1755        string. */
     flags = (*prev >= OP_SBRA)? match_cbegroup : 0;  
1756    
1757      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1758        {        {
1759        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM12);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
1760        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1761        if (flags != 0)    /* Could match an empty string */        if (*prev == OP_ONCE)
1762          {          {
1763          RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM50);          RMATCH(eptr, prev, offset_top, md, eptrb, RM8);
1764            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1765            md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1766            RRETURN(MATCH_ONCE);
1767            }
1768          if (*prev >= OP_SBRA)    /* Could match an empty string */
1769            {
1770            md->match_function_type = MATCH_CBEGROUP;
1771            RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
1772          RRETURN(rrc);          RRETURN(rrc);
1773          }          }
1774        ecode = prev;        ecode = prev;
# Line 1411  for (;;) Line 1776  for (;;)
1776        }        }
1777      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
1778        {        {
1779        RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM13);        if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1780          RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
1781          if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
1782        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1783          if (*prev == OP_ONCE)
1784            {
1785            RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM9);
1786            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1787            md->once_target = prev;
1788            RRETURN(MATCH_ONCE);
1789            }
1790        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       flags = 0;  
1791        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1792        }        }
1793      /* Control never gets here */      /* Control never gets here */
1794    
1795      /* Start of subject unless notbol, or after internal newline if multiline */      /* Not multiline mode: start of subject assertion, unless notbol. */
1796    
1797      case OP_CIRC:      case OP_CIRC:
1798      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);
     if ((ims & PCRE_MULTILINE) != 0)  
       {  
       if (eptr != md->start_subject &&  
           (eptr == md->end_subject || !WAS_NEWLINE(eptr)))  
         RRETURN(MATCH_NOMATCH);  
       ecode++;  
       break;  
       }  
     /* ... else fall through */  
1799    
1800      /* Start of subject assertion */      /* Start of subject assertion */
1801    
1802      case OP_SOD:      case OP_SOD:
1803      if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject) MRRETURN(MATCH_NOMATCH);
1804        ecode++;
1805        break;
1806    
1807        /* Multiline mode: start of subject unless notbol, or after any newline. */
1808    
1809        case OP_CIRCM:
1810        if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);
1811        if (eptr != md->start_subject &&
1812            (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
1813          MRRETURN(MATCH_NOMATCH);
1814      ecode++;      ecode++;
1815      break;      break;
1816    
1817      /* Start of match assertion */      /* Start of match assertion */
1818    
1819      case OP_SOM:      case OP_SOM:
1820      if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject + md->start_offset) MRRETURN(MATCH_NOMATCH);
1821      ecode++;      ecode++;
1822      break;      break;
1823    
# Line 1454  for (;;) Line 1828  for (;;)
1828      ecode++;      ecode++;
1829      break;      break;
1830    
1831      /* Assert before internal newline if multiline, or before a terminating      /* Multiline mode: assert before any newline, or before end of subject
1832      newline unless endonly is set, else end of subject unless noteol is set. */      unless noteol is set. */
1833    
1834      case OP_DOLL:      case OP_DOLLM:
1835      if ((ims & PCRE_MULTILINE) != 0)      if (eptr < md->end_subject)
1836        {        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }
       if (eptr < md->end_subject)  
         { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }  
       else  
         { if (md->noteol) RRETURN(MATCH_NOMATCH); }  
       ecode++;  
       break;  
       }  
1837      else      else
1838        {        {
1839        if (md->noteol) RRETURN(MATCH_NOMATCH);        if (md->noteol) MRRETURN(MATCH_NOMATCH);
1840        if (!md->endonly)        SCHECK_PARTIAL();
         {  
         if (eptr != md->end_subject &&  
             (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))  
           RRETURN(MATCH_NOMATCH);  
         ecode++;  
         break;  
         }  
1841        }        }
1842        ecode++;
1843        break;
1844    
1845        /* Not multiline mode: assert before a terminating newline or before end of
1846        subject unless noteol is set. */
1847    
1848        case OP_DOLL:
1849        if (md->noteol) MRRETURN(MATCH_NOMATCH);
1850        if (!md->endonly) goto ASSERT_NL_OR_EOS;
1851    
1852      /* ... else fall through for endonly */      /* ... else fall through for endonly */
1853    
1854      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
1855    
1856      case OP_EOD:      case OP_EOD:
1857      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);
1858        SCHECK_PARTIAL();
1859      ecode++;      ecode++;
1860      break;      break;
1861    
1862      /* End of subject or ending \n assertion (\Z) */      /* End of subject or ending \n assertion (\Z) */
1863    
1864      case OP_EODN:      case OP_EODN:
1865      if (eptr != md->end_subject &&      ASSERT_NL_OR_EOS:
1866        if (eptr < md->end_subject &&
1867          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
1868        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
1869    
1870        /* Either at end of string or \n before end. */
1871    
1872        SCHECK_PARTIAL();
1873      ecode++;      ecode++;
1874      break;      break;
1875    
# Line 1511  for (;;) Line 1887  for (;;)
1887  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1888        if (utf8)        if (utf8)
1889          {          {
1890            /* Get status of previous character */
1891    
1892          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
1893            {            {
1894            USPTR lastptr = eptr - 1;            USPTR lastptr = eptr - 1;
1895            while((*lastptr & 0xc0) == 0x80) lastptr--;            while((*lastptr & 0xc0) == 0x80) lastptr--;
1896            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
1897            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
1898    #ifdef SUPPORT_UCP
1899              if (md->use_ucp)
1900                {
1901                if (c == '_') prev_is_word = TRUE; else
1902                  {
1903                  int cat = UCD_CATEGORY(c);
1904                  prev_is_word = (cat == ucp_L || cat == ucp_N);
1905                  }
1906                }
1907              else
1908    #endif
1909            prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;            prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
1910            }            }
1911    
1912            /* Get status of next character */
1913    
1914          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
1915            {            {
1916            SCHECK_PARTIAL();            SCHECK_PARTIAL();
# Line 1527  for (;;) Line 1919  for (;;)
1919          else          else
1920            {            {
1921            GETCHAR(c, eptr);            GETCHAR(c, eptr);
1922    #ifdef SUPPORT_UCP
1923              if (md->use_ucp)
1924                {
1925                if (c == '_') cur_is_word = TRUE; else
1926                  {
1927                  int cat = UCD_CATEGORY(c);
1928                  cur_is_word = (cat == ucp_L || cat == ucp_N);
1929                  }
1930                }
1931              else
1932    #endif
1933            cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;            cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
1934            }            }
1935          }          }
1936        else        else
1937  #endif  #endif
1938    
1939        /* Not in UTF-8 mode */        /* Not in UTF-8 mode, but we may still have PCRE_UCP set, and for
1940          consistency with the behaviour of \w we do use it in this case. */
1941    
1942          {          {
1943            /* Get status of previous character */
1944    
1945          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
1946            {            {
1947            if (eptr <= md->start_used_ptr) md->start_used_ptr = eptr - 1;            if (eptr <= md->start_used_ptr) md->start_used_ptr = eptr - 1;
1948    #ifdef SUPPORT_UCP
1949              if (md->use_ucp)
1950                {
1951                c = eptr[-1];
1952                if (c == '_') prev_is_word = TRUE; else
1953                  {
1954                  int cat = UCD_CATEGORY(c);
1955                  prev_is_word = (cat == ucp_L || cat == ucp_N);
1956                  }
1957                }
1958              else
1959    #endif
1960            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);
1961            }            }
1962    
1963            /* Get status of next character */
1964    
1965          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
1966            {            {
1967            SCHECK_PARTIAL();            SCHECK_PARTIAL();
1968            cur_is_word = FALSE;            cur_is_word = FALSE;
1969            }            }
1970          else cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);          else
1971    #ifdef SUPPORT_UCP
1972            if (md->use_ucp)
1973              {
1974              c = *eptr;
1975              if (c == '_') cur_is_word = TRUE; else
1976                {
1977                int cat = UCD_CATEGORY(c);
1978                cur_is_word = (cat == ucp_L || cat == ucp_N);
1979                }
1980              }
1981            else
1982    #endif
1983            cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);
1984          }          }
1985    
1986        /* Now see if the situation is what we want */        /* Now see if the situation is what we want */
1987    
1988        if ((*ecode++ == OP_WORD_BOUNDARY)?        if ((*ecode++ == OP_WORD_BOUNDARY)?
1989             cur_is_word == prev_is_word : cur_is_word != prev_is_word)             cur_is_word == prev_is_word : cur_is_word != prev_is_word)
1990          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
1991        }        }
1992      break;      break;
1993    
1994      /* Match a single character type; inline for speed */      /* Match a single character type; inline for speed */
1995    
1996      case OP_ANY:      case OP_ANY:
1997      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);      if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
1998      /* Fall through */      /* Fall through */
1999    
2000      case OP_ALLANY:      case OP_ALLANY:
2001      if (eptr++ >= md->end_subject)      if (eptr++ >= md->end_subject)
2002        {        {
2003        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2004        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2005        }        }
2006      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
2007      ecode++;      ecode++;
# Line 1580  for (;;) Line 2014  for (;;)
2014      if (eptr++ >= md->end_subject)      if (eptr++ >= md->end_subject)
2015        {        {
2016        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2017        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2018        }        }
2019      ecode++;      ecode++;
2020      break;      break;
# Line 1589  for (;;) Line 2023  for (;;)
2023      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2024        {        {
2025        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2026        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2027        }        }
2028      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2029      if (      if (
# Line 1598  for (;;) Line 2032  for (;;)
2032  #endif  #endif
2033         (md->ctypes[c] & ctype_digit) != 0         (md->ctypes[c] & ctype_digit) != 0
2034         )         )
2035        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2036      ecode++;      ecode++;
2037      break;      break;
2038    
# Line 1606  for (;;) Line 2040  for (;;)
2040      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2041        {        {
2042        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2043        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2044        }        }
2045      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2046      if (      if (
# Line 1615  for (;;) Line 2049  for (;;)
2049  #endif  #endif
2050         (md->ctypes[c] & ctype_digit) == 0         (md->ctypes[c] & ctype_digit) == 0
2051         )         )
2052        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2053      ecode++;      ecode++;
2054      break;      break;
2055    
# Line 1623  for (;;) Line 2057  for (;;)
2057      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2058        {        {
2059        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2060        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2061        }        }
2062      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2063      if (      if (
# Line 1632  for (;;) Line 2066  for (;;)
2066  #endif  #endif
2067         (md->ctypes[c] & ctype_space) != 0         (md->ctypes[c] & ctype_space) != 0
2068         )         )
2069        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2070      ecode++;      ecode++;
2071      break;      break;
2072    
# Line 1640  for (;;) Line 2074  for (;;)
2074      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2075        {        {
2076        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2077        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2078        }        }
2079      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2080      if (      if (
# Line 1649  for (;;) Line 2083  for (;;)
2083  #endif  #endif
2084         (md->ctypes[c] & ctype_space) == 0         (md->ctypes[c] & ctype_space) == 0
2085         )         )
2086        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2087      ecode++;      ecode++;
2088      break;      break;
2089    
# Line 1657  for (;;) Line 2091  for (;;)
2091      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2092        {        {
2093        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2094        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2095        }        }
2096      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2097      if (      if (
# Line 1666  for (;;) Line 2100  for (;;)
2100  #endif  #endif
2101         (md->ctypes[c] & ctype_word) != 0         (md->ctypes[c] & ctype_word) != 0
2102         )         )
2103        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2104      ecode++;      ecode++;
2105      break;      break;
2106    
# Line 1674  for (;;) Line 2108  for (;;)
2108      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2109        {        {
2110        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2111        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2112        }        }
2113      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2114      if (      if (
# Line 1683  for (;;) Line 2117  for (;;)
2117  #endif  #endif
2118         (md->ctypes[c] & ctype_word) == 0         (md->ctypes[c] & ctype_word) == 0
2119         )         )
2120        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2121      ecode++;      ecode++;
2122      break;      break;
2123    
# Line 1691  for (;;) Line 2125  for (;;)
2125      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2126        {        {
2127        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2128        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2129        }        }
2130      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2131      switch(c)      switch(c)
2132        {        {
2133        default: RRETURN(MATCH_NOMATCH);        default: MRRETURN(MATCH_NOMATCH);
2134    
2135        case 0x000d:        case 0x000d:
2136        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
2137        break;        break;
# Line 1709  for (;;) Line 2144  for (;;)
2144        case 0x0085:        case 0x0085:
2145        case 0x2028:        case 0x2028:
2146        case 0x2029:        case 0x2029:
2147        if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);        if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
2148        break;        break;
2149        }        }
2150      ecode++;      ecode++;
# Line 1719  for (;;) Line 2154  for (;;)
2154      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2155        {        {
2156        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2157        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2158        }        }
2159      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2160      switch(c)      switch(c)
# Line 1744  for (;;) Line 2179  for (;;)
2179        case 0x202f:    /* NARROW NO-BREAK SPACE */        case 0x202f:    /* NARROW NO-BREAK SPACE */
2180        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
2181        case 0x3000:    /* IDEOGRAPHIC SPACE */        case 0x3000:    /* IDEOGRAPHIC SPACE */
2182        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2183        }        }
2184      ecode++;      ecode++;
2185      break;      break;
# Line 1753  for (;;) Line 2188  for (;;)
2188      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2189        {        {
2190        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2191        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2192        }        }
2193      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2194      switch(c)      switch(c)
2195        {        {
2196        default: RRETURN(MATCH_NOMATCH);        default: MRRETURN(MATCH_NOMATCH);
2197        case 0x09:      /* HT */        case 0x09:      /* HT */
2198        case 0x20:      /* SPACE */        case 0x20:      /* SPACE */
2199        case 0xa0:      /* NBSP */        case 0xa0:      /* NBSP */
# Line 1787  for (;;) Line 2222  for (;;)
2222      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2223        {        {
2224        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2225        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2226        }        }
2227      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2228      switch(c)      switch(c)
# Line 1800  for (;;) Line 2235  for (;;)
2235        case 0x85:      /* NEL */        case 0x85:      /* NEL */
2236        case 0x2028:    /* LINE SEPARATOR */        case 0x2028:    /* LINE SEPARATOR */
2237        case 0x2029:    /* PARAGRAPH SEPARATOR */        case 0x2029:    /* PARAGRAPH SEPARATOR */
2238        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2239        }        }
2240      ecode++;      ecode++;
2241      break;      break;
# Line 1809  for (;;) Line 2244  for (;;)
2244      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2245        {        {
2246        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2247        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2248        }        }
2249      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2250      switch(c)      switch(c)
2251        {        {
2252        default: RRETURN(MATCH_NOMATCH);        default: MRRETURN(MATCH_NOMATCH);
2253        case 0x0a:      /* LF */        case 0x0a:      /* LF */
2254        case 0x0b:      /* VT */        case 0x0b:      /* VT */
2255        case 0x0c:      /* FF */        case 0x0c:      /* FF */
# Line 1836  for (;;) Line 2271  for (;;)
2271      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2272        {        {
2273        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2274        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2275        }        }
2276      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2277        {        {
# Line 1845  for (;;) Line 2280  for (;;)
2280        switch(ecode[1])        switch(ecode[1])
2281          {          {
2282          case PT_ANY:          case PT_ANY:
2283          if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);          if (op == OP_NOTPROP) MRRETURN(MATCH_NOMATCH);
2284          break;          break;
2285    
2286          case PT_LAMP:          case PT_LAMP:
2287          if ((prop->chartype == ucp_Lu ||          if ((prop->chartype == ucp_Lu ||
2288               prop->chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
2289               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
2290            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2291           break;          break;
2292    
2293          case PT_GC:          case PT_GC:
2294          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))
2295            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2296          break;          break;
2297    
2298          case PT_PC:          case PT_PC:
2299          if ((ecode[2] != prop->chartype) == (op == OP_PROP))          if ((ecode[2] != prop->chartype) == (op == OP_PROP))
2300            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2301          break;          break;
2302    
2303          case PT_SC:          case PT_SC:
2304          if ((ecode[2] != prop->script) == (op == OP_PROP))          if ((ecode[2] != prop->script) == (op == OP_PROP))
2305            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2306            break;
2307    
2308            /* These are specials */
2309    
2310            case PT_ALNUM:
2311            if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||
2312                 _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2313              MRRETURN(MATCH_NOMATCH);
2314            break;
2315    
2316            case PT_SPACE:    /* Perl space */
2317            if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
2318                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2319                   == (op == OP_NOTPROP))
2320              MRRETURN(MATCH_NOMATCH);
2321          break;          break;
2322    
2323            case PT_PXSPACE:  /* POSIX space */
2324            if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
2325                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2326                 c == CHAR_FF || c == CHAR_CR)
2327                   == (op == OP_NOTPROP))
2328              MRRETURN(MATCH_NOMATCH);
2329            break;
2330    
2331            case PT_WORD:
2332            if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||
2333                 _pcre_ucp_gentype[prop->chartype] == ucp_N ||
2334                 c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2335              MRRETURN(MATCH_NOMATCH);
2336            break;
2337    
2338            /* This should never occur */
2339    
2340          default:          default:
2341          RRETURN(PCRE_ERROR_INTERNAL);          RRETURN(PCRE_ERROR_INTERNAL);
2342          }          }
# Line 1885  for (;;) Line 2352  for (;;)
2352      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2353        {        {
2354        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2355        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2356        }        }
2357      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2358        if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);
2359        while (eptr < md->end_subject)
2360        {        {
2361        int category = UCD_CATEGORY(c);        int len = 1;
2362        if (category == ucp_M) RRETURN(MATCH_NOMATCH);        if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2363        while (eptr < md->end_subject)        if (UCD_CATEGORY(c) != ucp_M) break;
2364          {        eptr += len;
         int len = 1;  
         if (!utf8) c = *eptr; else  
           {  
           GETCHARLEN(c, eptr, len);  
           }  
         category = UCD_CATEGORY(c);  
         if (category != ucp_M) break;  
         eptr += len;  
         }  
2365        }        }
2366      ecode++;      ecode++;
2367      break;      break;
# Line 1917  for (;;) Line 2377  for (;;)
2377      loops). */      loops). */
2378    
2379      case OP_REF:      case OP_REF:
2380        {      case OP_REFI:
2381        offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      caseless = op == OP_REFI;
2382        ecode += 3;      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2383        ecode += 3;
2384    
2385        /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2386    
2387        (a) In the default, Perl-compatible state, set the length to be longer      (a) In the default, Perl-compatible state, set the length negative;
2388        than the amount of subject left; this ensures that every attempt at a      this ensures that every attempt at a match fails. We can't just fail
2389        match fails. We can't just fail here, because of the possibility of      here, because of the possibility of quantifiers with zero minima.
       quantifiers with zero minima.  
2390    
2391        (b) If the JavaScript compatibility flag is set, set the length to zero      (b) If the JavaScript compatibility flag is set, set the length to zero
2392        so that the back reference matches an empty string.      so that the back reference matches an empty string.
2393    
2394        Otherwise, set the length to the length of what was matched by the      Otherwise, set the length to the length of what was matched by the
2395        referenced subpattern. */      referenced subpattern. */
2396    
2397        if (offset >= offset_top || md->offset_vector[offset] < 0)      if (offset >= offset_top || md->offset_vector[offset] < 0)
2398          length = (md->jscript_compat)? 0 : md->end_subject - eptr + 1;        length = (md->jscript_compat)? 0 : -1;
2399        else      else
2400          length = md->offset_vector[offset+1] - md->offset_vector[offset];        length = md->offset_vector[offset+1] - md->offset_vector[offset];
2401    
2402        /* Set up for repetition, or handle the non-repeated case */      /* Set up for repetition, or handle the non-repeated case */
2403    
2404        switch (*ecode)      switch (*ecode)
2405          {        {
2406          case OP_CRSTAR:        case OP_CRSTAR:
2407          case OP_CRMINSTAR:        case OP_CRMINSTAR:
2408          case OP_CRPLUS:        case OP_CRPLUS:
2409          case OP_CRMINPLUS:        case OP_CRMINPLUS:
2410          case OP_CRQUERY:        case OP_CRQUERY:
2411          case OP_CRMINQUERY:        case OP_CRMINQUERY:
2412          c = *ecode++ - OP_CRSTAR;        c = *ecode++ - OP_CRSTAR;
2413          minimize = (c & 1) != 0;        minimize = (c & 1) != 0;
2414          min = rep_min[c];                 /* Pick up values from tables; */        min = rep_min[c];                 /* Pick up values from tables; */
2415          max = rep_max[c];                 /* zero for max => infinity */        max = rep_max[c];                 /* zero for max => infinity */
2416          if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2417          break;        break;
2418    
2419          case OP_CRRANGE:        case OP_CRRANGE:
2420          case OP_CRMINRANGE:        case OP_CRMINRANGE:
2421          minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2422          min = GET2(ecode, 1);        min = GET2(ecode, 1);
2423          max = GET2(ecode, 3);        max = GET2(ecode, 3);
2424          if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2425          ecode += 5;        ecode += 5;
2426          break;        break;
2427    
2428          default:               /* No repeat follows */        default:               /* No repeat follows */
2429          if (!match_ref(offset, eptr, length, md, ims))        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2430            {          {
2431            CHECK_PARTIAL();          CHECK_PARTIAL();
2432            RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
           }  
         eptr += length;  
         continue;              /* With the main loop */  
2433          }          }
2434          eptr += length;
2435          continue;              /* With the main loop */
2436          }
2437    
2438        /* If the length of the reference is zero, just continue with the      /* Handle repeated back references. If the length of the reference is
2439        main loop. */      zero, just continue with the main loop. */
2440    
2441        if (length == 0) continue;      if (length == 0) continue;
2442    
2443        /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2444        the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
2445        address of eptr, so that eptr can be a register variable. */      address of eptr, so that eptr can be a register variable. */
2446    
2447        for (i = 1; i <= min; i++)      for (i = 1; i <= min; i++)
2448          {
2449          int slength;
2450          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2451          {          {
2452          if (!match_ref(offset, eptr, length, md, ims))          CHECK_PARTIAL();
2453            {          MRRETURN(MATCH_NOMATCH);
           CHECK_PARTIAL();  
           RRETURN(MATCH_NOMATCH);  
           }  
         eptr += length;  
2454          }          }
2455          eptr += slength;
2456          }
2457    
2458        /* If min = max, continue at the same level without recursion.      /* If min = max, continue at the same level without recursion.
2459        They are not both allowed to be zero. */      They are not both allowed to be zero. */
2460    
2461        if (min == max) continue;      if (min == max) continue;
2462    
2463        /* If minimizing, keep trying and advancing the pointer */      /* If minimizing, keep trying and advancing the pointer */
2464    
2465        if (minimize)      if (minimize)
2466          {
2467          for (fi = min;; fi++)
2468          {          {
2469          for (fi = min;; fi++)          int slength;
2470            RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2471            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2472            if (fi >= max) MRRETURN(MATCH_NOMATCH);
2473            if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2474            {            {
2475            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM14);            CHECK_PARTIAL();
2476            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            MRRETURN(MATCH_NOMATCH);
           if (fi >= max) RRETURN(MATCH_NOMATCH);  
           if (!match_ref(offset, eptr, length, md, ims))  
             {  
             CHECK_PARTIAL();  
             RRETURN(MATCH_NOMATCH);  
             }  
           eptr += length;  
2477            }            }
2478          /* Control never gets here */          eptr += slength;
2479          }          }
2480          /* Control never gets here */
2481          }
2482    
2483        /* If maximizing, find the longest string and work backwards */      /* If maximizing, find the longest string and work backwards */
2484    
2485        else      else
2486          {
2487          pp = eptr;
2488          for (i = min; i < max; i++)
2489          {          {
2490          pp = eptr;          int slength;
2491          for (i = min; i < max; i++)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2492            {            {
2493            if (!match_ref(offset, eptr, length, md, ims)) break;            CHECK_PARTIAL();
2494            eptr += length;            break;
           }  
         while (eptr >= pp)  
           {  
           RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM15);  
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
           eptr -= length;  
2495            }            }
2496          RRETURN(MATCH_NOMATCH);          eptr += slength;
2497            }
2498          while (eptr >= pp)
2499            {
2500            RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2501            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2502            eptr -= length;
2503          }          }
2504          MRRETURN(MATCH_NOMATCH);
2505        }        }
2506      /* Control never gets here */      /* Control never gets here */
2507    
# Line 2096  for (;;) Line 2562  for (;;)
2562            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2563              {              {
2564              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2565              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
2566              }              }
2567            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
2568            if (c > 255)            if (c > 255)
2569              {              {
2570              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
2571              }              }
2572            else            else
2573              {              {
2574              if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
2575              }              }
2576            }            }
2577          }          }
# Line 2118  for (;;) Line 2584  for (;;)
2584            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2585              {              {
2586              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2587              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
2588              }              }
2589            c = *eptr++;            c = *eptr++;
2590            if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
2591            }            }
2592          }          }
2593    
# Line 2141  for (;;) Line 2607  for (;;)
2607            {            {
2608            for (fi = min;; fi++)            for (fi = min;; fi++)
2609              {              {
2610              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2611              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2612              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
2613              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2614                {                {
2615                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2616                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
2617                }                }
2618              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
2619              if (c > 255)              if (c > 255)
2620                {                {
2621                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
2622                }                }
2623              else              else
2624                {                {
2625                if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);                if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
2626                }                }
2627              }              }
2628            }            }
# Line 2166  for (;;) Line 2632  for (;;)
2632            {            {
2633            for (fi = min;; fi++)            for (fi = min;; fi++)
2634              {              {
2635              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2636              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2637              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
2638              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2639                {                {
2640                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2641                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
2642                }                }
2643              c = *eptr++;              c = *eptr++;
2644              if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
2645              }              }
2646            }            }
2647          /* Control never gets here */          /* Control never gets here */
# Line 2194  for (;;) Line 2660  for (;;)
2660            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2661              {              {
2662              int len = 1;              int len = 1;
2663              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject)
2664                  {
2665                  SCHECK_PARTIAL();
2666                  break;
2667                  }
2668              GETCHARLEN(c, eptr, len);              GETCHARLEN(c, eptr, len);
2669              if (c > 255)              if (c > 255)
2670                {                {
# Line 2208  for (;;) Line 2678  for (;;)
2678              }              }
2679            for (;;)            for (;;)
2680              {              {
2681              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM18);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
2682              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2683              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
2684              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2220  for (;;) Line 2690  for (;;)
2690            {            {
2691            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2692              {              {
2693              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject)
2694                  {
2695                  SCHECK_PARTIAL();
2696                  break;
2697                  }
2698              c = *eptr;              c = *eptr;
2699              if ((data[c/8] & (1 << (c&7))) == 0) break;              if ((data[c/8] & (1 << (c&7))) == 0) break;
2700              eptr++;              eptr++;
2701              }              }
2702            while (eptr >= pp)            while (eptr >= pp)
2703              {              {
2704              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM19);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
2705              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2706              eptr--;              eptr--;
2707              }              }
2708            }            }
2709    
2710          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2711          }          }
2712        }        }
2713      /* Control never gets here */      /* Control never gets here */
# Line 2285  for (;;) Line 2759  for (;;)
2759          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
2760            {            {
2761            SCHECK_PARTIAL();            SCHECK_PARTIAL();
2762            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2763            }            }
2764          GETCHARINCTEST(c, eptr);          GETCHARINCTEST(c, eptr);
2765          if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);          if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);
2766          }          }
2767    
2768        /* If max == min we can continue with the main loop without the        /* If max == min we can continue with the main loop without the
# Line 2303  for (;;) Line 2777  for (;;)
2777          {          {
2778          for (fi = min;; fi++)          for (fi = min;; fi++)
2779            {            {
2780            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
2781            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2782            if (fi >= max) RRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
2783            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2784              {              {
2785              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2786              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
2787              }              }
2788            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
2789            if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);            if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);
2790            }            }
2791          /* Control never gets here */          /* Control never gets here */
2792          }          }
# Line 2325  for (;;) Line 2799  for (;;)
2799          for (i = min; i < max; i++)          for (i = min; i < max; i++)
2800            {            {
2801            int len = 1;            int len = 1;
2802            if (eptr >= md->end_subject) break;            if (eptr >= md->end_subject)
2803                {
2804                SCHECK_PARTIAL();
2805                break;
2806                }
2807            GETCHARLENTEST(c, eptr, len);            GETCHARLENTEST(c, eptr, len);
2808            if (!_pcre_xclass(c, data)) break;            if (!_pcre_xclass(c, data)) break;
2809            eptr += len;            eptr += len;
2810            }            }
2811          for(;;)          for(;;)
2812            {            {
2813            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
2814            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2815            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
2816            if (utf8) BACKCHAR(eptr);            if (utf8) BACKCHAR(eptr);
2817            }            }
2818          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2819          }          }
2820    
2821        /* Control never gets here */        /* Control never gets here */
# Line 2356  for (;;) Line 2834  for (;;)
2834        if (length > md->end_subject - eptr)        if (length > md->end_subject - eptr)
2835          {          {
2836          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
2837          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2838          }          }
2839        while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH);        while (length-- > 0) if (*ecode++ != *eptr++) MRRETURN(MATCH_NOMATCH);
2840        }        }
2841      else      else
2842  #endif  #endif
# Line 2368  for (;;) Line 2846  for (;;)
2846        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
2847          {          {
2848          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
2849          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2850          }          }
2851        if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);        if (ecode[1] != *eptr++) MRRETURN(MATCH_NOMATCH);
2852        ecode += 2;        ecode += 2;
2853        }        }
2854      break;      break;
2855    
2856      /* Match a single character, caselessly */      /* Match a single character, caselessly */
2857    
2858      case OP_CHARNC:      case OP_CHARI:
2859  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2860      if (utf8)      if (utf8)
2861        {        {
# Line 2388  for (;;) Line 2866  for (;;)
2866        if (length > md->end_subject - eptr)        if (length > md->end_subject - eptr)
2867          {          {
2868          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
2869          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2870          }          }
2871    
2872        /* If the pattern character's value is < 128, we have only one byte, and        /* If the pattern character's value is < 128, we have only one byte, and
# Line 2396  for (;;) Line 2874  for (;;)
2874    
2875        if (fc < 128)        if (fc < 128)
2876          {          {
2877          if (md->lcc[*ecode++] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);          if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
2878          }          }
2879    
2880        /* Otherwise we must pick up the subject character */        /* Otherwise we must pick up the subject character */
# Line 2415  for (;;) Line 2893  for (;;)
2893  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2894            if (dc != UCD_OTHERCASE(fc))            if (dc != UCD_OTHERCASE(fc))
2895  #endif  #endif
2896              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
2897            }            }
2898          }          }
2899        }        }
# Line 2427  for (;;) Line 2905  for (;;)
2905        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
2906          {          {
2907          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
2908          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2909          }          }
2910        if (md->lcc[ecode[1]] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);        if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
2911        ecode += 2;        ecode += 2;
2912        }        }
2913      break;      break;
# Line 2437  for (;;) Line 2915  for (;;)
2915      /* Match a single character repeatedly. */      /* Match a single character repeatedly. */
2916    
2917      case OP_EXACT:      case OP_EXACT:
2918        case OP_EXACTI:
2919      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
2920      ecode += 3;      ecode += 3;
2921      goto REPEATCHAR;      goto REPEATCHAR;
2922    
2923      case OP_POSUPTO:      case OP_POSUPTO:
2924        case OP_POSUPTOI:
2925      possessive = TRUE;      possessive = TRUE;
2926      /* Fall through */      /* Fall through */
2927    
2928      case OP_UPTO:      case OP_UPTO:
2929        case OP_UPTOI:
2930      case OP_MINUPTO:      case OP_MINUPTO:
2931        case OP_MINUPTOI:
2932      min = 0;      min = 0;
2933      max = GET2(ecode, 1);      max = GET2(ecode, 1);
2934      minimize = *ecode == OP_MINUPTO;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
2935      ecode += 3;      ecode += 3;
2936      goto REPEATCHAR;      goto REPEATCHAR;
2937    
2938      case OP_POSSTAR:      case OP_POSSTAR:
2939        case OP_POSSTARI:
2940      possessive = TRUE;      possessive = TRUE;
2941      min = 0;      min = 0;
2942      max = INT_MAX;      max = INT_MAX;
# Line 2461  for (;;) Line 2944  for (;;)
2944      goto REPEATCHAR;      goto REPEATCHAR;
2945    
2946      case OP_POSPLUS:      case OP_POSPLUS:
2947        case OP_POSPLUSI:
2948      possessive = TRUE;      possessive = TRUE;
2949      min = 1;      min = 1;
2950      max = INT_MAX;      max = INT_MAX;
# Line 2468  for (;;) Line 2952  for (;;)
2952      goto REPEATCHAR;      goto REPEATCHAR;
2953    
2954      case OP_POSQUERY:      case OP_POSQUERY:
2955        case OP_POSQUERYI:
2956      possessive = TRUE;      possessive = TRUE;
2957      min = 0;      min = 0;
2958      max = 1;      max = 1;
# Line 2475  for (;;) Line 2960  for (;;)
2960      goto REPEATCHAR;      goto REPEATCHAR;
2961    
2962      case OP_STAR:      case OP_STAR:
2963        case OP_STARI:
2964      case OP_MINSTAR:      case OP_MINSTAR:
2965        case OP_MINSTARI:
2966      case OP_PLUS:      case OP_PLUS:
2967        case OP_PLUSI:
2968      case OP_MINPLUS:      case OP_MINPLUS:
2969        case OP_MINPLUSI:
2970      case OP_QUERY:      case OP_QUERY:
2971        case OP_QUERYI:
2972      case OP_MINQUERY:      case OP_MINQUERY:
2973      c = *ecode++ - OP_STAR;      case OP_MINQUERYI:
2974        c = *ecode++ - ((op < OP_STARI)? OP_STAR : OP_STARI);
2975      minimize = (c & 1) != 0;      minimize = (c & 1) != 0;
   
2976      min = rep_min[c];                 /* Pick up values from tables; */      min = rep_min[c];                 /* Pick up values from tables; */
2977      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
2978      if (max == 0) max = INT_MAX;      if (max == 0) max = INT_MAX;
# Line 2505  for (;;) Line 2995  for (;;)
2995          {          {
2996  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2997          unsigned int othercase;          unsigned int othercase;
2998          if ((ims & PCRE_CASELESS) != 0 &&          if (op >= OP_STARI &&     /* Caseless */
2999              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3000            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = _pcre_ord2utf8(othercase, occhars);
3001          else oclength = 0;          else oclength = 0;
# Line 2523  for (;;) Line 3013  for (;;)
3013            else            else
3014              {              {
3015              CHECK_PARTIAL();              CHECK_PARTIAL();
3016              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3017              }              }
3018            }            }
3019    
# Line 2533  for (;;) Line 3023  for (;;)
3023            {            {
3024            for (fi = min;; fi++)            for (fi = min;; fi++)
3025              {              {
3026              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3027              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3028              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3029              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3030                memcmp(eptr, charptr, length) == 0) eptr += length;                memcmp(eptr, charptr, length) == 0) eptr += length;
3031  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 2546  for (;;) Line 3036  for (;;)
3036              else              else
3037                {                {
3038                CHECK_PARTIAL();                CHECK_PARTIAL();
3039                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3040                }                }
3041              }              }
3042            /* Control never gets here */            /* Control never gets here */
# Line 2564  for (;;) Line 3054  for (;;)
3054                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3055                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;
3056  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3057              else break;              else
3058                  {
3059                  CHECK_PARTIAL();
3060                  break;
3061                  }
3062              }              }
3063    
3064            if (possessive) continue;            if (possessive) continue;
3065    
3066            for(;;)            for(;;)
3067              {              {
3068              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3069              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3070              if (eptr == pp) { RRETURN(MATCH_NOMATCH); }              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }
3071  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3072              eptr--;              eptr--;
3073              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2608  for (;;) Line 3102  for (;;)
3102      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3103        max, eptr));        max, eptr));
3104    
3105      if ((ims & PCRE_CASELESS) != 0)      if (op >= OP_STARI)  /* Caseless */
3106        {        {
3107        fc = md->lcc[fc];        fc = md->lcc[fc];
3108        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
# Line 2616  for (;;) Line 3110  for (;;)
3110          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3111            {            {
3112            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3113            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
3114            }            }
3115          if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);          if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
3116          }          }
3117        if (min == max) continue;        if (min == max) continue;
3118        if (minimize)        if (minimize)
3119          {          {
3120          for (fi = min;; fi++)          for (fi = min;; fi++)
3121            {            {
3122            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3123            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3124            if (fi >= max) RRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
3125            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3126              {              {
3127              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3128              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3129              }              }
3130            if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);            if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
3131            }            }
3132          /* Control never gets here */          /* Control never gets here */
3133          }          }
# Line 2642  for (;;) Line 3136  for (;;)
3136          pp = eptr;          pp = eptr;
3137          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3138            {            {
3139            if (eptr >= md->end_subject || fc != md->lcc[*eptr]) break;            if (eptr >= md->end_subject)
3140                {
3141                SCHECK_PARTIAL();
3142                break;
3143                }
3144              if (fc != md->lcc[*eptr]) break;
3145            eptr++;            eptr++;
3146            }            }
3147    
# Line 2650  for (;;) Line 3149  for (;;)
3149    
3150          while (eptr >= pp)          while (eptr >= pp)
3151            {            {
3152            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM25);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
3153            eptr--;            eptr--;
3154            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3155            }            }
3156          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
3157          }          }
3158        /* Control never gets here */        /* Control never gets here */
3159        }        }
# Line 2668  for (;;) Line 3167  for (;;)
3167          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3168            {            {
3169            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3170            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
3171            }            }
3172          if (fc != *eptr++) RRETURN(MATCH_NOMATCH);          if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);
3173          }          }
3174    
3175        if (min == max) continue;        if (min == max) continue;
# Line 2679  for (;;) Line 3178  for (;;)
3178          {          {
3179          for (fi = min;; fi++)          for (fi = min;; fi++)
3180            {            {
3181            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3182            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3183            if (fi >= max) RRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
3184            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3185              {              {
3186              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3187              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3188              }              }
3189            if (fc != *eptr++) RRETURN(MATCH_NOMATCH);            if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);
3190            }            }
3191          /* Control never gets here */          /* Control never gets here */
3192          }          }
# Line 2696  for (;;) Line 3195  for (;;)
3195          pp = eptr;          pp = eptr;
3196          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3197            {            {
3198            if (eptr >= md->end_subject || fc != *eptr) break;            if (eptr >= md->end_subject)
3199                {
3200                SCHECK_PARTIAL();
3201                break;
3202                }
3203              if (fc != *eptr) break;
3204            eptr++;            eptr++;
3205            }            }
3206          if (possessive) continue;          if (possessive) continue;
3207    
3208          while (eptr >= pp)          while (eptr >= pp)
3209            {            {
3210            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM27);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
3211            eptr--;            eptr--;
3212            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3213            }            }
3214          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
3215          }          }
3216        }        }
3217      /* Control never gets here */      /* Control never gets here */
# Line 2716  for (;;) Line 3220  for (;;)
3220      checking can be multibyte. */      checking can be multibyte. */
3221    
3222      case OP_NOT:      case OP_NOT:
3223        case OP_NOTI:
3224      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3225        {        {
3226        SCHECK_PARTIAL();        SCHECK_PARTIAL();
3227        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
3228        }        }
3229      ecode++;      ecode++;
3230      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
3231      if ((ims & PCRE_CASELESS) != 0)      if (op == OP_NOTI)         /* The caseless case */
3232        {        {
3233  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3234        if (c < 256)        if (c < 256)
3235  #endif  #endif
3236        c = md->lcc[c];        c = md->lcc[c];
3237        if (md->lcc[*ecode++] == c) RRETURN(MATCH_NOMATCH);        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);
3238        }        }
3239      else      else    /* Caseful */
3240        {        {
3241        if (*ecode++ == c) RRETURN(MATCH_NOMATCH);        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);
3242        }        }
3243      break;      break;
3244    
# Line 2745  for (;;) Line 3250  for (;;)
3250      about... */      about... */
3251    
3252      case OP_NOTEXACT:      case OP_NOTEXACT:
3253        case OP_NOTEXACTI:
3254      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3255      ecode += 3;      ecode += 3;
3256      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3257    
3258      case OP_NOTUPTO:      case OP_NOTUPTO:
3259        case OP_NOTUPTOI:
3260      case OP_NOTMINUPTO:      case OP_NOTMINUPTO:
3261        case OP_NOTMINUPTOI:
3262      min = 0;      min = 0;
3263      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3264      minimize = *ecode == OP_NOTMINUPTO;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3265      ecode += 3;      ecode += 3;
3266      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3267    
3268      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
3269        case OP_NOTPOSSTARI:
3270      possessive = TRUE;      possessive = TRUE;
3271      min = 0;      min = 0;
3272      max = INT_MAX;      max = INT_MAX;
# Line 2765  for (;;) Line 3274  for (;;)
3274      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3275    
3276      case OP_NOTPOSPLUS:      case OP_NOTPOSPLUS:
3277        case OP_NOTPOSPLUSI:
3278      possessive = TRUE;      possessive = TRUE;
3279      min = 1;      min = 1;
3280      max = INT_MAX;      max = INT_MAX;
# Line 2772  for (;;) Line 3282  for (;;)
3282      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3283    
3284      case OP_NOTPOSQUERY:      case OP_NOTPOSQUERY:
3285        case OP_NOTPOSQUERYI:
3286      possessive = TRUE;      possessive = TRUE;
3287      min = 0;      min = 0;
3288      max = 1;      max = 1;
# Line 2779  for (;;) Line 3290  for (;;)
3290      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3291    
3292      case OP_NOTPOSUPTO:      case OP_NOTPOSUPTO:
3293        case OP_NOTPOSUPTOI:
3294      possessive = TRUE;      possessive = TRUE;
3295      min = 0;      min = 0;
3296      max = GET2(ecode, 1);      max = GET2(ecode, 1);
# Line 2786  for (;;) Line 3298  for (;;)
3298      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3299    
3300      case OP_NOTSTAR:      case OP_NOTSTAR:
3301        case OP_NOTSTARI:
3302      case OP_NOTMINSTAR:      case OP_NOTMINSTAR:
3303        case OP_NOTMINSTARI:
3304      case OP_NOTPLUS:      case OP_NOTPLUS:
3305        case OP_NOTPLUSI:
3306      case OP_NOTMINPLUS:      case OP_NOTMINPLUS:
3307        case OP_NOTMINPLUSI:
3308      case OP_NOTQUERY:      case OP_NOTQUERY:
3309        case OP_NOTQUERYI:
3310      case OP_NOTMINQUERY:      case OP_NOTMINQUERY:
3311      c = *ecode++ - OP_NOTSTAR;      case OP_NOTMINQUERYI:
3312        c = *ecode++ - ((op >= OP_NOTSTARI)? OP_NOTSTARI: OP_NOTSTAR);
3313      minimize = (c & 1) != 0;      minimize = (c & 1) != 0;
3314      min = rep_min[c];                 /* Pick up values from tables; */      min = rep_min[c];                 /* Pick up values from tables; */
3315      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
# Line 2813  for (;;) Line 3331  for (;;)
3331      DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3332        max, eptr));        max, eptr));
3333    
3334      if ((ims & PCRE_CASELESS) != 0)      if (op >= OP_NOTSTARI)     /* Caseless */
3335        {        {
3336        fc = md->lcc[fc];        fc = md->lcc[fc];
3337    
# Line 2827  for (;;) Line 3345  for (;;)
3345            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3346              {              {
3347              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3348              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3349              }              }
3350            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3351            if (d < 256) d = md->lcc[d];            if (d < 256) d = md->lcc[d];
3352            if (fc == d) RRETURN(MATCH_NOMATCH);            if (fc == d) MRRETURN(MATCH_NOMATCH);
3353            }            }
3354          }          }
3355        else        else
# Line 2844  for (;;) Line 3362  for (;;)
3362            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3363              {              {
3364              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3365              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3366              }              }
3367            if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);            if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
3368            }            }
3369          }          }
3370    
# Line 2861  for (;;) Line 3379  for (;;)
3379            register unsigned int d;            register unsigned int d;
3380            for (fi = min;; fi++)            for (fi = min;; fi++)
3381              {              {
3382              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3383              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3384              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3385              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3386                {                {
3387                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3388                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3389                }                }
3390              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3391              if (d < 256) d = md->lcc[d];              if (d < 256) d = md->lcc[d];
3392              if (fc == d) RRETURN(MATCH_NOMATCH);              if (fc == d) MRRETURN(MATCH_NOMATCH);
3393              }              }
3394            }            }
3395          else          else
# Line 2880  for (;;) Line 3398  for (;;)
3398            {            {
3399            for (fi = min;; fi++)            for (fi = min;; fi++)
3400              {              {
3401              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3402              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3403              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3404              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3405                {                {
3406                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3407                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3408                }                }
3409              if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);              if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
3410              }              }
3411            }            }
3412          /* Control never gets here */          /* Control never gets here */
# Line 2908  for (;;) Line 3426  for (;;)
3426            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3427              {              {
3428              int len = 1;              int len = 1;
3429              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject)
3430                  {
3431                  SCHECK_PARTIAL();
3432                  break;
3433                  }
3434              GETCHARLEN(d, eptr, len);              GETCHARLEN(d, eptr, len);
3435              if (d < 256) d = md->lcc[d];              if (d < 256) d = md->lcc[d];
3436              if (fc == d) break;              if (fc == d) break;
# Line 2917  for (;;) Line 3439  for (;;)
3439          if (possessive) continue;          if (possessive) continue;
3440          for(;;)          for(;;)
3441              {              {
3442              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3443              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3444              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3445              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2929  for (;;) Line 3451  for (;;)
3451            {            {
3452            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3453              {              {
3454              if (eptr >= md->end_subject || fc == md->lcc[*eptr]) break;              if (eptr >= md->end_subject)
3455                  {
3456                  SCHECK_PARTIAL();
3457                  break;
3458                  }
3459                if (fc == md->lcc[*eptr]) break;
3460              eptr++;              eptr++;
3461              }              }
3462            if (possessive) continue;            if (possessive) continue;
3463            while (eptr >= pp)            while (eptr >= pp)
3464              {              {
3465              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM31);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
3466              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3467              eptr--;              eptr--;
3468              }              }
3469            }            }
3470    
3471          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
3472          }          }
3473        /* Control never gets here */        /* Control never gets here */
3474        }        }
# Line 2960  for (;;) Line 3487  for (;;)
3487            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3488              {              {
3489              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3490              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3491              }              }
3492            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3493            if (fc == d) RRETURN(MATCH_NOMATCH);            if (fc == d) MRRETURN(MATCH_NOMATCH);
3494            }            }
3495          }          }
3496        else        else
# Line 2975  for (;;) Line 3502  for (;;)
3502            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3503              {              {
3504              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3505              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3506              }              }
3507            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);            if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);
3508            }            }
3509          }          }
3510    
# Line 2992  for (;;) Line 3519  for (;;)
3519            register unsigned int d;            register unsigned int d;
3520            for (fi = min;; fi++)            for (fi = min;; fi++)
3521              {              {
3522              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3523              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3524              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3525              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3526                {                {
3527                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3528                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3529                }                }
3530              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3531              if (fc == d) RRETURN(MATCH_NOMATCH);              if (fc == d) MRRETURN(MATCH_NOMATCH);
3532              }              }
3533            }            }
3534          else          else
# Line 3010  for (;;) Line 3537  for (;;)
3537            {            {
3538            for (fi = min;; fi++)            for (fi = min;; fi++)
3539              {              {
3540              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3541              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3542              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3543              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3544                {                {
3545                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3546                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3547                }                }
3548              if (fc == *eptr++) RRETURN(MATCH_NOMATCH);              if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);
3549              }              }
3550            }            }
3551          /* Control never gets here */          /* Control never gets here */
# Line 3038  for (;;) Line 3565  for (;;)
3565            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3566              {              {
3567              int len = 1;              int len = 1;
3568              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject)
3569                  {
3570                  SCHECK_PARTIAL();
3571                  break;
3572                  }
3573              GETCHARLEN(d, eptr, len);              GETCHARLEN(d, eptr, len);
3574              if (fc == d) break;              if (fc == d) break;
3575              eptr += len;              eptr += len;
# Line 3046  for (;;) Line 3577  for (;;)
3577            if (possessive) continue;            if (possessive) continue;
3578            for(;;)            for(;;)
3579              {              {
3580              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM34);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);
3581              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3582              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3583              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3058  for (;;) Line 3589  for (;;)
3589            {            {
3590            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3591              {              {
3592              if (eptr >= md->end_subject || fc == *eptr) break;              if (eptr >= md->end_subject)
3593                  {
3594                  SCHECK_PARTIAL();
3595                  break;
3596                  }
3597                if (fc == *eptr) break;
3598              eptr++;              eptr++;
3599              }              }
3600            if (possessive) continue;            if (possessive) continue;
3601            while (eptr >= pp)            while (eptr >= pp)
3602              {              {
3603              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM35);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);
3604              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3605              eptr--;              eptr--;
3606              }              }
3607            }            }
3608    
3609          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
3610          }          }
3611        }        }
3612      /* Control never gets here */      /* Control never gets here */
# Line 3164  for (;;) Line 3700  for (;;)
3700          switch(prop_type)          switch(prop_type)
3701            {            {
3702            case PT_ANY:            case PT_ANY:
3703            if (prop_fail_result) RRETURN(MATCH_NOMATCH);            if (prop_fail_result) MRRETURN(MATCH_NOMATCH);
3704            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
3705              {              {
3706              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3707                {                {
3708                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3709                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3710                }                }
3711              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3712              }              }
# Line 3179  for (;;) Line 3715  for (;;)
3715            case PT_LAMP:            case PT_LAMP:
3716            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
3717              {              {
3718                int chartype;
3719              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3720                {                {
3721                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3722                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3723                }                }
3724              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3725              prop_chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
3726              if ((prop_chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
3727                   prop_chartype == ucp_Ll ||                   chartype == ucp_Ll ||
3728                   prop_chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
3729                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3730              }              }
3731            break;            break;
3732    
# Line 3199  for (;;) Line 3736  for (;;)
3736              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3737                {                {
3738                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3739                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3740                }                }
3741              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3742              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
3743              if ((prop_category == prop_value) == prop_fail_result)                MRRETURN(MATCH_NOMATCH);
               RRETURN(MATCH_NOMATCH);  
3744              }              }
3745            break;            break;
3746    
# Line 3214  for (;;) Line 3750  for (;;)
3750              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3751                {                {
3752                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3753                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3754                }                }
3755              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3756              prop_chartype = UCD_CHARTYPE(c);              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
3757              if ((prop_chartype == prop_value) == prop_fail_result)                MRRETURN(MATCH_NOMATCH);
               RRETURN(MATCH_NOMATCH);  
3758              }              }
3759            break;            break;
3760    
# Line 3229  for (;;) Line 3764  for (;;)
3764              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3765                {                {
3766                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3767                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3768                  }
3769                GETCHARINCTEST(c, eptr);
3770                if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
3771                  MRRETURN(MATCH_NOMATCH);
3772                }
3773              break;
3774    
3775              case PT_ALNUM:
3776              for (i = 1; i <= min; i++)
3777                {
3778                int category;
3779                if (eptr >= md->end_subject)
3780                  {
3781                  SCHECK_PARTIAL();
3782                  MRRETURN(MATCH_NOMATCH);
3783                  }
3784                GETCHARINCTEST(c, eptr);
3785                category = UCD_CATEGORY(c);
3786                if ((category == ucp_L || category == ucp_N) == prop_fail_result)
3787                  MRRETURN(MATCH_NOMATCH);
3788                }
3789              break;
3790    
3791              case PT_SPACE:    /* Perl space */
3792              for (i = 1; i <= min; i++)
3793                {
3794                if (eptr >= md->end_subject)
3795                  {
3796                  SCHECK_PARTIAL();
3797                  MRRETURN(MATCH_NOMATCH);
3798                  }
3799                GETCHARINCTEST(c, eptr);
3800                if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
3801                     c == CHAR_FF || c == CHAR_CR)
3802                       == prop_fail_result)
3803                  MRRETURN(MATCH_NOMATCH);
3804                }
3805              break;
3806    
3807              case PT_PXSPACE:  /* POSIX space */
3808              for (i = 1; i <= min; i++)
3809                {
3810                if (eptr >= md->end_subject)
3811                  {
3812                  SCHECK_PARTIAL();
3813                  MRRETURN(MATCH_NOMATCH);
3814                }                }
3815              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3816              prop_script = UCD_SCRIPT(c);              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
3817              if ((prop_script == prop_value) == prop_fail_result)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
3818                RRETURN(MATCH_NOMATCH);                     == prop_fail_result)
3819                  MRRETURN(MATCH_NOMATCH);
3820              }              }
3821            break;            break;
3822    
3823              case PT_WORD:
3824              for (i = 1; i <= min; i++)
3825                {
3826                int category;
3827                if (eptr >= md->end_subject)
3828                  {
3829                  SCHECK_PARTIAL();
3830                  MRRETURN(MATCH_NOMATCH);
3831                  }
3832                GETCHARINCTEST(c, eptr);
3833                category = UCD_CATEGORY(c);
3834                if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)
3835                       == prop_fail_result)
3836                  MRRETURN(MATCH_NOMATCH);
3837                }
3838              break;
3839    
3840              /* This should not occur */
3841    
3842            default:            default:
3843            RRETURN(PCRE_ERROR_INTERNAL);            RRETURN(PCRE_ERROR_INTERNAL);
3844            }            }
# Line 3253  for (;;) Line 3854  for (;;)
3854            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3855              {              {
3856              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3857              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3858              }              }
3859            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3860            prop_category = UCD_CATEGORY(c);            if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);
           if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);  
3861            while (eptr < md->end_subject)            while (eptr < md->end_subject)
3862              {              {
3863              int len = 1;              int len = 1;
3864              if (!utf8) c = *eptr;              if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }
3865                else { GETCHARLEN(c, eptr, len); }              if (UCD_CATEGORY(c) != ucp_M) break;
             prop_category = UCD_CATEGORY(c);  
             if (prop_category != ucp_M) break;  
3866              eptr += len;              eptr += len;
3867              }              }
3868            }            }
# Line 3284  for (;;) Line 3882  for (;;)
3882            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3883              {              {
3884              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3885              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3886              }              }
3887            if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);            if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
3888            eptr++;            eptr++;
3889            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
3890            }            }
# Line 3298  for (;;) Line 3896  for (;;)
3896            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3897              {              {
3898              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3899              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3900              }              }
3901            eptr++;            eptr++;
3902            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
# Line 3306  for (;;) Line 3904  for (;;)
3904          break;          break;
3905    
3906          case OP_ANYBYTE:          case OP_ANYBYTE:
3907          if (eptr > md->end_subject - min) RRETURN(MATCH_NOMATCH);          if (eptr > md->end_subject - min) MRRETURN(MATCH_NOMATCH);
3908          eptr += min;          eptr += min;
3909          break;          break;
3910    
# Line 3316  for (;;) Line 3914  for (;;)
3914            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3915              {              {
3916              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3917              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3918              }              }
3919            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
3920            switch(c)            switch(c)
3921              {              {
3922              default: RRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
3923    
3924              case 0x000d:              case 0x000d:
3925              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
3926              break;              break;
# Line 3334  for (;;) Line 3933  for (;;)
3933              case 0x0085:              case 0x0085:
3934              case 0x2028:              case 0x2028:
3935              case 0x2029:              case 0x2029:
3936              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);              if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
3937              break;              break;
3938              }              }
3939            }            }
# Line 3346  for (;;) Line 3945  for (;;)
3945            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3946              {              {
3947              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3948              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3949              }              }
3950            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
3951            switch(c)            switch(c)
# Line 3371  for (;;) Line 3970  for (;;)
3970              case 0x202f:    /* NARROW NO-BREAK SPACE */              case 0x202f:    /* NARROW NO-BREAK SPACE */
3971              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
3972              case 0x3000:    /* IDEOGRAPHIC SPACE */              case 0x3000:    /* IDEOGRAPHIC SPACE */
3973              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3974              }              }
3975            }            }
3976          break;          break;
# Line 3382  for (;;) Line 3981  for (;;)
3981            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3982              {              {
3983              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3984              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3985              }              }
3986            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
3987            switch(c)            switch(c)
3988              {              {
3989              default: RRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
3990              case 0x09:      /* HT */              case 0x09:      /* HT */
3991              case 0x20:      /* SPACE */              case 0x20:      /* SPACE */
3992              case 0xa0:      /* NBSP */              case 0xa0:      /* NBSP */
# Line 3418  for (;;) Line 4017  for (;;)
4017            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4018              {              {
4019              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4020              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4021              }              }
4022            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4023            switch(c)            switch(c)
# Line 3431  for (;;) Line 4030  for (;;)
4030              case 0x85:      /* NEL */              case 0x85:      /* NEL */
4031              case 0x2028:    /* LINE SEPARATOR */              case 0x2028:    /* LINE SEPARATOR */
4032              case 0x2029:    /* PARAGRAPH SEPARATOR */