/[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 606 by ph10, Mon Jun 6 17:46:22 2011 UTC revision 1102 by chpe, Tue Oct 16 15:56:34 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 100  because the offset vector is always a mu Line 92  because the offset vector is always a mu
92  static const char rep_min[] = { 0, 0, 1, 1, 0, 0 };  static const char rep_min[] = { 0, 0, 1, 1, 0, 0 };
93  static const char rep_max[] = { 0, 0, 0, 0, 1, 1 };  static const char rep_max[] = { 0, 0, 0, 0, 1, 1 };
94    
   
   
95  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
96  /*************************************************  /*************************************************
97  *        Debugging function to print chars       *  *        Debugging function to print chars       *
# Line 120  Returns:     nothing Line 110  Returns:     nothing
110  */  */
111    
112  static void  static void
113  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)
114  {  {
115  unsigned int c;  pcre_uint32 c;
116    BOOL utf = md->utf;
117  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;
118  while (length-- > 0)  while (length-- > 0)
119    if (isprint(c = *(p++))) printf("%c", c); else printf("\\x%02x", c);    if (isprint(c = RAWUCHARINCTEST(p))) printf("%c", (char)c); else printf("\\x{%02x}", c);
120  }  }
121  #endif  #endif
122    
# Line 137  while (length-- > 0) Line 128  while (length-- > 0)
128    
129  /* 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
130  negative, so the match always fails. However, in JavaScript compatibility mode,  negative, so the match always fails. However, in JavaScript compatibility mode,
131  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
132  subject bytes matched may be different to the number of reference bytes.  subject bytes matched may be different to the number of reference bytes.
133    
134  Arguments:  Arguments:
# Line 147  Arguments: Line 138  Arguments:
138    md          points to match data block    md          points to match data block
139    caseless    TRUE if caseless    caseless    TRUE if caseless
140    
141  Returns:      < 0 if not matched, otherwise the number of subject bytes matched  Returns:      >= 0 the number of subject bytes matched
142                  -1 no match
143                  -2 partial match; always given if at end subject
144  */  */
145    
146  static int  static int
147  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,
148    BOOL caseless)    BOOL caseless)
149  {  {
150  USPTR eptr_start = eptr;  PCRE_PUCHAR eptr_start = eptr;
151  register USPTR p = md->start_subject + md->offset_vector[offset];  register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
152    BOOL utf = md->utf;
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 (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;        pcre_uint32 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      }        pcre_uchar cc, cp;
221          if (eptr >= md->end_subject) return -2;   /* Partial match */
222          cc = RAWUCHARTEST(eptr);
223          cp = RAWUCHARTEST(p);
224          if (TABLE_GET(cp, md->lcc, cp) != TABLE_GET(cc, md->lcc, cc)) return -1;
225          p++;
226          eptr++;
227          }
228        }
229    }    }
230    
231  /* 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
232  are in UTF-8 mode. */  are in UTF-8 mode. */
233    
234  else  else
235    {    {
236    if (eptr + length > md->end_subject) return -1;    while (length-- > 0)
237    while (length-- > 0) if (*p++ != *eptr++) return -1;      {
238        if (eptr >= md->end_subject) return -2;   /* Partial match */
239        if (RAWUCHARINCTEST(p) != RAWUCHARINCTEST(eptr)) return -1;
240        }
241    }    }
242    
243  return eptr - eptr_start;  return (int)(eptr - eptr_start);
244  }  }
245    
246    
# Line 276  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM Line 292  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
292         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
293         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
294         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
295         RM61,  RM62, RM63, RM64 };         RM61,  RM62, RM63, RM64, RM65, RM66 };
296    
297  /* 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
298  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 305  actually used in this definition. */
305  #define RMATCH(ra,rb,rc,rd,re,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
306    { \    { \
307    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
308    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1); \    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1); \
309    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
310    }    }
311  #define RRETURN(ra) \  #define RRETURN(ra) \
312    { \    { \
313    printf("match() returned %d from line %d ", ra, __LINE__); \    printf("match() returned %d from line %d\n", ra, __LINE__); \
314    return ra; \    return ra; \
315    }    }
316  #else  #else
317  #define RMATCH(ra,rb,rc,rd,re,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
318    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1)    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1)
319  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
320  #endif  #endif
321    
# Line 314  argument of match(), which never changes Line 330  argument of match(), which never changes
330    
331  #define RMATCH(ra,rb,rc,rd,re,rw)\  #define RMATCH(ra,rb,rc,rd,re,rw)\
332    {\    {\
333    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = frame->Xnextframe;\
334    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\    if (newframe == NULL)\
335    frame->Xwhere = rw; \      {\
336        newframe = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));\
337        if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
338        newframe->Xnextframe = NULL;\
339        frame->Xnextframe = newframe;\
340        }\
341      frame->Xwhere = rw;\
342    newframe->Xeptr = ra;\    newframe->Xeptr = ra;\
343    newframe->Xecode = rb;\    newframe->Xecode = rb;\
344    newframe->Xmstart = mstart;\    newframe->Xmstart = mstart;\
   newframe->Xmarkptr = markptr;\  
345    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
346    newframe->Xeptrb = re;\    newframe->Xeptrb = re;\
347    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
# Line 336  argument of match(), which never changes Line 357  argument of match(), which never changes
357    {\    {\
358    heapframe *oldframe = frame;\    heapframe *oldframe = frame;\
359    frame = oldframe->Xprevframe;\    frame = oldframe->Xprevframe;\
   (pcre_stack_free)(oldframe);\  
360    if (frame != NULL)\    if (frame != NULL)\
361      {\      {\
362      rrc = ra;\      rrc = ra;\
# Line 350  argument of match(), which never changes Line 370  argument of match(), which never changes
370    
371  typedef struct heapframe {  typedef struct heapframe {
372    struct heapframe *Xprevframe;    struct heapframe *Xprevframe;
373      struct heapframe *Xnextframe;
374    
375    /* Function arguments that may change */    /* Function arguments that may change */
376    
377    USPTR Xeptr;    PCRE_PUCHAR Xeptr;
378    const uschar *Xecode;    const pcre_uchar *Xecode;
379    USPTR Xmstart;    PCRE_PUCHAR Xmstart;
   USPTR Xmarkptr;  
380    int Xoffset_top;    int Xoffset_top;
381    eptrblock *Xeptrb;    eptrblock *Xeptrb;
382    unsigned int Xrdepth;    unsigned int Xrdepth;
383    
384    /* Function local variables */    /* Function local variables */
385    
386    USPTR Xcallpat;    PCRE_PUCHAR Xcallpat;
387  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
388    USPTR Xcharptr;    PCRE_PUCHAR Xcharptr;
389  #endif  #endif
390    USPTR Xdata;    PCRE_PUCHAR Xdata;
391    USPTR Xnext;    PCRE_PUCHAR Xnext;
392    USPTR Xpp;    PCRE_PUCHAR Xpp;
393    USPTR Xprev;    PCRE_PUCHAR Xprev;
394    USPTR Xsaved_eptr;    PCRE_PUCHAR Xsaved_eptr;
395    
396    recursion_info Xnew_recursive;    recursion_info Xnew_recursive;
397    
# Line 383  typedef struct heapframe { Line 403  typedef struct heapframe {
403    int Xprop_type;    int Xprop_type;
404    int Xprop_value;    int Xprop_value;
405    int Xprop_fail_result;    int Xprop_fail_result;
   int Xprop_category;  
   int Xprop_chartype;  
   int Xprop_script;  
406    int Xoclength;    int Xoclength;
407    uschar Xocchars[8];    pcre_uchar Xocchars[6];
408  #endif  #endif
409    
410    int Xcodelink;    int Xcodelink;
# Line 429  returns a negative (error) response, the Line 446  returns a negative (error) response, the
446  same response. */  same response. */
447    
448  /* 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
449  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
450  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.
451  something has been matched). For hard partial matching, we then return  something has been matched). For hard partial matching, we then return
452  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 457  the subject. */
457        eptr > md->start_used_ptr) \        eptr > md->start_used_ptr) \
458      { \      { \
459      md->hitend = TRUE; \      md->hitend = TRUE; \
460      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
461      }      }
462    
463  #define SCHECK_PARTIAL()\  #define SCHECK_PARTIAL()\
464    if (md->partial != 0 && eptr > md->start_used_ptr) \    if (md->partial != 0 && eptr > md->start_used_ptr) \
465      { \      { \
466      md->hitend = TRUE; \      md->hitend = TRUE; \
467      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
468      }      }
469    
470    
471  /* Performance note: It might be tempting to extract commonly used fields from  /* Performance note: It might be tempting to extract commonly used fields from
472  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
473  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
474  made performance worse.  made performance worse.
475    
# Line 461  Arguments: Line 478  Arguments:
478     ecode       pointer to current position in compiled code     ecode       pointer to current position in compiled code
479     mstart      pointer to the current match start position (can be modified     mstart      pointer to the current match start position (can be modified
480                   by encountering \K)                   by encountering \K)
    markptr     pointer to the most recent MARK name, or NULL  
481     offset_top  current top pointer     offset_top  current top pointer
482     md          pointer to "static" info for the match     md          pointer to "static" info for the match
483     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 492  Returns:       MATCH_MATCH if matched
492  */  */
493    
494  static int  static int
495  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,  match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
496    const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,    PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
497    unsigned int rdepth)    unsigned int rdepth)
498  {  {
499  /* 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 486  so they can be ordinary variables in all Line 502  so they can be ordinary variables in all
502    
503  register int  rrc;         /* Returns from recursive calls */  register int  rrc;         /* Returns from recursive calls */
504  register int  i;           /* Used for loops not involving calls to RMATCH() */  register int  i;           /* Used for loops not involving calls to RMATCH() */
505  register unsigned int c;   /* Character values not kept over RMATCH() calls */  register pcre_uint32 c;    /* Character values not kept over RMATCH() calls */
506  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf;         /* Local copy of UTF flag for speed */
507    
508  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
509  BOOL caseless;  BOOL caseless;
510  int condcode;  int condcode;
511    
512  /* 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
513  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
514  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
515  heap whenever RMATCH() does a "recursion". See the macro definitions above. */  whenever RMATCH() does a "recursion". See the macro definitions above. Putting
516    the top-level on the stack rather than malloc-ing them all gives a performance
517    boost in many cases where there is not much "recursion". */
518    
519  #ifdef NO_RECURSE  #ifdef NO_RECURSE
520  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 */  
521    
522  /* Copy in the original argument variables */  /* Copy in the original argument variables */
523    
524  frame->Xeptr = eptr;  frame->Xeptr = eptr;
525  frame->Xecode = ecode;  frame->Xecode = ecode;
526  frame->Xmstart = mstart;  frame->Xmstart = mstart;
 frame->Xmarkptr = markptr;  
527  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
528  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
529  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
# Line 522  HEAP_RECURSE: Line 537  HEAP_RECURSE:
537  #define eptr               frame->Xeptr  #define eptr               frame->Xeptr
538  #define ecode              frame->Xecode  #define ecode              frame->Xecode
539  #define mstart             frame->Xmstart  #define mstart             frame->Xmstart
 #define markptr            frame->Xmarkptr  
540  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
541  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
542  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
543    
544  /* Ditto for the local variables */  /* Ditto for the local variables */
545    
546  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
547  #define charptr            frame->Xcharptr  #define charptr            frame->Xcharptr
548  #endif  #endif
549  #define callpat            frame->Xcallpat  #define callpat            frame->Xcallpat
# Line 550  HEAP_RECURSE: Line 564  HEAP_RECURSE:
564  #define prop_type          frame->Xprop_type  #define prop_type          frame->Xprop_type
565  #define prop_value         frame->Xprop_value  #define prop_value         frame->Xprop_value
566  #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  
567  #define oclength           frame->Xoclength  #define oclength           frame->Xoclength
568  #define occhars            frame->Xocchars  #define occhars            frame->Xocchars
569  #endif  #endif
# Line 590  declarations can be cut out in a block. Line 601  declarations can be cut out in a block.
601  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
602  to RMATCH(). */  to RMATCH(). */
603    
604  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
605  const uschar *charptr;  const pcre_uchar *charptr;
606  #endif  #endif
607  const uschar *callpat;  const pcre_uchar *callpat;
608  const uschar *data;  const pcre_uchar *data;
609  const uschar *next;  const pcre_uchar *next;
610  USPTR         pp;  PCRE_PUCHAR       pp;
611  const uschar *prev;  const pcre_uchar *prev;
612  USPTR         saved_eptr;  PCRE_PUCHAR       saved_eptr;
613    
614  recursion_info new_recursive;  recursion_info new_recursive;
615    
616  BOOL cur_is_word;  BOOL cur_is_word;
617  BOOL condition;  BOOL condition;
618  BOOL prev_is_word;  BOOL prev_is_word;
619    
# Line 610  BOOL prev_is_word; Line 621  BOOL prev_is_word;
621  int prop_type;  int prop_type;
622  int prop_value;  int prop_value;
623  int prop_fail_result;  int prop_fail_result;
 int prop_category;  
 int prop_chartype;  
 int prop_script;  
624  int oclength;  int oclength;
625  uschar occhars[8];  pcre_uchar occhars[6];
626  #endif  #endif
627    
628  int codelink;  int codelink;
# Line 624  int max; Line 632  int max;
632  int min;  int min;
633  int number;  int number;
634  int offset;  int offset;
635  int op;  pcre_uchar op;
636  int save_capture_last;  int save_capture_last;
637  int save_offset1, save_offset2, save_offset3;  int save_offset1, save_offset2, save_offset3;
638  int stacksave[REC_STACK_SAVE_MAX];  int stacksave[REC_STACK_SAVE_MAX];
639    
640  eptrblock newptrb;  eptrblock newptrb;
641    
642    /* There is a special fudge for calling match() in a way that causes it to
643    measure the size of its basic stack frame when the stack is being used for
644    recursion. The second argument (ecode) being NULL triggers this behaviour. It
645    cannot normally ever be NULL. The return is the negated value of the frame
646    size. */
647    
648    if (ecode == NULL)
649      {
650      if (rdepth == 0)
651        return match((PCRE_PUCHAR)&rdepth, NULL, NULL, 0, NULL, NULL, 1);
652      else
653        {
654        int len = (char *)&rdepth - (char *)eptr;
655        return (len > 0)? -len : len;
656        }
657      }
658  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
659    
660  /* 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
661  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
662  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
663  the alternative names that are used. */  the alternative names that are used. */
664    
665  #define allow_zero    cur_is_word  #define allow_zero    cur_is_word
# Line 642  the alternative names that are used. */ Line 667  the alternative names that are used. */
667  #define code_offset   codelink  #define code_offset   codelink
668  #define condassert    condition  #define condassert    condition
669  #define matched_once  prev_is_word  #define matched_once  prev_is_word
670    #define foc           number
671    #define save_mark     data
672    
673  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
674  variables. */  variables. */
# Line 667  defined). However, RMATCH isn't like a f Line 694  defined). However, RMATCH isn't like a f
694  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,
695  however, impact performance when true recursion is being used. */  however, impact performance when true recursion is being used. */
696    
697  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
698  utf8 = md->utf8;       /* Local copy of the flag */  utf = md->utf;       /* Local copy of the flag */
699  #else  #else
700  utf8 = FALSE;  utf = FALSE;
701  #endif  #endif
702    
703  /* 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 707  if (md->match_call_count++ >= md->match_
707  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
708    
709  /* 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
710  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
711  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
712  up space on the stack. See also MATCH_CONDASSERT below.  up space on the stack. See also MATCH_CONDASSERT below.
713    
714  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 732  for (;;)
732    {    {
733    minimize = possessive = FALSE;    minimize = possessive = FALSE;
734    op = *ecode;    op = *ecode;
735    
736    switch(op)    switch(op)
737      {      {
738      case OP_MARK:      case OP_MARK:
739      markptr = ecode + 2;      md->nomatch_mark = ecode + 2;
740      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      md->mark = NULL;    /* In case previously set by assertion */
741        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
742        eptrb, RM55);        eptrb, RM55);
743        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
744             md->mark == NULL) md->mark = ecode + 2;
745    
746      /* 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
747      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 750  for (;;)
750      position and return MATCH_SKIP. Otherwise, pass back the return code      position and return MATCH_SKIP. Otherwise, pass back the return code
751      unaltered. */      unaltered. */
752    
753      if (rrc == MATCH_SKIP_ARG &&      else if (rrc == MATCH_SKIP_ARG &&
754          strcmp((char *)markptr, (char *)(md->start_match_ptr)) == 0)          STRCMP_UC_UC_TEST(ecode + 2, md->start_match_ptr) == 0)
755        {        {
756        md->start_match_ptr = eptr;        md->start_match_ptr = eptr;
757        RRETURN(MATCH_SKIP);        RRETURN(MATCH_SKIP);
758        }        }
   
     if (md->mark == NULL) md->mark = markptr;  
759      RRETURN(rrc);      RRETURN(rrc);
760    
761      case OP_FAIL:      case OP_FAIL:
762      MRRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
763    
764      /* COMMIT overrides PRUNE, SKIP, and THEN */      /* COMMIT overrides PRUNE, SKIP, and THEN */
765    
766      case OP_COMMIT:      case OP_COMMIT:
767      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
768        eptrb, RM52);        eptrb, RM52);
769      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
770          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
771          rrc != MATCH_THEN)          rrc != MATCH_THEN)
772        RRETURN(rrc);        RRETURN(rrc);
773      MRRETURN(MATCH_COMMIT);      RRETURN(MATCH_COMMIT);
774    
775      /* PRUNE overrides THEN */      /* PRUNE overrides THEN */
776    
777      case OP_PRUNE:      case OP_PRUNE:
778      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
779        eptrb, RM51);        eptrb, RM51);
780      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
781      MRRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
782    
783      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
784      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      md->nomatch_mark = ecode + 2;
785        md->mark = NULL;    /* In case previously set by assertion */
786        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
787        eptrb, RM56);        eptrb, RM56);
788        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
789             md->mark == NULL) md->mark = ecode + 2;
790      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
     md->mark = ecode + 2;  
791      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
792    
793      /* SKIP overrides PRUNE and THEN */      /* SKIP overrides PRUNE and THEN */
794    
795      case OP_SKIP:      case OP_SKIP:
796      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
797        eptrb, RM53);        eptrb, RM53);
798      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
799        RRETURN(rrc);        RRETURN(rrc);
800      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
801      MRRETURN(MATCH_SKIP);      RRETURN(MATCH_SKIP);
802    
803        /* Note that, for Perl compatibility, SKIP with an argument does NOT set
804        nomatch_mark. There is a flag that disables this opcode when re-matching a
805        pattern that ended with a SKIP for which there was not a matching MARK. */
806    
807      case OP_SKIP_ARG:      case OP_SKIP_ARG:
808      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      if (md->ignore_skip_arg)
809          {
810          ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
811          break;
812          }
813        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
814        eptrb, RM57);        eptrb, RM57);
815      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
816        RRETURN(rrc);        RRETURN(rrc);
817    
818      /* 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
819      returning the special MATCH_SKIP_ARG return code. This will either be      returning the special MATCH_SKIP_ARG return code. This will either be
820      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
821      as PRUNE. */      with the md->ignore_skip_arg flag set. */
822    
823      md->start_match_ptr = ecode + 2;      md->start_match_ptr = ecode + 2;
824      RRETURN(MATCH_SKIP_ARG);      RRETURN(MATCH_SKIP_ARG);
825    
826      /* 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
827      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
828      to skip back past alternatives that precede the THEN within the current      match pointer to do this. */
     branch. */  
829    
830      case OP_THEN:      case OP_THEN:
831      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
832        eptrb, RM54);        eptrb, RM54);
833      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
834      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
835      MRRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
836    
837      case OP_THEN_ARG:      case OP_THEN_ARG:
838      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],      md->nomatch_mark = ecode + 2;
839        offset_top, md, eptrb, RM58);      md->mark = NULL;    /* In case previously set by assertion */
840        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top,
841          md, eptrb, RM58);
842        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
843             md->mark == NULL) md->mark = ecode + 2;
844      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
845      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
     md->mark = ecode + LINK_SIZE + 2;  
846      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
847    
848        /* Handle an atomic group that does not contain any capturing parentheses.
849        This can be handled like an assertion. Prior to 8.13, all atomic groups
850        were handled this way. In 8.13, the code was changed as below for ONCE, so
851        that backups pass through the group and thereby reset captured values.
852        However, this uses a lot more stack, so in 8.20, atomic groups that do not
853        contain any captures generate OP_ONCE_NC, which can be handled in the old,
854        less stack intensive way.
855    
856        Check the alternative branches in turn - the matching won't pass the KET
857        for this kind of subpattern. If any one branch matches, we carry on as at
858        the end of a normal bracket, leaving the subject pointer, but resetting
859        the start-of-match value in case it was changed by \K. */
860    
861        case OP_ONCE_NC:
862        prev = ecode;
863        saved_eptr = eptr;
864        save_mark = md->mark;
865        do
866          {
867          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
868          if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
869            {
870            mstart = md->start_match_ptr;
871            break;
872            }
873          if (rrc == MATCH_THEN)
874            {
875            next = ecode + GET(ecode,1);
876            if (md->start_match_ptr < next &&
877                (*ecode == OP_ALT || *next == OP_ALT))
878              rrc = MATCH_NOMATCH;
879            }
880    
881          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
882          ecode += GET(ecode,1);
883          md->mark = save_mark;
884          }
885        while (*ecode == OP_ALT);
886    
887        /* If hit the end of the group (which could be repeated), fail */
888    
889        if (*ecode != OP_ONCE_NC && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
890    
891        /* Continue as from after the group, updating the offsets high water
892        mark, since extracts may have been taken. */
893    
894        do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
895    
896        offset_top = md->end_offset_top;
897        eptr = md->end_match_ptr;
898    
899        /* For a non-repeating ket, just continue at this level. This also
900        happens for a repeating ket if no characters were matched in the group.
901        This is the forcible breaking of infinite loops as implemented in Perl
902        5.005. */
903    
904        if (*ecode == OP_KET || eptr == saved_eptr)
905          {
906          ecode += 1+LINK_SIZE;
907          break;
908          }
909    
910        /* The repeating kets try the rest of the pattern or restart from the
911        preceding bracket, in the appropriate order. The second "call" of match()
912        uses tail recursion, to avoid using another stack frame. */
913    
914        if (*ecode == OP_KETRMIN)
915          {
916          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM65);
917          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
918          ecode = prev;
919          goto TAIL_RECURSE;
920          }
921        else  /* OP_KETRMAX */
922          {
923          RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
924          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
925          ecode += 1 + LINK_SIZE;
926          goto TAIL_RECURSE;
927          }
928        /* Control never gets here */
929    
930      /* Handle a capturing bracket, other than those that are possessive with an      /* Handle a capturing bracket, other than those that are possessive with an
931      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
932      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
933      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
934      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
935      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,
936      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
937      of the same bracket.      the working value and also the values of the final offsets, in case they
938        were set by a previous iteration of the same bracket.
939    
940      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
941      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 945  for (;;)
945      case OP_SCBRA:      case OP_SCBRA:
946      number = GET2(ecode, 1+LINK_SIZE);      number = GET2(ecode, 1+LINK_SIZE);
947      offset = number << 1;      offset = number << 1;
948    
949  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
950      printf("start bracket %d\n", number);      printf("start bracket %d\n", number);
951      printf("subject=");      printf("subject=");
# Line 834  for (;;) Line 959  for (;;)
959        save_offset2 = md->offset_vector[offset+1];        save_offset2 = md->offset_vector[offset+1];
960        save_offset3 = md->offset_vector[md->offset_end - number];        save_offset3 = md->offset_vector[md->offset_end - number];
961        save_capture_last = md->capture_last;        save_capture_last = md->capture_last;
962          save_mark = md->mark;
963    
964        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
965        md->offset_vector[md->offset_end - number] =        md->offset_vector[md->offset_end - number] =
# Line 841  for (;;) Line 967  for (;;)
967    
968        for (;;)        for (;;)
969          {          {
970          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
971          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
972            eptrb, RM1);            eptrb, RM1);
973          if (rrc != MATCH_NOMATCH &&          if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
974              (rrc != MATCH_THEN || md->start_match_ptr != ecode))  
975            RRETURN(rrc);          /* If we backed up to a THEN, check whether it is within the current
976            branch by comparing the address of the THEN that is passed back with
977            the end of the branch. If it is within the current branch, and the
978            branch is one of two or more alternatives (it either starts or ends
979            with OP_ALT), we have reached the limit of THEN's action, so convert
980            the return code to NOMATCH, which will cause normal backtracking to
981            happen from now on. Otherwise, THEN is passed back to an outer
982            alternative. This implements Perl's treatment of parenthesized groups,
983            where a group not containing | does not affect the current alternative,
984            that is, (X) is NOT the same as (X|(*F)). */
985    
986            if (rrc == MATCH_THEN)
987              {
988              next = ecode + GET(ecode,1);
989              if (md->start_match_ptr < next &&
990                  (*ecode == OP_ALT || *next == OP_ALT))
991                rrc = MATCH_NOMATCH;
992              }
993    
994            /* Anything other than NOMATCH is passed back. */
995    
996            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
997          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
998          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
999          if (*ecode != OP_ALT) break;          md->mark = save_mark;
1000            if (*ecode != OP_ALT) break;
1001          }          }
1002    
1003        DPRINTF(("bracket %d failed\n", number));        DPRINTF(("bracket %d failed\n", number));
   
1004        md->offset_vector[offset] = save_offset1;        md->offset_vector[offset] = save_offset1;
1005        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
1006        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
1007    
1008        if (rrc != MATCH_THEN) md->mark = markptr;        /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
1009        RRETURN(MATCH_NOMATCH);  
1010          RRETURN(rrc);
1011        }        }
1012    
1013      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
# Line 873  for (;;) Line 1021  for (;;)
1021      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1022      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1023    
1024      /* Non-capturing bracket, except for possessive with unlimited repeat. Loop      /* Non-capturing or atomic group, except for possessive with unlimited
1025      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.*/  
1026    
1027        When we get to the final alternative within the brackets, we used to return
1028        the result of a recursive call to match() whatever happened so it was
1029        possible to reduce stack usage by turning this into a tail recursion,
1030        except in the case of a possibly empty group. However, now that there is
1031        the possiblity of (*THEN) occurring in the final alternative, this
1032        optimization is no longer always possible.
1033    
1034        We can optimize if we know there are no (*THEN)s in the pattern; at present
1035        this is the best that can be done.
1036    
1037        MATCH_ONCE is returned when the end of an atomic group is successfully
1038        reached, but subsequent matching fails. It passes back up the tree (causing
1039        captured values to be reset) until the original atomic group level is
1040        reached. This is tested by comparing md->once_target with the start of the
1041        group. At this point, the return is converted into MATCH_NOMATCH so that
1042        previous backup points can be taken. */
1043    
1044        case OP_ONCE:
1045      case OP_BRA:      case OP_BRA:
1046      case OP_SBRA:      case OP_SBRA:
1047      DPRINTF(("start non-capturing bracket\n"));      DPRINTF(("start non-capturing bracket\n"));
1048    
1049      for (;;)      for (;;)
1050        {        {
1051        if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */        if (op >= OP_SBRA || op == OP_ONCE)
1052            md->match_function_type = MATCH_CBEGROUP;
1053    
1054          /* If this is not a possibly empty group, and there are no (*THEN)s in
1055          the pattern, and this is the final alternative, optimize as described
1056          above. */
1057    
1058          else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
1059          {          {
1060          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"));  
1061          goto TAIL_RECURSE;          goto TAIL_RECURSE;
1062          }          }
1063    
1064        /* 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. */  
1065    
1066        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;        save_mark = md->mark;
1067        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
1068          RM2);          RM2);
1069        if (rrc != MATCH_NOMATCH &&  
1070            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* See comment in the code for capturing groups above about handling
1071          THEN. */
1072    
1073          if (rrc == MATCH_THEN)
1074            {
1075            next = ecode + GET(ecode,1);
1076            if (md->start_match_ptr < next &&
1077                (*ecode == OP_ALT || *next == OP_ALT))
1078              rrc = MATCH_NOMATCH;
1079            }
1080    
1081          if (rrc != MATCH_NOMATCH)
1082            {
1083            if (rrc == MATCH_ONCE)
1084              {
1085              const pcre_uchar *scode = ecode;
1086              if (*scode != OP_ONCE)           /* If not at start, find it */
1087                {
1088                while (*scode == OP_ALT) scode += GET(scode, 1);
1089                scode -= GET(scode, 1);
1090                }
1091              if (md->once_target == scode) rrc = MATCH_NOMATCH;
1092              }
1093          RRETURN(rrc);          RRETURN(rrc);
1094            }
1095        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1096          md->mark = save_mark;
1097          if (*ecode != OP_ALT) break;
1098        }        }
     /* Control never reaches here. */  
1099    
1100      /* Handle possessive capturing brackets with an unlimited repeat. We come      RRETURN(MATCH_NOMATCH);
1101    
1102        /* Handle possessive capturing brackets with an unlimited repeat. We come
1103      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
1104      handled similarly to the normal case above. However, the matching is      handled similarly to the normal case above. However, the matching is
1105      different. The end of these brackets will always be OP_KETRPOS, which      different. The end of these brackets will always be OP_KETRPOS, which
1106      returns MATCH_KETRPOS without going further in the pattern. By this means      returns MATCH_KETRPOS without going further in the pattern. By this means
1107      we can handle the group by iteration rather than recursion, thereby      we can handle the group by iteration rather than recursion, thereby
1108      reducing the amount of stack needed. */      reducing the amount of stack needed. */
1109    
1110      case OP_CBRAPOS:      case OP_CBRAPOS:
1111      case OP_SCBRAPOS:      case OP_SCBRAPOS:
1112      allow_zero = FALSE;      allow_zero = FALSE;
1113    
1114      POSSESSIVE_CAPTURE:      POSSESSIVE_CAPTURE:
1115      number = GET2(ecode, 1+LINK_SIZE);      number = GET2(ecode, 1+LINK_SIZE);
1116      offset = number << 1;      offset = number << 1;
# Line 939  for (;;) Line 1125  for (;;)
1125      if (offset < md->offset_max)      if (offset < md->offset_max)
1126        {        {
1127        matched_once = FALSE;        matched_once = FALSE;
1128        code_offset = ecode - md->start_code;        code_offset = (int)(ecode - md->start_code);
1129    
1130        save_offset1 = md->offset_vector[offset];        save_offset1 = md->offset_vector[offset];
1131        save_offset2 = md->offset_vector[offset+1];        save_offset2 = md->offset_vector[offset+1];
# Line 947  for (;;) Line 1133  for (;;)
1133        save_capture_last = md->capture_last;        save_capture_last = md->capture_last;
1134    
1135        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
1136    
1137        /* Each time round the loop, save the current subject position for use        /* Each time round the loop, save the current subject position for use
1138        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
1139        restart it with a new subject starting position, remembering that we had        restart it with a new subject starting position, remembering that we had
1140        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
1141        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
1142        see if a previous iteration matched. If so, the group has matched;        see if a previous iteration matched. If so, the group has matched;
1143        continue from afterwards. Otherwise it has failed; restore the previous        continue from afterwards. Otherwise it has failed; restore the previous
1144        capture values before returning NOMATCH. */        capture values before returning NOMATCH. */
1145    
1146        for (;;)        for (;;)
1147          {          {
1148          md->offset_vector[md->offset_end - number] =          md->offset_vector[md->offset_end - number] =
1149            (int)(eptr - md->start_subject);            (int)(eptr - md->start_subject);
1150          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1151          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1152            eptrb, RM63);            eptrb, RM63);
1153          if (rrc == MATCH_KETRPOS)          if (rrc == MATCH_KETRPOS)
1154            {            {
1155            offset_top = md->end_offset_top;            offset_top = md->end_offset_top;
1156            eptr = md->end_match_ptr;            eptr = md->end_match_ptr;
1157            ecode = md->start_code + code_offset;            ecode = md->start_code + code_offset;
1158            save_capture_last = md->capture_last;            save_capture_last = md->capture_last;
1159            matched_once = TRUE;            matched_once = TRUE;
1160            continue;            continue;
1161            }            }
1162          if (rrc != MATCH_NOMATCH &&  
1163              (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* See comment in the code for capturing groups above about handling
1164            RRETURN(rrc);          THEN. */
1165    
1166            if (rrc == MATCH_THEN)
1167              {
1168              next = ecode + GET(ecode,1);
1169              if (md->start_match_ptr < next &&
1170                  (*ecode == OP_ALT || *next == OP_ALT))
1171                rrc = MATCH_NOMATCH;
1172              }
1173    
1174            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1175          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
1176          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
1177          if (*ecode != OP_ALT) break;          if (*ecode != OP_ALT) break;
1178          }          }
1179    
1180        if (!matched_once)        if (!matched_once)
1181          {          {
1182          md->offset_vector[offset] = save_offset1;          md->offset_vector[offset] = save_offset1;
1183          md->offset_vector[offset+1] = save_offset2;          md->offset_vector[offset+1] = save_offset2;
1184          md->offset_vector[md->offset_end - number] = save_offset3;          md->offset_vector[md->offset_end - number] = save_offset3;
1185          }          }
1186    
       if (rrc != MATCH_THEN) md->mark = markptr;  
1187        if (allow_zero || matched_once)        if (allow_zero || matched_once)
1188          {          {
1189          ecode += 1 + LINK_SIZE;          ecode += 1 + LINK_SIZE;
1190          break;          break;
1191          }          }
1192    
1193        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1194        }        }
1195    
1196      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
1197      as a non-capturing bracket. */      as a non-capturing bracket. */
1198    
# Line 1009  for (;;) Line 1204  for (;;)
1204      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1205      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1206    
1207      /* Non-capturing possessive bracket with unlimited repeat. We come here      /* Non-capturing possessive bracket with unlimited repeat. We come here
1208      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,
1209      without the capturing complication. It is written out separately for speed      without the capturing complication. It is written out separately for speed
1210      and cleanliness. */      and cleanliness. */
1211    
1212      case OP_BRAPOS:      case OP_BRAPOS:
1213      case OP_SBRAPOS:      case OP_SBRAPOS:
1214      allow_zero = FALSE;      allow_zero = FALSE;
1215    
1216      POSSESSIVE_NON_CAPTURE:      POSSESSIVE_NON_CAPTURE:
1217      matched_once = FALSE;      matched_once = FALSE;
1218      code_offset = ecode - md->start_code;      code_offset = (int)(ecode - md->start_code);
1219    
1220      for (;;)      for (;;)
1221        {        {
1222        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1223        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1224          eptrb, RM64);          eptrb, RM48);
1225        if (rrc == MATCH_KETRPOS)        if (rrc == MATCH_KETRPOS)
1226          {          {
1227            offset_top = md->end_offset_top;
1228          eptr = md->end_match_ptr;          eptr = md->end_match_ptr;
1229          ecode = md->start_code + code_offset;          ecode = md->start_code + code_offset;
1230          matched_once = TRUE;          matched_once = TRUE;
1231          continue;          continue;
1232          }          }
1233        if (rrc != MATCH_NOMATCH &&  
1234            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* See comment in the code for capturing groups above about handling
1235          RRETURN(rrc);        THEN. */
1236    
1237          if (rrc == MATCH_THEN)
1238            {
1239            next = ecode + GET(ecode,1);
1240            if (md->start_match_ptr < next &&
1241                (*ecode == OP_ALT || *next == OP_ALT))
1242              rrc = MATCH_NOMATCH;
1243            }
1244    
1245          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1246        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1247        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1248        }        }
1249    
1250      if (matched_once || allow_zero)      if (matched_once || allow_zero)
1251        {        {
1252        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1253        break;        break;
1254        }        }
1255      RRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
1256    
1257      /* Control never reaches here. */      /* Control never reaches here. */
# Line 1053  for (;;) Line 1259  for (;;)
1259      /* Conditional group: compilation checked that there are no more than      /* Conditional group: compilation checked that there are no more than
1260      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
1261      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
1262      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. */  
1263    
1264      case OP_COND:      case OP_COND:
1265      case OP_SCOND:      case OP_SCOND:
# Line 1065  for (;;) Line 1270  for (;;)
1270    
1271      if (ecode[LINK_SIZE+1] == OP_CALLOUT)      if (ecode[LINK_SIZE+1] == OP_CALLOUT)
1272        {        {
1273        if (pcre_callout != NULL)        if (PUBL(callout) != NULL)
1274          {          {
1275          pcre_callout_block cb;          PUBL(callout_block) cb;
1276          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 2;   /* Version 1 of the callout block */
1277          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[LINK_SIZE+2];
1278          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1279    #if defined COMPILE_PCRE8
1280          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
1281    #elif defined COMPILE_PCRE16
1282            cb.subject          = (PCRE_SPTR16)md->start_subject;
1283    #elif defined COMPILE_PCRE32
1284            cb.subject          = (PCRE_SPTR32)md->start_subject;
1285    #endif
1286          cb.subject_length   = (int)(md->end_subject - md->start_subject);          cb.subject_length   = (int)(md->end_subject - md->start_subject);
1287          cb.start_match      = (int)(mstart - md->start_subject);          cb.start_match      = (int)(mstart - md->start_subject);
1288          cb.current_position = (int)(eptr - md->start_subject);          cb.current_position = (int)(eptr - md->start_subject);
# Line 1080  for (;;) Line 1291  for (;;)
1291          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1292          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last;
1293          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1294          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);          cb.mark             = md->nomatch_mark;
1295            if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1296          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1297          }          }
1298        ecode += _pcre_OP_lengths[OP_CALLOUT];        ecode += PRIV(OP_lengths)[OP_CALLOUT];
1299        }        }
1300    
1301      condcode = ecode[LINK_SIZE+1];      condcode = ecode[LINK_SIZE+1];
# Line 1100  for (;;) Line 1312  for (;;)
1312        else        else
1313          {          {
1314          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
1315          condition =  (recno == RREF_ANY || recno == md->recursive->group_num);          condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1316    
1317          /* 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
1318          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
1319          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
1320          if any one is set. */          if any one is set. */
1321    
1322          if (!condition && condcode == OP_NRREF && recno != RREF_ANY)          if (!condition && condcode == OP_NRREF)
1323            {            {
1324            uschar *slotA = md->name_table;            pcre_uchar *slotA = md->name_table;
1325            for (i = 0; i < md->name_count; i++)            for (i = 0; i < md->name_count; i++)
1326              {              {
1327              if (GET2(slotA, 0) == recno) break;              if (GET2(slotA, 0) == recno) break;
# Line 1122  for (;;) Line 1334  for (;;)
1334    
1335            if (i < md->name_count)            if (i < md->name_count)
1336              {              {
1337              uschar *slotB = slotA;              pcre_uchar *slotB = slotA;
1338              while (slotB > md->name_table)              while (slotB > md->name_table)
1339                {                {
1340                slotB -= md->name_entry_size;                slotB -= md->name_entry_size;
1341                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1342                  {                  {
1343                  condition = GET2(slotB, 0) == md->recursive->group_num;                  condition = GET2(slotB, 0) == md->recursive->group_num;
1344                  if (condition) break;                  if (condition) break;
# Line 1142  for (;;) Line 1354  for (;;)
1354                for (i++; i < md->name_count; i++)                for (i++; i < md->name_count; i++)
1355                  {                  {
1356                  slotB += md->name_entry_size;                  slotB += md->name_entry_size;
1357                  if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                  if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1358                    {                    {
1359                    condition = GET2(slotB, 0) == md->recursive->group_num;                    condition = GET2(slotB, 0) == md->recursive->group_num;
1360                    if (condition) break;                    if (condition) break;
# Line 1155  for (;;) Line 1367  for (;;)
1367    
1368          /* Chose branch according to the condition */          /* Chose branch according to the condition */
1369    
1370          ecode += condition? 3 : GET(ecode, 1);          ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1371          }          }
1372        }        }
1373    
# Line 1172  for (;;) Line 1384  for (;;)
1384        if (!condition && condcode == OP_NCREF)        if (!condition && condcode == OP_NCREF)
1385          {          {
1386          int refno = offset >> 1;          int refno = offset >> 1;
1387          uschar *slotA = md->name_table;          pcre_uchar *slotA = md->name_table;
1388    
1389          for (i = 0; i < md->name_count; i++)          for (i = 0; i < md->name_count; i++)
1390            {            {
# Line 1186  for (;;) Line 1398  for (;;)
1398    
1399          if (i < md->name_count)          if (i < md->name_count)
1400            {            {
1401            uschar *slotB = slotA;            pcre_uchar *slotB = slotA;
1402            while (slotB > md->name_table)            while (slotB > md->name_table)
1403              {              {
1404              slotB -= md->name_entry_size;              slotB -= md->name_entry_size;
1405              if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)              if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1406                {                {
1407                offset = GET2(slotB, 0) << 1;                offset = GET2(slotB, 0) << 1;
1408                condition = offset < offset_top &&                condition = offset < offset_top &&
# Line 1208  for (;;) Line 1420  for (;;)
1420              for (i++; i < md->name_count; i++)              for (i++; i < md->name_count; i++)
1421                {                {
1422                slotB += md->name_entry_size;                slotB += md->name_entry_size;
1423                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1424                  {                  {
1425                  offset = GET2(slotB, 0) << 1;                  offset = GET2(slotB, 0) << 1;
1426                  condition = offset < offset_top &&                  condition = offset < offset_top &&
# Line 1223  for (;;) Line 1435  for (;;)
1435    
1436        /* Chose branch according to the condition */        /* Chose branch according to the condition */
1437    
1438        ecode += condition? 3 : GET(ecode, 1);        ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1439        }        }
1440    
1441      else if (condcode == OP_DEF)     /* DEFINE - always false */      else if (condcode == OP_DEF)     /* DEFINE - always false */
# Line 1238  for (;;) Line 1450  for (;;)
1450    
1451      else      else
1452        {        {
1453        md->match_function_type = MATCH_CONDASSERT;        md->match_function_type = MATCH_CONDASSERT;
1454        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);
1455        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
1456          {          {
1457            if (md->end_offset_top > offset_top)
1458              offset_top = md->end_offset_top;  /* Captures may have happened */
1459          condition = TRUE;          condition = TRUE;
1460          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
1461          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1462          }          }
1463        else if (rrc != MATCH_NOMATCH &&  
1464                (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
1465          assertion; it is therefore treated as NOMATCH. */
1466    
1467          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1468          {          {
1469          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
1470          }          }
# Line 1258  for (;;) Line 1475  for (;;)
1475          }          }
1476        }        }
1477    
1478      /* 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
1479      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
1480      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
1481      alternative doesn't exist, we can just plough on. */      call to match() is always required, unless the second alternative doesn't
1482        exist, in which case we can just plough on. Note that, for compatibility
1483        with Perl, the | in a conditional group is NOT treated as creating two
1484        alternatives. If a THEN is encountered in the branch, it propagates out to
1485        the enclosing alternative (unless nested in a deeper set of alternatives,
1486        of course). */
1487    
1488      if (condition || *ecode == OP_ALT)      if (condition || *ecode == OP_ALT)
1489        {        {
1490        ecode += 1 + LINK_SIZE;        if (op != OP_SCOND)
       if (op == OP_SCOND)        /* Possibly empty group */  
1491          {          {
1492          md->match_function_type = MATCH_CBEGROUP;          ecode += 1 + LINK_SIZE;
1493          RMATCH(eptr, ecode, offset_top, md, eptrb, RM49);          goto TAIL_RECURSE;
         RRETURN(rrc);  
1494          }          }
1495        else goto TAIL_RECURSE;  
1496          md->match_function_type = MATCH_CBEGROUP;
1497          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
1498          RRETURN(rrc);
1499        }        }
1500      else                         /* Condition false & no alternative */  
1501         /* Condition false & no alternative; continue after the group. */
1502    
1503        else
1504        {        {
1505        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1506        }        }
# Line 1301  for (;;) Line 1527  for (;;)
1527        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1528        if (offset_top <= offset) offset_top = offset + 2;        if (offset_top <= offset) offset_top = offset + 2;
1529        }        }
1530      ecode += 3;      ecode += 1 + IMM2_SIZE;
1531      break;      break;
1532    
1533    
1534      /* End of the pattern, either real or forced. If we are in a top-level      /* End of the pattern, either real or forced. */
     recursion, we should restore the offsets appropriately and continue from  
     after the call. */  
1535    
     case OP_ACCEPT:  
1536      case OP_END:      case OP_END:
1537      if (md->recursive != NULL && md->recursive->group_num == 0)      case OP_ACCEPT:
1538        {      case OP_ASSERT_ACCEPT:
       recursion_info *rec = md->recursive;  
       DPRINTF(("End of pattern in a (?0) recursion\n"));  
       md->recursive = rec->prevrec;  
       memmove(md->offset_vector, rec->offset_save,  
         rec->saved_max * sizeof(int));  
       offset_top = rec->save_offset_top;  
       ecode = rec->after_call;  
       break;  
       }  
1539    
1540      /* Otherwise, if we have matched an empty string, fail if PCRE_NOTEMPTY is      /* If we have matched an empty string, fail if not in an assertion and not
1541      set, or if PCRE_NOTEMPTY_ATSTART is set and we have matched at the start of      in a recursion if either PCRE_NOTEMPTY is set, or if PCRE_NOTEMPTY_ATSTART
1542      the subject. In both cases, backtracking will then try other alternatives,      is set and we have matched at the start of the subject. In both cases,
1543      if any. */      backtracking will then try other alternatives, if any. */
1544    
1545      if (eptr == mstart &&      if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
1546          (md->notempty ||           md->recursive == NULL &&
1547            (md->notempty_atstart &&           (md->notempty ||
1548              mstart == md->start_subject + md->start_offset)))             (md->notempty_atstart &&
1549        MRRETURN(MATCH_NOMATCH);               mstart == md->start_subject + md->start_offset)))
1550          RRETURN(MATCH_NOMATCH);
1551    
1552      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
1553    
# Line 1341  for (;;) Line 1556  for (;;)
1556      md->start_match_ptr = mstart;       /* and the start (\K can modify) */      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
1557    
1558      /* 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
1559      given as the argument to MRRETURN when the heap is in use. */      given as the argument to RRETURN when the heap is in use. */
1560    
1561      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1562      MRRETURN(rrc);      RRETURN(rrc);
1563    
1564      /* Assertion brackets. Check the alternative branches in turn - the      /* Assertion brackets. Check the alternative branches in turn - the
1565      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,
1566      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
1567      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
1568      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
1569      of a condition, we want to return immediately afterwards. The caller of      of a condition, we want to return immediately afterwards. The caller of
1570      this incarnation of the match() function will have set MATCH_CONDASSERT in      this incarnation of the match() function will have set MATCH_CONDASSERT in
1571      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
1572      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
1573      match() to remember this case. */      match() to remember this case. */
1574    
1575      case OP_ASSERT:      case OP_ASSERT:
1576      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1577        save_mark = md->mark;
1578      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1579        {        {
1580        condassert = TRUE;        condassert = TRUE;
1581        md->match_function_type = 0;        md->match_function_type = 0;
1582        }        }
1583      else condassert = FALSE;      else condassert = FALSE;
1584    
1585      do      do
1586        {        {
1587        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
# Line 1374  for (;;) Line 1590  for (;;)
1590          mstart = md->start_match_ptr;   /* In case \K reset it */          mstart = md->start_match_ptr;   /* In case \K reset it */
1591          break;          break;
1592          }          }
1593        if (rrc != MATCH_NOMATCH &&        md->mark = save_mark;
1594            (rrc != MATCH_THEN || md->start_match_ptr != ecode))  
1595          RRETURN(rrc);        /* A COMMIT failure must fail the entire assertion, without trying any
1596          subsequent branches. */
1597    
1598          if (rrc == MATCH_COMMIT) RRETURN(MATCH_NOMATCH);
1599    
1600          /* PCRE does not allow THEN to escape beyond an assertion; it
1601          is treated as NOMATCH. */
1602    
1603          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1604        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1605        }        }
1606      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1607    
1608      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
1609    
1610      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1611    
# Line 1401  for (;;) Line 1625  for (;;)
1625    
1626      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1627      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1628        save_mark = md->mark;
1629      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1630        {        {
1631        condassert = TRUE;        condassert = TRUE;
1632        md->match_function_type = 0;        md->match_function_type = 0;
1633        }        }
1634      else condassert = FALSE;      else condassert = FALSE;
1635    
1636      do      do
1637        {        {
1638        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1639        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);        md->mark = save_mark;
1640          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) RRETURN(MATCH_NOMATCH);
1641        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1642          {          {
1643          do ecode += GET(ecode,1); while (*ecode == OP_ALT);          do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1644          break;          break;
1645          }          }
1646        if (rrc != MATCH_NOMATCH &&  
1647            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1648          RRETURN(rrc);        as NOMATCH. */
1649    
1650          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1651        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1652        }        }
1653      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1654    
1655      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1656    
1657      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1658      continue;      continue;
1659    
# Line 1435  for (;;) Line 1663  for (;;)
1663      back a number of characters, not bytes. */      back a number of characters, not bytes. */
1664    
1665      case OP_REVERSE:      case OP_REVERSE:
1666  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1667      if (utf8)      if (utf)
1668        {        {
1669        i = GET(ecode, 1);        i = GET(ecode, 1);
1670        while (i-- > 0)        while (i-- > 0)
1671          {          {
1672          eptr--;          eptr--;
1673          if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1674          BACKCHAR(eptr);          BACKCHAR(eptr);
1675          }          }
1676        }        }
# Line 1453  for (;;) Line 1681  for (;;)
1681    
1682        {        {
1683        eptr -= GET(ecode, 1);        eptr -= GET(ecode, 1);
1684        if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1685        }        }
1686    
1687      /* Save the earliest consulted character, then skip to next op code */      /* Save the earliest consulted character, then skip to next op code */
# Line 1467  for (;;) Line 1695  for (;;)
1695      function is able to force a failure. */      function is able to force a failure. */
1696    
1697      case OP_CALLOUT:      case OP_CALLOUT:
1698      if (pcre_callout != NULL)      if (PUBL(callout) != NULL)
1699        {        {
1700        pcre_callout_block cb;        PUBL(callout_block) cb;
1701        cb.version          = 1;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1702        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1703        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1704    #if defined COMPILE_PCRE8
1705        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
1706    #elif defined COMPILE_PCRE16
1707          cb.subject          = (PCRE_SPTR16)md->start_subject;
1708    #elif defined COMPILE_PCRE32
1709          cb.subject          = (PCRE_SPTR32)md->start_subject;
1710    #endif
1711        cb.subject_length   = (int)(md->end_subject - md->start_subject);        cb.subject_length   = (int)(md->end_subject - md->start_subject);
1712        cb.start_match      = (int)(mstart - md->start_subject);        cb.start_match      = (int)(mstart - md->start_subject);
1713        cb.current_position = (int)(eptr - md->start_subject);        cb.current_position = (int)(eptr - md->start_subject);
# Line 1482  for (;;) Line 1716  for (;;)
1716        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1717        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last;
1718        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1719        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);        cb.mark             = md->nomatch_mark;
1720          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1721        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1722        }        }
1723      ecode += 2 + 2*LINK_SIZE;      ecode += 2 + 2*LINK_SIZE;
# Line 1492  for (;;) Line 1727  for (;;)
1727      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
1728      whole pattern. (This is so that it works from duplicated subpatterns.)      whole pattern. (This is so that it works from duplicated subpatterns.)
1729    
1730      If there are any capturing brackets started but not finished, we have to      The state of the capturing groups is preserved over recursion, and
1731      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
1732      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
1733      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
1734      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
1735      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
1736      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.  
1737    
1738      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
1739      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
1740      for the original version of this logic. */      for the original version of this logic. It has, however, been hacked around
1741        a lot, so he is not to blame for the current way it works. */
1742    
1743      case OP_RECURSE:      case OP_RECURSE:
1744        {        {
1745          recursion_info *ri;
1746          int recno;
1747    
1748        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1749        new_recursive.group_num = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
1750          GET2(callpat, 1 + LINK_SIZE);          GET2(callpat, 1 + LINK_SIZE);
1751    
1752          /* Check for repeating a recursion without advancing the subject pointer.
1753          This should catch convoluted mutual recursions. (Some simple cases are
1754          caught at compile time.) */
1755    
1756          for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
1757            if (recno == ri->group_num && eptr == ri->subject_position)
1758              RRETURN(PCRE_ERROR_RECURSELOOP);
1759    
1760        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1761    
1762          new_recursive.group_num = recno;
1763          new_recursive.subject_position = eptr;
1764        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1765        md->recursive = &new_recursive;        md->recursive = &new_recursive;
1766    
1767        /* Find where to continue from afterwards */        /* Where to continue from afterwards */
1768    
1769        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       new_recursive.after_call = ecode;  
1770    
1771        /* Now save the offset data. */        /* Now save the offset data */
1772    
1773        new_recursive.saved_max = md->offset_end;        new_recursive.saved_max = md->offset_end;
1774        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
# Line 1531  for (;;) Line 1776  for (;;)
1776        else        else
1777          {          {
1778          new_recursive.offset_save =          new_recursive.offset_save =
1779            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
1780          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1781          }          }
   
1782        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1783              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
       new_recursive.save_offset_top = offset_top;  
1784    
1785        /* OK, now we can do the recursion. For each top-level alternative we        /* OK, now we can do the recursion. After processing each alternative,
1786        restore the offset and recursion data. */        restore the offset data. If there were nested recursions, md->recursive
1787          might be changed, so reset it before looping. */
1788    
1789        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1790        cbegroup = (*callpat >= OP_SBRA);        cbegroup = (*callpat >= OP_SBRA);
1791        do        do
1792          {          {
1793          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1794          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
1795            md, eptrb, RM6);            md, eptrb, RM6);
1796            memcpy(md->offset_vector, new_recursive.offset_save,
1797                new_recursive.saved_max * sizeof(int));
1798            md->recursive = new_recursive.prevrec;
1799          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1800            {            {
1801            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
           md->recursive = new_recursive.prevrec;  
1802            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1803              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1804            MRRETURN(MATCH_MATCH);  
1805              /* Set where we got to in the subject, and reset the start in case
1806              it was changed by \K. This *is* propagated back out of a recursion,
1807              for Perl compatibility. */
1808    
1809              eptr = md->end_match_ptr;
1810              mstart = md->start_match_ptr;
1811              goto RECURSION_MATCHED;        /* Exit loop; end processing */
1812            }            }
1813          else if (rrc != MATCH_NOMATCH &&  
1814                  (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* PCRE does not allow THEN or COMMIT to escape beyond a recursion; it
1815            is treated as NOMATCH. */
1816    
1817            else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN &&
1818                     rrc != MATCH_COMMIT)
1819            {            {
1820            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1821            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1822              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1823            RRETURN(rrc);            RRETURN(rrc);
1824            }            }
1825    
1826          md->recursive = &new_recursive;          md->recursive = &new_recursive;
         memcpy(md->offset_vector, new_recursive.offset_save,  
             new_recursive.saved_max * sizeof(int));  
1827          callpat += GET(callpat, 1);          callpat += GET(callpat, 1);
1828          }          }
1829        while (*callpat == OP_ALT);        while (*callpat == OP_ALT);
# Line 1576  for (;;) Line 1831  for (;;)
1831        DPRINTF(("Recursion didn't match\n"));        DPRINTF(("Recursion didn't match\n"));
1832        md->recursive = new_recursive.prevrec;        md->recursive = new_recursive.prevrec;
1833        if (new_recursive.offset_save != stacksave)        if (new_recursive.offset_save != stacksave)
1834          (pcre_free)(new_recursive.offset_save);          (PUBL(free))(new_recursive.offset_save);
1835        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;  
1836        }        }
1837    
1838      /* The repeating kets try the rest of the pattern or restart from the      RECURSION_MATCHED:
1839      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 */  
1840    
1841      /* 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
1842      bracketed group and go to there. */      bracketed group and go to there. */
# Line 1665  for (;;) Line 1850  for (;;)
1850      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
1851      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
1852      optional ones preceded by BRAZERO or BRAMINZERO. */      optional ones preceded by BRAZERO or BRAMINZERO. */
1853    
1854      case OP_BRAZERO:      case OP_BRAZERO:
1855      next = ecode + 1;      next = ecode + 1;
1856      RMATCH(eptr, next, offset_top, md, eptrb, RM10);      RMATCH(eptr, next, offset_top, md, eptrb, RM10);
# Line 1673  for (;;) Line 1858  for (;;)
1858      do next += GET(next, 1); while (*next == OP_ALT);      do next += GET(next, 1); while (*next == OP_ALT);
1859      ecode = next + 1 + LINK_SIZE;      ecode = next + 1 + LINK_SIZE;
1860      break;      break;
1861    
1862      case OP_BRAMINZERO:      case OP_BRAMINZERO:
1863      next = ecode + 1;      next = ecode + 1;
1864      do next += GET(next, 1); while (*next == OP_ALT);      do next += GET(next, 1); while (*next == OP_ALT);
# Line 1687  for (;;) Line 1872  for (;;)
1872      do next += GET(next,1); while (*next == OP_ALT);      do next += GET(next,1); while (*next == OP_ALT);
1873      ecode = next + 1 + LINK_SIZE;      ecode = next + 1 + LINK_SIZE;
1874      break;      break;
1875    
1876      /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything      /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
1877      here; just jump to the group, with allow_zero set TRUE. */      here; just jump to the group, with allow_zero set TRUE. */
1878    
1879      case OP_BRAPOSZERO:      case OP_BRAPOSZERO:
1880      op = *(++ecode);      op = *(++ecode);
1881      allow_zero = TRUE;      allow_zero = TRUE;
1882      if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;      if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
1883        goto POSSESSIVE_NON_CAPTURE;        goto POSSESSIVE_NON_CAPTURE;
# Line 1702  for (;;) Line 1887  for (;;)
1887      case OP_KET:      case OP_KET:
1888      case OP_KETRMIN:      case OP_KETRMIN:
1889      case OP_KETRMAX:      case OP_KETRMAX:
1890      case OP_KETRPOS:      case OP_KETRPOS:
1891      prev = ecode - GET(ecode, 1);      prev = ecode - GET(ecode, 1);
1892    
1893      /* 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
1894      infinite repeats of empty string matches, retrieve the subject start from      infinite repeats of empty string matches, retrieve the subject start from
1895      the chain. Otherwise, set it NULL. */      the chain. Otherwise, set it NULL. */
1896    
1897      if (*prev >= OP_SBRA)      if (*prev >= OP_SBRA || *prev == OP_ONCE)
1898        {        {
1899        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
1900        eptrb = eptrb->epb_prev;              /* Backup to previous group */        eptrb = eptrb->epb_prev;              /* Backup to previous group */
1901        }        }
1902      else saved_eptr = NULL;      else saved_eptr = NULL;
1903    
1904      /* 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
1905      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
1906      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
1907      it was changed by \K. */      start in case it was changed by \K. */
1908    
1909      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||      if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
1910          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||           *prev == OP_ONCE_NC)
         *prev == OP_ONCE)  
1911        {        {
1912        md->end_match_ptr = eptr;      /* For ONCE */        md->end_match_ptr = eptr;      /* For ONCE_NC */
1913        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1914        md->start_match_ptr = mstart;        md->start_match_ptr = mstart;
1915        MRRETURN(MATCH_MATCH);        RRETURN(MATCH_MATCH);         /* Sets md->mark */
1916        }        }
1917    
1918      /* 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
1919      and if necessary complete handling an extraction by setting the offsets and      and if necessary complete handling an extraction by setting the offsets and
1920      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
1921      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
1922      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
1923        the current subject position and start match pointer and give a MATCH
1924        return. */
1925    
1926      if (*prev == OP_CBRA || *prev == OP_SCBRA ||      if (*prev == OP_CBRA || *prev == OP_SCBRA ||
1927          *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)          *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
# Line 1748  for (;;) Line 1934  for (;;)
1934        printf("\n");        printf("\n");
1935  #endif  #endif
1936    
1937          /* Handle a recursively called group. */
1938    
1939          if (md->recursive != NULL && md->recursive->group_num == number)
1940            {
1941            md->end_match_ptr = eptr;
1942            md->start_match_ptr = mstart;
1943            RRETURN(MATCH_MATCH);
1944            }
1945    
1946          /* Deal with capturing */
1947    
1948        md->capture_last = number;        md->capture_last = number;
1949        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
1950          {          {
1951            /* If offset is greater than offset_top, it means that we are
1952            "skipping" a capturing group, and that group's offsets must be marked
1953            unset. In earlier versions of PCRE, all the offsets were unset at the
1954            start of matching, but this doesn't work because atomic groups and
1955            assertions can cause a value to be set that should later be unset.
1956            Example: matching /(?>(a))b|(a)c/ against "ac". This sets group 1 as
1957            part of the atomic group, but this is not on the final matching path,
1958            so must be unset when 2 is set. (If there is no group 2, there is no
1959            problem, because offset_top will then be 2, indicating no capture.) */
1960    
1961            if (offset > offset_top)
1962              {
1963              register int *iptr = md->offset_vector + offset_top;
1964              register int *iend = md->offset_vector + offset;
1965              while (iptr < iend) *iptr++ = -1;
1966              }
1967    
1968            /* Now make the extraction */
1969    
1970          md->offset_vector[offset] =          md->offset_vector[offset] =
1971            md->offset_vector[md->offset_end - number];            md->offset_vector[md->offset_end - number];
1972          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1973          if (offset_top <= offset) offset_top = offset + 2;          if (offset_top <= offset) offset_top = offset + 2;
1974          }          }
   
       /* 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;  
         }  
1975        }        }
1976    
1977      /* For a non-repeating ket, just continue at this level. This also      /* For an ordinary non-repeating ket, just continue at this level. This
1978      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
1979      This is the forcible breaking of infinite loops as implemented in Perl      group. This is the forcible breaking of infinite loops as implemented in
1980      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,
1981      course of events. */      establish a backup point by processing the rest of the pattern at a lower
1982        level. If this results in a NOMATCH return, pass MATCH_ONCE back to the
1983        original OP_ONCE level, thereby bypassing intermediate backup points, but
1984        resetting any captures that happened along the way. */
1985    
1986      if (*ecode == OP_KET || eptr == saved_eptr)      if (*ecode == OP_KET || eptr == saved_eptr)
1987        {        {
1988        ecode += 1 + LINK_SIZE;        if (*prev == OP_ONCE)
1989            {
1990            RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
1991            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1992            md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1993            RRETURN(MATCH_ONCE);
1994            }
1995          ecode += 1 + LINK_SIZE;    /* Carry on at this level */
1996        break;        break;
1997        }        }
1998    
1999      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
2000      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
2001      at a time from the outer level, thus saving stack. */      at a time from the outer level, thus saving stack. */
2002    
2003      if (*ecode == OP_KETRPOS)      if (*ecode == OP_KETRPOS)
2004        {        {
2005        md->end_match_ptr = eptr;        md->end_match_ptr = eptr;
2006        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
2007        RRETURN(MATCH_KETRPOS);        RRETURN(MATCH_KETRPOS);
2008        }        }
2009    
2010      /* 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
2011      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
2012      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
2013      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
2014        string. */
2015    
2016      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
2017        {        {
2018        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
2019        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2020          if (*prev == OP_ONCE)
2021            {
2022            RMATCH(eptr, prev, offset_top, md, eptrb, RM8);
2023            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2024            md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
2025            RRETURN(MATCH_ONCE);
2026            }
2027        if (*prev >= OP_SBRA)    /* Could match an empty string */        if (*prev >= OP_SBRA)    /* Could match an empty string */
2028          {          {
         md->match_function_type = MATCH_CBEGROUP;  
2029          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
2030          RRETURN(rrc);          RRETURN(rrc);
2031          }          }
# Line 1816  for (;;) Line 2034  for (;;)
2034        }        }
2035      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
2036        {        {
       if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;  
2037        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
2038          if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
2039        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2040          if (*prev == OP_ONCE)
2041            {
2042            RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM9);
2043            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2044            md->once_target = prev;
2045            RRETURN(MATCH_ONCE);
2046            }
2047        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
2048        goto TAIL_RECURSE;        goto TAIL_RECURSE;
2049        }        }
# Line 1827  for (;;) Line 2052  for (;;)
2052      /* Not multiline mode: start of subject assertion, unless notbol. */      /* Not multiline mode: start of subject assertion, unless notbol. */
2053    
2054      case OP_CIRC:      case OP_CIRC:
2055      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2056    
2057      /* Start of subject assertion */      /* Start of subject assertion */
2058    
2059      case OP_SOD:      case OP_SOD:
2060      if (eptr != md->start_subject) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
2061      ecode++;      ecode++;
2062      break;      break;
2063    
2064      /* Multiline mode: start of subject unless notbol, or after any newline. */      /* Multiline mode: start of subject unless notbol, or after any newline. */
2065    
2066      case OP_CIRCM:      case OP_CIRCM:
2067      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2068      if (eptr != md->start_subject &&      if (eptr != md->start_subject &&
2069          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
2070        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2071      ecode++;      ecode++;
2072      break;      break;
2073    
2074      /* Start of match assertion */      /* Start of match assertion */
2075    
2076      case OP_SOM:      case OP_SOM:
2077      if (eptr != md->start_subject + md->start_offset) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
2078      ecode++;      ecode++;
2079      break;      break;
2080    
# Line 1865  for (;;) Line 2090  for (;;)
2090    
2091      case OP_DOLLM:      case OP_DOLLM:
2092      if (eptr < md->end_subject)      if (eptr < md->end_subject)
2093        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }        {
2094          if (!IS_NEWLINE(eptr))
2095            {
2096            if (md->partial != 0 &&
2097                eptr + 1 >= md->end_subject &&
2098                NLBLOCK->nltype == NLTYPE_FIXED &&
2099                NLBLOCK->nllen == 2 &&
2100                RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2101              {
2102              md->hitend = TRUE;
2103              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2104              }
2105            RRETURN(MATCH_NOMATCH);
2106            }
2107          }
2108      else      else
2109        {        {
2110        if (md->noteol) MRRETURN(MATCH_NOMATCH);        if (md->noteol) RRETURN(MATCH_NOMATCH);
2111        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2112        }        }
2113      ecode++;      ecode++;
2114      break;      break;
2115    
2116      /* Not multiline mode: assert before a terminating newline or before end of      /* Not multiline mode: assert before a terminating newline or before end of
2117      subject unless noteol is set. */      subject unless noteol is set. */
2118    
2119      case OP_DOLL:      case OP_DOLL:
2120      if (md->noteol) MRRETURN(MATCH_NOMATCH);      if (md->noteol) RRETURN(MATCH_NOMATCH);
2121      if (!md->endonly) goto ASSERT_NL_OR_EOS;      if (!md->endonly) goto ASSERT_NL_OR_EOS;
2122    
2123      /* ... else fall through for endonly */      /* ... else fall through for endonly */
# Line 1886  for (;;) Line 2125  for (;;)
2125      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
2126    
2127      case OP_EOD:      case OP_EOD:
2128      if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
2129      SCHECK_PARTIAL();      SCHECK_PARTIAL();
2130      ecode++;      ecode++;
2131      break;      break;
# Line 1897  for (;;) Line 2136  for (;;)
2136      ASSERT_NL_OR_EOS:      ASSERT_NL_OR_EOS:
2137      if (eptr < md->end_subject &&      if (eptr < md->end_subject &&
2138          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
2139        MRRETURN(MATCH_NOMATCH);        {
2140          if (md->partial != 0 &&
2141              eptr + 1 >= md->end_subject &&
2142              NLBLOCK->nltype == NLTYPE_FIXED &&
2143              NLBLOCK->nllen == 2 &&
2144              RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2145            {
2146            md->hitend = TRUE;
2147            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2148            }
2149          RRETURN(MATCH_NOMATCH);
2150          }
2151    
2152      /* Either at end of string or \n before end. */      /* Either at end of string or \n before end. */
2153    
# Line 1916  for (;;) Line 2166  for (;;)
2166        be "non-word" characters. Remember the earliest consulted character for        be "non-word" characters. Remember the earliest consulted character for
2167        partial matching. */        partial matching. */
2168    
2169  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2170        if (utf8)        if (utf)
2171          {          {
2172          /* Get status of previous character */          /* Get status of previous character */
2173    
2174          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
2175            {            {
2176            USPTR lastptr = eptr - 1;            PCRE_PUCHAR lastptr = eptr - 1;
2177            while((*lastptr & 0xc0) == 0x80) lastptr--;            BACKCHAR(lastptr);
2178            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
2179            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
2180  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 1989  for (;;) Line 2239  for (;;)
2239              }              }
2240            else            else
2241  #endif  #endif
2242            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);            prev_is_word = MAX_255(eptr[-1])
2243                && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
2244            }            }
2245    
2246          /* Get status of next character */          /* Get status of next character */
# Line 2012  for (;;) Line 2263  for (;;)
2263            }            }
2264          else          else
2265  #endif  #endif
2266          cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);          cur_is_word = MAX_255(*eptr)
2267              && ((md->ctypes[*eptr] & ctype_word) != 0);
2268          }          }
2269    
2270        /* Now see if the situation is what we want */        /* Now see if the situation is what we want */
2271    
2272        if ((*ecode++ == OP_WORD_BOUNDARY)?        if ((*ecode++ == OP_WORD_BOUNDARY)?
2273             cur_is_word == prev_is_word : cur_is_word != prev_is_word)             cur_is_word == prev_is_word : cur_is_word != prev_is_word)
2274          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2275        }        }
2276      break;      break;
2277    
2278      /* Match a single character type; inline for speed */      /* Match any single character type except newline; have to take care with
2279        CRLF newlines and partial matching. */
2280    
2281      case OP_ANY:      case OP_ANY:
2282      if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
2283        if (md->partial != 0 &&
2284            eptr + 1 >= md->end_subject &&
2285            NLBLOCK->nltype == NLTYPE_FIXED &&
2286            NLBLOCK->nllen == 2 &&
2287            RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2288          {
2289          md->hitend = TRUE;
2290          if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2291          }
2292    
2293      /* Fall through */      /* Fall through */
2294    
2295        /* Match any single character whatsoever. */
2296    
2297      case OP_ALLANY:      case OP_ALLANY:
2298      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2299        {        {                            /* not be updated before SCHECK_PARTIAL. */
2300        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2301        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2302        }        }
2303      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;      eptr++;
2304    #ifdef SUPPORT_UTF
2305        if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
2306    #endif
2307      ecode++;      ecode++;
2308      break;      break;
2309    
# Line 2043  for (;;) Line 2311  for (;;)
2311      any byte, even newline, independent of the setting of PCRE_DOTALL. */      any byte, even newline, independent of the setting of PCRE_DOTALL. */
2312    
2313      case OP_ANYBYTE:      case OP_ANYBYTE:
2314      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2315        {        {                            /* not be updated before SCHECK_PARTIAL. */
2316        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2317        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2318        }        }
2319        eptr++;
2320      ecode++;      ecode++;
2321      break;      break;
2322    
# Line 2055  for (;;) Line 2324  for (;;)
2324      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2325        {        {
2326        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2327        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2328        }        }
2329      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2330      if (      if (
2331  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2332         c < 256 &&         c < 256 &&
2333  #endif  #endif
2334         (md->ctypes[c] & ctype_digit) != 0         (md->ctypes[c] & ctype_digit) != 0
2335         )         )
2336        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2337      ecode++;      ecode++;
2338      break;      break;
2339    
# Line 2072  for (;;) Line 2341  for (;;)
2341      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2342        {        {
2343        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2344        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2345        }        }
2346      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2347      if (      if (
2348  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2349         c >= 256 ||         c > 255 ||
2350  #endif  #endif
2351         (md->ctypes[c] & ctype_digit) == 0         (md->ctypes[c] & ctype_digit) == 0
2352         )         )
2353        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2354      ecode++;      ecode++;
2355      break;      break;
2356    
# Line 2089  for (;;) Line 2358  for (;;)
2358      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2359        {        {
2360        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2361        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2362        }        }
2363      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2364      if (      if (
2365  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2366         c < 256 &&         c < 256 &&
2367  #endif  #endif
2368         (md->ctypes[c] & ctype_space) != 0         (md->ctypes[c] & ctype_space) != 0
2369         )         )
2370        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2371      ecode++;      ecode++;
2372      break;      break;
2373    
# Line 2106  for (;;) Line 2375  for (;;)
2375      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2376        {        {
2377        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2378        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2379        }        }
2380      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2381      if (      if (
2382  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2383         c >= 256 ||         c > 255 ||
2384  #endif  #endif
2385         (md->ctypes[c] & ctype_space) == 0         (md->ctypes[c] & ctype_space) == 0
2386         )         )
2387        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2388      ecode++;      ecode++;
2389      break;      break;
2390    
# Line 2123  for (;;) Line 2392  for (;;)
2392      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2393        {        {
2394        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2395        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2396        }        }
2397      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2398      if (      if (
2399  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2400         c < 256 &&         c < 256 &&
2401  #endif  #endif
2402         (md->ctypes[c] & ctype_word) != 0         (md->ctypes[c] & ctype_word) != 0
2403         )         )
2404        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2405      ecode++;      ecode++;
2406      break;      break;
2407    
# Line 2140  for (;;) Line 2409  for (;;)
2409      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2410        {        {
2411        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2412        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2413        }        }
2414      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2415      if (      if (
2416  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2417         c >= 256 ||         c > 255 ||
2418  #endif  #endif
2419         (md->ctypes[c] & ctype_word) == 0         (md->ctypes[c] & ctype_word) == 0
2420         )         )
2421        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2422      ecode++;      ecode++;
2423      break;      break;
2424    
# Line 2157  for (;;) Line 2426  for (;;)
2426      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2427        {        {
2428        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2429        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2430        }        }
2431      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2432      switch(c)      switch(c)
2433        {        {
2434        default: MRRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2435    
2436        case 0x000d:        case CHAR_CR:
2437        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr >= md->end_subject)
2438            {
2439            SCHECK_PARTIAL();
2440            }
2441          else if (RAWUCHARTEST(eptr) == CHAR_LF) eptr++;
2442        break;        break;
2443    
2444        case 0x000a:        case CHAR_LF:
2445        break;        break;
2446    
2447        case 0x000b:        case CHAR_VT:
2448        case 0x000c:        case CHAR_FF:
2449        case 0x0085:        case CHAR_NEL:
2450    #ifndef EBCDIC
2451        case 0x2028:        case 0x2028:
2452        case 0x2029:        case 0x2029:
2453        if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);  #endif  /* Not EBCDIC */
2454          if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
2455        break;        break;
2456        }        }
2457      ecode++;      ecode++;
# Line 2186  for (;;) Line 2461  for (;;)
2461      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2462        {        {
2463        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2464        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2465        }        }
2466      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2467      switch(c)      switch(c)
2468        {        {
2469          HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
2470        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);  
2471        }        }
2472      ecode++;      ecode++;
2473      break;      break;
# Line 2220  for (;;) Line 2476  for (;;)
2476      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2477        {        {
2478        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2479        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2480        }        }
2481      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2482      switch(c)      switch(c)
2483        {        {
2484        default: MRRETURN(MATCH_NOMATCH);        HSPACE_CASES: break;  /* Byte and multibyte cases */
2485        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;  
2486        }        }
2487      ecode++;      ecode++;
2488      break;      break;
# Line 2254  for (;;) Line 2491  for (;;)
2491      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2492        {        {
2493        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2494        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2495        }        }
2496      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2497      switch(c)      switch(c)
2498        {        {
2499          VSPACE_CASES: RRETURN(MATCH_NOMATCH);
2500        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);  
2501        }        }
2502      ecode++;      ecode++;
2503      break;      break;
# Line 2276  for (;;) Line 2506  for (;;)
2506      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2507        {        {
2508        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2509        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2510        }        }
2511      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2512      switch(c)      switch(c)
2513        {        {
2514        default: MRRETURN(MATCH_NOMATCH);        VSPACE_CASES: break;
2515        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;  
2516        }        }
2517      ecode++;      ecode++;
2518      break;      break;
# Line 2303  for (;;) Line 2526  for (;;)
2526      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2527        {        {
2528        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2529        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2530        }        }
2531      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2532        {        {
2533          const pcre_uint32 *cp;
2534        const ucd_record *prop = GET_UCD(c);        const ucd_record *prop = GET_UCD(c);
2535    
2536        switch(ecode[1])        switch(ecode[1])
2537          {          {
2538          case PT_ANY:          case PT_ANY:
2539          if (op == OP_NOTPROP) MRRETURN(MATCH_NOMATCH);          if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
2540          break;          break;
2541    
2542          case PT_LAMP:          case PT_LAMP:
2543          if ((prop->chartype == ucp_Lu ||          if ((prop->chartype == ucp_Lu ||
2544               prop->chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
2545               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
2546            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2547          break;          break;
2548    
2549          case PT_GC:          case PT_GC:
2550          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
2551            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2552          break;          break;
2553    
2554          case PT_PC:          case PT_PC:
2555          if ((ecode[2] != prop->chartype) == (op == OP_PROP))          if ((ecode[2] != prop->chartype) == (op == OP_PROP))
2556            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2557          break;          break;
2558    
2559          case PT_SC:          case PT_SC:
2560          if ((ecode[2] != prop->script) == (op == OP_PROP))          if ((ecode[2] != prop->script) == (op == OP_PROP))
2561            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2562          break;          break;
2563    
2564          /* These are specials */          /* These are specials */
2565    
2566          case PT_ALNUM:          case PT_ALNUM:
2567          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2568               _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))               PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2569            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2570          break;          break;
2571    
2572          case PT_SPACE:    /* Perl space */          case PT_SPACE:    /* Perl space */
2573          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2574               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2575                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2576            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2577          break;          break;
2578    
2579          case PT_PXSPACE:  /* POSIX space */          case PT_PXSPACE:  /* POSIX space */
2580          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2581               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2582               c == CHAR_FF || c == CHAR_CR)               c == CHAR_FF || c == CHAR_CR)
2583                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2584            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2585          break;          break;
2586    
2587          case PT_WORD:          case PT_WORD:
2588          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2589               _pcre_ucp_gentype[prop->chartype] == ucp_N ||               PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2590               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2591            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2592            break;
2593    
2594            case PT_CLIST:
2595            cp = PRIV(ucd_caseless_sets) + prop->caseset;
2596            for (;;)
2597              {
2598              if (c < *cp)
2599                { if (op == OP_PROP) { RRETURN(MATCH_NOMATCH); } else break; }
2600              if (c == *cp++)
2601                { if (op == OP_PROP) break; else { RRETURN(MATCH_NOMATCH); } }
2602              }
2603          break;          break;
2604    
2605          /* This should never occur */          /* This should never occur */
# Line 2384  for (;;) Line 2619  for (;;)
2619      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2620        {        {
2621        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2622        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2623        }        }
2624      GETCHARINCTEST(c, eptr);      else
2625        {        {
2626        int category = UCD_CATEGORY(c);        int lgb, rgb;
2627        if (category == ucp_M) MRRETURN(MATCH_NOMATCH);        GETCHARINCTEST(c, eptr);
2628          lgb = UCD_GRAPHBREAK(c);
2629        while (eptr < md->end_subject)        while (eptr < md->end_subject)
2630          {          {
2631          int len = 1;          int len = 1;
2632          if (!utf8) c = *eptr; else          if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2633            {          rgb = UCD_GRAPHBREAK(c);
2634            GETCHARLEN(c, eptr, len);          if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
2635            }          lgb = rgb;
         category = UCD_CATEGORY(c);  
         if (category != ucp_M) break;  
2636          eptr += len;          eptr += len;
2637          }          }
2638        }        }
2639        CHECK_PARTIAL();
2640      ecode++;      ecode++;
2641      break;      break;
2642  #endif  #endif  /* SUPPORT_UCP */
2643    
2644    
2645      /* 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 2416  for (;;) Line 2651  for (;;)
2651      loops). */      loops). */
2652    
2653      case OP_REF:      case OP_REF:
2654      case OP_REFI:      case OP_REFI:
2655      caseless = op == OP_REFI;      caseless = op == OP_REFI;
2656      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2657      ecode += 3;      ecode += 1 + IMM2_SIZE;
2658    
2659      /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2660    
# Line 2459  for (;;) Line 2694  for (;;)
2694        case OP_CRMINRANGE:        case OP_CRMINRANGE:
2695        minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2696        min = GET2(ecode, 1);        min = GET2(ecode, 1);
2697        max = GET2(ecode, 3);        max = GET2(ecode, 1 + IMM2_SIZE);
2698        if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2699        ecode += 5;        ecode += 1 + 2 * IMM2_SIZE;
2700        break;        break;
2701    
2702        default:               /* No repeat follows */        default:               /* No repeat follows */
2703        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2704          {          {
2705            if (length == -2) eptr = md->end_subject;   /* Partial match */
2706          CHECK_PARTIAL();          CHECK_PARTIAL();
2707          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2708          }          }
2709        eptr += length;        eptr += length;
2710        continue;              /* With the main loop */        continue;              /* With the main loop */
2711        }        }
2712    
2713      /* Handle repeated back references. If the length of the reference is      /* Handle repeated back references. If the length of the reference is
2714      zero, just continue with the main loop. */      zero, just continue with the main loop. If the length is negative, it
2715        means the reference is unset in non-Java-compatible mode. If the minimum is
2716        zero, we can continue at the same level without recursion. For any other
2717        minimum, carrying on will result in NOMATCH. */
2718    
2719      if (length == 0) continue;      if (length == 0) continue;
2720        if (length < 0 && min == 0) continue;
2721    
2722      /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2723      the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
# Line 2485  for (;;) Line 2725  for (;;)
2725    
2726      for (i = 1; i <= min; i++)      for (i = 1; i <= min; i++)
2727        {        {
2728        int slength;        int slength;
2729        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2730          {          {
2731            if (slength == -2) eptr = md->end_subject;   /* Partial match */
2732          CHECK_PARTIAL();          CHECK_PARTIAL();
2733          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2734          }          }
2735        eptr += slength;        eptr += slength;
2736        }        }
# Line 2505  for (;;) Line 2746  for (;;)
2746        {        {
2747        for (fi = min;; fi++)        for (fi = min;; fi++)
2748          {          {
2749          int slength;          int slength;
2750          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2751          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2752          if (fi >= max) MRRETURN(MATCH_NOMATCH);          if (fi >= max) RRETURN(MATCH_NOMATCH);
2753          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2754            {            {
2755              if (slength == -2) eptr = md->end_subject;   /* Partial match */
2756            CHECK_PARTIAL();            CHECK_PARTIAL();
2757            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2758            }            }
2759          eptr += slength;          eptr += slength;
2760          }          }
# Line 2526  for (;;) Line 2768  for (;;)
2768        pp = eptr;        pp = eptr;
2769        for (i = min; i < max; i++)        for (i = min; i < max; i++)
2770          {          {
2771          int slength;          int slength;
2772          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2773            {            {
2774            CHECK_PARTIAL();            /* Can't use CHECK_PARTIAL because we don't want to update eptr in
2775              the soft partial matching case. */
2776    
2777              if (slength == -2 && md->partial != 0 &&
2778                  md->end_subject > md->start_used_ptr)
2779                {
2780                md->hitend = TRUE;
2781                if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2782                }
2783            break;            break;
2784            }            }
2785          eptr += slength;          eptr += slength;
2786          }          }
2787    
2788        while (eptr >= pp)        while (eptr >= pp)
2789          {          {
2790          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2791          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2792          eptr -= length;          eptr -= length;
2793          }          }
2794        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2795        }        }
2796      /* Control never gets here */      /* Control never gets here */
2797    
# Line 2558  for (;;) Line 2809  for (;;)
2809      case OP_NCLASS:      case OP_NCLASS:
2810      case OP_CLASS:      case OP_CLASS:
2811        {        {
2812          /* The data variable is saved across frames, so the byte map needs to
2813          be stored there. */
2814    #define BYTE_MAP ((pcre_uint8 *)data)
2815        data = ecode + 1;                /* Save for matching */        data = ecode + 1;                /* Save for matching */
2816        ecode += 33;                     /* Advance past the item */        ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
2817    
2818        switch (*ecode)        switch (*ecode)
2819          {          {
# Line 2580  for (;;) Line 2834  for (;;)
2834          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2835          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2836          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2837          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2838          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2839          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2840          break;          break;
2841    
2842          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2592  for (;;) Line 2846  for (;;)
2846    
2847        /* First, ensure the minimum number of matches are present. */        /* First, ensure the minimum number of matches are present. */
2848    
2849  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2850        /* UTF-8 mode */        if (utf)
       if (utf8)  
2851          {          {
2852          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2853            {            {
2854            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2855              {              {
2856              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2857              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2858              }              }
2859            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
2860            if (c > 255)            if (c > 255)
2861              {              {
2862              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2863              }              }
2864            else            else
2865              {              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
             if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
             }  
2866            }            }
2867          }          }
2868        else        else
2869  #endif  #endif
2870        /* Not UTF-8 mode */        /* Not UTF mode */
2871          {          {
2872          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2873            {            {
2874            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2875              {              {
2876              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2877              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2878              }              }
2879            c = *eptr++;            c = *eptr++;
2880            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2881              if (c > 255)
2882                {
2883                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2884                }
2885              else
2886    #endif
2887                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2888            }            }
2889          }          }
2890    
# Line 2640  for (;;) Line 2898  for (;;)
2898    
2899        if (minimize)        if (minimize)
2900          {          {
2901  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2902          /* UTF-8 mode */          if (utf)
         if (utf8)  
2903            {            {
2904            for (fi = min;; fi++)            for (fi = min;; fi++)
2905              {              {
2906              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2907              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2908              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2909              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2910                {                {
2911                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2912                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2913                }                }
2914              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
2915              if (c > 255)              if (c > 255)
2916                {                {
2917                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2918                }                }
2919              else              else
2920                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
               if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
               }  
2921              }              }
2922            }            }
2923          else          else
2924  #endif  #endif
2925          /* Not UTF-8 mode */          /* Not UTF mode */
2926            {            {
2927            for (fi = min;; fi++)            for (fi = min;; fi++)
2928              {              {
2929              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2930              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2931              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2932              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2933                {                {
2934                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2935                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2936                }                }
2937              c = *eptr++;              c = *eptr++;
2938              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2939                if (c > 255)
2940                  {
2941                  if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2942                  }
2943                else
2944    #endif
2945                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2946              }              }
2947            }            }
2948          /* Control never gets here */          /* Control never gets here */
# Line 2692  for (;;) Line 2954  for (;;)
2954          {          {
2955          pp = eptr;          pp = eptr;
2956    
2957  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2958          /* UTF-8 mode */          if (utf)
         if (utf8)  
2959            {            {
2960            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2961              {              {
# Line 2710  for (;;) Line 2971  for (;;)
2971                if (op == OP_CLASS) break;                if (op == OP_CLASS) break;
2972                }                }
2973              else              else
2974                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
               if ((data[c/8] & (1 << (c&7))) == 0) break;  
               }  
2975              eptr += len;              eptr += len;
2976              }              }
2977            for (;;)            for (;;)
# Line 2725  for (;;) Line 2984  for (;;)
2984            }            }
2985          else          else
2986  #endif  #endif
2987            /* Not UTF-8 mode */            /* Not UTF mode */
2988            {            {
2989            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2990              {              {
# Line 2735  for (;;) Line 2994  for (;;)
2994                break;                break;
2995                }                }
2996              c = *eptr;              c = *eptr;
2997              if ((data[c/8] & (1 << (c&7))) == 0) break;  #ifndef COMPILE_PCRE8
2998                if (c > 255)
2999                  {
3000                  if (op == OP_CLASS) break;
3001                  }
3002                else
3003    #endif
3004                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
3005              eptr++;              eptr++;
3006              }              }
3007            while (eptr >= pp)            while (eptr >= pp)
# Line 2746  for (;;) Line 3012  for (;;)
3012              }              }
3013            }            }
3014    
3015          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3016          }          }
3017    #undef BYTE_MAP
3018        }        }
3019      /* Control never gets here */      /* Control never gets here */
3020    
# Line 2756  for (;;) Line 3023  for (;;)
3023      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
3024      mode, because Unicode properties are supported in non-UTF-8 mode. */      mode, because Unicode properties are supported in non-UTF-8 mode. */
3025    
3026  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3027      case OP_XCLASS:      case OP_XCLASS:
3028        {        {
3029        data = ecode + 1 + LINK_SIZE;                /* Save for matching */        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
# Line 2781  for (;;) Line 3048  for (;;)
3048          case OP_CRMINRANGE:          case OP_CRMINRANGE:
3049          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
3050          min = GET2(ecode, 1);          min = GET2(ecode, 1);
3051          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
3052          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
3053          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
3054          break;          break;
3055    
3056          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2798  for (;;) Line 3065  for (;;)
3065          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3066            {            {
3067            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3068            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3069            }            }
3070          GETCHARINCTEST(c, eptr);          GETCHARINCTEST(c, eptr);
3071          if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);          if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3072          }          }
3073    
3074        /* 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 2818  for (;;) Line 3085  for (;;)
3085            {            {
3086            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
3087            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3088            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3089            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3090              {              {
3091              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3092              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3093              }              }
3094            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3095            if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);            if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3096            }            }
3097          /* Control never gets here */          /* Control never gets here */
3098          }          }
# Line 2843  for (;;) Line 3110  for (;;)
3110              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3111              break;              break;
3112              }              }
3113    #ifdef SUPPORT_UTF
3114            GETCHARLENTEST(c, eptr, len);            GETCHARLENTEST(c, eptr, len);
3115            if (!_pcre_xclass(c, data)) break;  #else
3116              c = *eptr;
3117    #endif
3118              if (!PRIV(xclass)(c, data, utf)) break;
3119            eptr += len;            eptr += len;
3120            }            }
3121          for(;;)          for(;;)
# Line 2852  for (;;) Line 3123  for (;;)
3123            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
3124            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3125            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3126            if (utf8) BACKCHAR(eptr);  #ifdef SUPPORT_UTF
3127              if (utf) BACKCHAR(eptr);
3128    #endif
3129            }            }
3130          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3131          }          }
3132    
3133        /* Control never gets here */        /* Control never gets here */
# Line 2864  for (;;) Line 3137  for (;;)
3137      /* Match a single character, casefully */      /* Match a single character, casefully */
3138    
3139      case OP_CHAR:      case OP_CHAR:
3140  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3141      if (utf8)      if (utf)
3142        {        {
3143        length = 1;        length = 1;
3144        ecode++;        ecode++;
# Line 2873  for (;;) Line 3146  for (;;)
3146        if (length > md->end_subject - eptr)        if (length > md->end_subject - eptr)
3147          {          {
3148          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
3149          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3150          }          }
3151        while (length-- > 0) if (*ecode++ != *eptr++) MRRETURN(MATCH_NOMATCH);        while (length-- > 0) if (*ecode++ != RAWUCHARINC(eptr)) RRETURN(MATCH_NOMATCH);
3152        }        }
3153      else      else
3154  #endif  #endif
3155        /* Not UTF mode */
     /* Non-UTF-8 mode */  
3156        {        {
3157        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
3158          {          {
3159          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
3160          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3161          }          }
3162        if (ecode[1] != *eptr++) MRRETURN(MATCH_NOMATCH);        if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
3163        ecode += 2;        ecode += 2;
3164        }        }
3165      break;      break;
3166    
3167      /* Match a single character, caselessly */      /* Match a single character, caselessly. If we are at the end of the
3168        subject, give up immediately. */
3169    
3170      case OP_CHARI:      case OP_CHARI:
3171  #ifdef SUPPORT_UTF8      if (eptr >= md->end_subject)
3172      if (utf8)        {
3173          SCHECK_PARTIAL();
3174          RRETURN(MATCH_NOMATCH);
3175          }
3176    
3177    #ifdef SUPPORT_UTF
3178        if (utf)
3179        {        {
3180        length = 1;        length = 1;
3181        ecode++;        ecode++;
3182        GETCHARLEN(fc, ecode, length);        GETCHARLEN(fc, ecode, length);
3183    
       if (length > md->end_subject - eptr)  
         {  
         CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */  
         MRRETURN(MATCH_NOMATCH);  
         }  
   
3184        /* 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
3185        can use the fast lookup table. */        we know that its other case must also be one byte long, so we can use the
3186          fast lookup table. We know that there is at least one byte left in the
3187          subject. */
3188    
3189        if (fc < 128)        if (fc < 128)
3190          {          {
3191          if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          pcre_uchar cc = RAWUCHAR(eptr);
3192            if (md->lcc[fc] != TABLE_GET(cc, md->lcc, cc)) RRETURN(MATCH_NOMATCH);
3193            ecode++;
3194            eptr++;
3195          }          }
3196    
3197        /* Otherwise we must pick up the subject character */        /* Otherwise we must pick up the subject character. Note that we cannot
3198          use the value of "length" to check for sufficient bytes left, because the
3199          other case of the character may have more or fewer bytes.  */
3200    
3201        else        else
3202          {          {
3203          unsigned int dc;          pcre_uint32 dc;
3204          GETCHARINC(dc, eptr);          GETCHARINC(dc, eptr);
3205          ecode += length;          ecode += length;
3206    
# Line 2932  for (;;) Line 3212  for (;;)
3212  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3213            if (dc != UCD_OTHERCASE(fc))            if (dc != UCD_OTHERCASE(fc))
3214  #endif  #endif
3215              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3216            }            }
3217          }          }
3218        }        }
3219      else      else
3220  #endif   /* SUPPORT_UTF8 */  #endif   /* SUPPORT_UTF */
3221    
3222      /* Non-UTF-8 mode */      /* Not UTF mode */
3223        {        {
3224        if (md->end_subject - eptr < 1)        if (TABLE_GET(ecode[1], md->lcc, ecode[1])
3225          {            != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3226          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */        eptr++;
         MRRETURN(MATCH_NOMATCH);  
         }  
       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);  
3227        ecode += 2;        ecode += 2;
3228        }        }
3229      break;      break;
# Line 2956  for (;;) Line 3233  for (;;)
3233      case OP_EXACT:      case OP_EXACT:
3234      case OP_EXACTI:      case OP_EXACTI:
3235      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3236      ecode += 3;      ecode += 1 + IMM2_SIZE;
3237      goto REPEATCHAR;      goto REPEATCHAR;
3238    
3239      case OP_POSUPTO:      case OP_POSUPTO:
# Line 2971  for (;;) Line 3248  for (;;)
3248      min = 0;      min = 0;
3249      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3250      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
3251      ecode += 3;      ecode += 1 + IMM2_SIZE;
3252      goto REPEATCHAR;      goto REPEATCHAR;
3253    
3254      case OP_POSSTAR:      case OP_POSSTAR:
# Line 3019  for (;;) Line 3296  for (;;)
3296      /* Common code for all repeated single-character matches. */      /* Common code for all repeated single-character matches. */
3297    
3298      REPEATCHAR:      REPEATCHAR:
3299  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3300      if (utf8)      if (utf)
3301        {        {
3302        length = 1;        length = 1;
3303        charptr = ecode;        charptr = ecode;
# Line 3033  for (;;) Line 3310  for (;;)
3310        if (length > 1)        if (length > 1)
3311          {          {
3312  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3313          unsigned int othercase;          pcre_uint32 othercase;
3314          if (op >= OP_STARI &&     /* Caseless */          if (op >= OP_STARI &&     /* Caseless */
3315              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3316            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = PRIV(ord2utf)(othercase, occhars);
3317          else oclength = 0;          else oclength = 0;
3318  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3319    
3320          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3321            {            {
3322            if (eptr <= md->end_subject - length &&            if (eptr <= md->end_subject - length &&
3323              memcmp(eptr, charptr, length) == 0) eptr += length;              memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3324  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3325            else if (oclength > 0 &&            else if (oclength > 0 &&
3326                     eptr <= md->end_subject - oclength &&                     eptr <= md->end_subject - oclength &&
3327                     memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3328  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3329            else            else
3330              {              {
3331              CHECK_PARTIAL();              CHECK_PARTIAL();
3332              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3333              }              }
3334            }            }
3335    
# Line 3064  for (;;) Line 3341  for (;;)
3341              {              {
3342              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3343              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3344              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3345              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3346                memcmp(eptr, charptr, length) == 0) eptr += length;                memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3347  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3348              else if (oclength > 0 &&              else if (oclength > 0 &&
3349                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3350                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3351  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3352              else              else
3353                {                {
3354                CHECK_PARTIAL();                CHECK_PARTIAL();
3355                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3356                }                }
3357              }              }
3358            /* Control never gets here */            /* Control never gets here */
# Line 3087  for (;;) Line 3364  for (;;)
3364            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3365              {              {
3366              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3367                  memcmp(eptr, charptr, length) == 0) eptr += length;                  memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3368  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3369              else if (oclength > 0 &&              else if (oclength > 0 &&
3370                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3371                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3372  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3373              else              else
3374                {                {
# Line 3106  for (;;) Line 3383  for (;;)
3383              {              {
3384              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3385              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3386              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }              if (eptr == pp) { RRETURN(MATCH_NOMATCH); }
3387  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3388              eptr--;              eptr--;
3389              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3123  for (;;) Line 3400  for (;;)
3400        value of fc will always be < 128. */        value of fc will always be < 128. */
3401        }        }
3402      else      else
3403  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3404          /* When not in UTF-8 mode, load a single-byte character. */
3405      /* When not in UTF-8 mode, load a single-byte character. */        fc = *ecode++;
3406    
3407      fc = *ecode++;      /* The value of fc at this point is always one character, though we may
3408        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  
3409      caseful cases, for speed, since matching characters is likely to be quite      caseful cases, for speed, since matching characters is likely to be quite
3410      common. First, ensure the minimum number of matches are present. If min =      common. First, ensure the minimum number of matches are present. If min =
3411      max, continue at the same level without recursing. Otherwise, if      max, continue at the same level without recursing. Otherwise, if
# Line 3139  for (;;) Line 3414  for (;;)
3414      maximizing, find the maximum number of characters and work backwards. */      maximizing, find the maximum number of characters and work backwards. */
3415    
3416      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3417        max, eptr));        max, (char *)eptr));
3418    
3419      if (op >= OP_STARI)  /* Caseless */      if (op >= OP_STARI)  /* Caseless */
3420        {        {
3421        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3422          /* fc must be < 128 if UTF is enabled. */
3423          foc = md->fcc[fc];
3424    #else
3425    #ifdef SUPPORT_UTF
3426    #ifdef SUPPORT_UCP
3427          if (utf && fc > 127)
3428            foc = UCD_OTHERCASE(fc);
3429    #else
3430          if (utf && fc > 127)
3431            foc = fc;
3432    #endif /* SUPPORT_UCP */
3433          else
3434    #endif /* SUPPORT_UTF */
3435            foc = TABLE_GET(fc, md->fcc, fc);
3436    #endif /* COMPILE_PCRE8 */
3437    
3438        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3439          {          {
3440            pcre_uchar cc;
3441    
3442          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3443            {            {
3444            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3445            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3446            }            }
3447          if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          cc = RAWUCHARTEST(eptr);
3448            if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
3449            eptr++;
3450          }          }
3451        if (min == max) continue;        if (min == max) continue;
3452        if (minimize)        if (minimize)
3453          {          {
3454          for (fi = min;; fi++)          for (fi = min;; fi++)
3455            {            {
3456              pcre_uchar cc;
3457    
3458            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3459            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3460            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3461            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3462              {              {
3463              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3464              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3465              }              }
3466            if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            cc = RAWUCHARTEST(eptr);
3467              if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
3468              eptr++;
3469            }            }
3470          /* Control never gets here */          /* Control never gets here */
3471          }          }
# Line 3175  for (;;) Line 3474  for (;;)
3474          pp = eptr;          pp = eptr;
3475          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3476            {            {
3477              pcre_uchar cc;
3478    
3479            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3480              {              {
3481              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3482              break;              break;
3483              }              }
3484            if (fc != md->lcc[*eptr]) break;            cc = RAWUCHARTEST(eptr);
3485              if (fc != cc && foc != cc) break;
3486            eptr++;            eptr++;
3487            }            }
3488    
# Line 3192  for (;;) Line 3494  for (;;)
3494            eptr--;            eptr--;
3495            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3496            }            }
3497          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3498          }          }
3499        /* Control never gets here */        /* Control never gets here */
3500        }        }
# Line 3206  for (;;) Line 3508  for (;;)
3508          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3509            {            {
3510            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3511            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3512            }            }
3513          if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);          if (fc != RAWUCHARINCTEST(eptr)) RRETURN(MATCH_NOMATCH);
3514          }          }
3515    
3516        if (min == max) continue;        if (min == max) continue;
# Line 3219  for (;;) Line 3521  for (;;)
3521            {            {
3522            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3523            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3524            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3525            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3526              {              {
3527              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3528              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3529              }              }
3530            if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc != RAWUCHARINCTEST(eptr)) RRETURN(MATCH_NOMATCH);
3531            }            }
3532          /* Control never gets here */          /* Control never gets here */
3533          }          }
# Line 3239  for (;;) Line 3541  for (;;)
3541              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3542              break;              break;
3543              }              }
3544            if (fc != *eptr) break;            if (fc != RAWUCHARTEST(eptr)) break;
3545            eptr++;            eptr++;
3546            }            }
3547          if (possessive) continue;          if (possessive) continue;
# Line 3250  for (;;) Line 3552  for (;;)
3552            eptr--;            eptr--;
3553            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3554            }            }
3555          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3556          }          }
3557        }        }
3558      /* Control never gets here */      /* Control never gets here */
# Line 3259  for (;;) Line 3561  for (;;)
3561      checking can be multibyte. */      checking can be multibyte. */
3562    
3563      case OP_NOT:      case OP_NOT:
3564      case OP_NOTI:      case OP_NOTI:
3565      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3566        {        {
3567        SCHECK_PARTIAL();        SCHECK_PARTIAL();
3568        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
3569        }        }
3570      ecode++;  #ifdef SUPPORT_UTF
3571      GETCHARINCTEST(c, eptr);      if (utf)
     if (op == OP_NOTI)         /* The caseless case */  
3572        {        {
3573  #ifdef SUPPORT_UTF8        register pcre_uint32 ch, och;
3574        if (c < 256)  
3575  #endif        ecode++;
3576        c = md->lcc[c];        GETCHARINC(ch, ecode);
3577        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);        GETCHARINC(c, eptr);
3578    
3579          if (op == OP_NOT)
3580            {
3581            if (ch == c) RRETURN(MATCH_NOMATCH);
3582            }
3583          else
3584            {
3585    #ifdef SUPPORT_UCP
3586            if (ch > 127)
3587              och = UCD_OTHERCASE(ch);
3588    #else
3589            if (ch > 127)
3590              och = ch;
3591    #endif /* SUPPORT_UCP */
3592            else
3593              och = TABLE_GET(ch, md->fcc, ch);
3594            if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
3595            }
3596        }        }
3597      else    /* Caseful */      else
3598    #endif
3599        {        {
3600        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);        register pcre_uint32 ch = ecode[1];
3601          c = *eptr++;
3602          if (ch == c || (op == OP_NOTI && TABLE_GET(ch, md->fcc, ch) == c))
3603            RRETURN(MATCH_NOMATCH);
3604          ecode += 2;
3605        }        }
3606      break;      break;
3607    
# Line 3291  for (;;) Line 3615  for (;;)
3615      case OP_NOTEXACT:      case OP_NOTEXACT:
3616      case OP_NOTEXACTI:      case OP_NOTEXACTI:
3617      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3618      ecode += 3;      ecode += 1 + IMM2_SIZE;
3619      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3620    
3621      case OP_NOTUPTO:      case OP_NOTUPTO:
# Line 3301  for (;;) Line 3625  for (;;)
3625      min = 0;      min = 0;
3626      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3627      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3628      ecode += 3;      ecode += 1 + IMM2_SIZE;
3629      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3630    
3631      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
# Line 3333  for (;;) Line 3657  for (;;)
3657      possessive = TRUE;      possessive = TRUE;
3658      min = 0;      min = 0;
3659      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3660      ecode += 3;      ecode += 1 + IMM2_SIZE;
3661      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3662    
3663      case OP_NOTSTAR:      case OP_NOTSTAR:
# Line 3357  for (;;) Line 3681  for (;;)
3681      /* Common code for all repeated single-byte matches. */      /* Common code for all repeated single-byte matches. */
3682    
3683      REPEATNOTCHAR:      REPEATNOTCHAR:
3684      fc = *ecode++;      GETCHARINCTEST(fc, ecode);
3685    
3686      /* The code is duplicated for the caseless and caseful cases, for speed,      /* The code is duplicated for the caseless and caseful cases, for speed,
3687      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 3368  for (;;) Line 3692  for (;;)
3692      characters and work backwards. */      characters and work backwards. */
3693    
3694      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,
3695        max, eptr));        max, (char *)eptr));
3696    
3697      if (op >= OP_NOTSTARI)     /* Caseless */      if (op >= OP_NOTSTARI)     /* Caseless */
3698        {        {
3699        fc = md->lcc[fc];  #ifdef SUPPORT_UTF
3700    #ifdef SUPPORT_UCP
3701          if (utf && fc > 127)
3702            foc = UCD_OTHERCASE(fc);
3703    #else
3704          if (utf && fc > 127)
3705            foc = fc;
3706    #endif /* SUPPORT_UCP */
3707          else
3708    #endif /* SUPPORT_UTF */
3709            foc = TABLE_GET(fc, md->fcc, fc);
3710    
3711  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3712        /* UTF-8 mode */        if (utf)
       if (utf8)  
3713          {          {
3714          register unsigned int d;          register pcre_uint32 d;
3715          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3716            {            {
3717            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3718              {              {
3719              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3720              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3721              }              }
3722            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3723            if (d < 256) d = md->lcc[d];            if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
           if (fc == d) MRRETURN(MATCH_NOMATCH);  
3724            }            }
3725          }          }
3726        else        else
3727  #endif  #endif
3728          /* Not UTF mode */
       /* Not UTF-8 mode */  
3729          {          {
3730          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3731            {            {
3732            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3733              {              {
3734              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3735              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3736              }              }
3737            if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3738              eptr++;
3739            }            }
3740          }          }
3741    
# Line 3411  for (;;) Line 3743  for (;;)
3743    
3744        if (minimize)        if (minimize)
3745          {          {
3746  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3747          /* UTF-8 mode */          if (utf)
         if (utf8)  
3748            {            {
3749            register unsigned int d;            register pcre_uint32 d;
3750            for (fi = min;; fi++)            for (fi = min;; fi++)
3751              {              {
3752              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3753              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3754              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3755              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3756                {                {
3757                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3758                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3759                }                }
3760              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3761              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
             if (fc == d) MRRETURN(MATCH_NOMATCH);  
3762              }              }
3763            }            }
3764          else          else
3765  #endif  #endif
3766          /* Not UTF-8 mode */          /* Not UTF mode */
3767            {            {
3768            for (fi = min;; fi++)            for (fi = min;; fi++)
3769              {              {
3770              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3771              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3772              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3773              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3774                {                {
3775                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3776                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3777                }                }
3778              if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3779                eptr++;
3780              }              }
3781            }            }
3782          /* Control never gets here */          /* Control never gets here */
# Line 3457  for (;;) Line 3788  for (;;)
3788          {          {
3789          pp = eptr;          pp = eptr;
3790    
3791  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3792          /* UTF-8 mode */          if (utf)
         if (utf8)  
3793            {            {
3794            register unsigned int d;            register pcre_uint32 d;
3795            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3796              {              {
3797              int len = 1;              int len = 1;
# Line 3471  for (;;) Line 3801  for (;;)
3801                break;                break;
3802                }                }
3803              GETCHARLEN(d, eptr, len);              GETCHARLEN(d, eptr, len);
3804              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) break;
             if (fc == d) break;  
3805              eptr += len;              eptr += len;
3806              }              }
3807          if (possessive) continue;            if (possessive) continue;
3808          for(;;)            for(;;)
3809              {              {
3810              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3811              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
# Line 3486  for (;;) Line 3815  for (;;)
3815            }            }
3816          else          else
3817  #endif  #endif
3818          /* Not UTF-8 mode */          /* Not UTF mode */
3819            {            {
3820            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3821              {              {
# Line 3495  for (;;) Line 3824  for (;;)
3824                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3825                break;                break;
3826                }                }
3827              if (fc == md->lcc[*eptr]) break;              if (fc == *eptr || foc == *eptr) break;
3828              eptr++;              eptr++;
3829              }              }
3830            if (possessive) continue;            if (possessive) continue;
# Line 3507  for (;;) Line 3836  for (;;)
3836              }              }
3837            }            }
3838    
3839          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3840          }          }
3841        /* Control never gets here */        /* Control never gets here */
3842        }        }
# Line 3516  for (;;) Line 3845  for (;;)
3845    
3846      else      else
3847        {        {
3848  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3849        /* UTF-8 mode */        if (utf)
       if (utf8)  
3850          {          {
3851          register unsigned int d;          register pcre_uint32 d;
3852          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3853            {            {
3854            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3855              {              {
3856              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3857              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3858              }              }
3859            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3860            if (fc == d) MRRETURN(MATCH_NOMATCH);            if (fc == d) RRETURN(MATCH_NOMATCH);
3861            }            }
3862          }          }
3863        else        else
3864  #endif  #endif
3865        /* Not UTF-8 mode */        /* Not UTF mode */
3866          {          {
3867          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3868            {            {
3869            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3870              {              {
3871              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3872              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3873              }              }
3874            if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3875            }            }
3876          }          }
3877    
# Line 3551  for (;;) Line 3879  for (;;)
3879    
3880        if (minimize)        if (minimize)
3881          {          {
3882  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3883          /* UTF-8 mode */          if (utf)
         if (utf8)  
3884            {            {
3885            register unsigned int d;            register pcre_uint32 d;
3886            for (fi = min;; fi++)            for (fi = min;; fi++)
3887              {              {
3888              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3889              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3890              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3891              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3892                {                {
3893                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3894                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3895                }                }
3896              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3897              if (fc == d) MRRETURN(MATCH_NOMATCH);              if (fc == d) RRETURN(MATCH_NOMATCH);
3898              }              }
3899            }            }
3900          else          else
3901  #endif  #endif
3902          /* Not UTF-8 mode */          /* Not UTF mode */
3903            {            {
3904            for (fi = min;; fi++)            for (fi = min;; fi++)
3905              {              {
3906              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3907              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3908              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3909              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3910                {                {
3911                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3912                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3913                }                }
3914              if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3915              }              }
3916            }            }
3917          /* Control never gets here */          /* Control never gets here */
# Line 3596  for (;;) Line 3923  for (;;)
3923          {          {
3924          pp = eptr;          pp = eptr;
3925    
3926  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3927          /* UTF-8 mode */          if (utf)
         if (utf8)  
3928            {            {
3929            register unsigned int d;            register pcre_uint32 d;
3930            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3931              {              {
3932              int len = 1;              int len = 1;
# Line 3624  for (;;) Line 3950  for (;;)
3950            }            }
3951          else          else
3952  #endif  #endif
3953          /* Not UTF-8 mode */          /* Not UTF mode */
3954            {            {
3955            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3956              {              {
# Line 3645  for (;;) Line 3971  for (;;)
3971              }              }
3972            }            }
3973    
3974          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3975          }          }
3976        }        }
3977      /* Control never gets here */      /* Control never gets here */
# Line 3657  for (;;) Line 3983  for (;;)
3983      case OP_TYPEEXACT:      case OP_TYPEEXACT:
3984      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3985      minimize = TRUE;      minimize = TRUE;
3986      ecode += 3;      ecode += 1 + IMM2_SIZE;
3987      goto REPEATTYPE;      goto REPEATTYPE;
3988    
3989      case OP_TYPEUPTO:      case OP_TYPEUPTO:
# Line 3665  for (;;) Line 3991  for (;;)
3991      min = 0;      min = 0;
3992      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3993      minimize = *ecode == OP_TYPEMINUPTO;      minimize = *ecode == OP_TYPEMINUPTO;
3994      ecode += 3;      ecode += 1 + IMM2_SIZE;
3995      goto REPEATTYPE;      goto REPEATTYPE;
3996    
3997      case OP_TYPEPOSSTAR:      case OP_TYPEPOSSTAR:
# Line 3693  for (;;) Line 4019  for (;;)
4019      possessive = TRUE;      possessive = TRUE;
4020      min = 0;      min = 0;
4021      max = GET2(ecode, 1);      max = GET2(ecode, 1);
4022      ecode += 3;      ecode += 1 + IMM2_SIZE;
4023      goto REPEATTYPE;      goto REPEATTYPE;
4024    
4025      case OP_TYPESTAR:      case OP_TYPESTAR:
# Line 3739  for (;;) Line 4065  for (;;)
4065          switch(prop_type)          switch(prop_type)
4066            {            {
4067            case PT_ANY:            case PT_ANY:
4068            if (prop_fail_result) MRRETURN(MATCH_NOMATCH);            if (prop_fail_result) RRETURN(MATCH_NOMATCH);
4069            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
4070              {              {
4071              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4072                {                {
4073                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4074                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4075                }                }
4076              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4077              }              }
# Line 3754  for (;;) Line 4080  for (;;)
4080            case PT_LAMP:            case PT_LAMP:
4081            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
4082              {              {
4083                int chartype;
4084              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4085                {                {
4086                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4087                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4088                }                }
4089              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4090              prop_chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
4091              if ((prop_chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
4092                   prop_chartype == ucp_Ll ||                   chartype == ucp_Ll ||
4093                   prop_chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
4094                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4095              }              }
4096            break;            break;
4097    
# Line 3774  for (;;) Line 4101  for (;;)
4101              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4102                {                {
4103                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4104                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4105                }                }
4106              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4107              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
4108              if ((prop_category == prop_value) == prop_fail_result)                RRETURN(MATCH_NOMATCH);
               MRRETURN(MATCH_NOMATCH);  
4109              }              }
4110            break;            break;
4111    
# Line 3789  for (;;) Line 4115  for (;;)
4115              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4116                {                {
4117                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4118                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4119                }                }
4120              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4121              prop_chartype = UCD_CHARTYPE(c);              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
4122              if ((prop_chartype == prop_value) == prop_fail_result)                RRETURN(MATCH_NOMATCH);
               MRRETURN(MATCH_NOMATCH);  
4123              }              }
4124            break;            break;
4125    
# Line 3804  for (;;) Line 4129  for (;;)
4129              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4130                {                {
4131                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4132                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4133                }                }
4134              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4135              prop_script = UCD_SCRIPT(c);              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
4136              if ((prop_script == prop_value) == prop_fail_result)