/[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 608 by ph10, Sun Jun 12 16:25:55 2011 UTC revision 1055 by chpe, Tue Oct 16 15:53:30 2012 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-2011 University of Cambridge             Copyright (c) 1997-2012 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 37  POSSIBILITY OF SUCH DAMAGE. Line 37  POSSIBILITY OF SUCH DAMAGE.
37  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
38  */  */
39    
   
40  /* This module contains pcre_exec(), the externally visible function that does  /* This module contains pcre_exec(), the externally visible function that does
41  pattern matching using an NFA algorithm, trying to mimic Perl as closely as  pattern matching using an NFA algorithm, trying to mimic Perl as closely as
42  possible. There are also some static supporting functions. */  possible. There are also some static supporting functions. */
# Line 57  possible. There are also some static sup Line 56  possible. There are also some static sup
56  #undef min  #undef min
57  #undef max  #undef max
58    
59  /* Values for setting in md->match_function_type to indicate two special types  /* Values for setting in md->match_function_type to indicate two special types
60  of call to match(). We do it this way to save on using another stack variable,  of call to match(). We do it this way to save on using another stack variable,
61  as stack usage is to be discouraged. */  as stack usage is to be discouraged. */
62    
63  #define MATCH_CONDASSERT     1  /* Called to check a condition assertion */  #define MATCH_CONDASSERT     1  /* Called to check a condition assertion */
# Line 76  negative to avoid the external error cod Line 75  negative to avoid the external error cod
75  #define MATCH_ACCEPT       (-999)  #define MATCH_ACCEPT       (-999)
76  #define MATCH_COMMIT       (-998)  #define MATCH_COMMIT       (-998)
77  #define MATCH_KETRPOS      (-997)  #define MATCH_KETRPOS      (-997)
78  #define MATCH_PRUNE        (-996)  #define MATCH_ONCE         (-996)
79  #define MATCH_SKIP         (-995)  #define MATCH_PRUNE        (-995)
80  #define MATCH_SKIP_ARG     (-994)  #define MATCH_SKIP         (-994)
81  #define MATCH_THEN         (-993)  #define MATCH_SKIP_ARG     (-993)
82    #define MATCH_THEN         (-992)
 /* This is a convenience macro for code that occurs many times. */  
   
 #define MRRETURN(ra) \  
   { \  
   md->mark = markptr; \  
   RRETURN(ra); \  
   }  
83    
84  /* 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.
85  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 120  Returns:     nothing Line 112  Returns:     nothing
112  */  */
113    
114  static void  static void
115  pchars(const uschar *p, int length, BOOL is_subject, match_data *md)  pchars(const pcre_uchar *p, int length, BOOL is_subject, match_data *md)
116  {  {
117  unsigned int c;  unsigned int c;
118  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
# Line 137  while (length-- > 0) Line 129  while (length-- > 0)
129    
130  /* Normally, if a back reference hasn't been set, the length that is passed is  /* Normally, if a back reference hasn't been set, the length that is passed is
131  negative, so the match always fails. However, in JavaScript compatibility mode,  negative, so the match always fails. However, in JavaScript compatibility mode,
132  the length passed is zero. Note that in caseless UTF-8 mode, the number of  the length passed is zero. Note that in caseless UTF-8 mode, the number of
133  subject bytes matched may be different to the number of reference bytes.  subject bytes matched may be different to the number of reference bytes.
134    
135  Arguments:  Arguments:
# Line 147  Arguments: Line 139  Arguments:
139    md          points to match data block    md          points to match data block
140    caseless    TRUE if caseless    caseless    TRUE if caseless
141    
142  Returns:      < 0 if not matched, otherwise the number of subject bytes matched  Returns:      >= 0 the number of subject bytes matched
143                  -1 no match
144                  -2 partial match; always given if at end subject
145  */  */
146    
147  static int  static int
148  match_ref(int offset, register USPTR eptr, int length, match_data *md,  match_ref(int offset, register PCRE_PUCHAR eptr, int length, match_data *md,
149    BOOL caseless)    BOOL caseless)
150  {  {
151  USPTR eptr_start = eptr;  PCRE_PUCHAR eptr_start = eptr;
152  register USPTR p = md->start_subject + md->offset_vector[offset];  register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
153    
154  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
155  if (eptr >= md->end_subject)  if (eptr >= md->end_subject)
# Line 170  pchars(p, length, FALSE, md); Line 164  pchars(p, length, FALSE, md);
164  printf("\n");  printf("\n");
165  #endif  #endif
166    
167  /* Always fail if reference not set (and not JavaScript compatible). */  /* Always fail if reference not set (and not JavaScript compatible - in that
168    case the length is passed as zero). */
169    
170  if (length < 0) return -1;  if (length < 0) return -1;
171    
# Line 180  ASCII characters. */ Line 175  ASCII characters. */
175    
176  if (caseless)  if (caseless)
177    {    {
178  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
179  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
180    if (md->utf8)    if (md->utf)
181      {      {
182      /* Match characters up to the end of the reference. NOTE: the number of      /* Match characters up to the end of the reference. NOTE: the number of
183      bytes matched may differ, because there are some characters whose upper and      data units matched may differ, because in UTF-8 there are some characters
184      lower case versions code as different numbers of bytes. For example, U+023A      whose upper and lower case versions code have different numbers of bytes.
185      (2 bytes in UTF-8) is the upper case version of U+2C65 (3 bytes in UTF-8);      For example, U+023A (2 bytes in UTF-8) is the upper case version of U+2C65
186      a sequence of 3 of the former uses 6 bytes, as does a sequence of two of      (3 bytes in UTF-8); a sequence of 3 of the former uses 6 bytes, as does a
187      the latter. It is important, therefore, to check the length along the      sequence of two of the latter. It is important, therefore, to check the
188      reference, not along the subject (earlier code did this wrong). */      length along the reference, not along the subject (earlier code did this
189        wrong). */
190      USPTR endptr = p + length;  
191        PCRE_PUCHAR endptr = p + length;
192      while (p < endptr)      while (p < endptr)
193        {        {
194        int c, d;        unsigned int c, d;
195        if (eptr >= md->end_subject) return -1;        const ucd_record *ur;
196          if (eptr >= md->end_subject) return -2;   /* Partial match */
197        GETCHARINC(c, eptr);        GETCHARINC(c, eptr);
198        GETCHARINC(d, p);        GETCHARINC(d, p);
199        if (c != d && c != UCD_OTHERCASE(d)) return -1;        ur = GET_UCD(d);
200          if (c != d && c != d + ur->other_case)
201            {
202            const pcre_uint32 *pp = PRIV(ucd_caseless_sets) + ur->caseset;
203            for (;;)
204              {
205              if (c < *pp) return -1;
206              if (c == *pp++) break;
207              }
208            }
209        }        }
210      }      }
211    else    else
# Line 209  if (caseless) Line 215  if (caseless)
215    /* 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
216    is no UCP support. */    is no UCP support. */
217      {      {
     if (eptr + length > md->end_subject) return -1;  
218      while (length-- > 0)      while (length-- > 0)
219        { if (md->lcc[*p++] != md->lcc[*eptr++]) return -1; }        {
220      }        if (eptr >= md->end_subject) return -2;   /* Partial match */
221          if (TABLE_GET(*p, md->lcc, *p) != TABLE_GET(*eptr, md->lcc, *eptr)) return -1;
222          p++;
223          eptr++;
224          }
225        }
226    }    }
227    
228  /* 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
229  are in UTF-8 mode. */  are in UTF-8 mode. */
230    
231  else  else
232    {    {
233    if (eptr + length > md->end_subject) return -1;    while (length-- > 0)
234    while (length-- > 0) if (*p++ != *eptr++) return -1;      {
235        if (eptr >= md->end_subject) return -2;   /* Partial match */
236        if (*p++ != *eptr++) return -1;
237        }
238    }    }
239    
240  return eptr - eptr_start;  return (int)(eptr - eptr_start);
241  }  }
242    
243    
# Line 276  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM Line 289  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
289         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
290         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
291         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
292         RM61,  RM62, RM63, RM64 };         RM61,  RM62, RM63, RM64, RM65, RM66 };
293    
294  /* 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
295  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
# Line 289  actually used in this definition. */ Line 302  actually used in this definition. */
302  #define RMATCH(ra,rb,rc,rd,re,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
303    { \    { \
304    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
305    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1); \    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1); \
306    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
307    }    }
308  #define RRETURN(ra) \  #define RRETURN(ra) \
# Line 299  actually used in this definition. */ Line 312  actually used in this definition. */
312    }    }
313  #else  #else
314  #define RMATCH(ra,rb,rc,rd,re,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
315    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1)    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1)
316  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
317  #endif  #endif
318    
# Line 314  argument of match(), which never changes Line 327  argument of match(), which never changes
327    
328  #define RMATCH(ra,rb,rc,rd,re,rw)\  #define RMATCH(ra,rb,rc,rd,re,rw)\
329    {\    {\
330    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = frame->Xnextframe;\
331    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\    if (newframe == NULL)\
332    frame->Xwhere = rw; \      {\
333        newframe = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));\
334        if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
335        newframe->Xnextframe = NULL;\
336        frame->Xnextframe = newframe;\
337        }\
338      frame->Xwhere = rw;\
339    newframe->Xeptr = ra;\    newframe->Xeptr = ra;\
340    newframe->Xecode = rb;\    newframe->Xecode = rb;\
341    newframe->Xmstart = mstart;\    newframe->Xmstart = mstart;\
   newframe->Xmarkptr = markptr;\  
342    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
343    newframe->Xeptrb = re;\    newframe->Xeptrb = re;\
344    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
# Line 336  argument of match(), which never changes Line 354  argument of match(), which never changes
354    {\    {\
355    heapframe *oldframe = frame;\    heapframe *oldframe = frame;\
356    frame = oldframe->Xprevframe;\    frame = oldframe->Xprevframe;\
   (pcre_stack_free)(oldframe);\  
357    if (frame != NULL)\    if (frame != NULL)\
358      {\      {\
359      rrc = ra;\      rrc = ra;\
# Line 350  argument of match(), which never changes Line 367  argument of match(), which never changes
367    
368  typedef struct heapframe {  typedef struct heapframe {
369    struct heapframe *Xprevframe;    struct heapframe *Xprevframe;
370      struct heapframe *Xnextframe;
371    
372    /* Function arguments that may change */    /* Function arguments that may change */
373    
374    USPTR Xeptr;    PCRE_PUCHAR Xeptr;
375    const uschar *Xecode;    const pcre_uchar *Xecode;
376    USPTR Xmstart;    PCRE_PUCHAR Xmstart;
   USPTR Xmarkptr;  
377    int Xoffset_top;    int Xoffset_top;
378    eptrblock *Xeptrb;    eptrblock *Xeptrb;
379    unsigned int Xrdepth;    unsigned int Xrdepth;
380    
381    /* Function local variables */    /* Function local variables */
382    
383    USPTR Xcallpat;    PCRE_PUCHAR Xcallpat;
384  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
385    USPTR Xcharptr;    PCRE_PUCHAR Xcharptr;
386  #endif  #endif
387    USPTR Xdata;    PCRE_PUCHAR Xdata;
388    USPTR Xnext;    PCRE_PUCHAR Xnext;
389    USPTR Xpp;    PCRE_PUCHAR Xpp;
390    USPTR Xprev;    PCRE_PUCHAR Xprev;
391    USPTR Xsaved_eptr;    PCRE_PUCHAR Xsaved_eptr;
392    
393    recursion_info Xnew_recursive;    recursion_info Xnew_recursive;
394    
# Line 383  typedef struct heapframe { Line 400  typedef struct heapframe {
400    int Xprop_type;    int Xprop_type;
401    int Xprop_value;    int Xprop_value;
402    int Xprop_fail_result;    int Xprop_fail_result;
   int Xprop_category;  
   int Xprop_chartype;  
   int Xprop_script;  
403    int Xoclength;    int Xoclength;
404    uschar Xocchars[8];    pcre_uchar Xocchars[6];
405  #endif  #endif
406    
407    int Xcodelink;    int Xcodelink;
# Line 429  returns a negative (error) response, the Line 443  returns a negative (error) response, the
443  same response. */  same response. */
444    
445  /* These macros pack up tests that are used for partial matching, and which  /* These macros pack up tests that are used for partial matching, and which
446  appears several times in the code. We set the "hit end" flag if the pointer is  appear several times in the code. We set the "hit end" flag if the pointer is
447  at the end of the subject and also past the start of the subject (i.e.  at the end of the subject and also past the start of the subject (i.e.
448  something has been matched). For hard partial matching, we then return  something has been matched). For hard partial matching, we then return
449  immediately. The second one is used when we already know we are past the end of  immediately. The second one is used when we already know we are past the end of
# Line 440  the subject. */ Line 454  the subject. */
454        eptr > md->start_used_ptr) \        eptr > md->start_used_ptr) \
455      { \      { \
456      md->hitend = TRUE; \      md->hitend = TRUE; \
457      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
458      }      }
459    
460  #define SCHECK_PARTIAL()\  #define SCHECK_PARTIAL()\
461    if (md->partial != 0 && eptr > md->start_used_ptr) \    if (md->partial != 0 && eptr > md->start_used_ptr) \
462      { \      { \
463      md->hitend = TRUE; \      md->hitend = TRUE; \
464      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
465      }      }
466    
467    
468  /* Performance note: It might be tempting to extract commonly used fields from  /* Performance note: It might be tempting to extract commonly used fields from
469  the md structure (e.g. utf8, end_subject) into individual variables to improve  the md structure (e.g. utf, end_subject) into individual variables to improve
470  performance. Tests using gcc on a SPARC disproved this; in the first case, it  performance. Tests using gcc on a SPARC disproved this; in the first case, it
471  made performance worse.  made performance worse.
472    
# Line 461  Arguments: Line 475  Arguments:
475     ecode       pointer to current position in compiled code     ecode       pointer to current position in compiled code
476     mstart      pointer to the current match start position (can be modified     mstart      pointer to the current match start position (can be modified
477                   by encountering \K)                   by encountering \K)
    markptr     pointer to the most recent MARK name, or NULL  
478     offset_top  current top pointer     offset_top  current top pointer
479     md          pointer to "static" info for the match     md          pointer to "static" info for the match
480     eptrb       pointer to chain of blocks containing eptr at start of     eptrb       pointer to chain of blocks containing eptr at start of
# Line 476  Returns:       MATCH_MATCH if matched Line 489  Returns:       MATCH_MATCH if matched
489  */  */
490    
491  static int  static int
492  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,  match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
493    const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,    PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
494    unsigned int rdepth)    unsigned int rdepth)
495  {  {
496  /* 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,
# Line 487  so they can be ordinary variables in all Line 500  so they can be ordinary variables in all
500  register int  rrc;         /* Returns from recursive calls */  register int  rrc;         /* Returns from recursive calls */
501  register int  i;           /* Used for loops not involving calls to RMATCH() */  register int  i;           /* Used for loops not involving calls to RMATCH() */
502  register unsigned int c;   /* Character values not kept over RMATCH() calls */  register unsigned int c;   /* Character values not kept over RMATCH() calls */
503  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf;         /* Local copy of UTF flag for speed */
504    
505  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
506  BOOL caseless;  BOOL caseless;
507  int condcode;  int condcode;
508    
509  /* 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
510  preserved over calls to RMATCH() are part of a "frame" which is obtained from  preserved over calls to RMATCH() are part of a "frame". We set up the top-level
511  heap storage. Set up the top-level frame here; others are obtained from the  frame on the stack here; subsequent instantiations are obtained from the heap
512  heap whenever RMATCH() does a "recursion". See the macro definitions above. */  whenever RMATCH() does a "recursion". See the macro definitions above. Putting
513    the top-level on the stack rather than malloc-ing them all gives a performance
514    boost in many cases where there is not much "recursion". */
515    
516  #ifdef NO_RECURSE  #ifdef NO_RECURSE
517  heapframe *frame = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));  heapframe *frame = (heapframe *)md->match_frames_base;
 if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);  
 frame->Xprevframe = NULL;            /* Marks the top level */  
518    
519  /* Copy in the original argument variables */  /* Copy in the original argument variables */
520    
521  frame->Xeptr = eptr;  frame->Xeptr = eptr;
522  frame->Xecode = ecode;  frame->Xecode = ecode;
523  frame->Xmstart = mstart;  frame->Xmstart = mstart;
 frame->Xmarkptr = markptr;  
524  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
525  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
526  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
# Line 522  HEAP_RECURSE: Line 534  HEAP_RECURSE:
534  #define eptr               frame->Xeptr  #define eptr               frame->Xeptr
535  #define ecode              frame->Xecode  #define ecode              frame->Xecode
536  #define mstart             frame->Xmstart  #define mstart             frame->Xmstart
 #define markptr            frame->Xmarkptr  
537  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
538  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
539  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
540    
541  /* Ditto for the local variables */  /* Ditto for the local variables */
542    
543  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
544  #define charptr            frame->Xcharptr  #define charptr            frame->Xcharptr
545  #endif  #endif
546  #define callpat            frame->Xcallpat  #define callpat            frame->Xcallpat
# Line 550  HEAP_RECURSE: Line 561  HEAP_RECURSE:
561  #define prop_type          frame->Xprop_type  #define prop_type          frame->Xprop_type
562  #define prop_value         frame->Xprop_value  #define prop_value         frame->Xprop_value
563  #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  
564  #define oclength           frame->Xoclength  #define oclength           frame->Xoclength
565  #define occhars            frame->Xocchars  #define occhars            frame->Xocchars
566  #endif  #endif
# Line 590  declarations can be cut out in a block. Line 598  declarations can be cut out in a block.
598  below are for variables that do not have to be preserved over a recursive call  below are for variables that do not have to be preserved over a recursive call
599  to RMATCH(). */  to RMATCH(). */
600    
601  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
602  const uschar *charptr;  const pcre_uchar *charptr;
603  #endif  #endif
604  const uschar *callpat;  const pcre_uchar *callpat;
605  const uschar *data;  const pcre_uchar *data;
606  const uschar *next;  const pcre_uchar *next;
607  USPTR         pp;  PCRE_PUCHAR       pp;
608  const uschar *prev;  const pcre_uchar *prev;
609  USPTR         saved_eptr;  PCRE_PUCHAR       saved_eptr;
610    
611  recursion_info new_recursive;  recursion_info new_recursive;
612    
613  BOOL cur_is_word;  BOOL cur_is_word;
614  BOOL condition;  BOOL condition;
615  BOOL prev_is_word;  BOOL prev_is_word;
616    
# Line 610  BOOL prev_is_word; Line 618  BOOL prev_is_word;
618  int prop_type;  int prop_type;
619  int prop_value;  int prop_value;
620  int prop_fail_result;  int prop_fail_result;
 int prop_category;  
 int prop_chartype;  
 int prop_script;  
621  int oclength;  int oclength;
622  uschar occhars[8];  pcre_uchar occhars[6];
623  #endif  #endif
624    
625  int codelink;  int codelink;
# Line 630  int save_offset1, save_offset2, save_off Line 635  int save_offset1, save_offset2, save_off
635  int stacksave[REC_STACK_SAVE_MAX];  int stacksave[REC_STACK_SAVE_MAX];
636    
637  eptrblock newptrb;  eptrblock newptrb;
638    
639    /* There is a special fudge for calling match() in a way that causes it to
640    measure the size of its basic stack frame when the stack is being used for
641    recursion. The second argument (ecode) being NULL triggers this behaviour. It
642    cannot normally ever be NULL. The return is the negated value of the frame
643    size. */
644    
645    if (ecode == NULL)
646      {
647      if (rdepth == 0)
648        return match((PCRE_PUCHAR)&rdepth, NULL, NULL, 0, NULL, NULL, 1);
649      else
650        {
651        int len = (char *)&rdepth - (char *)eptr;
652        return (len > 0)? -len : len;
653        }
654      }
655  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
656    
657  /* To save space on the stack and in the heap frame, I have doubled up on some  /* To save space on the stack and in the heap frame, I have doubled up on some
658  of the local variables that are used only in localised parts of the code, but  of the local variables that are used only in localised parts of the code, but
659  still need to be preserved over recursive calls of match(). These macros define  still need to be preserved over recursive calls of match(). These macros define
660  the alternative names that are used. */  the alternative names that are used. */
661    
662  #define allow_zero    cur_is_word  #define allow_zero    cur_is_word
# Line 642  the alternative names that are used. */ Line 664  the alternative names that are used. */
664  #define code_offset   codelink  #define code_offset   codelink
665  #define condassert    condition  #define condassert    condition
666  #define matched_once  prev_is_word  #define matched_once  prev_is_word
667    #define foc           number
668    #define save_mark     data
669    
670  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
671  variables. */  variables. */
# Line 667  defined). However, RMATCH isn't like a f Line 691  defined). However, RMATCH isn't like a f
691  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,
692  however, impact performance when true recursion is being used. */  however, impact performance when true recursion is being used. */
693    
694  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
695  utf8 = md->utf8;       /* Local copy of the flag */  utf = md->utf;       /* Local copy of the flag */
696  #else  #else
697  utf8 = FALSE;  utf = FALSE;
698  #endif  #endif
699    
700  /* First check that we haven't called match() too many times, or that we  /* First check that we haven't called match() too many times, or that we
# Line 680  if (md->match_call_count++ >= md->match_ Line 704  if (md->match_call_count++ >= md->match_
704  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
705    
706  /* 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
707  string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is  string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is
708  done this way to save having to use another function argument, which would take  done this way to save having to use another function argument, which would take
709  up space on the stack. See also MATCH_CONDASSERT below.  up space on the stack. See also MATCH_CONDASSERT below.
710    
711  When MATCH_CBEGROUP is set, add the current subject pointer to the chain of  When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
# Line 705  for (;;) Line 729  for (;;)
729    {    {
730    minimize = possessive = FALSE;    minimize = possessive = FALSE;
731    op = *ecode;    op = *ecode;
732    
733    switch(op)    switch(op)
734      {      {
735      case OP_MARK:      case OP_MARK:
736      markptr = ecode + 2;      md->nomatch_mark = ecode + 2;
737      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      md->mark = NULL;    /* In case previously set by assertion */
738        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
739        eptrb, RM55);        eptrb, RM55);
740        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
741             md->mark == NULL) md->mark = ecode + 2;
742    
743      /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an      /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
744      argument, and we must check whether that argument matches this MARK's      argument, and we must check whether that argument matches this MARK's
# Line 720  for (;;) Line 747  for (;;)
747      position and return MATCH_SKIP. Otherwise, pass back the return code      position and return MATCH_SKIP. Otherwise, pass back the return code
748      unaltered. */      unaltered. */
749    
750      if (rrc == MATCH_SKIP_ARG &&      else if (rrc == MATCH_SKIP_ARG &&
751          strcmp((char *)markptr, (char *)(md->start_match_ptr)) == 0)          STRCMP_UC_UC(ecode + 2, md->start_match_ptr) == 0)
752        {        {
753        md->start_match_ptr = eptr;        md->start_match_ptr = eptr;
754        RRETURN(MATCH_SKIP);        RRETURN(MATCH_SKIP);
755        }        }
   
     if (md->mark == NULL) md->mark = markptr;  
756      RRETURN(rrc);      RRETURN(rrc);
757    
758      case OP_FAIL:      case OP_FAIL:
759      MRRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
760    
761      /* COMMIT overrides PRUNE, SKIP, and THEN */      /* COMMIT overrides PRUNE, SKIP, and THEN */
762    
763      case OP_COMMIT:      case OP_COMMIT:
764      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
765        eptrb, RM52);        eptrb, RM52);
766      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
767          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
768          rrc != MATCH_THEN)          rrc != MATCH_THEN)
769        RRETURN(rrc);        RRETURN(rrc);
770      MRRETURN(MATCH_COMMIT);      RRETURN(MATCH_COMMIT);
771    
772      /* PRUNE overrides THEN */      /* PRUNE overrides THEN */
773    
774      case OP_PRUNE:      case OP_PRUNE:
775      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
776        eptrb, RM51);        eptrb, RM51);
777      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
778      MRRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
779    
780      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
781      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      md->nomatch_mark = ecode + 2;
782        md->mark = NULL;    /* In case previously set by assertion */
783        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
784        eptrb, RM56);        eptrb, RM56);
785        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
786             md->mark == NULL) md->mark = ecode + 2;
787      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
     md->mark = ecode + 2;  
788      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
789    
790      /* SKIP overrides PRUNE and THEN */      /* SKIP overrides PRUNE and THEN */
791    
792      case OP_SKIP:      case OP_SKIP:
793      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
794        eptrb, RM53);        eptrb, RM53);
795      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
796        RRETURN(rrc);        RRETURN(rrc);
797      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
798      MRRETURN(MATCH_SKIP);      RRETURN(MATCH_SKIP);
799    
800        /* Note that, for Perl compatibility, SKIP with an argument does NOT set
801        nomatch_mark. There is a flag that disables this opcode when re-matching a
802        pattern that ended with a SKIP for which there was not a matching MARK. */
803    
804      case OP_SKIP_ARG:      case OP_SKIP_ARG:
805      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      if (md->ignore_skip_arg)
806          {
807          ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
808          break;
809          }
810        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
811        eptrb, RM57);        eptrb, RM57);
812      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
813        RRETURN(rrc);        RRETURN(rrc);
814    
815      /* Pass back the current skip name by overloading md->start_match_ptr and      /* Pass back the current skip name by overloading md->start_match_ptr and
816      returning the special MATCH_SKIP_ARG return code. This will either be      returning the special MATCH_SKIP_ARG return code. This will either be
817      caught by a matching MARK, or get to the top, where it is treated the same      caught by a matching MARK, or get to the top, where it causes a rematch
818      as PRUNE. */      with the md->ignore_skip_arg flag set. */
819    
820      md->start_match_ptr = ecode + 2;      md->start_match_ptr = ecode + 2;
821      RRETURN(MATCH_SKIP_ARG);      RRETURN(MATCH_SKIP_ARG);
822    
823      /* For THEN (and THEN_ARG) we pass back the address of the bracket or      /* For THEN (and THEN_ARG) we pass back the address of the opcode, so that
824      the alt that is at the start of the current branch. This makes it possible      the branch in which it occurs can be determined. Overload the start of
825      to skip back past alternatives that precede the THEN within the current      match pointer to do this. */
     branch. */  
826    
827      case OP_THEN:      case OP_THEN:
828      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
829        eptrb, RM54);        eptrb, RM54);
830      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
831      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
832      MRRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
833    
834      case OP_THEN_ARG:      case OP_THEN_ARG:
835      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],      md->nomatch_mark = ecode + 2;
836        offset_top, md, eptrb, RM58);      md->mark = NULL;    /* In case previously set by assertion */
837        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top,
838          md, eptrb, RM58);
839        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
840             md->mark == NULL) md->mark = ecode + 2;
841      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
842      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
     md->mark = ecode + LINK_SIZE + 2;  
843      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
844    
845        /* Handle an atomic group that does not contain any capturing parentheses.
846        This can be handled like an assertion. Prior to 8.13, all atomic groups
847        were handled this way. In 8.13, the code was changed as below for ONCE, so
848        that backups pass through the group and thereby reset captured values.
849        However, this uses a lot more stack, so in 8.20, atomic groups that do not
850        contain any captures generate OP_ONCE_NC, which can be handled in the old,
851        less stack intensive way.
852    
853        Check the alternative branches in turn - the matching won't pass the KET
854        for this kind of subpattern. If any one branch matches, we carry on as at
855        the end of a normal bracket, leaving the subject pointer, but resetting
856        the start-of-match value in case it was changed by \K. */
857    
858        case OP_ONCE_NC:
859        prev = ecode;
860        saved_eptr = eptr;
861        save_mark = md->mark;
862        do
863          {
864          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
865          if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
866            {
867            mstart = md->start_match_ptr;
868            break;
869            }
870          if (rrc == MATCH_THEN)
871            {
872            next = ecode + GET(ecode,1);
873            if (md->start_match_ptr < next &&
874                (*ecode == OP_ALT || *next == OP_ALT))
875              rrc = MATCH_NOMATCH;
876            }
877    
878          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
879          ecode += GET(ecode,1);
880          md->mark = save_mark;
881          }
882        while (*ecode == OP_ALT);
883    
884        /* If hit the end of the group (which could be repeated), fail */
885    
886        if (*ecode != OP_ONCE_NC && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
887    
888        /* Continue as from after the group, updating the offsets high water
889        mark, since extracts may have been taken. */
890    
891        do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
892    
893        offset_top = md->end_offset_top;
894        eptr = md->end_match_ptr;
895    
896        /* For a non-repeating ket, just continue at this level. This also
897        happens for a repeating ket if no characters were matched in the group.
898        This is the forcible breaking of infinite loops as implemented in Perl
899        5.005. */
900    
901        if (*ecode == OP_KET || eptr == saved_eptr)
902          {
903          ecode += 1+LINK_SIZE;
904          break;
905          }
906    
907        /* The repeating kets try the rest of the pattern or restart from the
908        preceding bracket, in the appropriate order. The second "call" of match()
909        uses tail recursion, to avoid using another stack frame. */
910    
911        if (*ecode == OP_KETRMIN)
912          {
913          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM65);
914          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
915          ecode = prev;
916          goto TAIL_RECURSE;
917          }
918        else  /* OP_KETRMAX */
919          {
920          RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
921          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
922          ecode += 1 + LINK_SIZE;
923          goto TAIL_RECURSE;
924          }
925        /* Control never gets here */
926    
927      /* Handle a capturing bracket, other than those that are possessive with an      /* Handle a capturing bracket, other than those that are possessive with an
928      unlimited repeat. If there is space in the offset vector, save the current      unlimited repeat. If there is space in the offset vector, save the current
929      subject position in the working slot at the top of the vector. We mustn't      subject position in the working slot at the top of the vector. We mustn't
930      change the current values of the data slot, because they may be set from a      change the current values of the data slot, because they may be set from a
931      previous iteration of this group, and be referred to by a reference inside      previous iteration of this group, and be referred to by a reference inside
932      the group. If we fail to match, we need to restore this value and also the      the group. A failure to match might occur after the group has succeeded,
933      values of the final offsets, in case they were set by a previous iteration      if something later on doesn't match. For this reason, we need to restore
934      of the same bracket.      the working value and also the values of the final offsets, in case they
935        were set by a previous iteration of the same bracket.
936    
937      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
938      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 820  for (;;) Line 942  for (;;)
942      case OP_SCBRA:      case OP_SCBRA:
943      number = GET2(ecode, 1+LINK_SIZE);      number = GET2(ecode, 1+LINK_SIZE);
944      offset = number << 1;      offset = number << 1;
945    
946  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
947      printf("start bracket %d\n", number);      printf("start bracket %d\n", number);
948      printf("subject=");      printf("subject=");
# Line 834  for (;;) Line 956  for (;;)
956        save_offset2 = md->offset_vector[offset+1];        save_offset2 = md->offset_vector[offset+1];
957        save_offset3 = md->offset_vector[md->offset_end - number];        save_offset3 = md->offset_vector[md->offset_end - number];
958        save_capture_last = md->capture_last;        save_capture_last = md->capture_last;
959          save_mark = md->mark;
960    
961        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
962        md->offset_vector[md->offset_end - number] =        md->offset_vector[md->offset_end - number] =
# Line 841  for (;;) Line 964  for (;;)
964    
965        for (;;)        for (;;)
966          {          {
967          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
968          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
969            eptrb, RM1);            eptrb, RM1);
970          if (rrc != MATCH_NOMATCH &&          if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
971              (rrc != MATCH_THEN || md->start_match_ptr != ecode))  
972            RRETURN(rrc);          /* If we backed up to a THEN, check whether it is within the current
973            branch by comparing the address of the THEN that is passed back with
974            the end of the branch. If it is within the current branch, and the
975            branch is one of two or more alternatives (it either starts or ends
976            with OP_ALT), we have reached the limit of THEN's action, so convert
977            the return code to NOMATCH, which will cause normal backtracking to
978            happen from now on. Otherwise, THEN is passed back to an outer
979            alternative. This implements Perl's treatment of parenthesized groups,
980            where a group not containing | does not affect the current alternative,
981            that is, (X) is NOT the same as (X|(*F)). */
982    
983            if (rrc == MATCH_THEN)
984              {
985              next = ecode + GET(ecode,1);
986              if (md->start_match_ptr < next &&
987                  (*ecode == OP_ALT || *next == OP_ALT))
988                rrc = MATCH_NOMATCH;
989              }
990    
991            /* Anything other than NOMATCH is passed back. */
992    
993            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
994          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
995          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
996          if (*ecode != OP_ALT) break;          md->mark = save_mark;
997            if (*ecode != OP_ALT) break;
998          }          }
999    
1000        DPRINTF(("bracket %d failed\n", number));        DPRINTF(("bracket %d failed\n", number));
   
1001        md->offset_vector[offset] = save_offset1;        md->offset_vector[offset] = save_offset1;
1002        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
1003        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
1004    
1005        if (rrc != MATCH_THEN) md->mark = markptr;        /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
1006        RRETURN(MATCH_NOMATCH);  
1007          RRETURN(rrc);
1008        }        }
1009    
1010      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
# Line 873  for (;;) Line 1018  for (;;)
1018      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1019      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1020    
1021      /* Non-capturing bracket, except for possessive with unlimited repeat. Loop      /* Non-capturing or atomic group, except for possessive with unlimited
1022      for all the alternatives. When we get to the final alternative within the      repeat and ONCE group with no captures. Loop for all the alternatives.
     brackets, we would return the result of a recursive call to match()  
     whatever happened. We can reduce stack usage by turning this into a tail  
     recursion, except in the case of a possibly empty group.*/  
1023    
1024        When we get to the final alternative within the brackets, we used to return
1025        the result of a recursive call to match() whatever happened so it was
1026        possible to reduce stack usage by turning this into a tail recursion,
1027        except in the case of a possibly empty group. However, now that there is
1028        the possiblity of (*THEN) occurring in the final alternative, this
1029        optimization is no longer always possible.
1030    
1031        We can optimize if we know there are no (*THEN)s in the pattern; at present
1032        this is the best that can be done.
1033    
1034        MATCH_ONCE is returned when the end of an atomic group is successfully
1035        reached, but subsequent matching fails. It passes back up the tree (causing
1036        captured values to be reset) until the original atomic group level is
1037        reached. This is tested by comparing md->once_target with the start of the
1038        group. At this point, the return is converted into MATCH_NOMATCH so that
1039        previous backup points can be taken. */
1040    
1041        case OP_ONCE:
1042      case OP_BRA:      case OP_BRA:
1043      case OP_SBRA:      case OP_SBRA:
1044      DPRINTF(("start non-capturing bracket\n"));      DPRINTF(("start non-capturing bracket\n"));
1045    
1046      for (;;)      for (;;)
1047        {        {
1048        if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */        if (op >= OP_SBRA || op == OP_ONCE)
1049            md->match_function_type = MATCH_CBEGROUP;
1050    
1051          /* If this is not a possibly empty group, and there are no (*THEN)s in
1052          the pattern, and this is the final alternative, optimize as described
1053          above. */
1054    
1055          else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
1056          {          {
1057          if (op >= OP_SBRA)   /* Possibly empty group */          ecode += PRIV(OP_lengths)[*ecode];
           {  
           md->match_function_type = MATCH_CBEGROUP;  
           RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,  
             RM48);  
           if (rrc == MATCH_NOMATCH) md->mark = markptr;  
           RRETURN(rrc);  
           }  
         /* Not a possibly empty group; use tail recursion */  
         ecode += _pcre_OP_lengths[*ecode];  
         DPRINTF(("bracket 0 tail recursion\n"));  
1058          goto TAIL_RECURSE;          goto TAIL_RECURSE;
1059          }          }
1060    
1061        /* For non-final alternatives, continue the loop for a NOMATCH result;        /* In all other cases, we have to make another call to match(). */
       otherwise return. */  
1062    
1063        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;        save_mark = md->mark;
1064        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
1065          RM2);          RM2);
1066        if (rrc != MATCH_NOMATCH &&  
1067            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* See comment in the code for capturing groups above about handling
1068          THEN. */
1069    
1070          if (rrc == MATCH_THEN)
1071            {
1072            next = ecode + GET(ecode,1);
1073            if (md->start_match_ptr < next &&
1074                (*ecode == OP_ALT || *next == OP_ALT))
1075              rrc = MATCH_NOMATCH;
1076            }
1077    
1078          if (rrc != MATCH_NOMATCH)
1079            {
1080            if (rrc == MATCH_ONCE)
1081              {
1082              const pcre_uchar *scode = ecode;
1083              if (*scode != OP_ONCE)           /* If not at start, find it */
1084                {
1085                while (*scode == OP_ALT) scode += GET(scode, 1);
1086                scode -= GET(scode, 1);
1087                }
1088              if (md->once_target == scode) rrc = MATCH_NOMATCH;
1089              }
1090          RRETURN(rrc);          RRETURN(rrc);
1091            }
1092        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1093          md->mark = save_mark;
1094          if (*ecode != OP_ALT) break;
1095        }        }
     /* Control never reaches here. */  
1096    
1097      /* Handle possessive capturing brackets with an unlimited repeat. We come      RRETURN(MATCH_NOMATCH);
1098    
1099        /* Handle possessive capturing brackets with an unlimited repeat. We come
1100      here from BRAZERO with allow_zero set TRUE. The offset_vector values are      here from BRAZERO with allow_zero set TRUE. The offset_vector values are
1101      handled similarly to the normal case above. However, the matching is      handled similarly to the normal case above. However, the matching is
1102      different. The end of these brackets will always be OP_KETRPOS, which      different. The end of these brackets will always be OP_KETRPOS, which
1103      returns MATCH_KETRPOS without going further in the pattern. By this means      returns MATCH_KETRPOS without going further in the pattern. By this means
1104      we can handle the group by iteration rather than recursion, thereby      we can handle the group by iteration rather than recursion, thereby
1105      reducing the amount of stack needed. */      reducing the amount of stack needed. */
1106    
1107      case OP_CBRAPOS:      case OP_CBRAPOS:
1108      case OP_SCBRAPOS:      case OP_SCBRAPOS:
1109      allow_zero = FALSE;      allow_zero = FALSE;
1110    
1111      POSSESSIVE_CAPTURE:      POSSESSIVE_CAPTURE:
1112      number = GET2(ecode, 1+LINK_SIZE);      number = GET2(ecode, 1+LINK_SIZE);
1113      offset = number << 1;      offset = number << 1;
# Line 939  for (;;) Line 1122  for (;;)
1122      if (offset < md->offset_max)      if (offset < md->offset_max)
1123        {        {
1124        matched_once = FALSE;        matched_once = FALSE;
1125        code_offset = ecode - md->start_code;        code_offset = (int)(ecode - md->start_code);
1126    
1127        save_offset1 = md->offset_vector[offset];        save_offset1 = md->offset_vector[offset];
1128        save_offset2 = md->offset_vector[offset+1];        save_offset2 = md->offset_vector[offset+1];
# Line 947  for (;;) Line 1130  for (;;)
1130        save_capture_last = md->capture_last;        save_capture_last = md->capture_last;
1131    
1132        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
1133    
1134        /* Each time round the loop, save the current subject position for use        /* Each time round the loop, save the current subject position for use
1135        when the group matches. For MATCH_MATCH, the group has matched, so we        when the group matches. For MATCH_MATCH, the group has matched, so we
1136        restart it with a new subject starting position, remembering that we had        restart it with a new subject starting position, remembering that we had
1137        at least one match. For MATCH_NOMATCH, carry on with the alternatives, as        at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
1138        usual. If we haven't matched any alternatives in any iteration, check to        usual. If we haven't matched any alternatives in any iteration, check to
1139        see if a previous iteration matched. If so, the group has matched;        see if a previous iteration matched. If so, the group has matched;
1140        continue from afterwards. Otherwise it has failed; restore the previous        continue from afterwards. Otherwise it has failed; restore the previous
1141        capture values before returning NOMATCH. */        capture values before returning NOMATCH. */
1142    
1143        for (;;)        for (;;)
1144          {          {
1145          md->offset_vector[md->offset_end - number] =          md->offset_vector[md->offset_end - number] =
1146            (int)(eptr - md->start_subject);            (int)(eptr - md->start_subject);
1147          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1148          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1149            eptrb, RM63);            eptrb, RM63);
1150          if (rrc == MATCH_KETRPOS)          if (rrc == MATCH_KETRPOS)
1151            {            {
1152            offset_top = md->end_offset_top;            offset_top = md->end_offset_top;
1153            eptr = md->end_match_ptr;            eptr = md->end_match_ptr;
1154            ecode = md->start_code + code_offset;            ecode = md->start_code + code_offset;
1155            save_capture_last = md->capture_last;            save_capture_last = md->capture_last;
1156            matched_once = TRUE;            matched_once = TRUE;
1157            continue;            continue;
1158            }            }
1159          if (rrc != MATCH_NOMATCH &&  
1160              (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* See comment in the code for capturing groups above about handling
1161            RRETURN(rrc);          THEN. */
1162    
1163            if (rrc == MATCH_THEN)
1164              {
1165              next = ecode + GET(ecode,1);
1166              if (md->start_match_ptr < next &&
1167                  (*ecode == OP_ALT || *next == OP_ALT))
1168                rrc = MATCH_NOMATCH;
1169              }
1170    
1171            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1172          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
1173          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
1174          if (*ecode != OP_ALT) break;          if (*ecode != OP_ALT) break;
1175          }          }
1176    
1177        if (!matched_once)        if (!matched_once)
1178          {          {
1179          md->offset_vector[offset] = save_offset1;          md->offset_vector[offset] = save_offset1;
1180          md->offset_vector[offset+1] = save_offset2;          md->offset_vector[offset+1] = save_offset2;
1181          md->offset_vector[md->offset_end - number] = save_offset3;          md->offset_vector[md->offset_end - number] = save_offset3;
1182          }          }
1183    
       if (rrc != MATCH_THEN) md->mark = markptr;  
1184        if (allow_zero || matched_once)        if (allow_zero || matched_once)
1185          {          {
1186          ecode += 1 + LINK_SIZE;          ecode += 1 + LINK_SIZE;
1187          break;          break;
1188          }          }
1189    
1190        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1191        }        }
1192    
1193      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
1194      as a non-capturing bracket. */      as a non-capturing bracket. */
1195    
# Line 1009  for (;;) Line 1201  for (;;)
1201      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1202      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1203    
1204      /* Non-capturing possessive bracket with unlimited repeat. We come here      /* Non-capturing possessive bracket with unlimited repeat. We come here
1205      from BRAZERO with allow_zero = TRUE. The code is similar to the above,      from BRAZERO with allow_zero = TRUE. The code is similar to the above,
1206      without the capturing complication. It is written out separately for speed      without the capturing complication. It is written out separately for speed
1207      and cleanliness. */      and cleanliness. */
1208    
1209      case OP_BRAPOS:      case OP_BRAPOS:
1210      case OP_SBRAPOS:      case OP_SBRAPOS:
1211      allow_zero = FALSE;      allow_zero = FALSE;
1212    
1213      POSSESSIVE_NON_CAPTURE:      POSSESSIVE_NON_CAPTURE:
1214      matched_once = FALSE;      matched_once = FALSE;
1215      code_offset = ecode - md->start_code;      code_offset = (int)(ecode - md->start_code);
1216    
1217      for (;;)      for (;;)
1218        {        {
1219        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1220        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1221          eptrb, RM64);          eptrb, RM48);
1222        if (rrc == MATCH_KETRPOS)        if (rrc == MATCH_KETRPOS)
1223          {          {
1224            offset_top = md->end_offset_top;
1225          eptr = md->end_match_ptr;          eptr = md->end_match_ptr;
1226          ecode = md->start_code + code_offset;          ecode = md->start_code + code_offset;
1227          matched_once = TRUE;          matched_once = TRUE;
1228          continue;          continue;
1229          }          }
1230        if (rrc != MATCH_NOMATCH &&  
1231            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* See comment in the code for capturing groups above about handling
1232          RRETURN(rrc);        THEN. */
1233    
1234          if (rrc == MATCH_THEN)
1235            {
1236            next = ecode + GET(ecode,1);
1237            if (md->start_match_ptr < next &&
1238                (*ecode == OP_ALT || *next == OP_ALT))
1239              rrc = MATCH_NOMATCH;
1240            }
1241    
1242          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1243        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1244        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1245        }        }
1246    
1247      if (matched_once || allow_zero)      if (matched_once || allow_zero)
1248        {        {
1249        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1250        break;        break;
1251        }        }
1252      RRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
1253    
1254      /* Control never reaches here. */      /* Control never reaches here. */
# Line 1053  for (;;) Line 1256  for (;;)
1256      /* Conditional group: compilation checked that there are no more than      /* Conditional group: compilation checked that there are no more than
1257      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
1258      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
1259      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. */  
1260    
1261      case OP_COND:      case OP_COND:
1262      case OP_SCOND:      case OP_SCOND:
# Line 1065  for (;;) Line 1267  for (;;)
1267    
1268      if (ecode[LINK_SIZE+1] == OP_CALLOUT)      if (ecode[LINK_SIZE+1] == OP_CALLOUT)
1269        {        {
1270        if (pcre_callout != NULL)        if (PUBL(callout) != NULL)
1271          {          {
1272          pcre_callout_block cb;          PUBL(callout_block) cb;
1273          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 2;   /* Version 1 of the callout block */
1274          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[LINK_SIZE+2];
1275          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1276    #if defined COMPILE_PCRE8
1277          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
1278    #elif defined COMPILE_PCRE16
1279            cb.subject          = (PCRE_SPTR16)md->start_subject;
1280    #elif defined COMPILE_PCRE32
1281            cb.subject          = (PCRE_SPTR32)md->start_subject;
1282    #endif
1283          cb.subject_length   = (int)(md->end_subject - md->start_subject);          cb.subject_length   = (int)(md->end_subject - md->start_subject);
1284          cb.start_match      = (int)(mstart - md->start_subject);          cb.start_match      = (int)(mstart - md->start_subject);
1285          cb.current_position = (int)(eptr - md->start_subject);          cb.current_position = (int)(eptr - md->start_subject);
# Line 1080  for (;;) Line 1288  for (;;)
1288          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1289          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last;
1290          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1291          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);          cb.mark             = md->nomatch_mark;
1292            if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1293          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1294          }          }
1295        ecode += _pcre_OP_lengths[OP_CALLOUT];        ecode += PRIV(OP_lengths)[OP_CALLOUT];
1296        }        }
1297    
1298      condcode = ecode[LINK_SIZE+1];      condcode = ecode[LINK_SIZE+1];
# Line 1100  for (;;) Line 1309  for (;;)
1309        else        else
1310          {          {
1311          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
1312          condition =  (recno == RREF_ANY || recno == md->recursive->group_num);          condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1313    
1314          /* If the test is for recursion into a specific subpattern, and it is          /* If the test is for recursion into a specific subpattern, and it is
1315          false, but the test was set up by name, scan the table to see if the          false, but the test was set up by name, scan the table to see if the
1316          name refers to any other numbers, and test them. The condition is true          name refers to any other numbers, and test them. The condition is true
1317          if any one is set. */          if any one is set. */
1318    
1319          if (!condition && condcode == OP_NRREF && recno != RREF_ANY)          if (!condition && condcode == OP_NRREF)
1320            {            {
1321            uschar *slotA = md->name_table;            pcre_uchar *slotA = md->name_table;
1322            for (i = 0; i < md->name_count; i++)            for (i = 0; i < md->name_count; i++)
1323              {              {
1324              if (GET2(slotA, 0) == recno) break;              if (GET2(slotA, 0) == recno) break;
# Line 1122  for (;;) Line 1331  for (;;)
1331    
1332            if (i < md->name_count)            if (i < md->name_count)
1333              {              {
1334              uschar *slotB = slotA;              pcre_uchar *slotB = slotA;
1335              while (slotB > md->name_table)              while (slotB > md->name_table)
1336                {                {
1337                slotB -= md->name_entry_size;                slotB -= md->name_entry_size;
1338                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1339                  {                  {
1340                  condition = GET2(slotB, 0) == md->recursive->group_num;                  condition = GET2(slotB, 0) == md->recursive->group_num;
1341                  if (condition) break;                  if (condition) break;
# Line 1142  for (;;) Line 1351  for (;;)
1351                for (i++; i < md->name_count; i++)                for (i++; i < md->name_count; i++)
1352                  {                  {
1353                  slotB += md->name_entry_size;                  slotB += md->name_entry_size;
1354                  if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                  if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1355                    {                    {
1356                    condition = GET2(slotB, 0) == md->recursive->group_num;                    condition = GET2(slotB, 0) == md->recursive->group_num;
1357                    if (condition) break;                    if (condition) break;
# Line 1155  for (;;) Line 1364  for (;;)
1364    
1365          /* Chose branch according to the condition */          /* Chose branch according to the condition */
1366    
1367          ecode += condition? 3 : GET(ecode, 1);          ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1368          }          }
1369        }        }
1370    
# Line 1172  for (;;) Line 1381  for (;;)
1381        if (!condition && condcode == OP_NCREF)        if (!condition && condcode == OP_NCREF)
1382          {          {
1383          int refno = offset >> 1;          int refno = offset >> 1;
1384          uschar *slotA = md->name_table;          pcre_uchar *slotA = md->name_table;
1385    
1386          for (i = 0; i < md->name_count; i++)          for (i = 0; i < md->name_count; i++)
1387            {            {
# Line 1186  for (;;) Line 1395  for (;;)
1395    
1396          if (i < md->name_count)          if (i < md->name_count)
1397            {            {
1398            uschar *slotB = slotA;            pcre_uchar *slotB = slotA;
1399            while (slotB > md->name_table)            while (slotB > md->name_table)
1400              {              {
1401              slotB -= md->name_entry_size;              slotB -= md->name_entry_size;
1402              if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)              if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1403                {                {
1404                offset = GET2(slotB, 0) << 1;                offset = GET2(slotB, 0) << 1;
1405                condition = offset < offset_top &&                condition = offset < offset_top &&
# Line 1208  for (;;) Line 1417  for (;;)
1417              for (i++; i < md->name_count; i++)              for (i++; i < md->name_count; i++)
1418                {                {
1419                slotB += md->name_entry_size;                slotB += md->name_entry_size;
1420                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1421                  {                  {
1422                  offset = GET2(slotB, 0) << 1;                  offset = GET2(slotB, 0) << 1;
1423                  condition = offset < offset_top &&                  condition = offset < offset_top &&
# Line 1223  for (;;) Line 1432  for (;;)
1432    
1433        /* Chose branch according to the condition */        /* Chose branch according to the condition */
1434    
1435        ecode += condition? 3 : GET(ecode, 1);        ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1436        }        }
1437    
1438      else if (condcode == OP_DEF)     /* DEFINE - always false */      else if (condcode == OP_DEF)     /* DEFINE - always false */
# Line 1238  for (;;) Line 1447  for (;;)
1447    
1448      else      else
1449        {        {
1450        md->match_function_type = MATCH_CONDASSERT;        md->match_function_type = MATCH_CONDASSERT;
1451        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);
1452        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
1453          {          {
1454            if (md->end_offset_top > offset_top)
1455              offset_top = md->end_offset_top;  /* Captures may have happened */
1456          condition = TRUE;          condition = TRUE;
1457          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
1458          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1459          }          }
1460        else if (rrc != MATCH_NOMATCH &&  
1461                (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
1462          assertion; it is therefore treated as NOMATCH. */
1463    
1464          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1465          {          {
1466          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
1467          }          }
# Line 1258  for (;;) Line 1472  for (;;)
1472          }          }
1473        }        }
1474    
1475      /* 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, can
1476      we can use tail recursion to avoid using another stack frame, except when      use tail recursion to avoid using another stack frame, except when there is
1477      we have an unlimited repeat of a possibly empty group. If the second      unlimited repeat of a possibly empty group. In the latter case, a recursive
1478      alternative doesn't exist, we can just plough on. */      call to match() is always required, unless the second alternative doesn't
1479        exist, in which case we can just plough on. Note that, for compatibility
1480        with Perl, the | in a conditional group is NOT treated as creating two
1481        alternatives. If a THEN is encountered in the branch, it propagates out to
1482        the enclosing alternative (unless nested in a deeper set of alternatives,
1483        of course). */
1484    
1485      if (condition || *ecode == OP_ALT)      if (condition || *ecode == OP_ALT)
1486        {        {
1487        ecode += 1 + LINK_SIZE;        if (op != OP_SCOND)
       if (op == OP_SCOND)        /* Possibly empty group */  
1488          {          {
1489          md->match_function_type = MATCH_CBEGROUP;          ecode += 1 + LINK_SIZE;
1490          RMATCH(eptr, ecode, offset_top, md, eptrb, RM49);          goto TAIL_RECURSE;
         RRETURN(rrc);  
1491          }          }
1492        else goto TAIL_RECURSE;  
1493          md->match_function_type = MATCH_CBEGROUP;
1494          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
1495          RRETURN(rrc);
1496        }        }
1497      else                         /* Condition false & no alternative */  
1498         /* Condition false & no alternative; continue after the group. */
1499    
1500        else
1501        {        {
1502        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1503        }        }
# Line 1301  for (;;) Line 1524  for (;;)
1524        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1525        if (offset_top <= offset) offset_top = offset + 2;        if (offset_top <= offset) offset_top = offset + 2;
1526        }        }
1527      ecode += 3;      ecode += 1 + IMM2_SIZE;
1528      break;      break;
1529    
1530    
1531      /* End of the pattern, either real or forced. If we are in a recursion, we      /* End of the pattern, either real or forced. */
     should restore the offsets appropriately, and if it's a top-level  
     recursion, continue from after the call. */  
1532    
     case OP_ACCEPT:  
1533      case OP_END:      case OP_END:
1534      if (md->recursive != NULL)      case OP_ACCEPT:
1535        {      case OP_ASSERT_ACCEPT:
1536        recursion_info *rec = md->recursive;  
1537        md->recursive = rec->prevrec;      /* If we have matched an empty string, fail if not in an assertion and not
1538        memmove(md->offset_vector, rec->offset_save,      in a recursion if either PCRE_NOTEMPTY is set, or if PCRE_NOTEMPTY_ATSTART
1539          rec->saved_max * sizeof(int));      is set and we have matched at the start of the subject. In both cases,
1540        offset_top = rec->save_offset_top;      backtracking will then try other alternatives, if any. */
1541        if (rec->group_num == 0)  
1542          {      if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
1543          ecode = rec->after_call;           md->recursive == NULL &&
1544          break;           (md->notempty ||
1545          }             (md->notempty_atstart &&
1546        }               mstart == md->start_subject + md->start_offset)))
1547          RRETURN(MATCH_NOMATCH);
     /* Otherwise, if we have matched an empty string, fail if PCRE_NOTEMPTY is  
     set, or if PCRE_NOTEMPTY_ATSTART is set and we have matched at the start of  
     the subject. In both cases, backtracking will then try other alternatives,  
     if any. */  
   
     else if (eptr == mstart &&  
         (md->notempty ||  
           (md->notempty_atstart &&  
             mstart == md->start_subject + md->start_offset)))  
       MRRETURN(MATCH_NOMATCH);  
1548    
1549      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
1550    
1551      md->end_match_ptr = eptr;           /* Record where we ended */      md->end_match_ptr = eptr;           /* Record where we ended */
1552      md->end_offset_top = offset_top;    /* and how many extracts were taken */      md->end_offset_top = offset_top;    /* and how many extracts were taken */
1553      md->start_match_ptr = mstart;       /* and the start (\K can modify) */      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
1554    
1555      /* For some reason, the macros don't work properly if an expression is      /* For some reason, the macros don't work properly if an expression is
1556      given as the argument to MRRETURN when the heap is in use. */      given as the argument to RRETURN when the heap is in use. */
1557    
1558      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1559      MRRETURN(rrc);      RRETURN(rrc);
1560    
1561      /* Assertion brackets. Check the alternative branches in turn - the      /* Assertion brackets. Check the alternative branches in turn - the
1562      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,
1563      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
1564      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
1565      this level is identical to the lookahead case. When the assertion is part      this level is identical to the lookahead case. When the assertion is part
1566      of a condition, we want to return immediately afterwards. The caller of      of a condition, we want to return immediately afterwards. The caller of
1567      this incarnation of the match() function will have set MATCH_CONDASSERT in      this incarnation of the match() function will have set MATCH_CONDASSERT in
1568      md->match_function type, and one of these opcodes will be the first opcode      md->match_function type, and one of these opcodes will be the first opcode
1569      that is processed. We use a local variable that is preserved over calls to      that is processed. We use a local variable that is preserved over calls to
1570      match() to remember this case. */      match() to remember this case. */
1571    
1572      case OP_ASSERT:      case OP_ASSERT:
1573      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1574        save_mark = md->mark;
1575      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1576        {        {
1577        condassert = TRUE;        condassert = TRUE;
1578        md->match_function_type = 0;        md->match_function_type = 0;
1579        }        }
1580      else condassert = FALSE;      else condassert = FALSE;
1581    
1582      do      do
1583        {        {
1584        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
# Line 1376  for (;;) Line 1587  for (;;)
1587          mstart = md->start_match_ptr;   /* In case \K reset it */          mstart = md->start_match_ptr;   /* In case \K reset it */
1588          break;          break;
1589          }          }
1590        if (rrc != MATCH_NOMATCH &&        md->mark = save_mark;
1591            (rrc != MATCH_THEN || md->start_match_ptr != ecode))  
1592          RRETURN(rrc);        /* A COMMIT failure must fail the entire assertion, without trying any
1593          subsequent branches. */
1594    
1595          if (rrc == MATCH_COMMIT) RRETURN(MATCH_NOMATCH);
1596    
1597          /* PCRE does not allow THEN to escape beyond an assertion; it
1598          is treated as NOMATCH. */
1599    
1600          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1601        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1602        }        }
1603      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1604    
1605      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
1606    
1607      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1608    
# Line 1403  for (;;) Line 1622  for (;;)
1622    
1623      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1624      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1625        save_mark = md->mark;
1626      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1627        {        {
1628        condassert = TRUE;        condassert = TRUE;
1629        md->match_function_type = 0;        md->match_function_type = 0;
1630        }        }
1631      else condassert = FALSE;      else condassert = FALSE;
1632    
1633      do      do
1634        {        {
1635        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1636        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);        md->mark = save_mark;
1637          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) RRETURN(MATCH_NOMATCH);
1638        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1639          {          {
1640          do ecode += GET(ecode,1); while (*ecode == OP_ALT);          do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1641          break;          break;
1642          }          }
1643        if (rrc != MATCH_NOMATCH &&  
1644            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1645          RRETURN(rrc);        as NOMATCH. */
1646    
1647          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1648        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1649        }        }
1650      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1651    
1652      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1653    
1654      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1655      continue;      continue;
1656    
# Line 1437  for (;;) Line 1660  for (;;)
1660      back a number of characters, not bytes. */      back a number of characters, not bytes. */
1661    
1662      case OP_REVERSE:      case OP_REVERSE:
1663  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1664      if (utf8)      if (utf)
1665        {        {
1666        i = GET(ecode, 1);        i = GET(ecode, 1);
1667        while (i-- > 0)        while (i-- > 0)
1668          {          {
1669          eptr--;          eptr--;
1670          if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1671          BACKCHAR(eptr);          BACKCHAR(eptr);
1672          }          }
1673        }        }
# Line 1455  for (;;) Line 1678  for (;;)
1678    
1679        {        {
1680        eptr -= GET(ecode, 1);        eptr -= GET(ecode, 1);
1681        if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1682        }        }
1683    
1684      /* Save the earliest consulted character, then skip to next op code */      /* Save the earliest consulted character, then skip to next op code */
# Line 1469  for (;;) Line 1692  for (;;)
1692      function is able to force a failure. */      function is able to force a failure. */
1693    
1694      case OP_CALLOUT:      case OP_CALLOUT:
1695      if (pcre_callout != NULL)      if (PUBL(callout) != NULL)
1696        {        {
1697        pcre_callout_block cb;        PUBL(callout_block) cb;
1698        cb.version          = 1;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1699        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1700        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1701    #if defined COMPILE_PCRE8
1702        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
1703    #elif defined COMPILE_PCRE16
1704          cb.subject          = (PCRE_SPTR16)md->start_subject;
1705    #elif defined COMPILE_PCRE32
1706          cb.subject          = (PCRE_SPTR32)md->start_subject;
1707    #endif
1708        cb.subject_length   = (int)(md->end_subject - md->start_subject);        cb.subject_length   = (int)(md->end_subject - md->start_subject);
1709        cb.start_match      = (int)(mstart - md->start_subject);        cb.start_match      = (int)(mstart - md->start_subject);
1710        cb.current_position = (int)(eptr - md->start_subject);        cb.current_position = (int)(eptr - md->start_subject);
# Line 1484  for (;;) Line 1713  for (;;)
1713        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1714        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last;
1715        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1716        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);        cb.mark             = md->nomatch_mark;
1717          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1718        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1719        }        }
1720      ecode += 2 + 2*LINK_SIZE;      ecode += 2 + 2*LINK_SIZE;
# Line 1494  for (;;) Line 1724  for (;;)
1724      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
1725      whole pattern. (This is so that it works from duplicated subpatterns.)      whole pattern. (This is so that it works from duplicated subpatterns.)
1726    
1727      If there are any capturing brackets started but not finished, we have to      The state of the capturing groups is preserved over recursion, and
1728      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
1729      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
1730      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
1731      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
1732      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
1733      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.  
1734    
1735      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
1736      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
1737      for the original version of this logic. */      for the original version of this logic. It has, however, been hacked around
1738        a lot, so he is not to blame for the current way it works. */
1739    
1740      case OP_RECURSE:      case OP_RECURSE:
1741        {        {
1742          recursion_info *ri;
1743          int recno;
1744    
1745        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1746        new_recursive.group_num = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
1747          GET2(callpat, 1 + LINK_SIZE);          GET2(callpat, 1 + LINK_SIZE);
1748    
1749          /* Check for repeating a recursion without advancing the subject pointer.
1750          This should catch convoluted mutual recursions. (Some simple cases are
1751          caught at compile time.) */
1752    
1753          for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
1754            if (recno == ri->group_num && eptr == ri->subject_position)
1755              RRETURN(PCRE_ERROR_RECURSELOOP);
1756    
1757        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1758    
1759          new_recursive.group_num = recno;
1760          new_recursive.subject_position = eptr;
1761        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1762        md->recursive = &new_recursive;        md->recursive = &new_recursive;
1763    
1764        /* Find where to continue from afterwards */        /* Where to continue from afterwards */
1765    
1766        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       new_recursive.after_call = ecode;  
1767    
1768        /* Now save the offset data. */        /* Now save the offset data */
1769    
1770        new_recursive.saved_max = md->offset_end;        new_recursive.saved_max = md->offset_end;
1771        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
# Line 1533  for (;;) Line 1773  for (;;)
1773        else        else
1774          {          {
1775          new_recursive.offset_save =          new_recursive.offset_save =
1776            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
1777          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1778          }          }
   
1779        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1780              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1781        new_recursive.save_offset_top = offset_top;  
1782          /* OK, now we can do the recursion. After processing each alternative,
1783        /* OK, now we can do the recursion. For each top-level alternative we        restore the offset data. If there were nested recursions, md->recursive
1784        restore the offset and recursion data. */        might be changed, so reset it before looping. */
1785    
1786        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1787        cbegroup = (*callpat >= OP_SBRA);        cbegroup = (*callpat >= OP_SBRA);
1788        do        do
1789          {          {
1790          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1791          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
1792            md, eptrb, RM6);            md, eptrb, RM6);
1793            memcpy(md->offset_vector, new_recursive.offset_save,
1794                new_recursive.saved_max * sizeof(int));
1795            md->recursive = new_recursive.prevrec;
1796          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1797            {            {
1798            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
           md->recursive = new_recursive.prevrec;  
1799            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1800              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1801            MRRETURN(MATCH_MATCH);  
1802              /* Set where we got to in the subject, and reset the start in case
1803              it was changed by \K. This *is* propagated back out of a recursion,
1804              for Perl compatibility. */
1805    
1806              eptr = md->end_match_ptr;
1807              mstart = md->start_match_ptr;
1808              goto RECURSION_MATCHED;        /* Exit loop; end processing */
1809            }            }
1810          else if (rrc != MATCH_NOMATCH &&  
1811                  (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* PCRE does not allow THEN or COMMIT to escape beyond a recursion; it
1812            is treated as NOMATCH. */
1813    
1814            else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN &&
1815                     rrc != MATCH_COMMIT)
1816            {            {
1817            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1818            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1819              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1820            RRETURN(rrc);            RRETURN(rrc);
1821            }            }
1822    
1823          md->recursive = &new_recursive;          md->recursive = &new_recursive;
         memcpy(md->offset_vector, new_recursive.offset_save,  
             new_recursive.saved_max * sizeof(int));  
1824          callpat += GET(callpat, 1);          callpat += GET(callpat, 1);
1825          }          }
1826        while (*callpat == OP_ALT);        while (*callpat == OP_ALT);
# Line 1578  for (;;) Line 1828  for (;;)
1828        DPRINTF(("Recursion didn't match\n"));        DPRINTF(("Recursion didn't match\n"));
1829        md->recursive = new_recursive.prevrec;        md->recursive = new_recursive.prevrec;
1830        if (new_recursive.offset_save != stacksave)        if (new_recursive.offset_save != stacksave)
1831          (pcre_free)(new_recursive.offset_save);          (PUBL(free))(new_recursive.offset_save);
1832        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
       }  
     /* 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, but resetting  
     the start-of-match value in case it was changed by \K. */  
   
     case OP_ONCE:  
     prev = ecode;  
     saved_eptr = eptr;  
   
     do  
       {  
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);  
       if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */  
         {  
         mstart = md->start_match_ptr;  
         break;  
         }  
       if (rrc != MATCH_NOMATCH &&  
           (rrc != MATCH_THEN || md->start_match_ptr != ecode))  
         RRETURN(rrc);  
       ecode += GET(ecode,1);  
       }  
     while (*ecode == OP_ALT);  
   
     /* If hit the end of the group (which could be repeated), fail */  
   
     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;  
1833        }        }
1834    
1835      /* The repeating kets try the rest of the pattern or restart from the      RECURSION_MATCHED:
1836      preceding bracket, in the appropriate order. The second "call" of match()      break;
     uses tail recursion, to avoid using another stack frame. */  
   
     if (*ecode == OP_KETRMIN)  
       {  
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM8);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode = prev;  
       goto TAIL_RECURSE;  
       }  
     else  /* OP_KETRMAX */  
       {  
       md->match_function_type = MATCH_CBEGROUP;  
       RMATCH(eptr, prev, offset_top, md, eptrb, RM9);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode += 1 + LINK_SIZE;  
       goto TAIL_RECURSE;  
       }  
     /* Control never gets here */  
1837    
1838      /* 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
1839      bracketed group and go to there. */      bracketed group and go to there. */
# Line 1667  for (;;) Line 1847  for (;;)
1847      at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets      at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets
1848      with fixed upper repeat limits are compiled as a number of copies, with the      with fixed upper repeat limits are compiled as a number of copies, with the
1849      optional ones preceded by BRAZERO or BRAMINZERO. */      optional ones preceded by BRAZERO or BRAMINZERO. */
1850    
1851      case OP_BRAZERO:      case OP_BRAZERO:
1852      next = ecode + 1;      next = ecode + 1;
1853      RMATCH(eptr, next, offset_top, md, eptrb, RM10);      RMATCH(eptr, next, offset_top, md, eptrb, RM10);
# Line 1675  for (;;) Line 1855  for (;;)
1855      do next += GET(next, 1); while (*next == OP_ALT);      do next += GET(next, 1); while (*next == OP_ALT);
1856      ecode = next + 1 + LINK_SIZE;      ecode = next + 1 + LINK_SIZE;
1857      break;      break;
1858    
1859      case OP_BRAMINZERO:      case OP_BRAMINZERO:
1860      next = ecode + 1;      next = ecode + 1;
1861      do next += GET(next, 1); while (*next == OP_ALT);      do next += GET(next, 1); while (*next == OP_ALT);
# Line 1689  for (;;) Line 1869  for (;;)
1869      do next += GET(next,1); while (*next == OP_ALT);      do next += GET(next,1); while (*next == OP_ALT);
1870      ecode = next + 1 + LINK_SIZE;      ecode = next + 1 + LINK_SIZE;
1871      break;      break;
1872    
1873      /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything      /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
1874      here; just jump to the group, with allow_zero set TRUE. */      here; just jump to the group, with allow_zero set TRUE. */
1875    
1876      case OP_BRAPOSZERO:      case OP_BRAPOSZERO:
1877      op = *(++ecode);      op = *(++ecode);
1878      allow_zero = TRUE;      allow_zero = TRUE;
1879      if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;      if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
1880        goto POSSESSIVE_NON_CAPTURE;        goto POSSESSIVE_NON_CAPTURE;
# Line 1704  for (;;) Line 1884  for (;;)
1884      case OP_KET:      case OP_KET:
1885      case OP_KETRMIN:      case OP_KETRMIN:
1886      case OP_KETRMAX:      case OP_KETRMAX:
1887      case OP_KETRPOS:      case OP_KETRPOS:
1888      prev = ecode - GET(ecode, 1);      prev = ecode - GET(ecode, 1);
1889    
1890      /* 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
1891      infinite repeats of empty string matches, retrieve the subject start from      infinite repeats of empty string matches, retrieve the subject start from
1892      the chain. Otherwise, set it NULL. */      the chain. Otherwise, set it NULL. */
1893    
1894      if (*prev >= OP_SBRA)      if (*prev >= OP_SBRA || *prev == OP_ONCE)
1895        {        {
1896        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
1897        eptrb = eptrb->epb_prev;              /* Backup to previous group */        eptrb = eptrb->epb_prev;              /* Backup to previous group */
1898        }        }
1899      else saved_eptr = NULL;      else saved_eptr = NULL;
1900    
1901      /* If we are at the end of an assertion group or an atomic group, stop      /* If we are at the end of an assertion group or a non-capturing atomic
1902      matching and return MATCH_MATCH, but record the current high water mark for      group, stop matching and return MATCH_MATCH, but record the current high
1903      use by positive assertions. We also need to record the match start in case      water mark for use by positive assertions. We also need to record the match
1904      it was changed by \K. */      start in case it was changed by \K. */
1905    
1906      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||      if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
1907          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||           *prev == OP_ONCE_NC)
         *prev == OP_ONCE)  
1908        {        {
1909        md->end_match_ptr = eptr;      /* For ONCE */        md->end_match_ptr = eptr;      /* For ONCE_NC */
1910        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1911        md->start_match_ptr = mstart;        md->start_match_ptr = mstart;
1912        MRRETURN(MATCH_MATCH);        RRETURN(MATCH_MATCH);         /* Sets md->mark */
1913        }        }
1914    
1915      /* 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
1916      and if necessary complete handling an extraction by setting the offsets and      and if necessary complete handling an extraction by setting the offsets and
1917      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
1918      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
1919      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
1920        the current subject position and start match pointer and give a MATCH
1921        return. */
1922    
1923      if (*prev == OP_CBRA || *prev == OP_SCBRA ||      if (*prev == OP_CBRA || *prev == OP_SCBRA ||
1924          *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)          *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
# Line 1750  for (;;) Line 1931  for (;;)
1931        printf("\n");        printf("\n");
1932  #endif  #endif
1933    
1934          /* Handle a recursively called group. */
1935    
1936          if (md->recursive != NULL && md->recursive->group_num == number)
1937            {
1938            md->end_match_ptr = eptr;
1939            md->start_match_ptr = mstart;
1940            RRETURN(MATCH_MATCH);
1941            }
1942    
1943          /* Deal with capturing */
1944    
1945        md->capture_last = number;        md->capture_last = number;
1946        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
1947          {          {
1948            /* If offset is greater than offset_top, it means that we are
1949            "skipping" a capturing group, and that group's offsets must be marked
1950            unset. In earlier versions of PCRE, all the offsets were unset at the
1951            start of matching, but this doesn't work because atomic groups and
1952            assertions can cause a value to be set that should later be unset.
1953            Example: matching /(?>(a))b|(a)c/ against "ac". This sets group 1 as
1954            part of the atomic group, but this is not on the final matching path,
1955            so must be unset when 2 is set. (If there is no group 2, there is no
1956            problem, because offset_top will then be 2, indicating no capture.) */
1957    
1958            if (offset > offset_top)
1959              {
1960              register int *iptr = md->offset_vector + offset_top;
1961              register int *iend = md->offset_vector + offset;
1962              while (iptr < iend) *iptr++ = -1;
1963              }
1964    
1965            /* Now make the extraction */
1966    
1967          md->offset_vector[offset] =          md->offset_vector[offset] =
1968            md->offset_vector[md->offset_end - number];            md->offset_vector[md->offset_end - number];
1969          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1970          if (offset_top <= offset) offset_top = offset + 2;          if (offset_top <= offset) offset_top = offset + 2;
1971          }          }
   
       /* Handle a recursively called group. Restore the offsets  
       appropriately and continue from after the call. */  
   
       if (md->recursive != NULL && md->recursive->group_num == number)  
         {  
         recursion_info *rec = md->recursive;  
         DPRINTF(("Recursion (%d) succeeded - continuing\n", number));  
         md->recursive = rec->prevrec;  
         memcpy(md->offset_vector, rec->offset_save,  
           rec->saved_max * sizeof(int));  
         offset_top = rec->save_offset_top;  
         ecode = rec->after_call;  
         break;  
         }  
1972        }        }
1973    
1974      /* For a non-repeating ket, just continue at this level. This also      /* For an ordinary non-repeating ket, just continue at this level. This
1975      happens for a repeating ket if no characters were matched in the group.      also happens for a repeating ket if no characters were matched in the
1976      This is the forcible breaking of infinite loops as implemented in Perl      group. This is the forcible breaking of infinite loops as implemented in
1977      5.005. If there is an options reset, it will get obeyed in the normal      Perl 5.005. For a non-repeating atomic group that includes captures,
1978      course of events. */      establish a backup point by processing the rest of the pattern at a lower
1979        level. If this results in a NOMATCH return, pass MATCH_ONCE back to the
1980        original OP_ONCE level, thereby bypassing intermediate backup points, but
1981        resetting any captures that happened along the way. */
1982    
1983      if (*ecode == OP_KET || eptr == saved_eptr)      if (*ecode == OP_KET || eptr == saved_eptr)
1984        {        {
1985        ecode += 1 + LINK_SIZE;        if (*prev == OP_ONCE)
1986            {
1987            RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
1988            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1989            md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1990            RRETURN(MATCH_ONCE);
1991            }
1992          ecode += 1 + LINK_SIZE;    /* Carry on at this level */
1993        break;        break;
1994        }        }
1995    
1996      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
1997      and return the MATCH_KETRPOS. This makes it possible to do the repeats one      and return the MATCH_KETRPOS. This makes it possible to do the repeats one
1998      at a time from the outer level, thus saving stack. */      at a time from the outer level, thus saving stack. */
1999    
2000      if (*ecode == OP_KETRPOS)      if (*ecode == OP_KETRPOS)
2001        {        {
2002        md->end_match_ptr = eptr;        md->end_match_ptr = eptr;
2003        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
2004        RRETURN(MATCH_KETRPOS);        RRETURN(MATCH_KETRPOS);
2005        }        }
2006    
2007      /* The normal repeating kets try the rest of the pattern or restart from      /* The normal repeating kets try the rest of the pattern or restart from
2008      the preceding bracket, in the appropriate order. In the second case, we can      the preceding bracket, in the appropriate order. In the second case, we can
2009      use 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
2010      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
2011        string. */
2012    
2013      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
2014        {        {
2015        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
2016        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2017          if (*prev == OP_ONCE)
2018            {
2019            RMATCH(eptr, prev, offset_top, md, eptrb, RM8);
2020            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2021            md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
2022            RRETURN(MATCH_ONCE);
2023            }
2024        if (*prev >= OP_SBRA)    /* Could match an empty string */        if (*prev >= OP_SBRA)    /* Could match an empty string */
2025          {          {
         md->match_function_type = MATCH_CBEGROUP;  
2026          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
2027          RRETURN(rrc);          RRETURN(rrc);
2028          }          }
# Line 1818  for (;;) Line 2031  for (;;)
2031        }        }
2032      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
2033        {        {
       if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;  
2034        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
2035          if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
2036        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2037          if (*prev == OP_ONCE)
2038            {
2039            RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM9);
2040            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2041            md->once_target = prev;
2042            RRETURN(MATCH_ONCE);
2043            }
2044        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
2045        goto TAIL_RECURSE;        goto TAIL_RECURSE;
2046        }        }
# Line 1829  for (;;) Line 2049  for (;;)
2049      /* Not multiline mode: start of subject assertion, unless notbol. */      /* Not multiline mode: start of subject assertion, unless notbol. */
2050    
2051      case OP_CIRC:      case OP_CIRC:
2052      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2053    
2054      /* Start of subject assertion */      /* Start of subject assertion */
2055    
2056      case OP_SOD:      case OP_SOD:
2057      if (eptr != md->start_subject) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
2058      ecode++;      ecode++;
2059      break;      break;
2060    
2061      /* Multiline mode: start of subject unless notbol, or after any newline. */      /* Multiline mode: start of subject unless notbol, or after any newline. */
2062    
2063      case OP_CIRCM:      case OP_CIRCM:
2064      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2065      if (eptr != md->start_subject &&      if (eptr != md->start_subject &&
2066          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
2067        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2068      ecode++;      ecode++;
2069      break;      break;
2070    
2071      /* Start of match assertion */      /* Start of match assertion */
2072    
2073      case OP_SOM:      case OP_SOM:
2074      if (eptr != md->start_subject + md->start_offset) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
2075      ecode++;      ecode++;
2076      break;      break;
2077    
# Line 1867  for (;;) Line 2087  for (;;)
2087    
2088      case OP_DOLLM:      case OP_DOLLM:
2089      if (eptr < md->end_subject)      if (eptr < md->end_subject)
2090        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }        {
2091          if (!IS_NEWLINE(eptr))
2092            {
2093            if (md->partial != 0 &&
2094                eptr + 1 >= md->end_subject &&
2095                NLBLOCK->nltype == NLTYPE_FIXED &&
2096                NLBLOCK->nllen == 2 &&
2097                *eptr == NLBLOCK->nl[0])
2098              {
2099              md->hitend = TRUE;
2100              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2101              }
2102            RRETURN(MATCH_NOMATCH);
2103            }
2104          }
2105      else      else
2106        {        {
2107        if (md->noteol) MRRETURN(MATCH_NOMATCH);        if (md->noteol) RRETURN(MATCH_NOMATCH);
2108        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2109        }        }
2110      ecode++;      ecode++;
2111      break;      break;
2112    
2113      /* Not multiline mode: assert before a terminating newline or before end of      /* Not multiline mode: assert before a terminating newline or before end of
2114      subject unless noteol is set. */      subject unless noteol is set. */
2115    
2116      case OP_DOLL:      case OP_DOLL:
2117      if (md->noteol) MRRETURN(MATCH_NOMATCH);      if (md->noteol) RRETURN(MATCH_NOMATCH);
2118      if (!md->endonly) goto ASSERT_NL_OR_EOS;      if (!md->endonly) goto ASSERT_NL_OR_EOS;
2119    
2120      /* ... else fall through for endonly */      /* ... else fall through for endonly */
# Line 1888  for (;;) Line 2122  for (;;)
2122      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
2123    
2124      case OP_EOD:      case OP_EOD:
2125      if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
2126      SCHECK_PARTIAL();      SCHECK_PARTIAL();
2127      ecode++;      ecode++;
2128      break;      break;
# Line 1899  for (;;) Line 2133  for (;;)
2133      ASSERT_NL_OR_EOS:      ASSERT_NL_OR_EOS:
2134      if (eptr < md->end_subject &&      if (eptr < md->end_subject &&
2135          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
2136        MRRETURN(MATCH_NOMATCH);        {
2137          if (md->partial != 0 &&
2138              eptr + 1 >= md->end_subject &&
2139              NLBLOCK->nltype == NLTYPE_FIXED &&
2140              NLBLOCK->nllen == 2 &&
2141              *eptr == NLBLOCK->nl[0])
2142            {
2143            md->hitend = TRUE;
2144            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2145            }
2146          RRETURN(MATCH_NOMATCH);
2147          }
2148    
2149      /* Either at end of string or \n before end. */      /* Either at end of string or \n before end. */
2150    
# Line 1918  for (;;) Line 2163  for (;;)
2163        be "non-word" characters. Remember the earliest consulted character for        be "non-word" characters. Remember the earliest consulted character for
2164        partial matching. */        partial matching. */
2165    
2166  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2167        if (utf8)        if (utf)
2168          {          {
2169          /* Get status of previous character */          /* Get status of previous character */
2170    
2171          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
2172            {            {
2173            USPTR lastptr = eptr - 1;            PCRE_PUCHAR lastptr = eptr - 1;
2174            while((*lastptr & 0xc0) == 0x80) lastptr--;            BACKCHAR(lastptr);
2175            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
2176            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
2177  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 1991  for (;;) Line 2236  for (;;)
2236              }              }
2237            else            else
2238  #endif  #endif
2239            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);            prev_is_word = MAX_255(eptr[-1])
2240                && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
2241            }            }
2242    
2243          /* Get status of next character */          /* Get status of next character */
# Line 2014  for (;;) Line 2260  for (;;)
2260            }            }
2261          else          else
2262  #endif  #endif
2263          cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);          cur_is_word = MAX_255(*eptr)
2264              && ((md->ctypes[*eptr] & ctype_word) != 0);
2265          }          }
2266    
2267        /* Now see if the situation is what we want */        /* Now see if the situation is what we want */
2268    
2269        if ((*ecode++ == OP_WORD_BOUNDARY)?        if ((*ecode++ == OP_WORD_BOUNDARY)?
2270             cur_is_word == prev_is_word : cur_is_word != prev_is_word)             cur_is_word == prev_is_word : cur_is_word != prev_is_word)
2271          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2272        }        }
2273      break;      break;
2274    
2275      /* Match a single character type; inline for speed */      /* Match any single character type except newline; have to take care with
2276        CRLF newlines and partial matching. */
2277    
2278      case OP_ANY:      case OP_ANY:
2279      if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
2280        if (md->partial != 0 &&
2281            eptr + 1 >= md->end_subject &&
2282            NLBLOCK->nltype == NLTYPE_FIXED &&
2283            NLBLOCK->nllen == 2 &&
2284            *eptr == NLBLOCK->nl[0])
2285          {
2286          md->hitend = TRUE;
2287          if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2288          }
2289    
2290      /* Fall through */      /* Fall through */
2291    
2292        /* Match any single character whatsoever. */
2293    
2294      case OP_ALLANY:      case OP_ALLANY:
2295      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2296        {        {                            /* not be updated before SCHECK_PARTIAL. */
2297        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2298        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2299        }        }
2300      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;      eptr++;
2301    #ifdef SUPPORT_UTF
2302        if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
2303    #endif
2304      ecode++;      ecode++;
2305      break;      break;
2306    
# Line 2045  for (;;) Line 2308  for (;;)
2308      any byte, even newline, independent of the setting of PCRE_DOTALL. */      any byte, even newline, independent of the setting of PCRE_DOTALL. */
2309    
2310      case OP_ANYBYTE:      case OP_ANYBYTE:
2311      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2312        {        {                            /* not be updated before SCHECK_PARTIAL. */
2313        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2314        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2315        }        }
2316        eptr++;
2317      ecode++;      ecode++;
2318      break;      break;
2319    
# Line 2057  for (;;) Line 2321  for (;;)
2321      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2322        {        {
2323        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2324        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2325        }        }
2326      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2327      if (      if (
2328  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2329         c < 256 &&         c < 256 &&
2330  #endif  #endif
2331         (md->ctypes[c] & ctype_digit) != 0         (md->ctypes[c] & ctype_digit) != 0
2332         )         )
2333        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2334      ecode++;      ecode++;
2335      break;      break;
2336    
# Line 2074  for (;;) Line 2338  for (;;)
2338      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2339        {        {
2340        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2341        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2342        }        }
2343      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2344      if (      if (
2345  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2346         c >= 256 ||         c > 255 ||
2347  #endif  #endif
2348         (md->ctypes[c] & ctype_digit) == 0         (md->ctypes[c] & ctype_digit) == 0
2349         )         )
2350        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2351      ecode++;      ecode++;
2352      break;      break;
2353    
# Line 2091  for (;;) Line 2355  for (;;)
2355      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2356        {        {
2357        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2358        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2359        }        }
2360      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2361      if (      if (
2362  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2363         c < 256 &&         c < 256 &&
2364  #endif  #endif
2365         (md->ctypes[c] & ctype_space) != 0         (md->ctypes[c] & ctype_space) != 0
2366         )         )
2367        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2368      ecode++;      ecode++;
2369      break;      break;
2370    
# Line 2108  for (;;) Line 2372  for (;;)
2372      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2373        {        {
2374        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2375        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2376        }        }
2377      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2378      if (      if (
2379  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2380         c >= 256 ||         c > 255 ||
2381  #endif  #endif
2382         (md->ctypes[c] & ctype_space) == 0         (md->ctypes[c] & ctype_space) == 0
2383         )         )
2384        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2385      ecode++;      ecode++;
2386      break;      break;
2387    
# Line 2125  for (;;) Line 2389  for (;;)
2389      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2390        {        {
2391        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2392        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2393        }        }
2394      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2395      if (      if (
2396  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2397         c < 256 &&         c < 256 &&
2398  #endif  #endif
2399         (md->ctypes[c] & ctype_word) != 0         (md->ctypes[c] & ctype_word) != 0
2400         )         )
2401        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2402      ecode++;      ecode++;
2403      break;      break;
2404    
# Line 2142  for (;;) Line 2406  for (;;)
2406      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2407        {        {
2408        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2409        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2410        }        }
2411      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2412      if (      if (
2413  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2414         c >= 256 ||         c > 255 ||
2415  #endif  #endif
2416         (md->ctypes[c] & ctype_word) == 0         (md->ctypes[c] & ctype_word) == 0
2417         )         )
2418        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2419      ecode++;      ecode++;
2420      break;      break;
2421    
# Line 2159  for (;;) Line 2423  for (;;)
2423      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2424        {        {
2425        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2426        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2427        }        }
2428      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2429      switch(c)      switch(c)
2430        {        {
2431        default: MRRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2432    
2433        case 0x000d:        case CHAR_CR:
2434        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr >= md->end_subject)
2435            {
2436            SCHECK_PARTIAL();
2437            }
2438          else if (*eptr == CHAR_LF) eptr++;
2439        break;        break;
2440    
2441        case 0x000a:        case CHAR_LF:
2442        break;        break;
2443    
2444        case 0x000b:        case CHAR_VT:
2445        case 0x000c:        case CHAR_FF:
2446        case 0x0085:        case CHAR_NEL:
2447    #ifndef EBCDIC
2448        case 0x2028:        case 0x2028:
2449        case 0x2029:        case 0x2029:
2450        if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);  #endif  /* Not EBCDIC */
2451          if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
2452        break;        break;
2453        }        }
2454      ecode++;      ecode++;
# Line 2188  for (;;) Line 2458  for (;;)
2458      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2459        {        {
2460        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2461        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2462        }        }
2463      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2464      switch(c)      switch(c)
2465        {        {
2466          HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
2467        default: break;        default: break;
       case 0x09:      /* HT */  
       case 0x20:      /* SPACE */  
       case 0xa0:      /* NBSP */  
       case 0x1680:    /* OGHAM SPACE MARK */  
       case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */  
       case 0x2000:    /* EN QUAD */  
       case 0x2001:    /* EM QUAD */  
       case 0x2002:    /* EN SPACE */  
       case 0x2003:    /* EM SPACE */  
       case 0x2004:    /* THREE-PER-EM SPACE */  
       case 0x2005:    /* FOUR-PER-EM SPACE */  
       case 0x2006:    /* SIX-PER-EM SPACE */  
       case 0x2007:    /* FIGURE SPACE */  
       case 0x2008:    /* PUNCTUATION SPACE */  
       case 0x2009:    /* THIN SPACE */  
       case 0x200A:    /* HAIR SPACE */  
       case 0x202f:    /* NARROW NO-BREAK SPACE */  
       case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */  
       case 0x3000:    /* IDEOGRAPHIC SPACE */  
       MRRETURN(MATCH_NOMATCH);  
2468        }        }
2469      ecode++;      ecode++;
2470      break;      break;
# Line 2222  for (;;) Line 2473  for (;;)
2473      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2474        {        {
2475        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2476        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2477        }        }
2478      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2479      switch(c)      switch(c)
2480        {        {
2481        default: MRRETURN(MATCH_NOMATCH);        HSPACE_CASES: break;  /* Byte and multibyte cases */
2482        case 0x09:      /* HT */        default: RRETURN(MATCH_NOMATCH);
       case 0x20:      /* SPACE */  
       case 0xa0:      /* NBSP */  
       case 0x1680:    /* OGHAM SPACE MARK */  
       case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */  
       case 0x2000:    /* EN QUAD */  
       case 0x2001:    /* EM QUAD */  
       case 0x2002:    /* EN SPACE */  
       case 0x2003:    /* EM SPACE */  
       case 0x2004:    /* THREE-PER-EM SPACE */  
       case 0x2005:    /* FOUR-PER-EM SPACE */  
       case 0x2006:    /* SIX-PER-EM SPACE */  
       case 0x2007:    /* FIGURE SPACE */  
       case 0x2008:    /* PUNCTUATION SPACE */  
       case 0x2009:    /* THIN SPACE */  
       case 0x200A:    /* HAIR SPACE */  
       case 0x202f:    /* NARROW NO-BREAK SPACE */  
       case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */  
       case 0x3000:    /* IDEOGRAPHIC SPACE */  
       break;  
2483        }        }
2484      ecode++;      ecode++;
2485      break;      break;
# Line 2256  for (;;) Line 2488  for (;;)
2488      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2489        {        {
2490        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2491        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2492        }        }
2493      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2494      switch(c)      switch(c)
2495        {        {
2496          VSPACE_CASES: RRETURN(MATCH_NOMATCH);
2497        default: break;        default: break;
       case 0x0a:      /* LF */  
       case 0x0b:      /* VT */  
       case 0x0c:      /* FF */  
       case 0x0d:      /* CR */  
       case 0x85:      /* NEL */  
       case 0x2028:    /* LINE SEPARATOR */  
       case 0x2029:    /* PARAGRAPH SEPARATOR */  
       MRRETURN(MATCH_NOMATCH);  
2498        }        }
2499      ecode++;      ecode++;
2500      break;      break;
# Line 2278  for (;;) Line 2503  for (;;)
2503      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2504        {        {
2505        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2506        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2507        }        }
2508      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2509      switch(c)      switch(c)
2510        {        {
2511        default: MRRETURN(MATCH_NOMATCH);        VSPACE_CASES: break;
2512        case 0x0a:      /* LF */        default: RRETURN(MATCH_NOMATCH);
       case 0x0b:      /* VT */  
       case 0x0c:      /* FF */  
       case 0x0d:      /* CR */  
       case 0x85:      /* NEL */  
       case 0x2028:    /* LINE SEPARATOR */  
       case 0x2029:    /* PARAGRAPH SEPARATOR */  
       break;  
2513        }        }
2514      ecode++;      ecode++;
2515      break;      break;
# Line 2305  for (;;) Line 2523  for (;;)
2523      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2524        {        {
2525        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2526        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2527        }        }
2528      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2529        {        {
2530          const pcre_uint32 *cp;
2531        const ucd_record *prop = GET_UCD(c);        const ucd_record *prop = GET_UCD(c);
2532    
2533        switch(ecode[1])        switch(ecode[1])
2534          {          {
2535          case PT_ANY:          case PT_ANY:
2536          if (op == OP_NOTPROP) MRRETURN(MATCH_NOMATCH);          if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
2537          break;          break;
2538    
2539          case PT_LAMP:          case PT_LAMP:
2540          if ((prop->chartype == ucp_Lu ||          if ((prop->chartype == ucp_Lu ||
2541               prop->chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
2542               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
2543            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2544          break;          break;
2545    
2546          case PT_GC:          case PT_GC:
2547          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
2548            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2549          break;          break;
2550    
2551          case PT_PC:          case PT_PC:
2552          if ((ecode[2] != prop->chartype) == (op == OP_PROP))          if ((ecode[2] != prop->chartype) == (op == OP_PROP))
2553            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2554          break;          break;
2555    
2556          case PT_SC:          case PT_SC:
2557          if ((ecode[2] != prop->script) == (op == OP_PROP))          if ((ecode[2] != prop->script) == (op == OP_PROP))
2558            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2559          break;          break;
2560    
2561          /* These are specials */          /* These are specials */
2562    
2563          case PT_ALNUM:          case PT_ALNUM:
2564          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2565               _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))               PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2566            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2567          break;          break;
2568    
2569          case PT_SPACE:    /* Perl space */          case PT_SPACE:    /* Perl space */
2570          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2571               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2572                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2573            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2574          break;          break;
2575    
2576          case PT_PXSPACE:  /* POSIX space */          case PT_PXSPACE:  /* POSIX space */
2577          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2578               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2579               c == CHAR_FF || c == CHAR_CR)               c == CHAR_FF || c == CHAR_CR)
2580                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2581            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2582          break;          break;
2583    
2584          case PT_WORD:          case PT_WORD:
2585          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2586               _pcre_ucp_gentype[prop->chartype] == ucp_N ||               PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2587               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2588            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2589            break;
2590    
2591            case PT_CLIST:
2592            cp = PRIV(ucd_caseless_sets) + prop->caseset;
2593            for (;;)
2594              {
2595              if (c < *cp)
2596                { if (op == OP_PROP) { RRETURN(MATCH_NOMATCH); } else break; }
2597              if (c == *cp++)
2598                { if (op == OP_PROP) break; else { RRETURN(MATCH_NOMATCH); } }
2599              }
2600          break;          break;
2601    
2602          /* This should never occur */          /* This should never occur */
# Line 2386  for (;;) Line 2616  for (;;)
2616      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2617        {        {
2618        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2619        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2620        }        }
2621      GETCHARINCTEST(c, eptr);      else
2622        {        {
2623        int category = UCD_CATEGORY(c);        int lgb, rgb;
2624        if (category == ucp_M) MRRETURN(MATCH_NOMATCH);        GETCHARINCTEST(c, eptr);
2625          lgb = UCD_GRAPHBREAK(c);
2626        while (eptr < md->end_subject)        while (eptr < md->end_subject)
2627          {          {
2628          int len = 1;          int len = 1;
2629          if (!utf8) c = *eptr; else          if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2630            {          rgb = UCD_GRAPHBREAK(c);
2631            GETCHARLEN(c, eptr, len);          if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
2632            }          lgb = rgb;
         category = UCD_CATEGORY(c);  
         if (category != ucp_M) break;  
2633          eptr += len;          eptr += len;
2634          }          }
2635        }        }
2636        CHECK_PARTIAL();
2637      ecode++;      ecode++;
2638      break;      break;
2639  #endif  #endif  /* SUPPORT_UCP */
2640    
2641    
2642      /* Match a back reference, possibly repeatedly. Look past the end of the      /* Match a back reference, possibly repeatedly. Look past the end of the
# Line 2418  for (;;) Line 2648  for (;;)
2648      loops). */      loops). */
2649    
2650      case OP_REF:      case OP_REF:
2651      case OP_REFI:      case OP_REFI:
2652      caseless = op == OP_REFI;      caseless = op == OP_REFI;
2653      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2654      ecode += 3;      ecode += 1 + IMM2_SIZE;
2655    
2656      /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2657    
# Line 2461  for (;;) Line 2691  for (;;)
2691        case OP_CRMINRANGE:        case OP_CRMINRANGE:
2692        minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2693        min = GET2(ecode, 1);        min = GET2(ecode, 1);
2694        max = GET2(ecode, 3);        max = GET2(ecode, 1 + IMM2_SIZE);
2695        if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2696        ecode += 5;        ecode += 1 + 2 * IMM2_SIZE;
2697        break;        break;
2698    
2699        default:               /* No repeat follows */        default:               /* No repeat follows */
2700        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2701          {          {
2702            if (length == -2) eptr = md->end_subject;   /* Partial match */
2703          CHECK_PARTIAL();          CHECK_PARTIAL();
2704          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2705          }          }
2706        eptr += length;        eptr += length;
2707        continue;              /* With the main loop */        continue;              /* With the main loop */
2708        }        }
2709    
2710      /* Handle repeated back references. If the length of the reference is      /* Handle repeated back references. If the length of the reference is
2711      zero, just continue with the main loop. */      zero, just continue with the main loop. If the length is negative, it
2712        means the reference is unset in non-Java-compatible mode. If the minimum is
2713        zero, we can continue at the same level without recursion. For any other
2714        minimum, carrying on will result in NOMATCH. */
2715    
2716      if (length == 0) continue;      if (length == 0) continue;
2717        if (length < 0 && min == 0) continue;
2718    
2719      /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2720      the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
# Line 2487  for (;;) Line 2722  for (;;)
2722    
2723      for (i = 1; i <= min; i++)      for (i = 1; i <= min; i++)
2724        {        {
2725        int slength;        int slength;
2726        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2727          {          {
2728            if (slength == -2) eptr = md->end_subject;   /* Partial match */
2729          CHECK_PARTIAL();          CHECK_PARTIAL();
2730          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2731          }          }
2732        eptr += slength;        eptr += slength;
2733        }        }
# Line 2507  for (;;) Line 2743  for (;;)
2743        {        {
2744        for (fi = min;; fi++)        for (fi = min;; fi++)
2745          {          {
2746          int slength;          int slength;
2747          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2748          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2749          if (fi >= max) MRRETURN(MATCH_NOMATCH);          if (fi >= max) RRETURN(MATCH_NOMATCH);
2750          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2751            {            {
2752              if (slength == -2) eptr = md->end_subject;   /* Partial match */
2753            CHECK_PARTIAL();            CHECK_PARTIAL();
2754            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2755            }            }
2756          eptr += slength;          eptr += slength;
2757          }          }
# Line 2528  for (;;) Line 2765  for (;;)
2765        pp = eptr;        pp = eptr;
2766        for (i = min; i < max; i++)        for (i = min; i < max; i++)
2767          {          {
2768          int slength;          int slength;
2769          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2770            {            {
2771            CHECK_PARTIAL();            /* Can't use CHECK_PARTIAL because we don't want to update eptr in
2772              the soft partial matching case. */
2773    
2774              if (slength == -2 && md->partial != 0 &&
2775                  md->end_subject > md->start_used_ptr)
2776                {
2777                md->hitend = TRUE;
2778                if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2779                }
2780            break;            break;
2781            }            }
2782          eptr += slength;          eptr += slength;
2783          }          }
2784    
2785        while (eptr >= pp)        while (eptr >= pp)
2786          {          {
2787          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2788          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2789          eptr -= length;          eptr -= length;
2790          }          }
2791        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2792        }        }
2793      /* Control never gets here */      /* Control never gets here */
2794    
# Line 2560  for (;;) Line 2806  for (;;)
2806      case OP_NCLASS:      case OP_NCLASS:
2807      case OP_CLASS:      case OP_CLASS:
2808        {        {
2809          /* The data variable is saved across frames, so the byte map needs to
2810          be stored there. */
2811    #define BYTE_MAP ((pcre_uint8 *)data)
2812        data = ecode + 1;                /* Save for matching */        data = ecode + 1;                /* Save for matching */
2813        ecode += 33;                     /* Advance past the item */        ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
2814    
2815        switch (*ecode)        switch (*ecode)
2816          {          {
# Line 2582  for (;;) Line 2831  for (;;)
2831          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2832          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2833          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2834          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2835          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2836          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2837          break;          break;
2838    
2839          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2594  for (;;) Line 2843  for (;;)
2843    
2844        /* First, ensure the minimum number of matches are present. */        /* First, ensure the minimum number of matches are present. */
2845    
2846  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2847        /* UTF-8 mode */        if (utf)
       if (utf8)  
2848          {          {
2849          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2850            {            {
2851            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2852              {              {
2853              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2854              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2855              }              }
2856            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
2857            if (c > 255)            if (c > 255)
2858              {              {
2859              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2860              }              }
2861            else            else
2862              {              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
             if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
             }  
2863            }            }
2864          }          }
2865        else        else
2866  #endif  #endif
2867        /* Not UTF-8 mode */        /* Not UTF mode */
2868          {          {
2869          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2870            {            {
2871            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2872              {              {
2873              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2874              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2875              }              }
2876            c = *eptr++;            c = *eptr++;
2877            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2878              if (c > 255)
2879                {
2880                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2881                }
2882              else
2883    #endif
2884                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2885            }            }
2886          }          }
2887    
# Line 2642  for (;;) Line 2895  for (;;)
2895    
2896        if (minimize)        if (minimize)
2897          {          {
2898  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2899          /* UTF-8 mode */          if (utf)
         if (utf8)  
2900            {            {
2901            for (fi = min;; fi++)            for (fi = min;; fi++)
2902              {              {
2903              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2904              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2905              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2906              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2907                {                {
2908                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2909                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2910                }                }
2911              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
2912              if (c > 255)              if (c > 255)
2913                {                {
2914                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2915                }                }
2916              else              else
2917                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
               if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
               }  
2918              }              }
2919            }            }
2920          else          else
2921  #endif  #endif
2922          /* Not UTF-8 mode */          /* Not UTF mode */
2923            {            {
2924            for (fi = min;; fi++)            for (fi = min;; fi++)
2925              {              {
2926              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2927              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2928              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2929              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2930                {                {
2931                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2932                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2933                }                }
2934              c = *eptr++;              c = *eptr++;
2935              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2936                if (c > 255)
2937                  {
2938                  if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2939                  }
2940                else
2941    #endif
2942                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2943              }              }
2944            }            }
2945          /* Control never gets here */          /* Control never gets here */
# Line 2694  for (;;) Line 2951  for (;;)
2951          {          {
2952          pp = eptr;          pp = eptr;
2953    
2954  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2955          /* UTF-8 mode */          if (utf)
         if (utf8)  
2956            {            {
2957            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2958              {              {
# Line 2712  for (;;) Line 2968  for (;;)
2968                if (op == OP_CLASS) break;                if (op == OP_CLASS) break;
2969                }                }
2970              else              else
2971                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
               if ((data[c/8] & (1 << (c&7))) == 0) break;  
               }  
2972              eptr += len;              eptr += len;
2973              }              }
2974            for (;;)            for (;;)
# Line 2727  for (;;) Line 2981  for (;;)
2981            }            }
2982          else          else
2983  #endif  #endif
2984            /* Not UTF-8 mode */            /* Not UTF mode */
2985            {            {
2986            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2987              {              {
# Line 2737  for (;;) Line 2991  for (;;)
2991                break;                break;
2992                }                }
2993              c = *eptr;              c = *eptr;
2994              if ((data[c/8] & (1 << (c&7))) == 0) break;  #ifndef COMPILE_PCRE8
2995                if (c > 255)
2996                  {
2997                  if (op == OP_CLASS) break;
2998                  }
2999                else
3000    #endif
3001                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
3002              eptr++;              eptr++;
3003              }              }
3004            while (eptr >= pp)            while (eptr >= pp)
# Line 2748  for (;;) Line 3009  for (;;)
3009              }              }
3010            }            }
3011    
3012          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3013          }          }
3014    #undef BYTE_MAP
3015        }        }
3016      /* Control never gets here */      /* Control never gets here */
3017    
# Line 2758  for (;;) Line 3020  for (;;)
3020      when UTF-8 mode mode is supported. Nevertheless, we may not be in UTF-8      when UTF-8 mode mode is supported. Nevertheless, we may not be in UTF-8
3021      mode, because Unicode properties are supported in non-UTF-8 mode. */      mode, because Unicode properties are supported in non-UTF-8 mode. */
3022    
3023  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3024      case OP_XCLASS:      case OP_XCLASS:
3025        {        {
3026        data = ecode + 1 + LINK_SIZE;                /* Save for matching */        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
# Line 2783  for (;;) Line 3045  for (;;)
3045          case OP_CRMINRANGE:          case OP_CRMINRANGE:
3046          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
3047          min = GET2(ecode, 1);          min = GET2(ecode, 1);
3048          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
3049          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
3050          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
3051          break;          break;
3052    
3053          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2800  for (;;) Line 3062  for (;;)
3062          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3063            {            {
3064            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3065            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3066            }            }
3067          GETCHARINCTEST(c, eptr);          GETCHARINCTEST(c, eptr);
3068          if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);          if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3069          }          }
3070    
3071        /* 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 2820  for (;;) Line 3082  for (;;)
3082            {            {
3083            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
3084            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3085            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3086            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3087              {              {
3088              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3089              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3090              }              }
3091            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3092            if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);            if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3093            }            }
3094          /* Control never gets here */          /* Control never gets here */
3095          }          }
# Line 2845  for (;;) Line 3107  for (;;)
3107              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3108              break;              break;
3109              }              }
3110    #ifdef SUPPORT_UTF
3111            GETCHARLENTEST(c, eptr, len);            GETCHARLENTEST(c, eptr, len);
3112            if (!_pcre_xclass(c, data)) break;  #else
3113              c = *eptr;
3114    #endif
3115              if (!PRIV(xclass)(c, data, utf)) break;
3116            eptr += len;            eptr += len;
3117            }            }
3118          for(;;)          for(;;)
# Line 2854  for (;;) Line 3120  for (;;)
3120            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
3121            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3122            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3123            if (utf8) BACKCHAR(eptr);  #ifdef SUPPORT_UTF
3124              if (utf) BACKCHAR(eptr);
3125    #endif
3126            }            }
3127          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3128          }          }
3129    
3130        /* Control never gets here */        /* Control never gets here */
# Line 2866  for (;;) Line 3134  for (;;)
3134      /* Match a single character, casefully */      /* Match a single character, casefully */
3135    
3136      case OP_CHAR:      case OP_CHAR:
3137  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3138      if (utf8)      if (utf)
3139        {        {
3140        length = 1;        length = 1;
3141        ecode++;        ecode++;
# Line 2875  for (;;) Line 3143  for (;;)
3143        if (length > md->end_subject - eptr)        if (length > md->end_subject - eptr)
3144          {          {
3145          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
3146          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3147          }          }
3148        while (length-- > 0) if (*ecode++ != *eptr++) MRRETURN(MATCH_NOMATCH);        while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH);
3149        }        }
3150      else      else
3151  #endif  #endif
3152        /* Not UTF mode */
     /* Non-UTF-8 mode */  
3153        {        {
3154        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
3155          {          {
3156          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
3157          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3158          }          }
3159        if (ecode[1] != *eptr++) MRRETURN(MATCH_NOMATCH);        if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
3160        ecode += 2;        ecode += 2;
3161        }        }
3162      break;      break;
3163    
3164      /* Match a single character, caselessly */      /* Match a single character, caselessly. If we are at the end of the
3165        subject, give up immediately. */
3166    
3167      case OP_CHARI:      case OP_CHARI:
3168  #ifdef SUPPORT_UTF8      if (eptr >= md->end_subject)
3169      if (utf8)        {
3170          SCHECK_PARTIAL();
3171          RRETURN(MATCH_NOMATCH);
3172          }
3173    
3174    #ifdef SUPPORT_UTF
3175        if (utf)
3176        {        {
3177        length = 1;        length = 1;
3178        ecode++;        ecode++;
3179        GETCHARLEN(fc, ecode, length);        GETCHARLEN(fc, ecode, length);
3180    
       if (length > md->end_subject - eptr)  
         {  
         CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */  
         MRRETURN(MATCH_NOMATCH);  
         }  
   
3181        /* 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
3182        can use the fast lookup table. */        we know that its other case must also be one byte long, so we can use the
3183          fast lookup table. We know that there is at least one byte left in the
3184          subject. */
3185    
3186        if (fc < 128)        if (fc < 128)
3187          {          {
3188          if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          if (md->lcc[fc]
3189                != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3190            ecode++;
3191            eptr++;
3192          }          }
3193    
3194        /* Otherwise we must pick up the subject character */        /* Otherwise we must pick up the subject character. Note that we cannot
3195          use the value of "length" to check for sufficient bytes left, because the
3196          other case of the character may have more or fewer bytes.  */
3197    
3198        else        else
3199          {          {
# Line 2934  for (;;) Line 3209  for (;;)
3209  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3210            if (dc != UCD_OTHERCASE(fc))            if (dc != UCD_OTHERCASE(fc))
3211  #endif  #endif
3212              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3213            }            }
3214          }          }
3215        }        }
3216      else      else
3217  #endif   /* SUPPORT_UTF8 */  #endif   /* SUPPORT_UTF */
3218    
3219      /* Non-UTF-8 mode */      /* Not UTF mode */
3220        {        {
3221        if (md->end_subject - eptr < 1)        if (TABLE_GET(ecode[1], md->lcc, ecode[1])
3222          {            != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3223          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */        eptr++;
         MRRETURN(MATCH_NOMATCH);  
         }  
       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);  
3224        ecode += 2;        ecode += 2;
3225        }        }
3226      break;      break;
# Line 2958  for (;;) Line 3230  for (;;)
3230      case OP_EXACT:      case OP_EXACT:
3231      case OP_EXACTI:      case OP_EXACTI:
3232      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3233      ecode += 3;      ecode += 1 + IMM2_SIZE;
3234      goto REPEATCHAR;      goto REPEATCHAR;
3235    
3236      case OP_POSUPTO:      case OP_POSUPTO:
# Line 2973  for (;;) Line 3245  for (;;)
3245      min = 0;      min = 0;
3246      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3247      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
3248      ecode += 3;      ecode += 1 + IMM2_SIZE;
3249      goto REPEATCHAR;      goto REPEATCHAR;
3250    
3251      case OP_POSSTAR:      case OP_POSSTAR:
# Line 3021  for (;;) Line 3293  for (;;)
3293      /* Common code for all repeated single-character matches. */      /* Common code for all repeated single-character matches. */
3294    
3295      REPEATCHAR:      REPEATCHAR:
3296  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3297      if (utf8)      if (utf)
3298        {        {
3299        length = 1;        length = 1;
3300        charptr = ecode;        charptr = ecode;
# Line 3038  for (;;) Line 3310  for (;;)
3310          unsigned int othercase;          unsigned int othercase;
3311          if (op >= OP_STARI &&     /* Caseless */          if (op >= OP_STARI &&     /* Caseless */
3312              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3313            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = PRIV(ord2utf)(othercase, occhars);
3314          else oclength = 0;          else oclength = 0;
3315  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3316    
3317          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3318            {            {
3319            if (eptr <= md->end_subject - length &&            if (eptr <= md->end_subject - length &&
3320              memcmp(eptr, charptr, length) == 0) eptr += length;              memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3321  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3322            else if (oclength > 0 &&            else if (oclength > 0 &&
3323                     eptr <= md->end_subject - oclength &&                     eptr <= md->end_subject - oclength &&
3324                     memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3325  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3326            else            else
3327              {              {
3328              CHECK_PARTIAL();              CHECK_PARTIAL();
3329              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3330              }              }
3331            }            }
3332    
# Line 3066  for (;;) Line 3338  for (;;)
3338              {              {
3339              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3340              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3341              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3342              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3343                memcmp(eptr, charptr, length) == 0) eptr += length;                memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3344  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3345              else if (oclength > 0 &&              else if (oclength > 0 &&
3346                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3347                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3348  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3349              else              else
3350                {                {
3351                CHECK_PARTIAL();                CHECK_PARTIAL();
3352                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3353                }                }
3354              }              }
3355            /* Control never gets here */            /* Control never gets here */
# Line 3089  for (;;) Line 3361  for (;;)
3361            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3362              {              {
3363              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3364                  memcmp(eptr, charptr, length) == 0) eptr += length;                  memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3365  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3366              else if (oclength > 0 &&              else if (oclength > 0 &&
3367                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3368                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3369  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3370              else              else
3371                {                {
# Line 3108  for (;;) Line 3380  for (;;)
3380              {              {
3381              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3382              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3383              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }              if (eptr == pp) { RRETURN(MATCH_NOMATCH); }
3384  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3385              eptr--;              eptr--;
3386              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3125  for (;;) Line 3397  for (;;)
3397        value of fc will always be < 128. */        value of fc will always be < 128. */
3398        }        }
3399      else      else
3400  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3401          /* When not in UTF-8 mode, load a single-byte character. */
3402      /* When not in UTF-8 mode, load a single-byte character. */        fc = *ecode++;
3403    
3404      fc = *ecode++;      /* The value of fc at this point is always one character, though we may
3405        or may not be in UTF mode. The code is duplicated for the caseless and
     /* The value of fc at this point is always less than 256, though we may or  
     may not be in UTF-8 mode. The code is duplicated for the caseless and  
3406      caseful cases, for speed, since matching characters is likely to be quite      caseful cases, for speed, since matching characters is likely to be quite
3407      common. First, ensure the minimum number of matches are present. If min =      common. First, ensure the minimum number of matches are present. If min =
3408      max, continue at the same level without recursing. Otherwise, if      max, continue at the same level without recursing. Otherwise, if
# Line 3141  for (;;) Line 3411  for (;;)
3411      maximizing, find the maximum number of characters and work backwards. */      maximizing, find the maximum number of characters and work backwards. */
3412    
3413      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3414        max, eptr));        max, (char *)eptr));
3415    
3416      if (op >= OP_STARI)  /* Caseless */      if (op >= OP_STARI)  /* Caseless */
3417        {        {
3418        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3419          /* fc must be < 128 if UTF is enabled. */
3420          foc = md->fcc[fc];
3421    #else
3422    #ifdef SUPPORT_UTF
3423    #ifdef SUPPORT_UCP
3424          if (utf && fc > 127)
3425            foc = UCD_OTHERCASE(fc);
3426    #else
3427          if (utf && fc > 127)
3428            foc = fc;
3429    #endif /* SUPPORT_UCP */
3430          else
3431    #endif /* SUPPORT_UTF */
3432            foc = TABLE_GET(fc, md->fcc, fc);
3433    #endif /* COMPILE_PCRE8 */
3434    
3435        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3436          {          {
3437          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3438            {            {
3439            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3440            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3441            }            }
3442          if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
3443            eptr++;
3444          }          }
3445        if (min == max) continue;        if (min == max) continue;
3446        if (minimize)        if (minimize)
# Line 3162  for (;;) Line 3449  for (;;)
3449            {            {
3450            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3451            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3452            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3453            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3454              {              {
3455              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3456              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3457              }              }
3458            if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
3459              eptr++;
3460            }            }
3461          /* Control never gets here */          /* Control never gets here */
3462          }          }
# Line 3182  for (;;) Line 3470  for (;;)
3470              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3471              break;              break;
3472              }              }
3473            if (fc != md->lcc[*eptr]) break;            if (fc != *eptr && foc != *eptr) break;
3474            eptr++;            eptr++;
3475            }            }
3476    
# Line 3194  for (;;) Line 3482  for (;;)
3482            eptr--;            eptr--;
3483            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3484            }            }
3485          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3486          }          }
3487        /* Control never gets here */        /* Control never gets here */
3488        }        }
# Line 3208  for (;;) Line 3496  for (;;)
3496          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3497            {            {
3498            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3499            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3500            }            }
3501          if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);          if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
3502          }          }
3503    
3504        if (min == max) continue;        if (min == max) continue;
# Line 3221  for (;;) Line 3509  for (;;)
3509            {            {
3510            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3511            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3512            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3513            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3514              {              {
3515              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3516              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3517              }              }
3518            if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
3519            }            }
3520          /* Control never gets here */          /* Control never gets here */
3521          }          }
# Line 3252  for (;;) Line 3540  for (;;)
3540            eptr--;            eptr--;
3541            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3542            }            }
3543          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3544          }          }
3545        }        }
3546      /* Control never gets here */      /* Control never gets here */
# Line 3261  for (;;) Line 3549  for (;;)
3549      checking can be multibyte. */      checking can be multibyte. */
3550    
3551      case OP_NOT:      case OP_NOT:
3552      case OP_NOTI:      case OP_NOTI:
3553      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3554        {        {
3555        SCHECK_PARTIAL();        SCHECK_PARTIAL();
3556        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
3557        }        }
3558      ecode++;  #ifdef SUPPORT_UTF
3559      GETCHARINCTEST(c, eptr);      if (utf)
     if (op == OP_NOTI)         /* The caseless case */  
3560        {        {
3561  #ifdef SUPPORT_UTF8        register unsigned int ch, och;
3562        if (c < 256)  
3563  #endif        ecode++;
3564        c = md->lcc[c];        GETCHARINC(ch, ecode);
3565        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);        GETCHARINC(c, eptr);
3566    
3567          if (op == OP_NOT)
3568            {
3569            if (ch == c) RRETURN(MATCH_NOMATCH);
3570            }
3571          else
3572            {
3573    #ifdef SUPPORT_UCP
3574            if (ch > 127)
3575              och = UCD_OTHERCASE(ch);
3576    #else
3577            if (ch > 127)
3578              och = ch;
3579    #endif /* SUPPORT_UCP */
3580            else
3581              och = TABLE_GET(ch, md->fcc, ch);
3582            if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
3583            }
3584        }        }
3585      else    /* Caseful */      else
3586    #endif
3587        {        {
3588        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);        register unsigned int ch = ecode[1];
3589          c = *eptr++;
3590          if (ch == c || (op == OP_NOTI && TABLE_GET(ch, md->fcc, ch) == c))
3591            RRETURN(MATCH_NOMATCH);
3592          ecode += 2;
3593        }        }
3594      break;      break;
3595    
# Line 3293  for (;;) Line 3603  for (;;)
3603      case OP_NOTEXACT:      case OP_NOTEXACT:
3604      case OP_NOTEXACTI:      case OP_NOTEXACTI:
3605      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3606      ecode += 3;      ecode += 1 + IMM2_SIZE;
3607      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3608    
3609      case OP_NOTUPTO:      case OP_NOTUPTO:
# Line 3303  for (;;) Line 3613  for (;;)
3613      min = 0;      min = 0;
3614      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3615      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3616      ecode += 3;      ecode += 1 + IMM2_SIZE;
3617      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3618    
3619      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
# Line 3335  for (;;) Line 3645  for (;;)
3645      possessive = TRUE;      possessive = TRUE;
3646      min = 0;      min = 0;
3647      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3648      ecode += 3;      ecode += 1 + IMM2_SIZE;
3649      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3650    
3651      case OP_NOTSTAR:      case OP_NOTSTAR:
# Line 3359  for (;;) Line 3669  for (;;)
3669      /* Common code for all repeated single-byte matches. */      /* Common code for all repeated single-byte matches. */
3670    
3671      REPEATNOTCHAR:      REPEATNOTCHAR:
3672      fc = *ecode++;      GETCHARINCTEST(fc, ecode);
3673    
3674      /* The code is duplicated for the caseless and caseful cases, for speed,      /* The code is duplicated for the caseless and caseful cases, for speed,
3675      since matching characters is likely to be quite common. First, ensure the      since matching characters is likely to be quite common. First, ensure the
# Line 3370  for (;;) Line 3680  for (;;)
3680      characters and work backwards. */      characters and work backwards. */
3681    
3682      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,
3683        max, eptr));        max, (char *)eptr));
3684    
3685      if (op >= OP_NOTSTARI)     /* Caseless */      if (op >= OP_NOTSTARI)     /* Caseless */
3686        {        {
3687        fc = md->lcc[fc];  #ifdef SUPPORT_UTF
3688    #ifdef SUPPORT_UCP
3689          if (utf && fc > 127)
3690            foc = UCD_OTHERCASE(fc);
3691    #else
3692          if (utf && fc > 127)
3693            foc = fc;
3694    #endif /* SUPPORT_UCP */
3695          else
3696    #endif /* SUPPORT_UTF */
3697            foc = TABLE_GET(fc, md->fcc, fc);
3698    
3699  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3700        /* UTF-8 mode */        if (utf)
       if (utf8)  
3701          {          {
3702          register unsigned int d;          register unsigned int d;
3703          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3386  for (;;) Line 3705  for (;;)
3705            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3706              {              {
3707              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3708              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3709              }              }
3710            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3711            if (d < 256) d = md->lcc[d];            if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
           if (fc == d) MRRETURN(MATCH_NOMATCH);  
3712            }            }
3713          }          }
3714        else        else
3715  #endif  #endif
3716          /* Not UTF mode */
       /* Not UTF-8 mode */  
3717          {          {
3718          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3719            {            {
3720            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3721              {              {
3722              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3723              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3724              }              }
3725            if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3726              eptr++;
3727            }            }
3728          }          }
3729    
# Line 3413  for (;;) Line 3731  for (;;)
3731    
3732        if (minimize)        if (minimize)
3733          {          {
3734  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3735          /* UTF-8 mode */          if (utf)
         if (utf8)  
3736            {            {
3737            register unsigned int d;            register unsigned int d;
3738            for (fi = min;; fi++)            for (fi = min;; fi++)
3739              {              {
3740              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3741              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3742              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3743              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3744                {                {
3745                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3746                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3747                }                }
3748              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3749              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
             if (fc == d) MRRETURN(MATCH_NOMATCH);  
3750              }              }
3751            }            }
3752          else          else
3753  #endif  #endif
3754          /* Not UTF-8 mode */          /* Not UTF mode */
3755            {            {
3756            for (fi = min;; fi++)            for (fi = min;; fi++)
3757              {              {
3758              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3759              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3760              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3761              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3762                {                {
3763                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3764                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3765                }                }
3766              if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3767                eptr++;
3768              }              }
3769            }            }
3770          /* Control never gets here */          /* Control never gets here */
# Line 3459  for (;;) Line 3776  for (;;)
3776          {          {
3777          pp = eptr;          pp = eptr;
3778    
3779  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3780          /* UTF-8 mode */          if (utf)
         if (utf8)  
3781            {            {
3782            register unsigned int d;            register unsigned int d;
3783            for (i = min; i < max; i++)            for (i = min; i < max; i++)
# Line 3473  for (;;) Line 3789  for (;;)
3789                break;                break;
3790                }                }
3791              GETCHARLEN(d, eptr, len);              GETCHARLEN(d, eptr, len);
3792              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) break;
             if (fc == d) break;  
3793              eptr += len;              eptr += len;
3794              }              }
3795          if (possessive) continue;            if (possessive) continue;
3796          for(;;)            for(;;)
3797              {              {
3798              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3799              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
# Line 3488  for (;;) Line 3803  for (;;)
3803            }            }
3804          else          else
3805  #endif  #endif
3806          /* Not UTF-8 mode */          /* Not UTF mode */
3807            {            {
3808            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3809              {              {
# Line 3497  for (;;) Line 3812  for (;;)
3812                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3813                break;                break;
3814                }                }
3815              if (fc == md->lcc[*eptr]) break;              if (fc == *eptr || foc == *eptr) break;
3816              eptr++;              eptr++;
3817              }              }
3818            if (possessive) continue;            if (possessive) continue;
# Line 3509  for (;;) Line 3824  for (;;)
3824              }              }
3825            }            }
3826    
3827          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3828          }          }
3829        /* Control never gets here */        /* Control never gets here */
3830        }        }
# Line 3518  for (;;) Line 3833  for (;;)
3833    
3834      else      else
3835        {        {
3836  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3837        /* UTF-8 mode */        if (utf)
       if (utf8)  
3838          {          {
3839          register unsigned int d;          register unsigned int d;
3840          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3528  for (;;) Line 3842  for (;;)
3842            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3843              {              {
3844              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3845              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3846              }              }
3847            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3848            if (fc == d) MRRETURN(MATCH_NOMATCH);            if (fc == d) RRETURN(MATCH_NOMATCH);
3849            }            }
3850          }          }
3851        else        else
3852  #endif  #endif
3853        /* Not UTF-8 mode */        /* Not UTF mode */
3854          {          {
3855          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3856            {            {
3857            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3858              {              {
3859              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3860              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3861              }              }
3862            if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3863            }            }
3864          }          }
3865    
# Line 3553  for (;;) Line 3867  for (;;)
3867    
3868        if (minimize)        if (minimize)
3869          {          {
3870  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3871          /* UTF-8 mode */          if (utf)
         if (utf8)  
3872            {            {
3873            register unsigned int d;            register unsigned int d;
3874            for (fi = min;; fi++)            for (fi = min;; fi++)
3875              {              {
3876              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3877              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3878              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3879              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3880                {                {
3881                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3882                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3883                }                }
3884              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3885              if (fc == d) MRRETURN(MATCH_NOMATCH);              if (fc == d) RRETURN(MATCH_NOMATCH);
3886              }              }
3887            }            }
3888          else          else
3889  #endif  #endif
3890          /* Not UTF-8 mode */          /* Not UTF mode */
3891            {            {
3892            for (fi = min;; fi++)            for (fi = min;; fi++)
3893              {              {
3894              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3895              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3896              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3897              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3898                {                {
3899                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3900                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3901                }                }
3902              if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3903              }              }
3904            }            }
3905          /* Control never gets here */          /* Control never gets here */
# Line 3598  for (;;) Line 3911  for (;;)
3911          {          {
3912          pp = eptr;          pp = eptr;
3913    
3914  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3915          /* UTF-8 mode */          if (utf)
         if (utf8)  
3916            {            {
3917            register unsigned int d;            register unsigned int d;
3918            for (i = min; i < max; i++)            for (i = min; i < max; i++)
# Line 3626  for (;;) Line 3938  for (;;)
3938            }            }
3939          else          else
3940  #endif  #endif
3941          /* Not UTF-8 mode */          /* Not UTF mode */
3942            {            {
3943            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3944</