/[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 461 by ph10, Mon Oct 5 10:59:35 2009 UTC revision 922 by ph10, Mon Feb 20 18:44:42 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-2009 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 57  possible. There are also some static sup Line 57  possible. There are also some static sup
57  #undef min  #undef min
58  #undef max  #undef max
59    
60  /* Flag bits for the match() function */  /* Values for setting in md->match_function_type to indicate two special types
61    of call to match(). We do it this way to save on using another stack variable,
62    as stack usage is to be discouraged. */
63    
64  #define match_condassert     0x01  /* Called to check a condition assertion */  #define MATCH_CONDASSERT     1  /* Called to check a condition assertion */
65  #define match_cbegroup       0x02  /* Could-be-empty unlimited repeat group */  #define MATCH_CBEGROUP       2  /* Could-be-empty unlimited repeat group */
66    
67  /* Non-error returns from the match() function. Error returns are externally  /* Non-error returns from the match() function. Error returns are externally
68  defined PCRE_ERROR_xxx codes, which are all negative. */  defined PCRE_ERROR_xxx codes, which are all negative. */
# Line 71  defined PCRE_ERROR_xxx codes, which are Line 73  defined PCRE_ERROR_xxx codes, which are
73  /* Special internal returns from the match() function. Make them sufficiently  /* Special internal returns from the match() function. Make them sufficiently
74  negative to avoid the external error codes. */  negative to avoid the external error codes. */
75    
76  #define MATCH_COMMIT       (-999)  #define MATCH_ACCEPT       (-999)
77  #define MATCH_PRUNE        (-998)  #define MATCH_COMMIT       (-998)
78  #define MATCH_SKIP         (-997)  #define MATCH_KETRPOS      (-997)
79  #define MATCH_THEN         (-996)  #define MATCH_ONCE         (-996)
80    #define MATCH_PRUNE        (-995)
81    #define MATCH_SKIP         (-994)
82    #define MATCH_SKIP_ARG     (-993)
83    #define MATCH_THEN         (-992)
84    
85  /* 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.
86  If the offset vector is bigger, malloc is used. This should be a multiple of 3,  If the offset vector is bigger, malloc is used. This should be a multiple of 3,
# Line 89  static const char rep_max[] = { 0, 0, 0, Line 95  static const char rep_max[] = { 0, 0, 0,
95    
96    
97    
98  #ifdef DEBUG  #ifdef PCRE_DEBUG
99  /*************************************************  /*************************************************
100  *        Debugging function to print chars       *  *        Debugging function to print chars       *
101  *************************************************/  *************************************************/
# Line 107  Returns:     nothing Line 113  Returns:     nothing
113  */  */
114    
115  static void  static void
116  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)
117  {  {
118  unsigned int c;  unsigned int c;
119  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
# Line 122  while (length-- > 0) Line 128  while (length-- > 0)
128  *          Match a back-reference                *  *          Match a back-reference                *
129  *************************************************/  *************************************************/
130    
131  /* If a back reference hasn't been set, the length that is passed is greater  /* Normally, if a back reference hasn't been set, the length that is passed is
132  than the number of characters left in the string, so the match fails.  negative, so the match always fails. However, in JavaScript compatibility mode,
133    the length passed is zero. Note that in caseless UTF-8 mode, the number of
134    subject bytes matched may be different to the number of reference bytes.
135    
136  Arguments:  Arguments:
137    offset      index into the offset vector    offset      index into the offset vector
138    eptr        points into the subject    eptr        pointer into the subject
139    length      length to be matched    length      length of reference to be matched (number of bytes)
140    md          points to match data block    md          points to match data block
141    ims         the ims flags    caseless    TRUE if caseless
142    
143  Returns:      TRUE if matched  Returns:      >= 0 the number of subject bytes matched
144                  -1 no match
145                  -2 partial match; always given if at end subject
146  */  */
147    
148  static BOOL  static int
149  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,
150    unsigned long int ims)    BOOL caseless)
151  {  {
152  USPTR p = md->start_subject + md->offset_vector[offset];  PCRE_PUCHAR eptr_start = eptr;
153    register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
154    
155  #ifdef DEBUG  #ifdef PCRE_DEBUG
156  if (eptr >= md->end_subject)  if (eptr >= md->end_subject)
157    printf("matching subject <null>");    printf("matching subject <null>");
158  else  else
# Line 154  pchars(p, length, FALSE, md); Line 165  pchars(p, length, FALSE, md);
165  printf("\n");  printf("\n");
166  #endif  #endif
167    
168  /* Always fail if not enough characters left */  /* Always fail if reference not set (and not JavaScript compatible - in that
169    case the length is passed as zero). */
170    
171  if (length > md->end_subject - eptr) return FALSE;  if (length < 0) return -1;
172    
173  /* Separate the caseless case for speed. In UTF-8 mode we can only do this  /* Separate the caseless case for speed. In UTF-8 mode we can only do this
174  properly if Unicode properties are supported. Otherwise, we can check only  properly if Unicode properties are supported. Otherwise, we can check only
175  ASCII characters. */  ASCII characters. */
176    
177  if ((ims & PCRE_CASELESS) != 0)  if (caseless)
178    {    {
179  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
180  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
181    if (md->utf8)    if (md->utf)
182      {      {
183      USPTR endptr = eptr + length;      /* Match characters up to the end of the reference. NOTE: the number of
184      while (eptr < endptr)      bytes matched may differ, because there are some characters whose upper and
185        lower case versions code as different numbers of bytes. For example, U+023A
186        (2 bytes in UTF-8) is the upper case version of U+2C65 (3 bytes in UTF-8);
187        a sequence of 3 of the former uses 6 bytes, as does a sequence of two of
188        the latter. It is important, therefore, to check the length along the
189        reference, not along the subject (earlier code did this wrong). */
190    
191        PCRE_PUCHAR endptr = p + length;
192        while (p < endptr)
193        {        {
194        int c, d;        int c, d;
195          if (eptr >= md->end_subject) return -2;   /* Partial match */
196        GETCHARINC(c, eptr);        GETCHARINC(c, eptr);
197        GETCHARINC(d, p);        GETCHARINC(d, p);
198        if (c != d && c != UCD_OTHERCASE(d)) return FALSE;        if (c != d && c != UCD_OTHERCASE(d)) return -1;
199        }        }
200      }      }
201    else    else
# Line 183  if ((ims & PCRE_CASELESS) != 0) Line 204  if ((ims & PCRE_CASELESS) != 0)
204    
205    /* 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
206    is no UCP support. */    is no UCP support. */
207        {
208    while (length-- > 0)      while (length-- > 0)
209      { if (md->lcc[*p++] != md->lcc[*eptr++]) return FALSE; }        {
210          if (eptr >= md->end_subject) return -2;   /* Partial match */
211          if (TABLE_GET(*p, md->lcc, *p) != TABLE_GET(*eptr, md->lcc, *eptr)) return -1;
212          p++;
213          eptr++;
214          }
215        }
216    }    }
217    
218  /* 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
219  are in UTF-8 mode. */  are in UTF-8 mode. */
220    
221  else  else
222    { while (length-- > 0) if (*p++ != *eptr++) return FALSE; }    {
223      while (length-- > 0)
224        {
225        if (eptr >= md->end_subject) return -2;   /* Partial match */
226        if (*p++ != *eptr++) return -1;
227        }
228      }
229    
230  return TRUE;  return (int)(eptr - eptr_start);
231  }  }
232    
233    
# Line 245  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM Line 278  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
278         RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,         RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
279         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
280         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
281         RM51,  RM52, RM53, RM54 };         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
282           RM61,  RM62, RM63, RM64, RM65, RM66 };
283    
284  /* 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
285  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
286  actuall used in this definition. */  actually used in this definition. */
287    
288  #ifndef NO_RECURSE  #ifndef NO_RECURSE
289  #define REGISTER register  #define REGISTER register
290    
291  #ifdef DEBUG  #ifdef PCRE_DEBUG
292  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
293    { \    { \
294    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
295    rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1); \    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1); \
296    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
297    }    }
298  #define RRETURN(ra) \  #define RRETURN(ra) \
# Line 267  actuall used in this definition. */ Line 301  actuall used in this definition. */
301    return ra; \    return ra; \
302    }    }
303  #else  #else
304  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
305    rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1)    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1)
306  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
307  #endif  #endif
308    
# Line 281  argument of match(), which never changes Line 315  argument of match(), which never changes
315    
316  #define REGISTER  #define REGISTER
317    
318  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\  #define RMATCH(ra,rb,rc,rd,re,rw)\
319    {\    {\
320    heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));\
321      if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
322    frame->Xwhere = rw; \    frame->Xwhere = rw; \
323    newframe->Xeptr = ra;\    newframe->Xeptr = ra;\
324    newframe->Xecode = rb;\    newframe->Xecode = rb;\
325    newframe->Xmstart = mstart;\    newframe->Xmstart = mstart;\
326    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
327    newframe->Xims = re;\    newframe->Xeptrb = re;\
   newframe->Xeptrb = rf;\  
   newframe->Xflags = rg;\  
328    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
329    newframe->Xprevframe = frame;\    newframe->Xprevframe = frame;\
330    frame = newframe;\    frame = newframe;\
# Line 303  argument of match(), which never changes Line 336  argument of match(), which never changes
336    
337  #define RRETURN(ra)\  #define RRETURN(ra)\
338    {\    {\
339    heapframe *newframe = frame;\    heapframe *oldframe = frame;\
340    frame = newframe->Xprevframe;\    frame = oldframe->Xprevframe;\
341    (pcre_stack_free)(newframe);\    if (oldframe != &frame_zero) (PUBL(stack_free))(oldframe);\
342    if (frame != NULL)\    if (frame != NULL)\
343      {\      {\
344      rrc = ra;\      rrc = ra;\
# Line 322  typedef struct heapframe { Line 355  typedef struct heapframe {
355    
356    /* Function arguments that may change */    /* Function arguments that may change */
357    
358    USPTR Xeptr;    PCRE_PUCHAR Xeptr;
359    const uschar *Xecode;    const pcre_uchar *Xecode;
360    USPTR Xmstart;    PCRE_PUCHAR Xmstart;
361    int Xoffset_top;    int Xoffset_top;
   long int Xims;  
362    eptrblock *Xeptrb;    eptrblock *Xeptrb;
   int Xflags;  
363    unsigned int Xrdepth;    unsigned int Xrdepth;
364    
365    /* Function local variables */    /* Function local variables */
366    
367    USPTR Xcallpat;    PCRE_PUCHAR Xcallpat;
368  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
369    USPTR Xcharptr;    PCRE_PUCHAR Xcharptr;
370  #endif  #endif
371    USPTR Xdata;    PCRE_PUCHAR Xdata;
372    USPTR Xnext;    PCRE_PUCHAR Xnext;
373    USPTR Xpp;    PCRE_PUCHAR Xpp;
374    USPTR Xprev;    PCRE_PUCHAR Xprev;
375    USPTR Xsaved_eptr;    PCRE_PUCHAR Xsaved_eptr;
376    
377    recursion_info Xnew_recursive;    recursion_info Xnew_recursive;
378    
# Line 349  typedef struct heapframe { Line 380  typedef struct heapframe {
380    BOOL Xcondition;    BOOL Xcondition;
381    BOOL Xprev_is_word;    BOOL Xprev_is_word;
382    
   unsigned long int Xoriginal_ims;  
   
383  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
384    int Xprop_type;    int Xprop_type;
385    int Xprop_value;    int Xprop_value;
386    int Xprop_fail_result;    int Xprop_fail_result;
   int Xprop_category;  
   int Xprop_chartype;  
   int Xprop_script;  
387    int Xoclength;    int Xoclength;
388    uschar Xocchars[8];    pcre_uchar Xocchars[6];
389  #endif  #endif
390    
391    int Xcodelink;    int Xcodelink;
# Line 401  returns a negative (error) response, the Line 427  returns a negative (error) response, the
427  same response. */  same response. */
428    
429  /* 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
430  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
431  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.
432  something has been matched). For hard partial matching, we then return  something has been matched). For hard partial matching, we then return
433  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
434  the subject. */  the subject. */
435    
436  #define CHECK_PARTIAL()\  #define CHECK_PARTIAL()\
437    if (md->partial != 0 && eptr >= md->end_subject && eptr > mstart)\    if (md->partial != 0 && eptr >= md->end_subject && \
438      {\        eptr > md->start_used_ptr) \
439      md->hitend = TRUE;\      { \
440      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);\      md->hitend = TRUE; \
441        if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
442      }      }
443    
444  #define SCHECK_PARTIAL()\  #define SCHECK_PARTIAL()\
445    if (md->partial && eptr > mstart)\    if (md->partial != 0 && eptr > md->start_used_ptr) \
446      {\      { \
447      md->hitend = TRUE;\      md->hitend = TRUE; \
448      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);\      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
449      }      }
450    
451    
452  /* Performance note: It might be tempting to extract commonly used fields from  /* Performance note: It might be tempting to extract commonly used fields from
453  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
454  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
455  made performance worse.  made performance worse.
456    
# Line 434  Arguments: Line 461  Arguments:
461                   by encountering \K)                   by encountering \K)
462     offset_top  current top pointer     offset_top  current top pointer
463     md          pointer to "static" info for the match     md          pointer to "static" info for the match
    ims         current /i, /m, and /s options  
464     eptrb       pointer to chain of blocks containing eptr at start of     eptrb       pointer to chain of blocks containing eptr at start of
465                   brackets - for testing for empty matches                   brackets - for testing for empty matches
    flags       can contain  
                  match_condassert - this is an assertion condition  
                  match_cbegroup - this is the start of an unlimited repeat  
                    group that can match an empty string  
466     rdepth      the recursion depth     rdepth      the recursion depth
467    
468  Returns:       MATCH_MATCH if matched            )  these values are >= 0  Returns:       MATCH_MATCH if matched            )  these values are >= 0
469                 MATCH_NOMATCH if failed to match  )                 MATCH_NOMATCH if failed to match  )
470                   a negative MATCH_xxx value for PRUNE, SKIP, etc
471                 a negative PCRE_ERROR_xxx value if aborted by an error condition                 a negative PCRE_ERROR_xxx value if aborted by an error condition
472                   (e.g. stopped by repeated call or recursion limit)                   (e.g. stopped by repeated call or recursion limit)
473  */  */
474    
475  static int  static int
476  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,  match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
477    int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,    PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
478    int flags, unsigned int rdepth)    unsigned int rdepth)
479  {  {
480  /* 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,
481  so they can be ordinary variables in all cases. Mark some of them with  so they can be ordinary variables in all cases. Mark some of them with
# Line 461  so they can be ordinary variables in all Line 484  so they can be ordinary variables in all
484  register int  rrc;         /* Returns from recursive calls */  register int  rrc;         /* Returns from recursive calls */
485  register int  i;           /* Used for loops not involving calls to RMATCH() */  register int  i;           /* Used for loops not involving calls to RMATCH() */
486  register unsigned int c;   /* Character values not kept over RMATCH() calls */  register unsigned int c;   /* Character values not kept over RMATCH() calls */
487  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf;         /* Local copy of UTF flag for speed */
488    
489  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
490    BOOL caseless;
491  int condcode;  int condcode;
492    
493  /* 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
494  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
495  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
496  heap whenever RMATCH() does a "recursion". See the macro definitions above. */  whenever RMATCH() does a "recursion". See the macro definitions above. Putting
497    the top-level on the stack rather than malloc-ing them all gives a performance
498    boost in many cases where there is not much "recursion". */
499    
500  #ifdef NO_RECURSE  #ifdef NO_RECURSE
501  heapframe *frame = (pcre_stack_malloc)(sizeof(heapframe));  heapframe frame_zero;
502    heapframe *frame = &frame_zero;
503  frame->Xprevframe = NULL;            /* Marks the top level */  frame->Xprevframe = NULL;            /* Marks the top level */
504    
505  /* Copy in the original argument variables */  /* Copy in the original argument variables */
# Line 481  frame->Xeptr = eptr; Line 508  frame->Xeptr = eptr;
508  frame->Xecode = ecode;  frame->Xecode = ecode;
509  frame->Xmstart = mstart;  frame->Xmstart = mstart;
510  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
 frame->Xims = ims;  
511  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
 frame->Xflags = flags;  
512  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
513    
514  /* This is where control jumps back to to effect "recursion" */  /* This is where control jumps back to to effect "recursion" */
# Line 496  HEAP_RECURSE: Line 521  HEAP_RECURSE:
521  #define ecode              frame->Xecode  #define ecode              frame->Xecode
522  #define mstart             frame->Xmstart  #define mstart             frame->Xmstart
523  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
 #define ims                frame->Xims  
524  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
 #define flags              frame->Xflags  
525  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
526    
527  /* Ditto for the local variables */  /* Ditto for the local variables */
528    
529  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
530  #define charptr            frame->Xcharptr  #define charptr            frame->Xcharptr
531  #endif  #endif
532  #define callpat            frame->Xcallpat  #define callpat            frame->Xcallpat
# Line 520  HEAP_RECURSE: Line 543  HEAP_RECURSE:
543  #define condition          frame->Xcondition  #define condition          frame->Xcondition
544  #define prev_is_word       frame->Xprev_is_word  #define prev_is_word       frame->Xprev_is_word
545    
 #define original_ims       frame->Xoriginal_ims  
   
546  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
547  #define prop_type          frame->Xprop_type  #define prop_type          frame->Xprop_type
548  #define prop_value         frame->Xprop_value  #define prop_value         frame->Xprop_value
549  #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  
550  #define oclength           frame->Xoclength  #define oclength           frame->Xoclength
551  #define occhars            frame->Xocchars  #define occhars            frame->Xocchars
552  #endif  #endif
# Line 558  i, and fc and c, can be the same variabl Line 576  i, and fc and c, can be the same variabl
576  #define fi i  #define fi i
577  #define fc c  #define fc c
578    
579    /* Many of the following variables are used only in small blocks of the code.
580    My normal style of coding would have declared them within each of those blocks.
581    However, in order to accommodate the version of this code that uses an external
582    "stack" implemented on the heap, it is easier to declare them all here, so the
583    declarations can be cut out in a block. The only declarations within blocks
584    below are for variables that do not have to be preserved over a recursive call
585    to RMATCH(). */
586    
587    #ifdef SUPPORT_UTF
588    const pcre_uchar *charptr;
589    #endif
590    const pcre_uchar *callpat;
591    const pcre_uchar *data;
592    const pcre_uchar *next;
593    PCRE_PUCHAR       pp;
594    const pcre_uchar *prev;
595    PCRE_PUCHAR       saved_eptr;
596    
597  #ifdef SUPPORT_UTF8                /* Many of these variables are used only  */  recursion_info new_recursive;
598  const uschar *charptr;             /* in small blocks of the code. My normal */  
599  #endif                             /* style of coding would have declared    */  BOOL cur_is_word;
 const uschar *callpat;             /* them within each of those blocks.      */  
 const uschar *data;                /* However, in order to accommodate the   */  
 const uschar *next;                /* version of this code that uses an      */  
 USPTR         pp;                  /* external "stack" implemented on the    */  
 const uschar *prev;                /* heap, it is easier to declare them all */  
 USPTR         saved_eptr;          /* here, so the declarations can be cut   */  
                                    /* out in a block. The only declarations  */  
 recursion_info new_recursive;      /* within blocks below are for variables  */  
                                    /* that do not have to be preserved over  */  
 BOOL cur_is_word;                  /* a recursive call to RMATCH().          */  
600  BOOL condition;  BOOL condition;
601  BOOL prev_is_word;  BOOL prev_is_word;
602    
 unsigned long int original_ims;  
   
603  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
604  int prop_type;  int prop_type;
605  int prop_value;  int prop_value;
606  int prop_fail_result;  int prop_fail_result;
 int prop_category;  
 int prop_chartype;  
 int prop_script;  
607  int oclength;  int oclength;
608  uschar occhars[8];  pcre_uchar occhars[6];
609  #endif  #endif
610    
611  int codelink;  int codelink;
# Line 601  int save_offset1, save_offset2, save_off Line 621  int save_offset1, save_offset2, save_off
621  int stacksave[REC_STACK_SAVE_MAX];  int stacksave[REC_STACK_SAVE_MAX];
622    
623  eptrblock newptrb;  eptrblock newptrb;
624    
625    /* There is a special fudge for calling match() in a way that causes it to
626    measure the size of its basic stack frame when the stack is being used for
627    recursion. The second argument (ecode) being NULL triggers this behaviour. It
628    cannot normally ever be NULL. The return is the negated value of the frame
629    size. */
630    
631    if (ecode == NULL)
632      {
633      if (rdepth == 0)
634        return match((PCRE_PUCHAR)&rdepth, NULL, NULL, 0, NULL, NULL, 1);
635      else
636        {
637        int len = (char *)&rdepth - (char *)eptr;
638        return (len > 0)? -len : len;
639        }
640      }
641  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
642    
643    /* To save space on the stack and in the heap frame, I have doubled up on some
644    of the local variables that are used only in localised parts of the code, but
645    still need to be preserved over recursive calls of match(). These macros define
646    the alternative names that are used. */
647    
648    #define allow_zero    cur_is_word
649    #define cbegroup      condition
650    #define code_offset   codelink
651    #define condassert    condition
652    #define matched_once  prev_is_word
653    #define foc           number
654    #define save_mark     data
655    
656  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
657  variables. */  variables. */
658    
# Line 622  TAIL_RECURSE: Line 672  TAIL_RECURSE:
672  /* OK, now we can get on with the real code of the function. Recursive calls  /* OK, now we can get on with the real code of the function. Recursive calls
673  are specified by the macro RMATCH and RRETURN is used to return. When  are specified by the macro RMATCH and RRETURN is used to return. When
674  NO_RECURSE is *not* defined, these just turn into a recursive call to match()  NO_RECURSE is *not* defined, these just turn into a recursive call to match()
675  and a "return", respectively (possibly with some debugging if DEBUG is  and a "return", respectively (possibly with some debugging if PCRE_DEBUG is
676  defined). However, RMATCH isn't like a function call because it's quite a  defined). However, RMATCH isn't like a function call because it's quite a
677  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,
678  however, impact performance when true recursion is being used. */  however, impact performance when true recursion is being used. */
679    
680  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
681  utf8 = md->utf8;       /* Local copy of the flag */  utf = md->utf;       /* Local copy of the flag */
682  #else  #else
683  utf8 = FALSE;  utf = FALSE;
684  #endif  #endif
685    
686  /* 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 639  haven't exceeded the recursive call limi Line 689  haven't exceeded the recursive call limi
689  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);
690  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
691    
 original_ims = ims;    /* Save for resetting on ')' */  
   
692  /* 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
693  string, the match_cbegroup flag is set. When this is the case, add the current  string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is
694  subject pointer to the chain of such remembered pointers, to be checked when we  done this way to save having to use another function argument, which would take
695  hit the closing ket, in order to break infinite loops that match no characters.  up space on the stack. See also MATCH_CONDASSERT below.
696  When match() is called in other circumstances, don't add to the chain. The  
697  match_cbegroup flag must NOT be used with tail recursion, because the memory  When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
698  block that is used is on the stack, so a new one may be required for each  such remembered pointers, to be checked when we hit the closing ket, in order
699  match(). */  to break infinite loops that match no characters. When match() is called in
700    other circumstances, don't add to the chain. The MATCH_CBEGROUP feature must
701    NOT be used with tail recursion, because the memory block that is used is on
702    the stack, so a new one may be required for each match(). */
703    
704  if ((flags & match_cbegroup) != 0)  if (md->match_function_type == MATCH_CBEGROUP)
705    {    {
706    newptrb.epb_saved_eptr = eptr;    newptrb.epb_saved_eptr = eptr;
707    newptrb.epb_prev = eptrb;    newptrb.epb_prev = eptrb;
708    eptrb = &newptrb;    eptrb = &newptrb;
709      md->match_function_type = 0;
710    }    }
711    
712  /* Now start processing the opcodes. */  /* Now start processing the opcodes. */
# Line 666  for (;;) Line 718  for (;;)
718    
719    switch(op)    switch(op)
720      {      {
721        case OP_MARK:
722        md->nomatch_mark = ecode + 2;
723        md->mark = NULL;    /* In case previously set by assertion */
724        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
725          eptrb, RM55);
726        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
727             md->mark == NULL) md->mark = ecode + 2;
728    
729        /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
730        argument, and we must check whether that argument matches this MARK's
731        argument. It is passed back in md->start_match_ptr (an overloading of that
732        variable). If it does match, we reset that variable to the current subject
733        position and return MATCH_SKIP. Otherwise, pass back the return code
734        unaltered. */
735    
736        else if (rrc == MATCH_SKIP_ARG &&
737            STRCMP_UC_UC(ecode + 2, md->start_match_ptr) == 0)
738          {
739          md->start_match_ptr = eptr;
740          RRETURN(MATCH_SKIP);
741          }
742        RRETURN(rrc);
743    
744      case OP_FAIL:      case OP_FAIL:
745      RRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
746    
747      case OP_PRUNE:      /* COMMIT overrides PRUNE, SKIP, and THEN */
     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,  
       ims, eptrb, flags, RM51);  
     if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
     RRETURN(MATCH_PRUNE);  
748    
749      case OP_COMMIT:      case OP_COMMIT:
750      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
751        ims, eptrb, flags, RM52);        eptrb, RM52);
752      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
753            rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
754            rrc != MATCH_THEN)
755          RRETURN(rrc);
756      RRETURN(MATCH_COMMIT);      RRETURN(MATCH_COMMIT);
757    
758        /* PRUNE overrides THEN */
759    
760        case OP_PRUNE:
761        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
762          eptrb, RM51);
763        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
764        RRETURN(MATCH_PRUNE);
765    
766        case OP_PRUNE_ARG:
767        md->nomatch_mark = ecode + 2;
768        md->mark = NULL;    /* In case previously set by assertion */
769        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
770          eptrb, RM56);
771        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
772             md->mark == NULL) md->mark = ecode + 2;
773        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
774        RRETURN(MATCH_PRUNE);
775    
776        /* SKIP overrides PRUNE and THEN */
777    
778      case OP_SKIP:      case OP_SKIP:
779      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
780        ims, eptrb, flags, RM53);        eptrb, RM53);
781      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
782          RRETURN(rrc);
783      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
784      RRETURN(MATCH_SKIP);      RRETURN(MATCH_SKIP);
785    
786        /* Note that, for Perl compatibility, SKIP with an argument does NOT set
787        nomatch_mark. There is a flag that disables this opcode when re-matching a
788        pattern that ended with a SKIP for which there was not a matching MARK. */
789    
790        case OP_SKIP_ARG:
791        if (md->ignore_skip_arg)
792          {
793          ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
794          break;
795          }
796        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
797          eptrb, RM57);
798        if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
799          RRETURN(rrc);
800    
801        /* Pass back the current skip name by overloading md->start_match_ptr and
802        returning the special MATCH_SKIP_ARG return code. This will either be
803        caught by a matching MARK, or get to the top, where it causes a rematch
804        with the md->ignore_skip_arg flag set. */
805    
806        md->start_match_ptr = ecode + 2;
807        RRETURN(MATCH_SKIP_ARG);
808    
809        /* For THEN (and THEN_ARG) we pass back the address of the opcode, so that
810        the branch in which it occurs can be determined. Overload the start of
811        match pointer to do this. */
812    
813      case OP_THEN:      case OP_THEN:
814      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
815        ims, eptrb, flags, RM54);        eptrb, RM54);
816      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
817        md->start_match_ptr = ecode;
818      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
819    
820      /* Handle a capturing bracket. If there is space in the offset vector, save      case OP_THEN_ARG:
821      the current subject position in the working slot at the top of the vector.      md->nomatch_mark = ecode + 2;
822      We mustn't change the current values of the data slot, because they may be      md->mark = NULL;    /* In case previously set by assertion */
823      set from a previous iteration of this group, and be referred to by a      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top,
824      reference inside the group.        md, eptrb, RM58);
825        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
826      If the bracket fails to match, we need to restore this value and also the           md->mark == NULL) md->mark = ecode + 2;
827      values of the final offsets, in case they were set by a previous iteration      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
828      of the same bracket.      md->start_match_ptr = ecode;
829        RRETURN(MATCH_THEN);
830    
831        /* Handle an atomic group that does not contain any capturing parentheses.
832        This can be handled like an assertion. Prior to 8.13, all atomic groups
833        were handled this way. In 8.13, the code was changed as below for ONCE, so
834        that backups pass through the group and thereby reset captured values.
835        However, this uses a lot more stack, so in 8.20, atomic groups that do not
836        contain any captures generate OP_ONCE_NC, which can be handled in the old,
837        less stack intensive way.
838    
839        Check the alternative branches in turn - the matching won't pass the KET
840        for this kind of subpattern. If any one branch matches, we carry on as at
841        the end of a normal bracket, leaving the subject pointer, but resetting
842        the start-of-match value in case it was changed by \K. */
843    
844        case OP_ONCE_NC:
845        prev = ecode;
846        saved_eptr = eptr;
847        save_mark = md->mark;
848        do
849          {
850          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
851          if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
852            {
853            mstart = md->start_match_ptr;
854            break;
855            }
856          if (rrc == MATCH_THEN)
857            {
858            next = ecode + GET(ecode,1);
859            if (md->start_match_ptr < next &&
860                (*ecode == OP_ALT || *next == OP_ALT))
861              rrc = MATCH_NOMATCH;
862            }
863    
864          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
865          ecode += GET(ecode,1);
866          md->mark = save_mark;
867          }
868        while (*ecode == OP_ALT);
869    
870        /* If hit the end of the group (which could be repeated), fail */
871    
872        if (*ecode != OP_ONCE_NC && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
873    
874        /* Continue as from after the group, updating the offsets high water
875        mark, since extracts may have been taken. */
876    
877        do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
878    
879        offset_top = md->end_offset_top;
880        eptr = md->end_match_ptr;
881    
882        /* For a non-repeating ket, just continue at this level. This also
883        happens for a repeating ket if no characters were matched in the group.
884        This is the forcible breaking of infinite loops as implemented in Perl
885        5.005. */
886    
887        if (*ecode == OP_KET || eptr == saved_eptr)
888          {
889          ecode += 1+LINK_SIZE;
890          break;
891          }
892    
893        /* The repeating kets try the rest of the pattern or restart from the
894        preceding bracket, in the appropriate order. The second "call" of match()
895        uses tail recursion, to avoid using another stack frame. */
896    
897        if (*ecode == OP_KETRMIN)
898          {
899          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM65);
900          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
901          ecode = prev;
902          goto TAIL_RECURSE;
903          }
904        else  /* OP_KETRMAX */
905          {
906          md->match_function_type = MATCH_CBEGROUP;
907          RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
908          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
909          ecode += 1 + LINK_SIZE;
910          goto TAIL_RECURSE;
911          }
912        /* Control never gets here */
913    
914        /* Handle a capturing bracket, other than those that are possessive with an
915        unlimited repeat. If there is space in the offset vector, save the current
916        subject position in the working slot at the top of the vector. We mustn't
917        change the current values of the data slot, because they may be set from a
918        previous iteration of this group, and be referred to by a reference inside
919        the group. A failure to match might occur after the group has succeeded,
920        if something later on doesn't match. For this reason, we need to restore
921        the working value and also the values of the final offsets, in case they
922        were set by a previous iteration of the same bracket.
923    
924      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
925      a non-capturing bracket. Don't worry about setting the flag for the error      a non-capturing bracket. Don't worry about setting the flag for the error
# Line 713  for (;;) Line 930  for (;;)
930      number = GET2(ecode, 1+LINK_SIZE);      number = GET2(ecode, 1+LINK_SIZE);
931      offset = number << 1;      offset = number << 1;
932    
933  #ifdef DEBUG  #ifdef PCRE_DEBUG
934      printf("start bracket %d\n", number);      printf("start bracket %d\n", number);
935      printf("subject=");      printf("subject=");
936      pchars(eptr, 16, TRUE, md);      pchars(eptr, 16, TRUE, md);
# Line 726  for (;;) Line 943  for (;;)
943        save_offset2 = md->offset_vector[offset+1];        save_offset2 = md->offset_vector[offset+1];
944        save_offset3 = md->offset_vector[md->offset_end - number];        save_offset3 = md->offset_vector[md->offset_end - number];
945        save_capture_last = md->capture_last;        save_capture_last = md->capture_last;
946          save_mark = md->mark;
947    
948        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
949        md->offset_vector[md->offset_end - number] = eptr - md->start_subject;        md->offset_vector[md->offset_end - number] =
950            (int)(eptr - md->start_subject);
951    
952        flags = (op == OP_SCBRA)? match_cbegroup : 0;        for (;;)
       do  
953          {          {
954          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
955            ims, eptrb, flags, RM1);          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
956          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);            eptrb, RM1);
957            if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
958    
959            /* If we backed up to a THEN, check whether it is within the current
960            branch by comparing the address of the THEN that is passed back with
961            the end of the branch. If it is within the current branch, and the
962            branch is one of two or more alternatives (it either starts or ends
963            with OP_ALT), we have reached the limit of THEN's action, so convert
964            the return code to NOMATCH, which will cause normal backtracking to
965            happen from now on. Otherwise, THEN is passed back to an outer
966            alternative. This implements Perl's treatment of parenthesized groups,
967            where a group not containing | does not affect the current alternative,
968            that is, (X) is NOT the same as (X|(*F)). */
969    
970            if (rrc == MATCH_THEN)
971              {
972              next = ecode + GET(ecode,1);
973              if (md->start_match_ptr < next &&
974                  (*ecode == OP_ALT || *next == OP_ALT))
975                rrc = MATCH_NOMATCH;
976              }
977    
978            /* Anything other than NOMATCH is passed back. */
979    
980            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
981          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
982          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
983            md->mark = save_mark;
984            if (*ecode != OP_ALT) break;
985          }          }
       while (*ecode == OP_ALT);  
986    
987        DPRINTF(("bracket %d failed\n", number));        DPRINTF(("bracket %d failed\n", number));
   
988        md->offset_vector[offset] = save_offset1;        md->offset_vector[offset] = save_offset1;
989        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
990        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
991    
992        RRETURN(MATCH_NOMATCH);        /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
993    
994          RRETURN(rrc);
995        }        }
996    
997      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
# Line 761  for (;;) Line 1005  for (;;)
1005      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1006      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1007    
1008      /* Non-capturing bracket. Loop for all the alternatives. When we get to the      /* Non-capturing or atomic group, except for possessive with unlimited
1009      final alternative within the brackets, we would return the result of a      repeat and ONCE group with no captures. Loop for all the alternatives.
1010      recursive call to match() whatever happened. We can reduce stack usage by  
1011      turning this into a tail recursion, except in the case when match_cbegroup      When we get to the final alternative within the brackets, we used to return
1012      is set.*/      the result of a recursive call to match() whatever happened so it was
1013        possible to reduce stack usage by turning this into a tail recursion,
1014        except in the case of a possibly empty group. However, now that there is
1015        the possiblity of (*THEN) occurring in the final alternative, this
1016        optimization is no longer always possible.
1017    
1018        We can optimize if we know there are no (*THEN)s in the pattern; at present
1019        this is the best that can be done.
1020    
1021        MATCH_ONCE is returned when the end of an atomic group is successfully
1022        reached, but subsequent matching fails. It passes back up the tree (causing
1023        captured values to be reset) until the original atomic group level is
1024        reached. This is tested by comparing md->once_target with the start of the
1025        group. At this point, the return is converted into MATCH_NOMATCH so that
1026        previous backup points can be taken. */
1027    
1028        case OP_ONCE:
1029      case OP_BRA:      case OP_BRA:
1030      case OP_SBRA:      case OP_SBRA:
1031      DPRINTF(("start non-capturing bracket\n"));      DPRINTF(("start non-capturing bracket\n"));
1032      flags = (op >= OP_SBRA)? match_cbegroup : 0;  
1033      for (;;)      for (;;)
1034        {        {
1035        if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */        if (op >= OP_SBRA || op == OP_ONCE) md->match_function_type = MATCH_CBEGROUP;
1036    
1037          /* If this is not a possibly empty group, and there are no (*THEN)s in
1038          the pattern, and this is the final alternative, optimize as described
1039          above. */
1040    
1041          else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
1042          {          {
1043          if (flags == 0)    /* Not a possibly empty group */          ecode += PRIV(OP_lengths)[*ecode];
1044            goto TAIL_RECURSE;
1045            }
1046    
1047          /* In all other cases, we have to make another call to match(). */
1048    
1049          save_mark = md->mark;
1050          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
1051            RM2);
1052    
1053          /* See comment in the code for capturing groups above about handling
1054          THEN. */
1055    
1056          if (rrc == MATCH_THEN)
1057            {
1058            next = ecode + GET(ecode,1);
1059            if (md->start_match_ptr < next &&
1060                (*ecode == OP_ALT || *next == OP_ALT))
1061              rrc = MATCH_NOMATCH;
1062            }
1063    
1064          if (rrc != MATCH_NOMATCH)
1065            {
1066            if (rrc == MATCH_ONCE)
1067            {            {
1068            ecode += _pcre_OP_lengths[*ecode];            const pcre_uchar *scode = ecode;
1069            DPRINTF(("bracket 0 tail recursion\n"));            if (*scode != OP_ONCE)           /* If not at start, find it */
1070            goto TAIL_RECURSE;              {
1071                while (*scode == OP_ALT) scode += GET(scode, 1);
1072                scode -= GET(scode, 1);
1073                }
1074              if (md->once_target == scode) rrc = MATCH_NOMATCH;
1075            }            }
1076            RRETURN(rrc);
1077            }
1078          ecode += GET(ecode, 1);
1079          md->mark = save_mark;
1080          if (*ecode != OP_ALT) break;
1081          }
1082    
1083          /* Possibly empty group; can't use tail recursion. */      RRETURN(MATCH_NOMATCH);
1084    
1085          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,      /* Handle possessive capturing brackets with an unlimited repeat. We come
1086            eptrb, flags, RM48);      here from BRAZERO with allow_zero set TRUE. The offset_vector values are
1087          RRETURN(rrc);      handled similarly to the normal case above. However, the matching is
1088        different. The end of these brackets will always be OP_KETRPOS, which
1089        returns MATCH_KETRPOS without going further in the pattern. By this means
1090        we can handle the group by iteration rather than recursion, thereby
1091        reducing the amount of stack needed. */
1092    
1093        case OP_CBRAPOS:
1094        case OP_SCBRAPOS:
1095        allow_zero = FALSE;
1096    
1097        POSSESSIVE_CAPTURE:
1098        number = GET2(ecode, 1+LINK_SIZE);
1099        offset = number << 1;
1100    
1101    #ifdef PCRE_DEBUG
1102        printf("start possessive bracket %d\n", number);
1103        printf("subject=");
1104        pchars(eptr, 16, TRUE, md);
1105        printf("\n");
1106    #endif
1107    
1108        if (offset < md->offset_max)
1109          {
1110          matched_once = FALSE;
1111          code_offset = (int)(ecode - md->start_code);
1112    
1113          save_offset1 = md->offset_vector[offset];
1114          save_offset2 = md->offset_vector[offset+1];
1115          save_offset3 = md->offset_vector[md->offset_end - number];
1116          save_capture_last = md->capture_last;
1117    
1118          DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
1119    
1120          /* Each time round the loop, save the current subject position for use
1121          when the group matches. For MATCH_MATCH, the group has matched, so we
1122          restart it with a new subject starting position, remembering that we had
1123          at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
1124          usual. If we haven't matched any alternatives in any iteration, check to
1125          see if a previous iteration matched. If so, the group has matched;
1126          continue from afterwards. Otherwise it has failed; restore the previous
1127          capture values before returning NOMATCH. */
1128    
1129          for (;;)
1130            {
1131            md->offset_vector[md->offset_end - number] =
1132              (int)(eptr - md->start_subject);
1133            if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1134            RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1135              eptrb, RM63);
1136            if (rrc == MATCH_KETRPOS)
1137              {
1138              offset_top = md->end_offset_top;
1139              eptr = md->end_match_ptr;
1140              ecode = md->start_code + code_offset;
1141              save_capture_last = md->capture_last;
1142              matched_once = TRUE;
1143              continue;
1144              }
1145    
1146            /* See comment in the code for capturing groups above about handling
1147            THEN. */
1148    
1149            if (rrc == MATCH_THEN)
1150              {
1151              next = ecode + GET(ecode,1);
1152              if (md->start_match_ptr < next &&
1153                  (*ecode == OP_ALT || *next == OP_ALT))
1154                rrc = MATCH_NOMATCH;
1155              }
1156    
1157            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1158            md->capture_last = save_capture_last;
1159            ecode += GET(ecode, 1);
1160            if (*ecode != OP_ALT) break;
1161            }
1162    
1163          if (!matched_once)
1164            {
1165            md->offset_vector[offset] = save_offset1;
1166            md->offset_vector[offset+1] = save_offset2;
1167            md->offset_vector[md->offset_end - number] = save_offset3;
1168          }          }
1169    
1170        /* For non-final alternatives, continue the loop for a NOMATCH result;        if (allow_zero || matched_once)
1171        otherwise return. */          {
1172            ecode += 1 + LINK_SIZE;
1173            break;
1174            }
1175    
1176        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,        RRETURN(MATCH_NOMATCH);
1177          eptrb, flags, RM2);        }
1178        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);  
1179        /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
1180        as a non-capturing bracket. */
1181    
1182        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1183        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1184    
1185        DPRINTF(("insufficient capture room: treat as non-capturing\n"));
1186    
1187        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1188        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1189    
1190        /* Non-capturing possessive bracket with unlimited repeat. We come here
1191        from BRAZERO with allow_zero = TRUE. The code is similar to the above,
1192        without the capturing complication. It is written out separately for speed
1193        and cleanliness. */
1194    
1195        case OP_BRAPOS:
1196        case OP_SBRAPOS:
1197        allow_zero = FALSE;
1198    
1199        POSSESSIVE_NON_CAPTURE:
1200        matched_once = FALSE;
1201        code_offset = (int)(ecode - md->start_code);
1202    
1203        for (;;)
1204          {
1205          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1206          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1207            eptrb, RM48);
1208          if (rrc == MATCH_KETRPOS)
1209            {
1210            offset_top = md->end_offset_top;
1211            eptr = md->end_match_ptr;
1212            ecode = md->start_code + code_offset;
1213            matched_once = TRUE;
1214            continue;
1215            }
1216    
1217          /* See comment in the code for capturing groups above about handling
1218          THEN. */
1219    
1220          if (rrc == MATCH_THEN)
1221            {
1222            next = ecode + GET(ecode,1);
1223            if (md->start_match_ptr < next &&
1224                (*ecode == OP_ALT || *next == OP_ALT))
1225              rrc = MATCH_NOMATCH;
1226            }
1227    
1228          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1229        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1230          if (*ecode != OP_ALT) break;
1231        }        }
1232    
1233        if (matched_once || allow_zero)
1234          {
1235          ecode += 1 + LINK_SIZE;
1236          break;
1237          }
1238        RRETURN(MATCH_NOMATCH);
1239    
1240      /* Control never reaches here. */      /* Control never reaches here. */
1241    
1242      /* Conditional group: compilation checked that there are no more than      /* Conditional group: compilation checked that there are no more than
1243      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
1244      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
1245      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. */  
1246    
1247      case OP_COND:      case OP_COND:
1248      case OP_SCOND:      case OP_SCOND:
1249      codelink= GET(ecode, 1);      codelink = GET(ecode, 1);
1250    
1251      /* Because of the way auto-callout works during compile, a callout item is      /* Because of the way auto-callout works during compile, a callout item is
1252      inserted between OP_COND and an assertion condition. */      inserted between OP_COND and an assertion condition. */
1253    
1254      if (ecode[LINK_SIZE+1] == OP_CALLOUT)      if (ecode[LINK_SIZE+1] == OP_CALLOUT)
1255        {        {
1256        if (pcre_callout != NULL)        if (PUBL(callout) != NULL)
1257          {          {
1258          pcre_callout_block cb;          PUBL(callout_block) cb;
1259          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 2;   /* Version 1 of the callout block */
1260          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[LINK_SIZE+2];
1261          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1262    #ifdef COMPILE_PCRE8
1263          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
1264          cb.subject_length   = md->end_subject - md->start_subject;  #else
1265          cb.start_match      = mstart - md->start_subject;          cb.subject          = (PCRE_SPTR16)md->start_subject;
1266          cb.current_position = eptr - md->start_subject;  #endif
1267            cb.subject_length   = (int)(md->end_subject - md->start_subject);
1268            cb.start_match      = (int)(mstart - md->start_subject);
1269            cb.current_position = (int)(eptr - md->start_subject);
1270          cb.pattern_position = GET(ecode, LINK_SIZE + 3);          cb.pattern_position = GET(ecode, LINK_SIZE + 3);
1271          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);
1272          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1273          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last;
1274          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1275          if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);          cb.mark             = md->nomatch_mark;
1276            if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1277          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1278          }          }
1279        ecode += _pcre_OP_lengths[OP_CALLOUT];        ecode += PRIV(OP_lengths)[OP_CALLOUT];
1280        }        }
1281    
1282      condcode = ecode[LINK_SIZE+1];      condcode = ecode[LINK_SIZE+1];
# Line 849  for (;;) Line 1293  for (;;)
1293        else        else
1294          {          {
1295          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
1296          condition =  (recno == RREF_ANY || recno == md->recursive->group_num);          condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1297    
1298          /* 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
1299          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
1300          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
1301          if any one is set. */          if any one is set. */
1302    
1303          if (!condition && condcode == OP_NRREF && recno != RREF_ANY)          if (!condition && condcode == OP_NRREF)
1304            {            {
1305            uschar *slotA = md->name_table;            pcre_uchar *slotA = md->name_table;
1306            for (i = 0; i < md->name_count; i++)            for (i = 0; i < md->name_count; i++)
1307              {              {
1308              if (GET2(slotA, 0) == recno) break;              if (GET2(slotA, 0) == recno) break;
# Line 871  for (;;) Line 1315  for (;;)
1315    
1316            if (i < md->name_count)            if (i < md->name_count)
1317              {              {
1318              uschar *slotB = slotA;              pcre_uchar *slotB = slotA;
1319              while (slotB > md->name_table)              while (slotB > md->name_table)
1320                {                {
1321                slotB -= md->name_entry_size;                slotB -= md->name_entry_size;
1322                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1323                  {                  {
1324                  condition = GET2(slotB, 0) == md->recursive->group_num;                  condition = GET2(slotB, 0) == md->recursive->group_num;
1325                  if (condition) break;                  if (condition) break;
# Line 891  for (;;) Line 1335  for (;;)
1335                for (i++; i < md->name_count; i++)                for (i++; i < md->name_count; i++)
1336                  {                  {
1337                  slotB += md->name_entry_size;                  slotB += md->name_entry_size;
1338                  if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                  if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1339                    {                    {
1340                    condition = GET2(slotB, 0) == md->recursive->group_num;                    condition = GET2(slotB, 0) == md->recursive->group_num;
1341                    if (condition) break;                    if (condition) break;
# Line 904  for (;;) Line 1348  for (;;)
1348    
1349          /* Chose branch according to the condition */          /* Chose branch according to the condition */
1350    
1351          ecode += condition? 3 : GET(ecode, 1);          ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1352          }          }
1353        }        }
1354    
# Line 921  for (;;) Line 1365  for (;;)
1365        if (!condition && condcode == OP_NCREF)        if (!condition && condcode == OP_NCREF)
1366          {          {
1367          int refno = offset >> 1;          int refno = offset >> 1;
1368          uschar *slotA = md->name_table;          pcre_uchar *slotA = md->name_table;
1369    
1370          for (i = 0; i < md->name_count; i++)          for (i = 0; i < md->name_count; i++)
1371            {            {
# Line 935  for (;;) Line 1379  for (;;)
1379    
1380          if (i < md->name_count)          if (i < md->name_count)
1381            {            {
1382            uschar *slotB = slotA;            pcre_uchar *slotB = slotA;
1383            while (slotB > md->name_table)            while (slotB > md->name_table)
1384              {              {
1385              slotB -= md->name_entry_size;              slotB -= md->name_entry_size;
1386              if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)              if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1387                {                {
1388                offset = GET2(slotB, 0) << 1;                offset = GET2(slotB, 0) << 1;
1389                condition = offset < offset_top &&                condition = offset < offset_top &&
# Line 957  for (;;) Line 1401  for (;;)
1401              for (i++; i < md->name_count; i++)              for (i++; i < md->name_count; i++)
1402                {                {
1403                slotB += md->name_entry_size;                slotB += md->name_entry_size;
1404                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1405                  {                  {
1406                  offset = GET2(slotB, 0) << 1;                  offset = GET2(slotB, 0) << 1;
1407                  condition = offset < offset_top &&                  condition = offset < offset_top &&
# Line 972  for (;;) Line 1416  for (;;)
1416    
1417        /* Chose branch according to the condition */        /* Chose branch according to the condition */
1418    
1419        ecode += condition? 3 : GET(ecode, 1);        ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1420        }        }
1421    
1422      else if (condcode == OP_DEF)     /* DEFINE - always false */      else if (condcode == OP_DEF)     /* DEFINE - always false */
# Line 982  for (;;) Line 1426  for (;;)
1426        }        }
1427    
1428      /* The condition is an assertion. Call match() to evaluate it - setting      /* The condition is an assertion. Call match() to evaluate it - setting
1429      the final argument match_condassert causes it to stop at the end of an      md->match_function_type to MATCH_CONDASSERT causes it to stop at the end of
1430      assertion. */      an assertion. */
1431    
1432      else      else
1433        {        {
1434        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,        md->match_function_type = MATCH_CONDASSERT;
1435            match_condassert, RM3);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);
1436        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
1437          {          {
1438            if (md->end_offset_top > offset_top)
1439              offset_top = md->end_offset_top;  /* Captures may have happened */
1440          condition = TRUE;          condition = TRUE;
1441          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
1442          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1443          }          }
1444    
1445          /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
1446          assertion; it is therefore treated as NOMATCH. */
1447    
1448        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1449          {          {
1450          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
# Line 1006  for (;;) Line 1456  for (;;)
1456          }          }
1457        }        }
1458    
1459      /* 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
1460      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
1461      match_cbegroup is required for an unlimited repeat of a possibly empty      unlimited repeat of a possibly empty group. In the latter case, a recursive
1462      group. If the second alternative doesn't exist, we can just plough on. */      call to match() is always required, unless the second alternative doesn't
1463        exist, in which case we can just plough on. Note that, for compatibility
1464        with Perl, the | in a conditional group is NOT treated as creating two
1465        alternatives. If a THEN is encountered in the branch, it propagates out to
1466        the enclosing alternative (unless nested in a deeper set of alternatives,
1467        of course). */
1468    
1469      if (condition || *ecode == OP_ALT)      if (condition || *ecode == OP_ALT)
1470        {        {
1471        ecode += 1 + LINK_SIZE;        if (op != OP_SCOND)
       if (op == OP_SCOND)        /* Possibly empty group */  
         {  
         RMATCH(eptr, ecode, offset_top, md, ims, eptrb, match_cbegroup, RM49);  
         RRETURN(rrc);  
         }  
       else                       /* Group must match something */  
1472          {          {
1473          flags = 0;          ecode += 1 + LINK_SIZE;
1474          goto TAIL_RECURSE;          goto TAIL_RECURSE;
1475          }          }
1476    
1477          md->match_function_type = MATCH_CBEGROUP;
1478          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
1479          RRETURN(rrc);
1480        }        }
1481      else                         /* Condition false & no alternative */  
1482         /* Condition false & no alternative; continue after the group. */
1483    
1484        else
1485        {        {
1486        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1487        }        }
# Line 1039  for (;;) Line 1495  for (;;)
1495      number = GET2(ecode, 1);      number = GET2(ecode, 1);
1496      offset = number << 1;      offset = number << 1;
1497    
1498  #ifdef DEBUG  #ifdef PCRE_DEBUG
1499        printf("end bracket %d at *ACCEPT", number);        printf("end bracket %d at *ACCEPT", number);
1500        printf("\n");        printf("\n");
1501  #endif  #endif
# Line 1049  for (;;) Line 1505  for (;;)
1505        {        {
1506        md->offset_vector[offset] =        md->offset_vector[offset] =
1507          md->offset_vector[md->offset_end - number];          md->offset_vector[md->offset_end - number];
1508        md->offset_vector[offset+1] = eptr - md->start_subject;        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1509        if (offset_top <= offset) offset_top = offset + 2;        if (offset_top <= offset) offset_top = offset + 2;
1510        }        }
1511      ecode += 3;      ecode += 1 + IMM2_SIZE;
1512      break;      break;
1513    
1514    
1515      /* 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. */  
1516    
     case OP_ACCEPT:  
1517      case OP_END:      case OP_END:
1518      if (md->recursive != NULL && md->recursive->group_num == 0)      case OP_ACCEPT:
1519        {      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;  
       mstart = rec->save_start;  
       ims = original_ims;  
       ecode = rec->after_call;  
       break;  
       }  
1520    
1521      /* 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
1522      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
1523      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,
1524      if any. */      backtracking will then try other alternatives, if any. */
1525    
1526      if (eptr == mstart &&      if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
1527          (md->notempty ||           md->recursive == NULL &&
1528            (md->notempty_atstart &&           (md->notempty ||
1529              mstart == md->start_subject + md->start_offset)))             (md->notempty_atstart &&
1530                 mstart == md->start_subject + md->start_offset)))
1531        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1532    
1533      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
# Line 1092  for (;;) Line 1535  for (;;)
1535      md->end_match_ptr = eptr;           /* Record where we ended */      md->end_match_ptr = eptr;           /* Record where we ended */
1536      md->end_offset_top = offset_top;    /* and how many extracts were taken */      md->end_offset_top = offset_top;    /* and how many extracts were taken */
1537      md->start_match_ptr = mstart;       /* and the start (\K can modify) */      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
     RRETURN(MATCH_MATCH);  
1538    
1539      /* Change option settings */      /* For some reason, the macros don't work properly if an expression is
1540        given as the argument to RRETURN when the heap is in use. */
1541    
1542      case OP_OPT:      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1543      ims = ecode[1];      RRETURN(rrc);
     ecode += 2;  
     DPRINTF(("ims set to %02lx\n", ims));  
     break;  
1544    
1545      /* Assertion brackets. Check the alternative branches in turn - the      /* Assertion brackets. Check the alternative branches in turn - the
1546      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,
1547      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
1548      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
1549      this level is identical to the lookahead case. */      this level is identical to the lookahead case. When the assertion is part
1550        of a condition, we want to return immediately afterwards. The caller of
1551        this incarnation of the match() function will have set MATCH_CONDASSERT in
1552        md->match_function type, and one of these opcodes will be the first opcode
1553        that is processed. We use a local variable that is preserved over calls to
1554        match() to remember this case. */
1555    
1556      case OP_ASSERT:      case OP_ASSERT:
1557      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1558        save_mark = md->mark;
1559        if (md->match_function_type == MATCH_CONDASSERT)
1560          {
1561          condassert = TRUE;
1562          md->match_function_type = 0;
1563          }
1564        else condassert = FALSE;
1565    
1566      do      do
1567        {        {
1568        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
1569          RM4);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1570        if (rrc == MATCH_MATCH) break;          {
1571            mstart = md->start_match_ptr;   /* In case \K reset it */
1572            break;
1573            }
1574    
1575          /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1576          as NOMATCH. */
1577    
1578        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1579        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1580          md->mark = save_mark;
1581        }        }
1582      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1583    
1584      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
1585    
1586      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1587    
1588      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);
1589    
1590      /* Continue from after the assertion, updating the offsets high water      /* Continue from after the assertion, updating the offsets high water
1591      mark, since extracts may have been taken during the assertion. */      mark, since extracts may have been taken during the assertion. */
# Line 1133  for (;;) Line 1595  for (;;)
1595      offset_top = md->end_offset_top;      offset_top = md->end_offset_top;
1596      continue;      continue;
1597    
1598      /* Negative assertion: all branches must fail to match */      /* Negative assertion: all branches must fail to match. Encountering SKIP,
1599        PRUNE, or COMMIT means we must assume failure without checking subsequent
1600        branches. */
1601    
1602      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1603      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1604        save_mark = md->mark;
1605        if (md->match_function_type == MATCH_CONDASSERT)
1606          {
1607          condassert = TRUE;
1608          md->match_function_type = 0;
1609          }
1610        else condassert = FALSE;
1611    
1612      do      do
1613        {        {
1614        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1615          RM5);        md->mark = save_mark;
1616        if (rrc == MATCH_MATCH) RRETURN(MATCH_NOMATCH);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) RRETURN(MATCH_NOMATCH);
1617          if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1618            {
1619            do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1620            break;
1621            }
1622    
1623          /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1624          as NOMATCH. */
1625    
1626        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1627        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1628        }        }
1629      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1630    
1631      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1632    
1633      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1634      continue;      continue;
# Line 1158  for (;;) Line 1639  for (;;)
1639      back a number of characters, not bytes. */      back a number of characters, not bytes. */
1640    
1641      case OP_REVERSE:      case OP_REVERSE:
1642  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1643      if (utf8)      if (utf)
1644        {        {
1645        i = GET(ecode, 1);        i = GET(ecode, 1);
1646        while (i-- > 0)        while (i-- > 0)
# Line 1190  for (;;) Line 1671  for (;;)
1671      function is able to force a failure. */      function is able to force a failure. */
1672    
1673      case OP_CALLOUT:      case OP_CALLOUT:
1674      if (pcre_callout != NULL)      if (PUBL(callout) != NULL)
1675        {        {
1676        pcre_callout_block cb;        PUBL(callout_block) cb;
1677        cb.version          = 1;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1678        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1679        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1680    #ifdef COMPILE_PCRE8
1681        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
1682        cb.subject_length   = md->end_subject - md->start_subject;  #else
1683        cb.start_match      = mstart - md->start_subject;        cb.subject          = (PCRE_SPTR16)md->start_subject;
1684        cb.current_position = eptr - md->start_subject;  #endif
1685          cb.subject_length   = (int)(md->end_subject - md->start_subject);
1686          cb.start_match      = (int)(mstart - md->start_subject);
1687          cb.current_position = (int)(eptr - md->start_subject);
1688        cb.pattern_position = GET(ecode, 2);        cb.pattern_position = GET(ecode, 2);
1689        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
1690        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1691        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last;
1692        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1693        if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);        cb.mark             = md->nomatch_mark;
1694          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1695        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1696        }        }
1697      ecode += 2 + 2*LINK_SIZE;      ecode += 2 + 2*LINK_SIZE;
# Line 1215  for (;;) Line 1701  for (;;)
1701      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
1702      whole pattern. (This is so that it works from duplicated subpatterns.)      whole pattern. (This is so that it works from duplicated subpatterns.)
1703    
1704      If there are any capturing brackets started but not finished, we have to      The state of the capturing groups is preserved over recursion, and
1705      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
1706      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
1707      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
1708      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
1709      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
1710      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.  
1711    
1712      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
1713      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
1714      for the original version of this logic. */      for the original version of this logic. It has, however, been hacked around
1715        a lot, so he is not to blame for the current way it works. */
1716    
1717      case OP_RECURSE:      case OP_RECURSE:
1718        {        {
1719          recursion_info *ri;
1720          int recno;
1721    
1722        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1723        new_recursive.group_num = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
1724          GET2(callpat, 1 + LINK_SIZE);          GET2(callpat, 1 + LINK_SIZE);
1725    
1726          /* Check for repeating a recursion without advancing the subject pointer.
1727          This should catch convoluted mutual recursions. (Some simple cases are
1728          caught at compile time.) */
1729    
1730          for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
1731            if (recno == ri->group_num && eptr == ri->subject_position)
1732              RRETURN(PCRE_ERROR_RECURSELOOP);
1733    
1734        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1735    
1736          new_recursive.group_num = recno;
1737          new_recursive.subject_position = eptr;
1738        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1739        md->recursive = &new_recursive;        md->recursive = &new_recursive;
1740    
1741        /* Find where to continue from afterwards */        /* Where to continue from afterwards */
1742    
1743        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       new_recursive.after_call = ecode;  
1744    
1745        /* Now save the offset data. */        /* Now save the offset data */
1746    
1747        new_recursive.saved_max = md->offset_end;        new_recursive.saved_max = md->offset_end;
1748        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
# Line 1254  for (;;) Line 1750  for (;;)
1750        else        else
1751          {          {
1752          new_recursive.offset_save =          new_recursive.offset_save =
1753            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
1754          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1755          }          }
   
1756        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1757              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
       new_recursive.save_start = mstart;  
       new_recursive.save_offset_top = offset_top;  
       mstart = eptr;  
1758    
1759        /* OK, now we can do the recursion. For each top-level alternative we        /* OK, now we can do the recursion. After processing each alternative,
1760        restore the offset and recursion data. */        restore the offset data. If there were nested recursions, md->recursive
1761          might be changed, so reset it before looping. */
1762    
1763        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1764        flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;        cbegroup = (*callpat >= OP_SBRA);
1765        do        do
1766          {          {
1767          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1768            md, ims, eptrb, flags, RM6);          RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
1769          if (rrc == MATCH_MATCH)            md, eptrb, RM6);
1770            memcpy(md->offset_vector, new_recursive.offset_save,
1771                new_recursive.saved_max * sizeof(int));
1772            md->recursive = new_recursive.prevrec;
1773            if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1774            {            {
1775            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
           md->recursive = new_recursive.prevrec;  
1776            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1777              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1778            RRETURN(MATCH_MATCH);  
1779              /* Set where we got to in the subject, and reset the start in case
1780              it was changed by \K. This *is* propagated back out of a recursion,
1781              for Perl compatibility. */
1782    
1783              eptr = md->end_match_ptr;
1784              mstart = md->start_match_ptr;
1785              goto RECURSION_MATCHED;        /* Exit loop; end processing */
1786            }            }
1787    
1788            /* PCRE does not allow THEN to escape beyond a recursion; it is treated
1789            as NOMATCH. */
1790    
1791          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1792            {            {
1793            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1794            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1795              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1796            RRETURN(rrc);            RRETURN(rrc);
1797            }            }
1798    
1799          md->recursive = &new_recursive;          md->recursive = &new_recursive;
         memcpy(md->offset_vector, new_recursive.offset_save,  
             new_recursive.saved_max * sizeof(int));  
1800          callpat += GET(callpat, 1);          callpat += GET(callpat, 1);
1801          }          }
1802        while (*callpat == OP_ALT);        while (*callpat == OP_ALT);
# Line 1299  for (;;) Line 1804  for (;;)
1804        DPRINTF(("Recursion didn't match\n"));        DPRINTF(("Recursion didn't match\n"));
1805        md->recursive = new_recursive.prevrec;        md->recursive = new_recursive.prevrec;
1806        if (new_recursive.offset_save != stacksave)        if (new_recursive.offset_save != stacksave)
1807          (pcre_free)(new_recursive.offset_save);          (PUBL(free))(new_recursive.offset_save);
1808        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1809        }        }
     /* Control never reaches here */  
1810    
1811      /* "Once" brackets are like assertion brackets except that after a match,      RECURSION_MATCHED:
1812      the point in the subject string is not moved back. Thus there can never be      break;
     a move back into the brackets. Friedl calls these "atomic" subpatterns.  
     Check the alternative branches in turn - the matching won't pass the KET  
     for this kind of subpattern. If any one branch matches, we carry on as at  
     the end of a normal bracket, leaving the subject pointer. */  
   
     case OP_ONCE:  
     prev = ecode;  
     saved_eptr = eptr;  
   
     do  
       {  
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM7);  
       if (rrc == MATCH_MATCH) break;  
       if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);  
       ecode += GET(ecode,1);  
       }  
     while (*ecode == OP_ALT);  
   
     /* 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;  
       }  
   
     /* The repeating kets try the rest of the pattern or restart from the  
     preceding bracket, in the appropriate order. The second "call" of match()  
     uses tail recursion, to avoid using another stack frame. We need to reset  
     any options that changed within the bracket before re-running it, so  
     check the next opcode. */  
   
     if (ecode[1+LINK_SIZE] == OP_OPT)  
       {  
       ims = (ims & ~PCRE_IMS) | ecode[4];  
       DPRINTF(("ims set to %02lx at group repeat\n", ims));  
       }  
   
     if (*ecode == OP_KETRMIN)  
       {  
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM8);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode = prev;  
       flags = 0;  
       goto TAIL_RECURSE;  
       }  
     else  /* OP_KETRMAX */  
       {  
       RMATCH(eptr, prev, offset_top, md, ims, eptrb, match_cbegroup, RM9);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode += 1 + LINK_SIZE;  
       flags = 0;  
       goto TAIL_RECURSE;  
       }  
     /* Control never gets here */  
1813    
1814      /* 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
1815      bracketed group and go to there. */      bracketed group and go to there. */
# Line 1392  for (;;) Line 1825  for (;;)
1825      optional ones preceded by BRAZERO or BRAMINZERO. */      optional ones preceded by BRAZERO or BRAMINZERO. */
1826    
1827      case OP_BRAZERO:      case OP_BRAZERO:
1828        {      next = ecode + 1;
1829        next = ecode+1;      RMATCH(eptr, next, offset_top, md, eptrb, RM10);
1830        RMATCH(eptr, next, offset_top, md, ims, eptrb, 0, RM10);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1831        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      do next += GET(next, 1); while (*next == OP_ALT);
1832        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1833      break;      break;
1834    
1835      case OP_BRAMINZERO:      case OP_BRAMINZERO:
1836        {      next = ecode + 1;
1837        next = ecode+1;      do next += GET(next, 1); while (*next == OP_ALT);
1838        do next += GET(next, 1); while (*next == OP_ALT);      RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, eptrb, RM11);
1839        RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0, RM11);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1840        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      ecode++;
       ecode++;  
       }  
1841      break;      break;
1842    
1843      case OP_SKIPZERO:      case OP_SKIPZERO:
1844        {      next = ecode+1;
1845        next = ecode+1;      do next += GET(next,1); while (*next == OP_ALT);
1846        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1847      break;      break;
1848    
1849        /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
1850        here; just jump to the group, with allow_zero set TRUE. */
1851    
1852        case OP_BRAPOSZERO:
1853        op = *(++ecode);
1854        allow_zero = TRUE;
1855        if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
1856          goto POSSESSIVE_NON_CAPTURE;
1857    
1858      /* End of a group, repeated or non-repeating. */      /* End of a group, repeated or non-repeating. */
1859    
1860      case OP_KET:      case OP_KET:
1861      case OP_KETRMIN:      case OP_KETRMIN:
1862      case OP_KETRMAX:      case OP_KETRMAX:
1863        case OP_KETRPOS:
1864      prev = ecode - GET(ecode, 1);      prev = ecode - GET(ecode, 1);
1865    
1866      /* 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
1867      infinite repeats of empty string matches, retrieve the subject start from      infinite repeats of empty string matches, retrieve the subject start from
1868      the chain. Otherwise, set it NULL. */      the chain. Otherwise, set it NULL. */
1869    
1870      if (*prev >= OP_SBRA)      if (*prev >= OP_SBRA || *prev == OP_ONCE)
1871        {        {
1872        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
1873        eptrb = eptrb->epb_prev;              /* Backup to previous group */        eptrb = eptrb->epb_prev;              /* Backup to previous group */
1874        }        }
1875      else saved_eptr = NULL;      else saved_eptr = NULL;
1876    
1877      /* If we are at the end of an assertion group, stop matching and return      /* If we are at the end of an assertion group or a non-capturing atomic
1878      MATCH_MATCH, but record the current high water mark for use by positive      group, stop matching and return MATCH_MATCH, but record the current high
1879      assertions. Do this also for the "once" (atomic) groups. */      water mark for use by positive assertions. We also need to record the match
1880        start in case it was changed by \K. */
1881      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||  
1882          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||      if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
1883          *prev == OP_ONCE)           *prev == OP_ONCE_NC)
1884        {        {
1885        md->end_match_ptr = eptr;      /* For ONCE */        md->end_match_ptr = eptr;      /* For ONCE_NC */
1886        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1887        RRETURN(MATCH_MATCH);        md->start_match_ptr = mstart;
1888          RRETURN(MATCH_MATCH);         /* Sets md->mark */
1889        }        }
1890    
1891      /* 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
1892      and if necessary complete handling an extraction by setting the offsets and      and if necessary complete handling an extraction by setting the offsets and
1893      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
1894      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
1895      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
1896        the current subject position and start match pointer and give a MATCH
1897        return. */
1898    
1899      if (*prev == OP_CBRA || *prev == OP_SCBRA)      if (*prev == OP_CBRA || *prev == OP_SCBRA ||
1900            *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
1901        {        {
1902        number = GET2(prev, 1+LINK_SIZE);        number = GET2(prev, 1+LINK_SIZE);
1903        offset = number << 1;        offset = number << 1;
1904    
1905  #ifdef DEBUG  #ifdef PCRE_DEBUG
1906        printf("end bracket %d", number);        printf("end bracket %d", number);
1907        printf("\n");        printf("\n");
1908  #endif  #endif
1909    
1910          /* Handle a recursively called group. */
1911    
1912          if (md->recursive != NULL && md->recursive->group_num == number)
1913            {
1914            md->end_match_ptr = eptr;
1915            md->start_match_ptr = mstart;
1916            RRETURN(MATCH_MATCH);
1917            }
1918    
1919          /* Deal with capturing */
1920    
1921        md->capture_last = number;        md->capture_last = number;
1922        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
1923          {          {
1924            /* If offset is greater than offset_top, it means that we are
1925            "skipping" a capturing group, and that group's offsets must be marked
1926            unset. In earlier versions of PCRE, all the offsets were unset at the
1927            start of matching, but this doesn't work because atomic groups and
1928            assertions can cause a value to be set that should later be unset.
1929            Example: matching /(?>(a))b|(a)c/ against "ac". This sets group 1 as
1930            part of the atomic group, but this is not on the final matching path,
1931            so must be unset when 2 is set. (If there is no group 2, there is no
1932            problem, because offset_top will then be 2, indicating no capture.) */
1933    
1934            if (offset > offset_top)
1935              {
1936              register int *iptr = md->offset_vector + offset_top;
1937              register int *iend = md->offset_vector + offset;
1938              while (iptr < iend) *iptr++ = -1;
1939              }
1940    
1941            /* Now make the extraction */
1942    
1943          md->offset_vector[offset] =          md->offset_vector[offset] =
1944            md->offset_vector[md->offset_end - number];            md->offset_vector[md->offset_end - number];
1945          md->offset_vector[offset+1] = eptr - md->start_subject;          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1946          if (offset_top <= offset) offset_top = offset + 2;          if (offset_top <= offset) offset_top = offset + 2;
1947          }          }
1948          }
1949    
1950        /* Handle a recursively called group. Restore the offsets      /* For an ordinary non-repeating ket, just continue at this level. This
1951        appropriately and continue from after the call. */      also happens for a repeating ket if no characters were matched in the
1952        group. This is the forcible breaking of infinite loops as implemented in
1953        Perl 5.005. For a non-repeating atomic group that includes captures,
1954        establish a backup point by processing the rest of the pattern at a lower
1955        level. If this results in a NOMATCH return, pass MATCH_ONCE back to the
1956        original OP_ONCE level, thereby bypassing intermediate backup points, but
1957        resetting any captures that happened along the way. */
1958    
1959        if (md->recursive != NULL && md->recursive->group_num == number)      if (*ecode == OP_KET || eptr == saved_eptr)
1960          {
1961          if (*prev == OP_ONCE)
1962          {          {
1963          recursion_info *rec = md->recursive;          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
1964          DPRINTF(("Recursion (%d) succeeded - continuing\n", number));          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1965          md->recursive = rec->prevrec;          md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1966          mstart = rec->save_start;          RRETURN(MATCH_ONCE);
         memcpy(md->offset_vector, rec->offset_save,  
           rec->saved_max * sizeof(int));  
         offset_top = rec->save_offset_top;  
         ecode = rec->after_call;  
         ims = original_ims;  
         break;  
1967          }          }
1968          ecode += 1 + LINK_SIZE;    /* Carry on at this level */
1969          break;
1970        }        }
1971    
1972      /* For both capturing and non-capturing groups, reset the value of the ims      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
1973      flags, in case they got changed during the group. */      and return the MATCH_KETRPOS. This makes it possible to do the repeats one
1974        at a time from the outer level, thus saving stack. */
     ims = original_ims;  
     DPRINTF(("ims reset to %02lx\n", ims));  
   
     /* For a non-repeating ket, just continue at this level. This also  
     happens for a repeating ket if no characters were matched in the group.  
     This is the forcible breaking of infinite loops as implemented in Perl  
     5.005. If there is an options reset, it will get obeyed in the normal  
     course of events. */  
1975    
1976      if (*ecode == OP_KET || eptr == saved_eptr)      if (*ecode == OP_KETRPOS)
1977        {        {
1978        ecode += 1 + LINK_SIZE;        md->end_match_ptr = eptr;
1979        break;        md->end_offset_top = offset_top;
1980          RRETURN(MATCH_KETRPOS);
1981        }        }
1982    
1983      /* The repeating kets try the rest of the pattern or restart from the      /* The normal repeating kets try the rest of the pattern or restart from
1984      preceding bracket, in the appropriate order. In the second case, we can use      the preceding bracket, in the appropriate order. In the second case, we can
1985      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
1986      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
1987        string. */
     flags = (*prev >= OP_SBRA)? match_cbegroup : 0;  
1988    
1989      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1990        {        {
1991        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM12);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
1992        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1993        if (flags != 0)    /* Could match an empty string */        if (*prev == OP_ONCE)
1994            {
1995            RMATCH(eptr, prev, offset_top, md, eptrb, RM8);
1996            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1997            md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1998            RRETURN(MATCH_ONCE);
1999            }
2000          if (*prev >= OP_SBRA)    /* Could match an empty string */
2001          {          {
2002          RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM50);          md->match_function_type = MATCH_CBEGROUP;
2003            RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
2004          RRETURN(rrc);          RRETURN(rrc);
2005          }          }
2006        ecode = prev;        ecode = prev;
# Line 1532  for (;;) Line 2008  for (;;)
2008        }        }
2009      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
2010        {        {
2011        RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM13);        if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
2012          RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
2013          if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
2014        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2015          if (*prev == OP_ONCE)
2016            {
2017            RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM9);
2018            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2019            md->once_target = prev;
2020            RRETURN(MATCH_ONCE);
2021            }
2022        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       flags = 0;  
2023        goto TAIL_RECURSE;        goto TAIL_RECURSE;
2024        }        }
2025      /* Control never gets here */      /* Control never gets here */
2026    
2027      /* Start of subject unless notbol, or after internal newline if multiline */      /* Not multiline mode: start of subject assertion, unless notbol. */
2028    
2029      case OP_CIRC:      case OP_CIRC:
2030      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
     if ((ims & PCRE_MULTILINE) != 0)  
       {  
       if (eptr != md->start_subject &&  
           (eptr == md->end_subject || !WAS_NEWLINE(eptr)))  
         RRETURN(MATCH_NOMATCH);  
       ecode++;  
       break;  
       }  
     /* ... else fall through */  
2031    
2032      /* Start of subject assertion */      /* Start of subject assertion */
2033    
# Line 1561  for (;;) Line 2036  for (;;)
2036      ecode++;      ecode++;
2037      break;      break;
2038    
2039        /* Multiline mode: start of subject unless notbol, or after any newline. */
2040    
2041        case OP_CIRCM:
2042        if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2043        if (eptr != md->start_subject &&
2044            (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
2045          RRETURN(MATCH_NOMATCH);
2046        ecode++;
2047        break;
2048    
2049      /* Start of match assertion */      /* Start of match assertion */
2050    
2051      case OP_SOM:      case OP_SOM:
# Line 1575  for (;;) Line 2060  for (;;)
2060      ecode++;      ecode++;
2061      break;      break;
2062    
2063      /* Assert before internal newline if multiline, or before a terminating      /* Multiline mode: assert before any newline, or before end of subject
2064      newline unless endonly is set, else end of subject unless noteol is set. */      unless noteol is set. */
2065    
2066      case OP_DOLL:      case OP_DOLLM:
2067      if ((ims & PCRE_MULTILINE) != 0)      if (eptr < md->end_subject)
2068        {        {
2069        if (eptr < md->end_subject)        if (!IS_NEWLINE(eptr))
2070          { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }          {
2071        else          if (md->partial != 0 &&
2072          { if (md->noteol) RRETURN(MATCH_NOMATCH); }              eptr + 1 >= md->end_subject &&
2073        ecode++;              NLBLOCK->nltype == NLTYPE_FIXED &&
2074        break;              NLBLOCK->nllen == 2 &&
2075                *eptr == NLBLOCK->nl[0])
2076              {
2077              md->hitend = TRUE;
2078              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2079              }
2080            RRETURN(MATCH_NOMATCH);
2081            }
2082        }        }
2083      else      else
2084        {        {
2085        if (md->noteol) RRETURN(MATCH_NOMATCH);        if (md->noteol) RRETURN(MATCH_NOMATCH);
2086        if (!md->endonly)        SCHECK_PARTIAL();
         {  
         if (eptr != md->end_subject &&  
             (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))  
           RRETURN(MATCH_NOMATCH);  
         ecode++;  
         break;  
         }  
2087        }        }
2088        ecode++;
2089        break;
2090    
2091        /* Not multiline mode: assert before a terminating newline or before end of
2092        subject unless noteol is set. */
2093    
2094        case OP_DOLL:
2095        if (md->noteol) RRETURN(MATCH_NOMATCH);
2096        if (!md->endonly) goto ASSERT_NL_OR_EOS;
2097    
2098      /* ... else fall through for endonly */      /* ... else fall through for endonly */
2099    
2100      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
2101    
2102      case OP_EOD:      case OP_EOD:
2103      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
2104        SCHECK_PARTIAL();
2105      ecode++;      ecode++;
2106      break;      break;
2107    
2108      /* End of subject or ending \n assertion (\Z) */      /* End of subject or ending \n assertion (\Z) */
2109    
2110      case OP_EODN:      case OP_EODN:
2111      if (eptr != md->end_subject &&      ASSERT_NL_OR_EOS:
2112        if (eptr < md->end_subject &&
2113          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
2114          {
2115          if (md->partial != 0 &&
2116              eptr + 1 >= md->end_subject &&
2117              NLBLOCK->nltype == NLTYPE_FIXED &&
2118              NLBLOCK->nllen == 2 &&
2119              *eptr == NLBLOCK->nl[0])
2120            {
2121            md->hitend = TRUE;
2122            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2123            }
2124        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2125          }
2126    
2127        /* Either at end of string or \n before end. */
2128    
2129        SCHECK_PARTIAL();
2130      ecode++;      ecode++;
2131      break;      break;
2132    
# Line 1629  for (;;) Line 2141  for (;;)
2141        be "non-word" characters. Remember the earliest consulted character for        be "non-word" characters. Remember the earliest consulted character for
2142        partial matching. */        partial matching. */
2143    
2144  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2145        if (utf8)        if (utf)
2146          {          {
2147            /* Get status of previous character */
2148    
2149          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
2150            {            {
2151            USPTR lastptr = eptr - 1;            PCRE_PUCHAR lastptr = eptr - 1;
2152            while((*lastptr & 0xc0) == 0x80) lastptr--;            BACKCHAR(lastptr);
2153            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
2154            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
2155    #ifdef SUPPORT_UCP
2156              if (md->use_ucp)
2157                {
2158                if (c == '_') prev_is_word = TRUE; else
2159                  {
2160                  int cat = UCD_CATEGORY(c);
2161                  prev_is_word = (cat == ucp_L || cat == ucp_N);
2162                  }
2163                }
2164              else
2165    #endif
2166            prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;            prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
2167            }            }
2168    
2169            /* Get status of next character */
2170    
2171          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
2172            {            {
2173            SCHECK_PARTIAL();            SCHECK_PARTIAL();
# Line 1648  for (;;) Line 2176  for (;;)
2176          else          else
2177            {            {
2178            GETCHAR(c, eptr);            GETCHAR(c, eptr);
2179    #ifdef SUPPORT_UCP
2180              if (md->use_ucp)
2181                {
2182                if (c == '_') cur_is_word = TRUE; else
2183                  {
2184                  int cat = UCD_CATEGORY(c);
2185                  cur_is_word = (cat == ucp_L || cat == ucp_N);
2186                  }
2187                }
2188              else
2189    #endif
2190            cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;            cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
2191            }            }
2192          }          }
2193        else        else
2194  #endif  #endif
2195    
2196        /* Not in UTF-8 mode */        /* Not in UTF-8 mode, but we may still have PCRE_UCP set, and for
2197          consistency with the behaviour of \w we do use it in this case. */
2198    
2199          {          {
2200            /* Get status of previous character */
2201    
2202          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
2203            {            {
2204            if (eptr <= md->start_used_ptr) md->start_used_ptr = eptr - 1;            if (eptr <= md->start_used_ptr) md->start_used_ptr = eptr - 1;
2205            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);  #ifdef SUPPORT_UCP
2206              if (md->use_ucp)
2207                {
2208                c = eptr[-1];
2209                if (c == '_') prev_is_word = TRUE; else
2210                  {
2211                  int cat = UCD_CATEGORY(c);
2212                  prev_is_word = (cat == ucp_L || cat == ucp_N);
2213                  }
2214                }
2215              else
2216    #endif
2217              prev_is_word = MAX_255(eptr[-1])
2218                && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
2219            }            }
2220    
2221            /* Get status of next character */
2222    
2223          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
2224            {            {
2225            SCHECK_PARTIAL();            SCHECK_PARTIAL();
2226            cur_is_word = FALSE;            cur_is_word = FALSE;
2227            }            }
2228          else cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);          else
2229    #ifdef SUPPORT_UCP
2230            if (md->use_ucp)
2231              {
2232              c = *eptr;
2233              if (c == '_') cur_is_word = TRUE; else
2234                {
2235                int cat = UCD_CATEGORY(c);
2236                cur_is_word = (cat == ucp_L || cat == ucp_N);
2237                }
2238              }
2239            else
2240    #endif
2241            cur_is_word = MAX_255(*eptr)
2242              && ((md->ctypes[*eptr] & ctype_word) != 0);
2243          }          }
2244    
2245        /* Now see if the situation is what we want */        /* Now see if the situation is what we want */
# Line 1678  for (;;) Line 2250  for (;;)
2250        }        }
2251      break;      break;
2252    
2253      /* Match a single character type; inline for speed */      /* Match any single character type except newline; have to take care with
2254        CRLF newlines and partial matching. */
2255    
2256      case OP_ANY:      case OP_ANY:
2257      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
2258        if (md->partial != 0 &&
2259            eptr + 1 >= md->end_subject &&
2260            NLBLOCK->nltype == NLTYPE_FIXED &&
2261            NLBLOCK->nllen == 2 &&
2262            *eptr == NLBLOCK->nl[0])
2263          {
2264          md->hitend = TRUE;
2265          if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2266          }
2267    
2268      /* Fall through */      /* Fall through */
2269    
2270        /* Match any single character whatsoever. */
2271    
2272      case OP_ALLANY:      case OP_ALLANY:
2273      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2274        {        {                            /* not be updated before SCHECK_PARTIAL. */
2275        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2276        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2277        }        }
2278      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;      eptr++;
2279    #ifdef SUPPORT_UTF
2280        if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
2281    #endif
2282      ecode++;      ecode++;
2283      break;      break;
2284    
# Line 1698  for (;;) Line 2286  for (;;)
2286      any byte, even newline, independent of the setting of PCRE_DOTALL. */      any byte, even newline, independent of the setting of PCRE_DOTALL. */
2287    
2288      case OP_ANYBYTE:      case OP_ANYBYTE:
2289      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2290        {        {                            /* not be updated before SCHECK_PARTIAL. */
2291        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2292        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2293        }        }
2294        eptr++;
2295      ecode++;      ecode++;
2296      break;      break;
2297    
# Line 1714  for (;;) Line 2303  for (;;)
2303        }        }
2304      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2305      if (      if (
2306  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2307         c < 256 &&         c < 256 &&
2308  #endif  #endif
2309         (md->ctypes[c] & ctype_digit) != 0         (md->ctypes[c] & ctype_digit) != 0
# Line 1731  for (;;) Line 2320  for (;;)
2320        }        }
2321      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2322      if (      if (
2323  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2324         c >= 256 ||         c > 255 ||
2325  #endif  #endif
2326         (md->ctypes[c] & ctype_digit) == 0         (md->ctypes[c] & ctype_digit) == 0
2327         )         )
# Line 1748  for (;;) Line 2337  for (;;)
2337        }        }
2338      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2339      if (      if (
2340  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2341         c < 256 &&         c < 256 &&
2342  #endif  #endif
2343         (md->ctypes[c] & ctype_space) != 0         (md->ctypes[c] & ctype_space) != 0
# Line 1765  for (;;) Line 2354  for (;;)
2354        }        }
2355      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2356      if (      if (
2357  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2358         c >= 256 ||         c > 255 ||
2359  #endif  #endif
2360         (md->ctypes[c] & ctype_space) == 0         (md->ctypes[c] & ctype_space) == 0
2361         )         )
# Line 1782  for (;;) Line 2371  for (;;)
2371        }        }
2372      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2373      if (      if (
2374  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2375         c < 256 &&         c < 256 &&
2376  #endif  #endif
2377         (md->ctypes[c] & ctype_word) != 0         (md->ctypes[c] & ctype_word) != 0
# Line 1799  for (;;) Line 2388  for (;;)
2388        }        }
2389      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2390      if (      if (
2391  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2392         c >= 256 ||         c > 255 ||
2393  #endif  #endif
2394         (md->ctypes[c] & ctype_word) == 0         (md->ctypes[c] & ctype_word) == 0
2395         )         )
# Line 1818  for (;;) Line 2407  for (;;)
2407      switch(c)      switch(c)
2408        {        {
2409        default: RRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2410    
2411        case 0x000d:        case 0x000d:
2412        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr >= md->end_subject)
2413            {
2414            SCHECK_PARTIAL();
2415            }
2416          else if (*eptr == 0x0a) eptr++;
2417        break;        break;
2418    
2419        case 0x000a:        case 0x000a:
# Line 1974  for (;;) Line 2568  for (;;)
2568               prop->chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
2569               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
2570            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2571           break;          break;
2572    
2573          case PT_GC:          case PT_GC:
2574          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
2575            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2576          break;          break;
2577    
# Line 1991  for (;;) Line 2585  for (;;)
2585            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2586          break;          break;
2587    
2588            /* These are specials */
2589    
2590            case PT_ALNUM:
2591            if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2592                 PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2593              RRETURN(MATCH_NOMATCH);
2594            break;
2595    
2596            case PT_SPACE:    /* Perl space */
2597            if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2598                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2599                   == (op == OP_NOTPROP))
2600              RRETURN(MATCH_NOMATCH);
2601            break;
2602    
2603            case PT_PXSPACE:  /* POSIX space */
2604            if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2605                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2606                 c == CHAR_FF || c == CHAR_CR)
2607                   == (op == OP_NOTPROP))
2608              RRETURN(MATCH_NOMATCH);
2609            break;
2610    
2611            case PT_WORD:
2612            if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2613                 PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2614                 c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2615              RRETURN(MATCH_NOMATCH);
2616            break;
2617    
2618            /* This should never occur */
2619    
2620          default:          default:
2621          RRETURN(PCRE_ERROR_INTERNAL);          RRETURN(PCRE_ERROR_INTERNAL);
2622          }          }
# Line 2009  for (;;) Line 2635  for (;;)
2635        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2636        }        }
2637      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2638        if (UCD_CATEGORY(c) == ucp_M) RRETURN(MATCH_NOMATCH);
2639        while (eptr < md->end_subject)
2640        {        {
2641        int category = UCD_CATEGORY(c);        int len = 1;
2642        if (category == ucp_M) RRETURN(MATCH_NOMATCH);        if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2643        while (eptr < md->end_subject)        if (UCD_CATEGORY(c) != ucp_M) break;
2644          {        eptr += len;
         int len = 1;  
         if (!utf8) c = *eptr; else  
           {  
           GETCHARLEN(c, eptr, len);  
           }  
         category = UCD_CATEGORY(c);  
         if (category != ucp_M) break;  
         eptr += len;  
         }  
2645        }        }
2646        CHECK_PARTIAL();
2647      ecode++;      ecode++;
2648      break;      break;
2649  #endif  #endif
# Line 2038  for (;;) Line 2658  for (;;)
2658      loops). */      loops). */
2659    
2660      case OP_REF:      case OP_REF:
2661        {      case OP_REFI:
2662        offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      caseless = op == OP_REFI;
2663        ecode += 3;      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2664        ecode += 1 + IMM2_SIZE;
2665    
2666        /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2667    
2668        (a) In the default, Perl-compatible state, set the length to be longer      (a) In the default, Perl-compatible state, set the length negative;
2669        than the amount of subject left; this ensures that every attempt at a      this ensures that every attempt at a match fails. We can't just fail
2670        match fails. We can't just fail here, because of the possibility of      here, because of the possibility of quantifiers with zero minima.
       quantifiers with zero minima.  
2671    
2672        (b) If the JavaScript compatibility flag is set, set the length to zero      (b) If the JavaScript compatibility flag is set, set the length to zero
2673        so that the back reference matches an empty string.      so that the back reference matches an empty string.
2674    
2675        Otherwise, set the length to the length of what was matched by the      Otherwise, set the length to the length of what was matched by the
2676        referenced subpattern. */      referenced subpattern. */
2677    
2678        if (offset >= offset_top || md->offset_vector[offset] < 0)      if (offset >= offset_top || md->offset_vector[offset] < 0)
2679          length = (md->jscript_compat)? 0 : md->end_subject - eptr + 1;        length = (md->jscript_compat)? 0 : -1;
2680        else      else
2681          length = md->offset_vector[offset+1] - md->offset_vector[offset];        length = md->offset_vector[offset+1] - md->offset_vector[offset];
2682    
2683        /* Set up for repetition, or handle the non-repeated case */      /* Set up for repetition, or handle the non-repeated case */
2684    
2685        switch (*ecode)      switch (*ecode)
2686          {        {
2687          case OP_CRSTAR:        case OP_CRSTAR:
2688          case OP_CRMINSTAR:        case OP_CRMINSTAR:
2689          case OP_CRPLUS:        case OP_CRPLUS:
2690          case OP_CRMINPLUS:        case OP_CRMINPLUS:
2691          case OP_CRQUERY:        case OP_CRQUERY:
2692          case OP_CRMINQUERY:        case OP_CRMINQUERY:
2693          c = *ecode++ - OP_CRSTAR;        c = *ecode++ - OP_CRSTAR;
2694          minimize = (c & 1) != 0;        minimize = (c & 1) != 0;
2695          min = rep_min[c];                 /* Pick up values from tables; */        min = rep_min[c];                 /* Pick up values from tables; */
2696          max = rep_max[c];                 /* zero for max => infinity */        max = rep_max[c];                 /* zero for max => infinity */
2697          if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2698          break;        break;
2699    
2700          case OP_CRRANGE:        case OP_CRRANGE:
2701          case OP_CRMINRANGE:        case OP_CRMINRANGE:
2702          minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2703          min = GET2(ecode, 1);        min = GET2(ecode, 1);
2704          max = GET2(ecode, 3);        max = GET2(ecode, 1 + IMM2_SIZE);
2705          if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2706          ecode += 5;        ecode += 1 + 2 * IMM2_SIZE;
2707          break;        break;
2708    
2709          default:               /* No repeat follows */        default:               /* No repeat follows */
2710          if (!match_ref(offset, eptr, length, md, ims))        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2711            {          {
2712            CHECK_PARTIAL();          if (length == -2) eptr = md->end_subject;   /* Partial match */
2713            RRETURN(MATCH_NOMATCH);          CHECK_PARTIAL();
2714            }          RRETURN(MATCH_NOMATCH);
         eptr += length;  
         continue;              /* With the main loop */  
2715          }          }
2716          eptr += length;
2717          continue;              /* With the main loop */
2718          }
2719    
2720        /* If the length of the reference is zero, just continue with the      /* Handle repeated back references. If the length of the reference is
2721        main loop. */      zero, just continue with the main loop. If the length is negative, it
2722        means the reference is unset in non-Java-compatible mode. If the minimum is
2723        zero, we can continue at the same level without recursion. For any other
2724        minimum, carrying on will result in NOMATCH. */
2725    
2726        if (length == 0) continue;      if (length == 0) continue;
2727        if (length < 0 && min == 0) continue;
2728    
2729        /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2730        the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
2731        address of eptr, so that eptr can be a register variable. */      address of eptr, so that eptr can be a register variable. */
2732    
2733        for (i = 1; i <= min; i++)      for (i = 1; i <= min; i++)
2734          {
2735          int slength;
2736          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2737          {          {
2738          if (!match_ref(offset, eptr, length, md, ims))          if (slength == -2) eptr = md->end_subject;   /* Partial match */
2739            {          CHECK_PARTIAL();
2740            CHECK_PARTIAL();          RRETURN(MATCH_NOMATCH);
           RRETURN(MATCH_NOMATCH);  
           }  
         eptr += length;  
2741          }          }
2742          eptr += slength;
2743          }
2744    
2745        /* If min = max, continue at the same level without recursion.      /* If min = max, continue at the same level without recursion.
2746        They are not both allowed to be zero. */      They are not both allowed to be zero. */
2747    
2748        if (min == max) continue;      if (min == max) continue;
2749    
2750        /* If minimizing, keep trying and advancing the pointer */      /* If minimizing, keep trying and advancing the pointer */
2751    
2752        if (minimize)      if (minimize)
2753          {
2754          for (fi = min;; fi++)
2755          {          {
2756          for (fi = min;; fi++)          int slength;
2757            RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2758            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2759            if (fi >= max) RRETURN(MATCH_NOMATCH);
2760            if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2761            {            {
2762            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM14);            if (slength == -2) eptr = md->end_subject;   /* Partial match */
2763            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            CHECK_PARTIAL();
2764            if (fi >= max) RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
           if (!match_ref(offset, eptr, length, md, ims))  
             {  
             CHECK_PARTIAL();  
             RRETURN(MATCH_NOMATCH);  
             }  
           eptr += length;  
2765            }            }
2766          /* Control never gets here */          eptr += slength;
2767          }          }
2768          /* Control never gets here */
2769          }
2770    
2771        /* If maximizing, find the longest string and work backwards */      /* If maximizing, find the longest string and work backwards */
2772    
2773        else      else
2774          {
2775          pp = eptr;
2776          for (i = min; i < max; i++)
2777          {          {
2778          pp = eptr;          int slength;
2779          for (i = min; i < max; i++)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2780            {            {
2781            if (!match_ref(offset, eptr, length, md, ims)) break;            /* Can't use CHECK_PARTIAL because we don't want to update eptr in
2782            eptr += length;            the soft partial matching case. */
2783            }  
2784          while (eptr >= pp)            if (slength == -2 && md->partial != 0 &&
2785            {                md->end_subject > md->start_used_ptr)
2786            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM15);              {
2787            if (rrc != MATCH_NOMATCH) RRETURN(rrc);              md->hitend = TRUE;
2788            eptr -= length;              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2789                }
2790              break;
2791            }            }
2792          RRETURN(MATCH_NOMATCH);          eptr += slength;
2793            }
2794    
2795          while (eptr >= pp)
2796            {
2797            RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2798            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2799            eptr -= length;
2800          }          }
2801          RRETURN(MATCH_NOMATCH);
2802        }        }
2803      /* Control never gets here */      /* Control never gets here */
2804    
# Line 2174  for (;;) Line 2816  for (;;)
2816      case OP_NCLASS:      case OP_NCLASS:
2817      case OP_CLASS:      case OP_CLASS:
2818        {        {
2819          /* The data variable is saved across frames, so the byte map needs to
2820          be stored there. */
2821    #define BYTE_MAP ((pcre_uint8 *)data)
2822        data = ecode + 1;                /* Save for matching */        data = ecode + 1;                /* Save for matching */
2823        ecode += 33;                     /* Advance past the item */        ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
2824    
2825        switch (*ecode)        switch (*ecode)
2826          {          {
# Line 2196  for (;;) Line 2841  for (;;)
2841          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2842          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2843          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2844          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2845          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2846          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2847          break;          break;
2848    
2849          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2208  for (;;) Line 2853  for (;;)
2853    
2854        /* First, ensure the minimum number of matches are present. */        /* First, ensure the minimum number of matches are present. */
2855    
2856  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2857        /* UTF-8 mode */        if (utf)
       if (utf8)  
2858          {          {
2859          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2860            {            {
# Line 2225  for (;;) Line 2869  for (;;)
2869              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2870              }              }
2871            else            else
2872              {              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
             if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);  
             }  
2873            }            }
2874          }          }
2875        else        else
2876  #endif  #endif
2877        /* Not UTF-8 mode */        /* Not UTF mode */
2878          {          {
2879          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2880            {            {
# Line 2242  for (;;) Line 2884  for (;;)
2884              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2885              }              }
2886            c = *eptr++;            c = *eptr++;
2887            if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2888              if (c > 255)
2889                {
2890                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2891                }
2892              else
2893    #endif
2894                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2895            }            }
2896          }          }
2897    
# Line 2256  for (;;) Line 2905  for (;;)
2905    
2906        if (minimize)        if (minimize)
2907          {          {
2908  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2909          /* UTF-8 mode */          if (utf)
         if (utf8)  
2910            {            {
2911            for (fi = min;; fi++)            for (fi = min;; fi++)
2912              {              {
2913              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2914              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2915              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2916              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 2276  for (;;) Line 2924  for (;;)
2924                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2925                }                }
2926              else              else
2927                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
               if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);  
               }  
2928              }              }
2929            }            }
2930          else          else
2931  #endif  #endif
2932          /* Not UTF-8 mode */          /* Not UTF mode */
2933            {            {
2934            for (fi = min;; fi++)            for (fi = min;; fi++)
2935              {              {
2936              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2937              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2938              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2939              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 2296  for (;;) Line 2942  for (;;)
2942                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2943                }                }
2944              c = *eptr++;              c = *eptr++;
2945              if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2946                if (c > 255)
2947                  {
2948                  if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2949                  }
2950                else
2951    #endif
2952                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2953              }              }
2954            }            }
2955          /* Control never gets here */          /* Control never gets here */
# Line 2308  for (;;) Line 2961  for (;;)
2961          {          {
2962          pp = eptr;          pp = eptr;
2963    
2964  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2965          /* UTF-8 mode */          if (utf)
         if (utf8)  
2966            {            {
2967            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2968              {              {
2969              int len = 1;              int len = 1;
2970              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject)
2971                  {
2972                  SCHECK_PARTIAL();
2973                  break;
2974                  }
2975              GETCHARLEN(c, eptr, len);              GETCHARLEN(c, eptr, len);
2976              if (c > 255)              if (c > 255)
2977                {                {
2978                if (op == OP_CLASS) break;                if (op == OP_CLASS) break;
2979                }                }
2980              else              else
2981                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
               if ((data[c/8] & (1 << (c&7))) == 0) break;  
               }  
2982              eptr += len;              eptr += len;
2983              }              }
2984            for (;;)            for (;;)
2985              {              {
2986              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM18);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
2987              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2988              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
2989              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2337  for (;;) Line 2991  for (;;)
2991            }            }
2992          else          else
2993  #endif  #endif
2994            /* Not UTF-8 mode */            /* Not UTF mode */
2995            {            {
2996            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2997              {              {
2998              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject)
2999                  {
3000                  SCHECK_PARTIAL();
3001                  break;
3002                  }
3003              c = *eptr;              c = *eptr;
3004              if ((data[c/8] & (1 << (c&7))) == 0) break;  #ifndef COMPILE_PCRE8
3005                if (c > 255)
3006                  {
3007                  if (op == OP_CLASS) break;
3008                  }
3009                else
3010    #endif
3011                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
3012              eptr++;              eptr++;
3013              }              }
3014            while (eptr >= pp)            while (eptr >= pp)
3015              {              {
3016              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM19);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
3017              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3018              eptr--;              eptr--;
3019              }              }
# Line 2356  for (;;) Line 3021  for (;;)
3021    
3022          RRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3023          }          }
3024    #undef BYTE_MAP
3025        }        }
3026      /* Control never gets here */      /* Control never gets here */
3027    
# Line 2364  for (;;) Line 3030  for (;;)
3030      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
3031      mode, because Unicode properties are supported in non-UTF-8 mode. */      mode, because Unicode properties are supported in non-UTF-8 mode. */
3032    
3033  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3034      case OP_XCLASS:      case OP_XCLASS:
3035        {        {
3036        data = ecode + 1 + LINK_SIZE;                /* Save for matching */        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
# Line 2389  for (;;) Line 3055  for (;;)
3055          case OP_CRMINRANGE:          case OP_CRMINRANGE:
3056          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
3057          min = GET2(ecode, 1);          min = GET2(ecode, 1);
3058          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
3059          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
3060          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
3061          break;          break;
3062    
3063          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2409  for (;;) Line 3075  for (;;)
3075            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3076            }            }
3077          GETCHARINCTEST(c, eptr);          GETCHARINCTEST(c, eptr);
3078          if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);          if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3079          }          }
3080    
3081        /* 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 2424  for (;;) Line 3090  for (;;)
3090          {          {
3091          for (fi = min;; fi++)          for (fi = min;; fi++)
3092            {            {
3093            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
3094            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3095            if (fi >= max) RRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3096            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 2433  for (;;) Line 3099  for (;;)
3099              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3100              }              }
3101            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3102            if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);            if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3103            }            }
3104          /* Control never gets here */          /* Control never gets here */
3105          }          }
# Line 2446  for (;;) Line 3112  for (;;)
3112          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3113            {            {
3114            int len = 1;            int len = 1;
3115            if (eptr >= md->end_subject) break;            if (eptr >= md->end_subject)
3116                {
3117                SCHECK_PARTIAL();
3118                break;
3119                }
3120    #ifdef SUPPORT_UTF
3121            GETCHARLENTEST(c, eptr, len);            GETCHARLENTEST(c, eptr, len);
3122            if (!_pcre_xclass(c, data)) break;  #else
3123              c = *eptr;
3124    #endif
3125              if (!PRIV(xclass)(c, data, utf)) break;
3126            eptr += len;            eptr += len;
3127            }            }
3128          for(;;)          for(;;)
3129            {            {
3130            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
3131            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3132            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3133            if (utf8) BACKCHAR(eptr);  #ifdef SUPPORT_UTF
3134              if (utf) BACKCHAR(eptr);
3135    #endif
3136            }            }
3137          RRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3138          }          }
# Line 2468  for (;;) Line 3144  for (;;)
3144      /* Match a single character, casefully */      /* Match a single character, casefully */
3145    
3146      case OP_CHAR:      case OP_CHAR:
3147  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3148      if (utf8)      if (utf)
3149        {        {
3150        length = 1;        length = 1;
3151        ecode++;        ecode++;
# Line 2483  for (;;) Line 3159  for (;;)
3159        }        }
3160      else      else
3161  #endif  #endif
3162        /* Not UTF mode */
     /* Non-UTF-8 mode */  
3163        {        {
3164        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
3165          {          {
# Line 2496  for (;;) Line 3171  for (;;)
3171        }        }
3172      break;      break;
3173    
3174      /* Match a single character, caselessly */      /* Match a single character, caselessly. If we are at the end of the
3175        subject, give up immediately. */
3176    
3177        case OP_CHARI:
3178        if (eptr >= md->end_subject)
3179          {
3180          SCHECK_PARTIAL();
3181          RRETURN(MATCH_NOMATCH);
3182          }
3183    
3184      case OP_CHARNC:  #ifdef SUPPORT_UTF
3185  #ifdef SUPPORT_UTF8      if (utf)
     if (utf8)  
3186        {        {
3187        length = 1;        length = 1;
3188        ecode++;        ecode++;
3189        GETCHARLEN(fc, ecode, length);        GETCHARLEN(fc, ecode, length);
3190    
       if (length > md->end_subject - eptr)  
         {  
         CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */  
         RRETURN(MATCH_NOMATCH);  
         }  
   
3191        /* 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
3192        can use the fast lookup table. */        we know that its other case must also be one byte long, so we can use the
3193          fast lookup table. We know that there is at least one byte left in the
3194          subject. */
3195    
3196        if (fc < 128)        if (fc < 128)
3197          {          {
3198          if (md->lcc[*ecode++] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);          if (md->lcc[fc]
3199                != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3200            ecode++;
3201            eptr++;
3202          }          }
3203    
3204        /* Otherwise we must pick up the subject character */        /* Otherwise we must pick up the subject character. Note that we cannot
3205          use the value of "length" to check for sufficient bytes left, because the
3206          other case of the character may have more or fewer bytes.  */
3207    
3208        else        else
3209          {          {
# Line 2541  for (;;) Line 3224  for (;;)
3224          }          }
3225        }        }
3226      else      else
3227  #endif   /* SUPPORT_UTF8 */  #endif   /* SUPPORT_UTF */
3228    
3229      /* Non-UTF-8 mode */      /* Not UTF mode */
3230        {        {
3231        if (md->end_subject - eptr < 1)        if (TABLE_GET(ecode[1], md->lcc, ecode[1])
3232          {            != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3233          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */        eptr++;
         RRETURN(MATCH_NOMATCH);  
         }  
       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);  
3234        ecode += 2;        ecode += 2;
3235        }        }
3236      break;      break;
# Line 2558  for (;;) Line 3238  for (;;)
3238      /* Match a single character repeatedly. */      /* Match a single character repeatedly. */
3239    
3240      case OP_EXACT:      case OP_EXACT:
3241        case OP_EXACTI:
3242      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3243      ecode += 3;      ecode += 1 + IMM2_SIZE;
3244      goto REPEATCHAR;      goto REPEATCHAR;
3245    
3246      case OP_POSUPTO:      case OP_POSUPTO:
3247        case OP_POSUPTOI:
3248      possessive = TRUE;      possessive = TRUE;
3249      /* Fall through */      /* Fall through */
3250    
3251      case OP_UPTO:      case OP_UPTO:
3252        case OP_UPTOI:
3253      case OP_MINUPTO:      case OP_MINUPTO:
3254        case OP_MINUPTOI:
3255      min = 0;      min = 0;
3256      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3257      minimize = *ecode == OP_MINUPTO;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
3258      ecode += 3;      ecode += 1 + IMM2_SIZE;
3259      goto REPEATCHAR;      goto REPEATCHAR;
3260    
3261      case OP_POSSTAR:      case OP_POSSTAR:
3262        case OP_POSSTARI:
3263      possessive = TRUE;      possessive = TRUE;
3264      min = 0;      min = 0;
3265      max = INT_MAX;      max = INT_MAX;
# Line 2582  for (;;) Line 3267  for (;;)
3267      goto REPEATCHAR;      goto REPEATCHAR;
3268    
3269      case OP_POSPLUS:      case OP_POSPLUS:
3270        case OP_POSPLUSI:
3271      possessive = TRUE;      possessive = TRUE;
3272      min = 1;      min = 1;
3273      max = INT_MAX;      max = INT_MAX;
# Line 2589  for (;;) Line 3275  for (;;)
3275      goto REPEATCHAR;      goto REPEATCHAR;
3276    
3277      case OP_POSQUERY:      case OP_POSQUERY:
3278        case OP_POSQUERYI:
3279      possessive = TRUE;      possessive = TRUE;
3280      min = 0;      min = 0;
3281      max = 1;      max = 1;
# Line 2596  for (;;) Line 3283  for (;;)
3283      goto REPEATCHAR;      goto REPEATCHAR;
3284    
3285      case OP_STAR:      case OP_STAR:
3286        case OP_STARI:
3287      case OP_MINSTAR:      case OP_MINSTAR:
3288        case OP_MINSTARI:
3289      case OP_PLUS:      case OP_PLUS:
3290        case OP_PLUSI:
3291      case OP_MINPLUS:      case OP_MINPLUS:
3292        case OP_MINPLUSI:
3293      case OP_QUERY:      case OP_QUERY:
3294        case OP_QUERYI:
3295      case OP_MINQUERY:      case OP_MINQUERY:
3296      c = *ecode++ - OP_STAR;      case OP_MINQUERYI:
3297        c = *ecode++ - ((op < OP_STARI)? OP_STAR : OP_STARI);
3298      minimize = (c & 1) != 0;      minimize = (c & 1) != 0;
   
3299      min = rep_min[c];                 /* Pick up values from tables; */      min = rep_min[c];                 /* Pick up values from tables; */
3300      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
3301      if (max == 0) max = INT_MAX;      if (max == 0) max = INT_MAX;
# Line 2611  for (;;) Line 3303  for (;;)
3303      /* Common code for all repeated single-character matches. */      /* Common code for all repeated single-character matches. */
3304    
3305      REPEATCHAR:      REPEATCHAR:
3306  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3307      if (utf8)      if (utf)
3308        {        {
3309        length = 1;        length = 1;
3310        charptr = ecode;        charptr = ecode;
# Line 2626  for (;;) Line 3318  for (;;)
3318          {          {
3319  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3320          unsigned int othercase;          unsigned int othercase;
3321          if ((ims & PCRE_CASELESS) != 0 &&          if (op >= OP_STARI &&     /* Caseless */
3322              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3323            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = PRIV(ord2utf)(othercase, occhars);
3324          else oclength = 0;          else oclength = 0;
3325  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3326    
3327          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3328            {            {
3329            if (eptr <= md->end_subject - length &&            if (eptr <= md->end_subject - length &&
3330              memcmp(eptr, charptr, length) == 0) eptr += length;              memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3331  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3332            else if (oclength > 0 &&            else if (oclength > 0 &&
3333                     eptr <= md->end_subject - oclength &&                     eptr <= md->end_subject - oclength &&
3334                     memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3335  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3336            else            else
3337              {              {
# Line 2654  for (;;) Line 3346  for (;;)
3346            {            {
3347            for (fi = min;; fi++)            for (fi = min;; fi++)
3348              {              {
3349              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3350              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3351              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3352              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3353                memcmp(eptr, charptr, length) == 0) eptr += length;                memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3354  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3355              else if (oclength > 0 &&              else if (oclength > 0 &&
3356                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3357                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3358  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3359              else              else
3360                {                {
# Line 2679  for (;;) Line 3371  for (;;)
3371            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3372              {              {
3373              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3374                  memcmp(eptr, charptr, length) == 0) eptr += length;                  memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3375  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3376              else if (oclength > 0 &&              else if (oclength > 0 &&
3377                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3378                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3379  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3380              else break;              else
3381                  {
3382                  CHECK_PARTIAL();
3383                  break;
3384                  }
3385              }              }
3386    
3387            if (possessive) continue;            if (possessive) continue;
3388    
3389            for(;;)            for(;;)
3390              {              {
3391              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3392              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3393              if (eptr == pp) { RRETURN(MATCH_NOMATCH); }              if (eptr == pp) { RRETURN(MATCH_NOMATCH); }
3394  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 2711  for (;;) Line 3407  for (;;)
3407        value of fc will always be < 128. */        value of fc will always be < 128. */
3408        }        }
3409      else      else
3410  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3411          /* When not in UTF-8 mode, load a single-byte character. */
3412      /* When not in UTF-8 mode, load a single-byte character. */        fc = *ecode++;
   
     fc = *ecode++;  
3413    
3414      /* The value of fc at this point is always less than 256, though we may or      /* The value of fc at this point is always one character, though we may
3415      may not be in UTF-8 mode. The code is duplicated for the caseless and      or may not be in UTF mode. The code is duplicated for the caseless and
3416      caseful cases, for speed, since matching characters is likely to be quite      caseful cases, for speed, since matching characters is likely to be quite
3417      common. First, ensure the minimum number of matches are present. If min =      common. First, ensure the minimum number of matches are present. If min =
3418      max, continue at the same level without recursing. Otherwise, if      max, continue at the same level without recursing. Otherwise, if
# Line 2729  for (;;) Line 3423  for (;;)
3423      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3424        max, eptr));        max, eptr));
3425    
3426      if ((ims & PCRE_CASELESS) != 0)      if (op >= OP_STARI)  /* Caseless */
3427        {        {
3428        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3429          /* fc must be < 128 if UTF is enabled. */
3430          foc = md->fcc[fc];
3431    #else
3432    #ifdef SUPPORT_UTF
3433    #ifdef SUPPORT_UCP
3434          if (utf && fc > 127)
3435            foc = UCD_OTHERCASE(fc);
3436    #else
3437          if (utf && fc > 127)
3438            foc = fc;
3439    #endif /* SUPPORT_UCP */
3440          else
3441    #endif /* SUPPORT_UTF */
3442            foc = TABLE_GET(fc, md->fcc, fc);
3443    #endif /* COMPILE_PCRE8 */
3444    
3445        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3446          {          {
3447          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
# Line 2739  for (;;) Line 3449  for (;;)
3449            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3450            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3451            }            }
3452          if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);          if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
3453            eptr++;
3454          }          }
3455        if (min == max) continue;        if (min == max) continue;
3456        if (minimize)        if (minimize)
3457          {          {
3458          for (fi = min;; fi++)          for (fi = min;; fi++)
3459            {            {
3460            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3461            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3462            if (fi >= max) RRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3463            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 2754  for (;;) Line 3465  for (;;)
3465              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3466              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3467              }              }
3468            if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);            if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
3469              eptr++;
3470            }            }
3471          /* Control never gets here */          /* Control never gets here */
3472          }          }
# Line 2763  for (;;) Line 3475  for (;;)
3475          pp = eptr;          pp = eptr;
3476          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3477            {            {
3478            if (eptr >= md->end_subject || fc != md->lcc[*eptr]) break;            if (eptr >= md->end_subject)
3479                {
3480                SCHECK_PARTIAL();
3481                break;
3482                }
3483              if (fc != *eptr && foc != *eptr) break;
3484            eptr++;            eptr++;
3485            }            }
3486    
# Line 2771  for (;;) Line 3488  for (;;)
3488    
3489          while (eptr >= pp)          while (eptr >= pp)
3490            {            {
3491            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM25);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
3492            eptr--;            eptr--;
3493            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3494            }            }
# Line 2800  for (;;) Line 3517  for (;;)
3517          {          {
3518          for (fi = min;; fi++)          for (fi = min;; fi++)
3519            {            {
3520            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3521            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3522            if (fi >= max) RRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3523            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 2817  for (;;) Line 3534  for (;;)
3534          pp = eptr;          pp = eptr;
3535          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3536            {            {
3537            if (eptr >= md->end_subject || fc != *eptr) break;            if (eptr >= md->end_subject)
3538                {
3539                SCHECK_PARTIAL();
3540                break;
3541                }
3542              if (fc != *eptr) break;
3543            eptr++;            eptr++;
3544            }            }
3545          if (possessive) continue;          if (possessive) continue;
3546    
3547          while (eptr >= pp)          while (eptr >= pp)
3548            {            {
3549            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM27);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
3550            eptr--;            eptr--;
3551            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3552            }            }
# Line 2837  for (;;) Line 3559  for (;;)
3559      checking can be multibyte. */      checking can be multibyte. */
3560    
3561      case OP_NOT:      case OP_NOT:
3562        case OP_NOTI:
3563      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3564        {        {
3565        SCHECK_PARTIAL();        SCHECK_PARTIAL();
# Line 2844  for (;;) Line 3567  for (;;)
3567        }        }
3568      ecode++;      ecode++;
3569      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
3570      if ((ims & PCRE_CASELESS) != 0)      if (op == OP_NOTI)         /* The caseless case */
3571        {        {
3572  #ifdef SUPPORT_UTF8        register unsigned int ch, och;
3573        if (c < 256)        ch = *ecode++;
3574  #endif  #ifdef COMPILE_PCRE8
3575        c = md->lcc[c];        /* ch must be < 128 if UTF is enabled. */
3576        if (md->lcc[*ecode++] == c) RRETURN(MATCH_NOMATCH);        och = md->fcc[ch];
3577    #else
3578    #ifdef SUPPORT_UTF
3579    #ifdef SUPPORT_UCP
3580          if (utf && ch > 127)
3581            och = UCD_OTHERCASE(ch);
3582    #else
3583          if (utf && ch > 127)
3584            och = ch;
3585    #endif /* SUPPORT_UCP */
3586          else
3587    #endif /* SUPPORT_UTF */
3588            och = TABLE_GET(ch, md->fcc, ch);
3589    #endif /* COMPILE_PCRE8 */
3590          if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
3591        }        }
3592      else      else    /* Caseful */
3593        {        {
3594        if (*ecode++ == c) RRETURN(MATCH_NOMATCH);        if (*ecode++ == c) RRETURN(MATCH_NOMATCH);
3595        }        }
# Line 2866  for (;;) Line 3603  for (;;)
3603      about... */      about... */
3604    
3605      case OP_NOTEXACT:      case OP_NOTEXACT:
3606        case OP_NOTEXACTI:
3607      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3608      ecode += 3;      ecode += 1 + IMM2_SIZE;
3609      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3610    
3611      case OP_NOTUPTO:      case OP_NOTUPTO:
3612        case OP_NOTUPTOI:
3613      case OP_NOTMINUPTO:      case OP_NOTMINUPTO:
3614        case OP_NOTMINUPTOI:
3615      min = 0;      min = 0;
3616      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3617      minimize = *ecode == OP_NOTMINUPTO;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3618      ecode += 3;      ecode += 1 + IMM2_SIZE;
3619      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3620    
3621      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
3622        case OP_NOTPOSSTARI:
3623      possessive = TRUE;      possessive = TRUE;
3624      min = 0;      min = 0;
3625      max = INT_MAX;      max = INT_MAX;
# Line 2886  for (;;) Line 3627  for (;;)
3627      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3628    
3629      case OP_NOTPOSPLUS:      case OP_NOTPOSPLUS:
3630        case OP_NOTPOSPLUSI:
3631      possessive = TRUE;      possessive = TRUE;
3632      min = 1;      min = 1;
3633      max = INT_MAX;      max = INT_MAX;
# Line 2893  for (;;) Line 3635  for (;;)
3635      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3636    
3637      case OP_NOTPOSQUERY:      case OP_NOTPOSQUERY:
3638        case OP_NOTPOSQUERYI:
3639      possessive = TRUE;      possessive = TRUE;
3640      min = 0;      min = 0;
3641      max = 1;      max = 1;
# Line 2900  for (;;) Line 3643  for (;;)
3643      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3644    
3645      case OP_NOTPOSUPTO:      case OP_NOTPOSUPTO:
3646        case OP_NOTPOSUPTOI:
3647      possessive = TRUE;      possessive = TRUE;
3648      min = 0;      min = 0;
3649      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3650      ecode += 3;      ecode += 1 + IMM2_SIZE;
3651      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3652    
3653      case OP_NOTSTAR:      case OP_NOTSTAR:
3654        case OP_NOTSTARI:
3655      case OP_NOTMINSTAR:      case OP_NOTMINSTAR:
3656        case OP_NOTMINSTARI:
3657      case OP_NOTPLUS:      case OP_NOTPLUS:
3658        case OP_NOTPLUSI:
3659      case OP_NOTMINPLUS:      case OP_NOTMINPLUS:
3660        case OP_NOTMINPLUSI:
3661      case OP_NOTQUERY:      case OP_NOTQUERY:
3662        case OP_NOTQUERYI:
3663      case OP_NOTMINQUERY:      case OP_NOTMINQUERY:
3664      c = *ecode++ - OP_NOTSTAR;      case OP_NOTMINQUERYI:
3665        c = *ecode++ - ((op >= OP_NOTSTARI)? OP_NOTSTARI: OP_NOTSTAR);
3666      minimize = (c & 1) != 0;      minimize = (c & 1) != 0;
3667      min = rep_min[c];                 /* Pick up values from tables; */      min = rep_min[c];                 /* Pick up values from tables; */
3668      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
# Line 2934  for (;;) Line 3684  for (;;)
3684      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,
3685        max, eptr));        max, eptr));
3686    
3687      if ((ims & PCRE_CASELESS) != 0)      if (op >= OP_NOTSTARI)     /* Caseless */
3688        {        {
3689        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3690          /* fc must be < 128 if UTF is enabled. */
3691          foc = md->fcc[fc];
3692    #else
3693    #ifdef SUPPORT_UTF
3694    #ifdef SUPPORT_UCP
3695          if (utf && fc > 127)
3696            foc = UCD_OTHERCASE(fc);
3697    #else
3698          if (utf && fc > 127)
3699            foc = fc;
3700    #endif /* SUPPORT_UCP */
3701          else
3702    #endif /* SUPPORT_UTF */
3703            foc = TABLE_GET(fc, md->fcc, fc);
3704    #endif /* COMPILE_PCRE8 */
3705    
3706  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3707        /* UTF-8 mode */        if (utf)
       if (utf8)  
3708          {          {
3709          register unsigned int d;          register unsigned int d;
3710          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 2951  for (;;) Line 3715  for (;;)
3715              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3716              }              }
3717            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3718            if (d < 256) d = md->lcc[d];            if (fc == d || (unsigned int) foc == d) RRETURN(MATCH_NOMATCH);
           if (fc == d) RRETURN(MATCH_NOMATCH);  
3719            }            }
3720          }          }
3721        else        else
3722  #endif  #endif
3723          /* Not UTF mode */
       /* Not UTF-8 mode */  
3724          {          {
3725          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3726            {            {
# Line 2967  for (;;) Line 3729  for (;;)
3729              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3730              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3731              }              }
3732            if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);            if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3733              eptr++;
3734            }            }
3735          }          }
3736    
# Line 2975  for (;;) Line 3738  for (;;)
3738    
3739        if (minimize)        if (minimize)
3740          {          {
3741  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3742          /* UTF-8 mode */          if (utf)
         if (utf8)  
3743            {            {
3744            register unsigned int d;            register unsigned int d;
3745            for (fi = min;; fi++)            for (fi = min;; fi++)
3746              {              {
3747              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3748              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3749              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3750              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 2991  for (;;) Line 3753  for (;;)
3753                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3754                }                }
3755              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3756              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
             if (fc == d) RRETURN(MATCH_NOMATCH);  
3757              }              }
3758            }            }
3759          else          else
3760  #endif  #endif
3761          /* Not UTF-8 mode */          /* Not UTF mode */
3762            {            {
3763            for (fi = min;; fi++)            for (fi = min;; fi++)
3764              {              {
3765              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3766              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3767              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3768              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3009  for (;;) Line 3770  for (;;)
3770                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3771                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3772                }                }
3773              if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);              if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3774                eptr++;
3775              }              }
3776            }            }
3777          /* Control never gets here */          /* Control never gets here */
# Line 3021  for (;;) Line 3783  for (;;)
3783          {          {
3784          pp = eptr;          pp = eptr;
3785    
3786  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3787          /* UTF-8 mode */          if (utf)
         if (utf8)  
3788            {            {
3789            register unsigned int d;            register unsigned int d;
3790            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3791              {              {
3792              int len = 1;              int len = 1;
3793              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject)
3794                  {
3795                  SCHECK_PARTIAL();
3796                  break;
3797                  }
3798              GETCHARLEN(d, eptr, len);              GETCHARLEN(d, eptr, len);
3799              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) break;
             if (fc == d) break;  
3800              eptr += len;              eptr += len;
3801              }              }
3802          if (possessive) continue;            if (possessive) continue;
3803          for(;;)            for(;;)
3804              {              {
3805              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3806              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3807              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3808              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3046  for (;;) Line 3810  for (;;)
3810            }            }
3811          else          else
3812  #endif  #endif
3813          /* Not UTF-8 mode */          /* Not UTF mode */
3814            {            {
3815            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3816              {              {
3817              if (eptr >= md->end_subject || fc == md->lcc[*eptr]) break;              if (eptr >= md->end_subject)
3818                  {
3819                  SCHECK_PARTIAL();
3820                  break;
3821                  }
3822                if (fc == *eptr || foc == *eptr) break;
3823              eptr++;              eptr++;
3824              }              }
3825            if (possessive) continue;            if (possessive) continue;
3826            while (eptr >= pp)            while (eptr >= pp)
3827              {              {
3828              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM31);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
3829              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3830              eptr--;              eptr--;
3831              }              }
# Line 3071  for (;;) Line 3840  for (;;)
3840    
3841      else      else
3842        {        {
3843  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3844        /* UTF-8 mode */        if (utf)
       if (utf8)  
3845          {          {
3846          register unsigned int d;          register unsigned int d;
3847          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3089  for (;;) Line 3857  for (;;)
3857          }          }
3858        else        else
3859  #endif  #endif
3860        /* Not UTF-8 mode */        /* Not UTF mode */
3861          {          {
3862          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3863            {            {
# Line 3106  for (;;) Line 3874  for (;;)
3874    
3875        if (minimize)        if (minimize)
3876          {          {
3877  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3878          /* UTF-8 mode */          if (utf)
         if (utf8)  
3879            {            {
3880            register unsigned int d;            register unsigned int d;
3881            for (fi = min;; fi++)            for (fi = min;; fi++)
3882              {              {
3883              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3884              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3885              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3886              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3127  for (;;) Line 3894  for (;;)
3894            }            }
3895          else          else
3896  #endif  #endif
3897          /* Not UTF-8 mode */          /* Not UTF mode */
3898            {            {
3899            for (fi = min;; fi++)            for (fi = min;; fi++)
3900              {              {
3901              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3902              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3903              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3904              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3151  for (;;) Line 3918  for (;;)
3918          {          {
3919          pp = eptr;          pp = eptr;
3920    
3921  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3922          /* UTF-8 mode */          if (utf)
         if (utf8)  
3923            {            {
3924            register unsigned int d;            register unsigned int d;
3925            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3926              {              {
3927              int len = 1;              int len = 1;
3928              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject)
3929                  {
3930                  SCHECK_PARTIAL();
3931                  break;
3932                  }
3933              GETCHARLEN(d, eptr, len);              GETCHARLEN(d, eptr, len);
3934              if (fc == d) break;              if (fc == d) break;
3935              eptr += len;              eptr += len;
# Line 3167  for (;;) Line 3937  for (;;)
3937            if (possessive) continue;            if (possessive) continue;
3938            for(;;)            for(;;)
3939              {              {
3940              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM34);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);
3941              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3942              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3943              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3175  for (;;) Line 3945  for (;;)
3945            }            }
3946          else          else
3947  #endif  #endif
3948          /* Not UTF-8 mode */          /* Not UTF mode */
3949            {            {
3950            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3951              {              {
3952              if (eptr >= md->end_subject || fc == *eptr) break;              if (eptr >= md->end_subject)
3953                  {
3954                  SCHECK_PARTIAL();
3955                  break;
3956                  }
3957                if (fc == *eptr) break;
3958              eptr++;              eptr++;
3959              }              }
3960            if (possessive) continue;            if (possessive) continue;
3961            while (eptr >= pp)            while (eptr >= pp)
3962              {              {
3963              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM35);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);
3964              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3965              eptr--;              eptr--;
3966              }              }
# Line 3203  for (;;) Line 3978  for (;;)
3978      case OP_TYPEEXACT:      case OP_TYPEEXACT:
3979      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3980      minimize = TRUE;      minimize = TRUE;
3981      ecode += 3;      ecode += 1 + IMM2_SIZE;
3982      goto REPEATTYPE;      goto REPEATTYPE;
3983    
3984      case OP_TYPEUPTO:      case OP_TYPEUPTO:
# Line 3211  for (;;) Line 3986  for (;;)
3986      min = 0;      min = 0;
3987      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3988      minimize = *ecode == OP_TYPEMINUPTO;      minimize = *ecode == OP_TYPEMINUPTO;
3989      ecode += 3;      ecode += 1 + IMM2_SIZE;
3990      goto REPEATTYPE;      goto REPEATTYPE;
3991    
3992      case OP_TYPEPOSSTAR:      case OP_TYPEPOSSTAR:
# Line 3239  for (;;) Line 4014  for (;;)
4014      possessive = TRUE;      possessive = TRUE;
4015      min = 0;      min = 0;
4016      max = GET2(ecode, 1);      max = GET2(ecode, 1);
4017      ecode += 3;      ecode += 1 + IMM2_SIZE;
4018      goto REPEATTYPE;      goto REPEATTYPE;
4019    
4020      case OP_TYPESTAR:      case OP_TYPESTAR:
# Line 3300  for (;;) Line 4075  for (;;)
4075            case PT_LAMP:            case PT_LAMP:
4076            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
4077              {              {
4078                int chartype;
4079              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4080                {                {
4081                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4082                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4083                }                }
4084              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4085              prop_chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
4086              if ((prop_chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
4087                   prop_chartype == ucp_Ll ||                   chartype == ucp_Ll ||
4088                   prop_chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
4089                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4090              }              }
4091            break;            break;
# Line 3323  for (;;) Line 4099  for (;;)
4099                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4100                }                }
4101              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4102              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
             if ((prop_category == prop_value) == prop_fail_result)  
4103                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4104              }              }
4105            break;            break;
# Line 3338  for (;;) Line 4113  for (;;)
4113                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4114                }                }
4115              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4116              prop_chartype = UCD_CHARTYPE(c);              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
             if ((prop_chartype == prop_value) == prop_fail_result)  
4117                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4118              }              }
4119            break;            break;
# Line 3353  for (;;) Line 4127  for (;;)
4127                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4128                }                }
4129              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4130              prop_script = UCD_SCRIPT(c);              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
4131              if ((prop_script == prop_value) == prop_fail_result)                RRETURN(MATCH_NOMATCH);
4132                }
4133              break;
4134    
4135              case PT_ALNUM:
4136              for (i = 1; i <= min; i++)
4137                {
4138                int category;
4139                if (eptr >= md->end_subject)
4140                  {
4141                  SCHECK_PARTIAL();
4142                  RRETURN(MATCH_NOMATCH);
4143                  }
4144                GETCHARINCTEST(c, eptr);
4145                category = UCD_CATEGORY(c);
4146                if ((category == ucp_L || category == ucp_N) == prop_fail_result)
4147                  RRETURN(MATCH_NOMATCH);
4148                }
4149              break;
4150    
4151              case PT_SPACE:    /* Perl space */
4152              for (i = 1; i <= min; i++)
4153                {
4154                if (eptr >= md->end_subject)
4155                  {
4156                  SCHECK_PARTIAL();
4157                  RRETURN(MATCH_NOMATCH);
4158                  }
4159                GETCHARINCTEST(c, eptr);
4160                if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
4161                     c == CHAR_FF || c == CHAR_CR)
4162                       == prop_fail_result)
4163                  RRETURN(MATCH_NOMATCH);
4164                }
4165              break;
4166    
4167              case PT_PXSPACE:  /* POSIX space */
4168              for (i = 1; i <= min; i++)
4169                {
4170                if (eptr >= md->end_subject)
4171                  {
4172                  SCHECK_PARTIAL();
4173                  RRETURN(MATCH_NOMATCH);
4174                  }
4175                GETCHARINCTEST(c, eptr);
4176                if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
4177                     c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
4178                       == prop_fail_result)
4179                  RRETURN(MATCH_NOMATCH);
4180                }
4181              break;
4182    
4183              case PT_WORD:
4184              for (i = 1; i <= min; i++)
4185                {
4186                int category;
4187                if (eptr >= md->end_subject)
4188                  {
4189                  SCHECK_PARTIAL();
4190                  RRETURN(MATCH_NOMATCH);
4191                  }
4192     &n