/[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 354 by ph10, Mon Jul 7 16:30:33 2008 UTC revision 934 by ph10, Sat Feb 25 12:30:36 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-2008 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
202  #endif  #endif
203  #endif  #endif
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 = frame->Xnextframe;\
321    frame->Xwhere = rw; \    if (newframe == NULL)\
322        {\
323        newframe = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));\
324        if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
325        newframe->Xnextframe = NULL;\
326        frame->Xnextframe = newframe;\
327        }\
328      frame->Xwhere = rw;\
329    newframe->Xeptr = ra;\    newframe->Xeptr = ra;\
330    newframe->Xecode = rb;\    newframe->Xecode = rb;\
331    newframe->Xmstart = mstart;\    newframe->Xmstart = mstart;\
332    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
333    newframe->Xims = re;\    newframe->Xeptrb = re;\
   newframe->Xeptrb = rf;\  
   newframe->Xflags = rg;\  
334    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
335    newframe->Xprevframe = frame;\    newframe->Xprevframe = frame;\
336    frame = newframe;\    frame = newframe;\
# Line 303  argument of match(), which never changes Line 342  argument of match(), which never changes
342    
343  #define RRETURN(ra)\  #define RRETURN(ra)\
344    {\    {\
345    heapframe *newframe = frame;\    heapframe *oldframe = frame;\
346    frame = newframe->Xprevframe;\    frame = oldframe->Xprevframe;\
   (pcre_stack_free)(newframe);\  
347    if (frame != NULL)\    if (frame != NULL)\
348      {\      {\
349      rrc = ra;\      rrc = ra;\
# Line 319  argument of match(), which never changes Line 357  argument of match(), which never changes
357    
358  typedef struct heapframe {  typedef struct heapframe {
359    struct heapframe *Xprevframe;    struct heapframe *Xprevframe;
360      struct heapframe *Xnextframe;
361    
362    /* Function arguments that may change */    /* Function arguments that may change */
363    
364    const uschar *Xeptr;    PCRE_PUCHAR Xeptr;
365    const uschar *Xecode;    const pcre_uchar *Xecode;
366    const uschar *Xmstart;    PCRE_PUCHAR Xmstart;
367    int Xoffset_top;    int Xoffset_top;
   long int Xims;  
368    eptrblock *Xeptrb;    eptrblock *Xeptrb;
   int Xflags;  
369    unsigned int Xrdepth;    unsigned int Xrdepth;
370    
371    /* Function local variables */    /* Function local variables */
372    
373    const uschar *Xcallpat;    PCRE_PUCHAR Xcallpat;
374    const uschar *Xcharptr;  #ifdef SUPPORT_UTF
375    const uschar *Xdata;    PCRE_PUCHAR Xcharptr;
376    const uschar *Xnext;  #endif
377    const uschar *Xpp;    PCRE_PUCHAR Xdata;
378    const uschar *Xprev;    PCRE_PUCHAR Xnext;
379    const uschar *Xsaved_eptr;    PCRE_PUCHAR Xpp;
380      PCRE_PUCHAR Xprev;
381      PCRE_PUCHAR Xsaved_eptr;
382    
383    recursion_info Xnew_recursive;    recursion_info Xnew_recursive;
384    
# Line 347  typedef struct heapframe { Line 386  typedef struct heapframe {
386    BOOL Xcondition;    BOOL Xcondition;
387    BOOL Xprev_is_word;    BOOL Xprev_is_word;
388    
   unsigned long int Xoriginal_ims;  
   
389  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
390    int Xprop_type;    int Xprop_type;
391    int Xprop_value;    int Xprop_value;
392    int Xprop_fail_result;    int Xprop_fail_result;
   int Xprop_category;  
   int Xprop_chartype;  
   int Xprop_script;  
393    int Xoclength;    int Xoclength;
394    uschar Xocchars[8];    pcre_uchar Xocchars[6];
395  #endif  #endif
396    
397      int Xcodelink;
398    int Xctype;    int Xctype;
399    unsigned int Xfc;    unsigned int Xfc;
400    int Xfi;    int Xfi;
# Line 395  typedef struct heapframe { Line 430  typedef struct heapframe {
430    
431  /* This function is called recursively in many circumstances. Whenever it  /* This function is called recursively in many circumstances. Whenever it
432  returns a negative (error) response, the outer incarnation must also return the  returns a negative (error) response, the outer incarnation must also return the
433  same response.  same response. */
434    
435    /* These macros pack up tests that are used for partial matching, and which
436    appear several times in the code. We set the "hit end" flag if the pointer is
437    at the end of the subject and also past the start of the subject (i.e.
438    something has been matched). For hard partial matching, we then return
439    immediately. The second one is used when we already know we are past the end of
440    the subject. */
441    
442    #define CHECK_PARTIAL()\
443      if (md->partial != 0 && eptr >= md->end_subject && \
444          eptr > md->start_used_ptr) \
445        { \
446        md->hitend = TRUE; \
447        if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
448        }
449    
450    #define SCHECK_PARTIAL()\
451      if (md->partial != 0 && eptr > md->start_used_ptr) \
452        { \
453        md->hitend = TRUE; \
454        if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
455        }
456    
457    
458  Performance note: It might be tempting to extract commonly used fields from the  /* Performance note: It might be tempting to extract commonly used fields from
459  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
460  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
461  made performance worse.  made performance worse.
462    
# Line 409  Arguments: Line 467  Arguments:
467                   by encountering \K)                   by encountering \K)
468     offset_top  current top pointer     offset_top  current top pointer
469     md          pointer to "static" info for the match     md          pointer to "static" info for the match
    ims         current /i, /m, and /s options  
470     eptrb       pointer to chain of blocks containing eptr at start of     eptrb       pointer to chain of blocks containing eptr at start of
471                   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  
472     rdepth      the recursion depth     rdepth      the recursion depth
473    
474  Returns:       MATCH_MATCH if matched            )  these values are >= 0  Returns:       MATCH_MATCH if matched            )  these values are >= 0
475                 MATCH_NOMATCH if failed to match  )                 MATCH_NOMATCH if failed to match  )
476                   a negative MATCH_xxx value for PRUNE, SKIP, etc
477                 a negative PCRE_ERROR_xxx value if aborted by an error condition                 a negative PCRE_ERROR_xxx value if aborted by an error condition
478                   (e.g. stopped by repeated call or recursion limit)                   (e.g. stopped by repeated call or recursion limit)
479  */  */
480    
481  static int  static int
482  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, const uschar *mstart,  match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
483    int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,    PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
484    int flags, unsigned int rdepth)    unsigned int rdepth)
485  {  {
486  /* 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,
487  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 436  so they can be ordinary variables in all Line 490  so they can be ordinary variables in all
490  register int  rrc;         /* Returns from recursive calls */  register int  rrc;         /* Returns from recursive calls */
491  register int  i;           /* Used for loops not involving calls to RMATCH() */  register int  i;           /* Used for loops not involving calls to RMATCH() */
492  register unsigned int c;   /* Character values not kept over RMATCH() calls */  register unsigned int c;   /* Character values not kept over RMATCH() calls */
493  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf;         /* Local copy of UTF flag for speed */
494    
495  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
496    BOOL caseless;
497    int condcode;
498    
499  /* 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
500  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
501  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
502  heap whenever RMATCH() does a "recursion". See the macro definitions above. */  whenever RMATCH() does a "recursion". See the macro definitions above. Putting
503    the top-level on the stack rather than malloc-ing them all gives a performance
504    boost in many cases where there is not much "recursion". */
505    
506  #ifdef NO_RECURSE  #ifdef NO_RECURSE
507  heapframe *frame = (pcre_stack_malloc)(sizeof(heapframe));  heapframe *frame = (heapframe *)md->match_frames_base;
 frame->Xprevframe = NULL;            /* Marks the top level */  
508    
509  /* Copy in the original argument variables */  /* Copy in the original argument variables */
510    
# Line 455  frame->Xeptr = eptr; Line 512  frame->Xeptr = eptr;
512  frame->Xecode = ecode;  frame->Xecode = ecode;
513  frame->Xmstart = mstart;  frame->Xmstart = mstart;
514  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
 frame->Xims = ims;  
515  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
 frame->Xflags = flags;  
516  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
517    
518  /* This is where control jumps back to to effect "recursion" */  /* This is where control jumps back to to effect "recursion" */
# Line 470  HEAP_RECURSE: Line 525  HEAP_RECURSE:
525  #define ecode              frame->Xecode  #define ecode              frame->Xecode
526  #define mstart             frame->Xmstart  #define mstart             frame->Xmstart
527  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
 #define ims                frame->Xims  
528  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
 #define flags              frame->Xflags  
529  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
530    
531  /* Ditto for the local variables */  /* Ditto for the local variables */
532    
533  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
534  #define charptr            frame->Xcharptr  #define charptr            frame->Xcharptr
535  #endif  #endif
536  #define callpat            frame->Xcallpat  #define callpat            frame->Xcallpat
537    #define codelink           frame->Xcodelink
538  #define data               frame->Xdata  #define data               frame->Xdata
539  #define next               frame->Xnext  #define next               frame->Xnext
540  #define pp                 frame->Xpp  #define pp                 frame->Xpp
# Line 493  HEAP_RECURSE: Line 547  HEAP_RECURSE:
547  #define condition          frame->Xcondition  #define condition          frame->Xcondition
548  #define prev_is_word       frame->Xprev_is_word  #define prev_is_word       frame->Xprev_is_word
549    
 #define original_ims       frame->Xoriginal_ims  
   
550  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
551  #define prop_type          frame->Xprop_type  #define prop_type          frame->Xprop_type
552  #define prop_value         frame->Xprop_value  #define prop_value         frame->Xprop_value
553  #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  
554  #define oclength           frame->Xoclength  #define oclength           frame->Xoclength
555  #define occhars            frame->Xocchars  #define occhars            frame->Xocchars
556  #endif  #endif
# Line 531  i, and fc and c, can be the same variabl Line 580  i, and fc and c, can be the same variabl
580  #define fi i  #define fi i
581  #define fc c  #define fc c
582    
583    /* Many of the following variables are used only in small blocks of the code.
584    My normal style of coding would have declared them within each of those blocks.
585    However, in order to accommodate the version of this code that uses an external
586    "stack" implemented on the heap, it is easier to declare them all here, so the
587    declarations can be cut out in a block. The only declarations within blocks
588    below are for variables that do not have to be preserved over a recursive call
589    to RMATCH(). */
590    
591    #ifdef SUPPORT_UTF
592    const pcre_uchar *charptr;
593    #endif
594    const pcre_uchar *callpat;
595    const pcre_uchar *data;
596    const pcre_uchar *next;
597    PCRE_PUCHAR       pp;
598    const pcre_uchar *prev;
599    PCRE_PUCHAR       saved_eptr;
600    
601    recursion_info new_recursive;
602    
603  #ifdef SUPPORT_UTF8                /* Many of these variables are used only  */  BOOL cur_is_word;
 const uschar *charptr;             /* in small blocks of the code. My normal */  
 #endif                             /* style of coding would have declared    */  
 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().          */  
604  BOOL condition;  BOOL condition;
605  BOOL prev_is_word;  BOOL prev_is_word;
606    
 unsigned long int original_ims;  
   
607  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
608  int prop_type;  int prop_type;
609  int prop_value;  int prop_value;
610  int prop_fail_result;  int prop_fail_result;
 int prop_category;  
 int prop_chartype;  
 int prop_script;  
611  int oclength;  int oclength;
612  uschar occhars[8];  pcre_uchar occhars[6];
613  #endif  #endif
614    
615    int codelink;
616  int ctype;  int ctype;
617  int length;  int length;
618  int max;  int max;
# Line 573  int save_offset1, save_offset2, save_off Line 625  int save_offset1, save_offset2, save_off
625  int stacksave[REC_STACK_SAVE_MAX];  int stacksave[REC_STACK_SAVE_MAX];
626    
627  eptrblock newptrb;  eptrblock newptrb;
628    
629    /* There is a special fudge for calling match() in a way that causes it to
630    measure the size of its basic stack frame when the stack is being used for
631    recursion. The second argument (ecode) being NULL triggers this behaviour. It
632    cannot normally ever be NULL. The return is the negated value of the frame
633    size. */
634    
635    if (ecode == NULL)
636      {
637      if (rdepth == 0)
638        return match((PCRE_PUCHAR)&rdepth, NULL, NULL, 0, NULL, NULL, 1);
639      else
640        {
641        int len = (char *)&rdepth - (char *)eptr;
642        return (len > 0)? -len : len;
643        }
644      }
645  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
646    
647    /* To save space on the stack and in the heap frame, I have doubled up on some
648    of the local variables that are used only in localised parts of the code, but
649    still need to be preserved over recursive calls of match(). These macros define
650    the alternative names that are used. */
651    
652    #define allow_zero    cur_is_word
653    #define cbegroup      condition
654    #define code_offset   codelink
655    #define condassert    condition
656    #define matched_once  prev_is_word
657    #define foc           number
658    #define save_mark     data
659    
660  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
661  variables. */  variables. */
662    
# Line 594  TAIL_RECURSE: Line 676  TAIL_RECURSE:
676  /* 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
677  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
678  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()
679  and a "return", respectively (possibly with some debugging if DEBUG is  and a "return", respectively (possibly with some debugging if PCRE_DEBUG is
680  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
681  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,
682  however, impact performance when true recursion is being used. */  however, impact performance when true recursion is being used. */
683    
684  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
685  utf8 = md->utf8;       /* Local copy of the flag */  utf = md->utf;       /* Local copy of the flag */
686  #else  #else
687  utf8 = FALSE;  utf = FALSE;
688  #endif  #endif
689    
690  /* 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 611  haven't exceeded the recursive call limi Line 693  haven't exceeded the recursive call limi
693  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);
694  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
695    
 original_ims = ims;    /* Save for resetting on ')' */  
   
696  /* 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
697  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
698  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
699  hit the closing ket, in order to break infinite loops that match no characters.  up space on the stack. See also MATCH_CONDASSERT below.
700  When match() is called in other circumstances, don't add to the chain. The  
701  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
702  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
703  match(). */  to break infinite loops that match no characters. When match() is called in
704    other circumstances, don't add to the chain. The MATCH_CBEGROUP feature must
705    NOT be used with tail recursion, because the memory block that is used is on
706    the stack, so a new one may be required for each match(). */
707    
708  if ((flags & match_cbegroup) != 0)  if (md->match_function_type == MATCH_CBEGROUP)
709    {    {
710    newptrb.epb_saved_eptr = eptr;    newptrb.epb_saved_eptr = eptr;
711    newptrb.epb_prev = eptrb;    newptrb.epb_prev = eptrb;
712    eptrb = &newptrb;    eptrb = &newptrb;
713      md->match_function_type = 0;
714    }    }
715    
716  /* Now start processing the opcodes. */  /* Now start processing the opcodes. */
# Line 636  for (;;) Line 720  for (;;)
720    minimize = possessive = FALSE;    minimize = possessive = FALSE;
721    op = *ecode;    op = *ecode;
722    
   /* For partial matching, remember if we ever hit the end of the subject after  
   matching at least one subject character. */  
   
   if (md->partial &&  
       eptr >= md->end_subject &&  
       eptr > mstart)  
     md->hitend = TRUE;  
   
723    switch(op)    switch(op)
724      {      {
725        case OP_MARK:
726        md->nomatch_mark = ecode + 2;
727        md->mark = NULL;    /* In case previously set by assertion */
728        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
729          eptrb, RM55);
730        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
731             md->mark == NULL) md->mark = ecode + 2;
732    
733        /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
734        argument, and we must check whether that argument matches this MARK's
735        argument. It is passed back in md->start_match_ptr (an overloading of that
736        variable). If it does match, we reset that variable to the current subject
737        position and return MATCH_SKIP. Otherwise, pass back the return code
738        unaltered. */
739    
740        else if (rrc == MATCH_SKIP_ARG &&
741            STRCMP_UC_UC(ecode + 2, md->start_match_ptr) == 0)
742          {
743          md->start_match_ptr = eptr;
744          RRETURN(MATCH_SKIP);
745          }
746        RRETURN(rrc);
747    
748      case OP_FAIL:      case OP_FAIL:
749      RRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
750    
751      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);  
752    
753      case OP_COMMIT:      case OP_COMMIT:
754      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
755        ims, eptrb, flags, RM52);        eptrb, RM52);
756      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
757            rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
758            rrc != MATCH_THEN)
759          RRETURN(rrc);
760      RRETURN(MATCH_COMMIT);      RRETURN(MATCH_COMMIT);
761    
762        /* PRUNE overrides THEN */
763    
764        case OP_PRUNE:
765        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
766          eptrb, RM51);
767        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
768        RRETURN(MATCH_PRUNE);
769    
770        case OP_PRUNE_ARG:
771        md->nomatch_mark = ecode + 2;
772        md->mark = NULL;    /* In case previously set by assertion */
773        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
774          eptrb, RM56);
775        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
776             md->mark == NULL) md->mark = ecode + 2;
777        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
778        RRETURN(MATCH_PRUNE);
779    
780        /* SKIP overrides PRUNE and THEN */
781    
782      case OP_SKIP:      case OP_SKIP:
783      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
784        ims, eptrb, flags, RM53);        eptrb, RM53);
785      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
786          RRETURN(rrc);
787      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
788      RRETURN(MATCH_SKIP);      RRETURN(MATCH_SKIP);
789    
790        /* Note that, for Perl compatibility, SKIP with an argument does NOT set
791        nomatch_mark. There is a flag that disables this opcode when re-matching a
792        pattern that ended with a SKIP for which there was not a matching MARK. */
793    
794        case OP_SKIP_ARG:
795        if (md->ignore_skip_arg)
796          {
797          ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
798          break;
799          }
800        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
801          eptrb, RM57);
802        if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
803          RRETURN(rrc);
804    
805        /* Pass back the current skip name by overloading md->start_match_ptr and
806        returning the special MATCH_SKIP_ARG return code. This will either be
807        caught by a matching MARK, or get to the top, where it causes a rematch
808        with the md->ignore_skip_arg flag set. */
809    
810        md->start_match_ptr = ecode + 2;
811        RRETURN(MATCH_SKIP_ARG);
812    
813        /* For THEN (and THEN_ARG) we pass back the address of the opcode, so that
814        the branch in which it occurs can be determined. Overload the start of
815        match pointer to do this. */
816    
817      case OP_THEN:      case OP_THEN:
818      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
819        ims, eptrb, flags, RM54);        eptrb, RM54);
820        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
821        md->start_match_ptr = ecode;
822        RRETURN(MATCH_THEN);
823    
824        case OP_THEN_ARG:
825        md->nomatch_mark = ecode + 2;
826        md->mark = NULL;    /* In case previously set by assertion */
827        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top,
828          md, eptrb, RM58);
829        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
830             md->mark == NULL) md->mark = ecode + 2;
831      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
832        md->start_match_ptr = ecode;
833      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
834    
835      /* Handle a capturing bracket. If there is space in the offset vector, save      /* Handle an atomic group that does not contain any capturing parentheses.
836      the current subject position in the working slot at the top of the vector.      This can be handled like an assertion. Prior to 8.13, all atomic groups
837      We mustn't change the current values of the data slot, because they may be      were handled this way. In 8.13, the code was changed as below for ONCE, so
838      set from a previous iteration of this group, and be referred to by a      that backups pass through the group and thereby reset captured values.
839      reference inside the group.      However, this uses a lot more stack, so in 8.20, atomic groups that do not
840        contain any captures generate OP_ONCE_NC, which can be handled in the old,
841      If the bracket fails to match, we need to restore this value and also the      less stack intensive way.
842      values of the final offsets, in case they were set by a previous iteration  
843      of the same bracket.      Check the alternative branches in turn - the matching won't pass the KET
844        for this kind of subpattern. If any one branch matches, we carry on as at
845        the end of a normal bracket, leaving the subject pointer, but resetting
846        the start-of-match value in case it was changed by \K. */
847    
848        case OP_ONCE_NC:
849        prev = ecode;
850        saved_eptr = eptr;
851        save_mark = md->mark;
852        do
853          {
854          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
855          if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
856            {
857            mstart = md->start_match_ptr;
858            break;
859            }
860          if (rrc == MATCH_THEN)
861            {
862            next = ecode + GET(ecode,1);
863            if (md->start_match_ptr < next &&
864                (*ecode == OP_ALT || *next == OP_ALT))
865              rrc = MATCH_NOMATCH;
866            }
867    
868          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
869          ecode += GET(ecode,1);
870          md->mark = save_mark;
871          }
872        while (*ecode == OP_ALT);
873    
874        /* If hit the end of the group (which could be repeated), fail */
875    
876        if (*ecode != OP_ONCE_NC && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
877    
878        /* Continue as from after the group, updating the offsets high water
879        mark, since extracts may have been taken. */
880    
881        do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
882    
883        offset_top = md->end_offset_top;
884        eptr = md->end_match_ptr;
885    
886        /* For a non-repeating ket, just continue at this level. This also
887        happens for a repeating ket if no characters were matched in the group.
888        This is the forcible breaking of infinite loops as implemented in Perl
889        5.005. */
890    
891        if (*ecode == OP_KET || eptr == saved_eptr)
892          {
893          ecode += 1+LINK_SIZE;
894          break;
895          }
896    
897        /* The repeating kets try the rest of the pattern or restart from the
898        preceding bracket, in the appropriate order. The second "call" of match()
899        uses tail recursion, to avoid using another stack frame. */
900    
901        if (*ecode == OP_KETRMIN)
902          {
903          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM65);
904          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
905          ecode = prev;
906          goto TAIL_RECURSE;
907          }
908        else  /* OP_KETRMAX */
909          {
910          md->match_function_type = MATCH_CBEGROUP;
911          RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
912          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
913          ecode += 1 + LINK_SIZE;
914          goto TAIL_RECURSE;
915          }
916        /* Control never gets here */
917    
918        /* Handle a capturing bracket, other than those that are possessive with an
919        unlimited repeat. If there is space in the offset vector, save the current
920        subject position in the working slot at the top of the vector. We mustn't
921        change the current values of the data slot, because they may be set from a
922        previous iteration of this group, and be referred to by a reference inside
923        the group. A failure to match might occur after the group has succeeded,
924        if something later on doesn't match. For this reason, we need to restore
925        the working value and also the values of the final offsets, in case they
926        were set by a previous iteration of the same bracket.
927    
928      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
929      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 693  for (;;) Line 934  for (;;)
934      number = GET2(ecode, 1+LINK_SIZE);      number = GET2(ecode, 1+LINK_SIZE);
935      offset = number << 1;      offset = number << 1;
936    
937  #ifdef DEBUG  #ifdef PCRE_DEBUG
938      printf("start bracket %d\n", number);      printf("start bracket %d\n", number);
939      printf("subject=");      printf("subject=");
940      pchars(eptr, 16, TRUE, md);      pchars(eptr, 16, TRUE, md);
# Line 706  for (;;) Line 947  for (;;)
947        save_offset2 = md->offset_vector[offset+1];        save_offset2 = md->offset_vector[offset+1];
948        save_offset3 = md->offset_vector[md->offset_end - number];        save_offset3 = md->offset_vector[md->offset_end - number];
949        save_capture_last = md->capture_last;        save_capture_last = md->capture_last;
950          save_mark = md->mark;
951    
952        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
953        md->offset_vector[md->offset_end - number] = eptr - md->start_subject;        md->offset_vector[md->offset_end - number] =
954            (int)(eptr - md->start_subject);
955    
956        flags = (op == OP_SCBRA)? match_cbegroup : 0;        for (;;)
       do  
957          {          {
958          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
959            ims, eptrb, flags, RM1);          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
960          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);            eptrb, RM1);
961            if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
962    
963            /* If we backed up to a THEN, check whether it is within the current
964            branch by comparing the address of the THEN that is passed back with
965            the end of the branch. If it is within the current branch, and the
966            branch is one of two or more alternatives (it either starts or ends
967            with OP_ALT), we have reached the limit of THEN's action, so convert
968            the return code to NOMATCH, which will cause normal backtracking to
969            happen from now on. Otherwise, THEN is passed back to an outer
970            alternative. This implements Perl's treatment of parenthesized groups,
971            where a group not containing | does not affect the current alternative,
972            that is, (X) is NOT the same as (X|(*F)). */
973    
974            if (rrc == MATCH_THEN)
975              {
976              next = ecode + GET(ecode,1);
977              if (md->start_match_ptr < next &&
978                  (*ecode == OP_ALT || *next == OP_ALT))
979                rrc = MATCH_NOMATCH;
980              }
981    
982            /* Anything other than NOMATCH is passed back. */
983    
984            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
985          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
986          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
987            md->mark = save_mark;
988            if (*ecode != OP_ALT) break;
989          }          }
       while (*ecode == OP_ALT);  
990    
991        DPRINTF(("bracket %d failed\n", number));        DPRINTF(("bracket %d failed\n", number));
   
992        md->offset_vector[offset] = save_offset1;        md->offset_vector[offset] = save_offset1;
993        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
994        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
995    
996        RRETURN(MATCH_NOMATCH);        /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
997    
998          RRETURN(rrc);
999        }        }
1000    
1001      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
# Line 741  for (;;) Line 1009  for (;;)
1009      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1010      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1011    
1012      /* Non-capturing bracket. Loop for all the alternatives. When we get to the      /* Non-capturing or atomic group, except for possessive with unlimited
1013      final alternative within the brackets, we would return the result of a      repeat and ONCE group with no captures. Loop for all the alternatives.
1014      recursive call to match() whatever happened. We can reduce stack usage by  
1015      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
1016      is set.*/      the result of a recursive call to match() whatever happened so it was
1017        possible to reduce stack usage by turning this into a tail recursion,
1018        except in the case of a possibly empty group. However, now that there is
1019        the possiblity of (*THEN) occurring in the final alternative, this
1020        optimization is no longer always possible.
1021    
1022        We can optimize if we know there are no (*THEN)s in the pattern; at present
1023        this is the best that can be done.
1024    
1025        MATCH_ONCE is returned when the end of an atomic group is successfully
1026        reached, but subsequent matching fails. It passes back up the tree (causing
1027        captured values to be reset) until the original atomic group level is
1028        reached. This is tested by comparing md->once_target with the start of the
1029        group. At this point, the return is converted into MATCH_NOMATCH so that
1030        previous backup points can be taken. */
1031    
1032        case OP_ONCE:
1033      case OP_BRA:      case OP_BRA:
1034      case OP_SBRA:      case OP_SBRA:
1035      DPRINTF(("start non-capturing bracket\n"));      DPRINTF(("start non-capturing bracket\n"));
1036      flags = (op >= OP_SBRA)? match_cbegroup : 0;  
1037      for (;;)      for (;;)
1038        {        {
1039        if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */        if (op >= OP_SBRA || op == OP_ONCE) md->match_function_type = MATCH_CBEGROUP;
         {  
         if (flags == 0)    /* Not a possibly empty group */  
           {  
           ecode += _pcre_OP_lengths[*ecode];  
           DPRINTF(("bracket 0 tail recursion\n"));  
           goto TAIL_RECURSE;  
           }  
1040    
1041          /* Possibly empty group; can't use tail recursion. */        /* If this is not a possibly empty group, and there are no (*THEN)s in
1042          the pattern, and this is the final alternative, optimize as described
1043          above. */
1044    
1045          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,        else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
1046            eptrb, flags, RM48);          {
1047          RRETURN(rrc);          ecode += PRIV(OP_lengths)[*ecode];
1048            goto TAIL_RECURSE;
1049          }          }
1050    
1051        /* For non-final alternatives, continue the loop for a NOMATCH result;        /* In all other cases, we have to make another call to match(). */
       otherwise return. */  
1052    
1053        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,        save_mark = md->mark;
1054          eptrb, flags, RM2);        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
1055        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);          RM2);
1056    
1057          /* See comment in the code for capturing groups above about handling
1058          THEN. */
1059    
1060          if (rrc == MATCH_THEN)
1061            {
1062            next = ecode + GET(ecode,1);
1063            if (md->start_match_ptr < next &&
1064                (*ecode == OP_ALT || *next == OP_ALT))
1065              rrc = MATCH_NOMATCH;
1066            }
1067    
1068          if (rrc != MATCH_NOMATCH)
1069            {
1070            if (rrc == MATCH_ONCE)
1071              {
1072              const pcre_uchar *scode = ecode;
1073              if (*scode != OP_ONCE)           /* If not at start, find it */
1074                {
1075                while (*scode == OP_ALT) scode += GET(scode, 1);
1076                scode -= GET(scode, 1);
1077                }
1078              if (md->once_target == scode) rrc = MATCH_NOMATCH;
1079              }
1080            RRETURN(rrc);
1081            }
1082        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1083          md->mark = save_mark;
1084          if (*ecode != OP_ALT) break;
1085        }        }
     /* Control never reaches here. */  
1086    
1087      /* Conditional group: compilation checked that there are no more than      RRETURN(MATCH_NOMATCH);
     two branches. If the condition is false, skipping the first branch takes us  
     past the end if there is only one branch, but that's OK because that is  
     exactly what going to the ket would do. As there is only one branch to be  
     obeyed, we can use tail recursion to avoid using another stack frame. */  
1088    
1089      case OP_COND:      /* Handle possessive capturing brackets with an unlimited repeat. We come
1090      case OP_SCOND:      here from BRAZERO with allow_zero set TRUE. The offset_vector values are
1091      if (ecode[LINK_SIZE+1] == OP_RREF)         /* Recursion test */      handled similarly to the normal case above. However, the matching is
1092        {      different. The end of these brackets will always be OP_KETRPOS, which
1093        offset = GET2(ecode, LINK_SIZE + 2);     /* Recursion group number*/      returns MATCH_KETRPOS without going further in the pattern. By this means
1094        condition = md->recursive != NULL &&      we can handle the group by iteration rather than recursion, thereby
1095          (offset == RREF_ANY || offset == md->recursive->group_num);      reducing the amount of stack needed. */
1096        ecode += condition? 3 : GET(ecode, 1);  
1097        }      case OP_CBRAPOS:
1098        case OP_SCBRAPOS:
1099        allow_zero = FALSE;
1100    
1101      else if (ecode[LINK_SIZE+1] == OP_CREF)    /* Group used test */      POSSESSIVE_CAPTURE:
1102        {      number = GET2(ecode, 1+LINK_SIZE);
1103        offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */      offset = number << 1;
1104        condition = offset < offset_top && md->offset_vector[offset] >= 0;  
1105        ecode += condition? 3 : GET(ecode, 1);  #ifdef PCRE_DEBUG
1106        }      printf("start possessive bracket %d\n", number);
1107        printf("subject=");
1108        pchars(eptr, 16, TRUE, md);
1109        printf("\n");
1110    #endif
1111    
1112      else if (ecode[LINK_SIZE+1] == OP_DEF)     /* DEFINE - always false */      if (offset < md->offset_max)
1113        {        {
1114        condition = FALSE;        matched_once = FALSE;
1115        ecode += GET(ecode, 1);        code_offset = (int)(ecode - md->start_code);
       }  
1116    
1117      /* The condition is an assertion. Call match() to evaluate it - setting        save_offset1 = md->offset_vector[offset];
1118      the final argument match_condassert causes it to stop at the end of an        save_offset2 = md->offset_vector[offset+1];
1119      assertion. */        save_offset3 = md->offset_vector[md->offset_end - number];
1120          save_capture_last = md->capture_last;
1121    
1122      else        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
1123        {  
1124        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,        /* Each time round the loop, save the current subject position for use
1125            match_condassert, RM3);        when the group matches. For MATCH_MATCH, the group has matched, so we
1126        if (rrc == MATCH_MATCH)        restart it with a new subject starting position, remembering that we had
1127          {        at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
1128          condition = TRUE;        usual. If we haven't matched any alternatives in any iteration, check to
1129          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);        see if a previous iteration matched. If so, the group has matched;
1130          while (*ecode == OP_ALT) ecode += GET(ecode, 1);        continue from afterwards. Otherwise it has failed; restore the previous
1131          capture values before returning NOMATCH. */
1132    
1133          for (;;)
1134            {
1135            md->offset_vector[md->offset_end - number] =
1136              (int)(eptr - md->start_subject);
1137            if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1138            RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1139              eptrb, RM63);
1140            if (rrc == MATCH_KETRPOS)
1141              {
1142              offset_top = md->end_offset_top;
1143              eptr = md->end_match_ptr;
1144              ecode = md->start_code + code_offset;
1145              save_capture_last = md->capture_last;
1146              matched_once = TRUE;
1147              continue;
1148              }
1149    
1150            /* See comment in the code for capturing groups above about handling
1151            THEN. */
1152    
1153            if (rrc == MATCH_THEN)
1154              {
1155              next = ecode + GET(ecode,1);
1156              if (md->start_match_ptr < next &&
1157                  (*ecode == OP_ALT || *next == OP_ALT))
1158                rrc = MATCH_NOMATCH;
1159              }
1160    
1161            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1162            md->capture_last = save_capture_last;
1163            ecode += GET(ecode, 1);
1164            if (*ecode != OP_ALT) break;
1165          }          }
1166        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)  
1167          if (!matched_once)
1168          {          {
1169          RRETURN(rrc);         /* Need braces because of following else */          md->offset_vector[offset] = save_offset1;
1170            md->offset_vector[offset+1] = save_offset2;
1171            md->offset_vector[md->offset_end - number] = save_offset3;
1172          }          }
1173        else  
1174          if (allow_zero || matched_once)
1175          {          {
1176          condition = FALSE;          ecode += 1 + LINK_SIZE;
1177          ecode += GET(ecode, 1);          break;
1178          }          }
1179    
1180          RRETURN(MATCH_NOMATCH);
1181        }        }
1182    
1183      /* We are now at the branch that is to be obeyed. As there is only one,      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
1184      we can use tail recursion to avoid using another stack frame, except when      as a non-capturing bracket. */
1185      match_cbegroup is required for an unlimited repeat of a possibly empty  
1186      group. If the second alternative doesn't exist, we can just plough on. */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1187        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1188    
1189        DPRINTF(("insufficient capture room: treat as non-capturing\n"));
1190    
1191      if (condition || *ecode == OP_ALT)      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1192        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1193    
1194        /* Non-capturing possessive bracket with unlimited repeat. We come here
1195        from BRAZERO with allow_zero = TRUE. The code is similar to the above,
1196        without the capturing complication. It is written out separately for speed
1197        and cleanliness. */
1198    
1199        case OP_BRAPOS:
1200        case OP_SBRAPOS:
1201        allow_zero = FALSE;
1202    
1203        POSSESSIVE_NON_CAPTURE:
1204        matched_once = FALSE;
1205        code_offset = (int)(ecode - md->start_code);
1206    
1207        for (;;)
1208        {        {
1209        ecode += 1 + LINK_SIZE;        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1210        if (op == OP_SCOND)        /* Possibly empty group */        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1211          {          eptrb, RM48);
1212          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, match_cbegroup, RM49);        if (rrc == MATCH_KETRPOS)
1213          RRETURN(rrc);          {
1214          }          offset_top = md->end_offset_top;
1215        else                       /* Group must match something */          eptr = md->end_match_ptr;
1216          {          ecode = md->start_code + code_offset;
1217          flags = 0;          matched_once = TRUE;
1218          goto TAIL_RECURSE;          continue;
1219            }
1220    
1221          /* See comment in the code for capturing groups above about handling
1222          THEN. */
1223    
1224          if (rrc == MATCH_THEN)
1225            {
1226            next = ecode + GET(ecode,1);
1227            if (md->start_match_ptr < next &&
1228                (*ecode == OP_ALT || *next == OP_ALT))
1229              rrc = MATCH_NOMATCH;
1230          }          }
1231    
1232          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1233          ecode += GET(ecode, 1);
1234          if (*ecode != OP_ALT) break;
1235        }        }
1236      else                         /* Condition false & no 2nd alternative */  
1237        if (matched_once || allow_zero)
1238        {        {
1239        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1240          break;
1241        }        }
1242      break;      RRETURN(MATCH_NOMATCH);
1243    
1244        /* Control never reaches here. */
1245    
1246      /* End of the pattern, either real or forced. If we are in a top-level      /* Conditional group: compilation checked that there are no more than
1247      recursion, we should restore the offsets appropriately and continue from      two branches. If the condition is false, skipping the first branch takes us
1248      after the call. */      past the end if there is only one branch, but that's OK because that is
1249        exactly what going to the ket would do. */
1250    
1251      case OP_ACCEPT:      case OP_COND:
1252      case OP_END:      case OP_SCOND:
1253      if (md->recursive != NULL && md->recursive->group_num == 0)      codelink = GET(ecode, 1);
1254    
1255        /* Because of the way auto-callout works during compile, a callout item is
1256        inserted between OP_COND and an assertion condition. */
1257    
1258        if (ecode[LINK_SIZE+1] == OP_CALLOUT)
1259        {        {
1260        recursion_info *rec = md->recursive;        if (PUBL(callout) != NULL)
1261        DPRINTF(("End of pattern in a (?0) recursion\n"));          {
1262        md->recursive = rec->prevrec;          PUBL(callout_block) cb;
1263        memmove(md->offset_vector, rec->offset_save,          cb.version          = 2;   /* Version 1 of the callout block */
1264          rec->saved_max * sizeof(int));          cb.callout_number   = ecode[LINK_SIZE+2];
1265        mstart = rec->save_start;          cb.offset_vector    = md->offset_vector;
1266        ims = original_ims;  #ifdef COMPILE_PCRE8
1267        ecode = rec->after_call;          cb.subject          = (PCRE_SPTR)md->start_subject;
1268        break;  #else
1269            cb.subject          = (PCRE_SPTR16)md->start_subject;
1270    #endif
1271            cb.subject_length   = (int)(md->end_subject - md->start_subject);
1272            cb.start_match      = (int)(mstart - md->start_subject);
1273            cb.current_position = (int)(eptr - md->start_subject);
1274            cb.pattern_position = GET(ecode, LINK_SIZE + 3);
1275            cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);
1276            cb.capture_top      = offset_top/2;
1277            cb.capture_last     = md->capture_last;
1278            cb.callout_data     = md->callout_data;
1279            cb.mark             = md->nomatch_mark;
1280            if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1281            if (rrc < 0) RRETURN(rrc);
1282            }
1283          ecode += PRIV(OP_lengths)[OP_CALLOUT];
1284        }        }
1285    
1286      /* Otherwise, if PCRE_NOTEMPTY is set, fail if we have matched an empty      condcode = ecode[LINK_SIZE+1];
     string - backtracking will then try other alternatives, if any. */  
1287    
1288      if (md->notempty && eptr == mstart) RRETURN(MATCH_NOMATCH);      /* Now see what the actual condition is */
     md->end_match_ptr = eptr;           /* Record where we ended */  
     md->end_offset_top = offset_top;    /* and how many extracts were taken */  
     md->start_match_ptr = mstart;       /* and the start (\K can modify) */  
     RRETURN(MATCH_MATCH);  
   
     /* Change option settings */  
1289    
1290      case OP_OPT:      if (condcode == OP_RREF || condcode == OP_NRREF)    /* Recursion test */
1291      ims = ecode[1];        {
1292      ecode += 2;        if (md->recursive == NULL)                /* Not recursing => FALSE */
1293      DPRINTF(("ims set to %02lx\n", ims));          {
1294      break;          condition = FALSE;
1295            ecode += GET(ecode, 1);
1296            }
1297          else
1298            {
1299            int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
1300            condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1301    
1302      /* Assertion brackets. Check the alternative branches in turn - the          /* If the test is for recursion into a specific subpattern, and it is
1303      matching won't pass the KET for an assertion. If any one branch matches,          false, but the test was set up by name, scan the table to see if the
1304      the assertion is true. Lookbehind assertions have an OP_REVERSE item at the          name refers to any other numbers, and test them. The condition is true
1305      start of each branch to move the current point backwards, so the code at          if any one is set. */
1306      this level is identical to the lookahead case. */  
1307            if (!condition && condcode == OP_NRREF)
1308              {
1309              pcre_uchar *slotA = md->name_table;
1310              for (i = 0; i < md->name_count; i++)
1311                {
1312                if (GET2(slotA, 0) == recno) break;
1313                slotA += md->name_entry_size;
1314                }
1315    
1316              /* Found a name for the number - there can be only one; duplicate
1317              names for different numbers are allowed, but not vice versa. First
1318              scan down for duplicates. */
1319    
1320              if (i < md->name_count)
1321                {
1322                pcre_uchar *slotB = slotA;
1323                while (slotB > md->name_table)
1324                  {
1325                  slotB -= md->name_entry_size;
1326                  if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1327                    {
1328                    condition = GET2(slotB, 0) == md->recursive->group_num;
1329                    if (condition) break;
1330                    }
1331                  else break;
1332                  }
1333    
1334                /* Scan up for duplicates */
1335    
1336                if (!condition)
1337                  {
1338                  slotB = slotA;
1339                  for (i++; i < md->name_count; i++)
1340                    {
1341                    slotB += md->name_entry_size;
1342                    if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1343                      {
1344                      condition = GET2(slotB, 0) == md->recursive->group_num;
1345                      if (condition) break;
1346                      }
1347                    else break;
1348                    }
1349                  }
1350                }
1351              }
1352    
1353            /* Chose branch according to the condition */
1354    
1355            ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1356            }
1357          }
1358    
1359        else if (condcode == OP_CREF || condcode == OP_NCREF)  /* Group used test */
1360          {
1361          offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */
1362          condition = offset < offset_top && md->offset_vector[offset] >= 0;
1363    
1364          /* If the numbered capture is unset, but the reference was by name,
1365          scan the table to see if the name refers to any other numbers, and test
1366          them. The condition is true if any one is set. This is tediously similar
1367          to the code above, but not close enough to try to amalgamate. */
1368    
1369          if (!condition && condcode == OP_NCREF)
1370            {
1371            int refno = offset >> 1;
1372            pcre_uchar *slotA = md->name_table;
1373    
1374            for (i = 0; i < md->name_count; i++)
1375              {
1376              if (GET2(slotA, 0) == refno) break;
1377              slotA += md->name_entry_size;
1378              }
1379    
1380            /* Found a name for the number - there can be only one; duplicate names
1381            for different numbers are allowed, but not vice versa. First scan down
1382            for duplicates. */
1383    
1384            if (i < md->name_count)
1385              {
1386              pcre_uchar *slotB = slotA;
1387              while (slotB > md->name_table)
1388                {
1389                slotB -= md->name_entry_size;
1390                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1391                  {
1392                  offset = GET2(slotB, 0) << 1;
1393                  condition = offset < offset_top &&
1394                    md->offset_vector[offset] >= 0;
1395                  if (condition) break;
1396                  }
1397                else break;
1398                }
1399    
1400              /* Scan up for duplicates */
1401    
1402              if (!condition)
1403                {
1404                slotB = slotA;
1405                for (i++; i < md->name_count; i++)
1406                  {
1407                  slotB += md->name_entry_size;
1408                  if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1409                    {
1410                    offset = GET2(slotB, 0) << 1;
1411                    condition = offset < offset_top &&
1412                      md->offset_vector[offset] >= 0;
1413                    if (condition) break;
1414                    }
1415                  else break;
1416                  }
1417                }
1418              }
1419            }
1420    
1421          /* Chose branch according to the condition */
1422    
1423          ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1424          }
1425    
1426        else if (condcode == OP_DEF)     /* DEFINE - always false */
1427          {
1428          condition = FALSE;
1429          ecode += GET(ecode, 1);
1430          }
1431    
1432        /* The condition is an assertion. Call match() to evaluate it - setting
1433        md->match_function_type to MATCH_CONDASSERT causes it to stop at the end of
1434        an assertion. */
1435    
1436        else
1437          {
1438          md->match_function_type = MATCH_CONDASSERT;
1439          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);
1440          if (rrc == MATCH_MATCH)
1441            {
1442            if (md->end_offset_top > offset_top)
1443              offset_top = md->end_offset_top;  /* Captures may have happened */
1444            condition = TRUE;
1445            ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
1446            while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1447            }
1448    
1449          /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
1450          assertion; it is therefore treated as NOMATCH. */
1451    
1452          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1453            {
1454            RRETURN(rrc);         /* Need braces because of following else */
1455            }
1456          else
1457            {
1458            condition = FALSE;
1459            ecode += codelink;
1460            }
1461          }
1462    
1463        /* We are now at the branch that is to be obeyed. As there is only one, can
1464        use tail recursion to avoid using another stack frame, except when there is
1465        unlimited repeat of a possibly empty group. In the latter case, a recursive
1466        call to match() is always required, unless the second alternative doesn't
1467        exist, in which case we can just plough on. Note that, for compatibility
1468        with Perl, the | in a conditional group is NOT treated as creating two
1469        alternatives. If a THEN is encountered in the branch, it propagates out to
1470        the enclosing alternative (unless nested in a deeper set of alternatives,
1471        of course). */
1472    
1473        if (condition || *ecode == OP_ALT)
1474          {
1475          if (op != OP_SCOND)
1476            {
1477            ecode += 1 + LINK_SIZE;
1478            goto TAIL_RECURSE;
1479            }
1480    
1481          md->match_function_type = MATCH_CBEGROUP;
1482          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
1483          RRETURN(rrc);
1484          }
1485    
1486         /* Condition false & no alternative; continue after the group. */
1487    
1488        else
1489          {
1490          ecode += 1 + LINK_SIZE;
1491          }
1492        break;
1493    
1494    
1495        /* Before OP_ACCEPT there may be any number of OP_CLOSE opcodes,
1496        to close any currently open capturing brackets. */
1497    
1498        case OP_CLOSE:
1499        number = GET2(ecode, 1);
1500        offset = number << 1;
1501    
1502    #ifdef PCRE_DEBUG
1503          printf("end bracket %d at *ACCEPT", number);
1504          printf("\n");
1505    #endif
1506    
1507        md->capture_last = number;
1508        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
1509          {
1510          md->offset_vector[offset] =
1511            md->offset_vector[md->offset_end - number];
1512          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1513          if (offset_top <= offset) offset_top = offset + 2;
1514          }
1515        ecode += 1 + IMM2_SIZE;
1516        break;
1517    
1518    
1519        /* End of the pattern, either real or forced. */
1520    
1521        case OP_END:
1522        case OP_ACCEPT:
1523        case OP_ASSERT_ACCEPT:
1524    
1525        /* If we have matched an empty string, fail if not in an assertion and not
1526        in a recursion if either PCRE_NOTEMPTY is set, or if PCRE_NOTEMPTY_ATSTART
1527        is set and we have matched at the start of the subject. In both cases,
1528        backtracking will then try other alternatives, if any. */
1529    
1530        if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
1531             md->recursive == NULL &&
1532             (md->notempty ||
1533               (md->notempty_atstart &&
1534                 mstart == md->start_subject + md->start_offset)))
1535          RRETURN(MATCH_NOMATCH);
1536    
1537        /* Otherwise, we have a match. */
1538    
1539        md->end_match_ptr = eptr;           /* Record where we ended */
1540        md->end_offset_top = offset_top;    /* and how many extracts were taken */
1541        md->start_match_ptr = mstart;       /* and the start (\K can modify) */
1542    
1543        /* For some reason, the macros don't work properly if an expression is
1544        given as the argument to RRETURN when the heap is in use. */
1545    
1546        rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1547        RRETURN(rrc);
1548    
1549        /* Assertion brackets. Check the alternative branches in turn - the
1550        matching won't pass the KET for an assertion. If any one branch matches,
1551        the assertion is true. Lookbehind assertions have an OP_REVERSE item at the
1552        start of each branch to move the current point backwards, so the code at
1553        this level is identical to the lookahead case. When the assertion is part
1554        of a condition, we want to return immediately afterwards. The caller of
1555        this incarnation of the match() function will have set MATCH_CONDASSERT in
1556        md->match_function type, and one of these opcodes will be the first opcode
1557        that is processed. We use a local variable that is preserved over calls to
1558        match() to remember this case. */
1559    
1560      case OP_ASSERT:      case OP_ASSERT:
1561      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1562        save_mark = md->mark;
1563        if (md->match_function_type == MATCH_CONDASSERT)
1564          {
1565          condassert = TRUE;
1566          md->match_function_type = 0;
1567          }
1568        else condassert = FALSE;
1569    
1570      do      do
1571        {        {
1572        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
1573          RM4);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1574        if (rrc == MATCH_MATCH) break;          {
1575            mstart = md->start_match_ptr;   /* In case \K reset it */
1576            break;
1577            }
1578    
1579          /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1580          as NOMATCH. */
1581    
1582        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1583        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1584          md->mark = save_mark;
1585        }        }
1586      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1587    
1588      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
1589    
1590      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1591    
1592      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);
1593    
1594      /* Continue from after the assertion, updating the offsets high water      /* Continue from after the assertion, updating the offsets high water
1595      mark, since extracts may have been taken during the assertion. */      mark, since extracts may have been taken during the assertion. */
# Line 926  for (;;) Line 1599  for (;;)
1599      offset_top = md->end_offset_top;      offset_top = md->end_offset_top;
1600      continue;      continue;
1601    
1602      /* Negative assertion: all branches must fail to match */      /* Negative assertion: all branches must fail to match. Encountering SKIP,
1603        PRUNE, or COMMIT means we must assume failure without checking subsequent
1604        branches. */
1605    
1606      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1607      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1608        save_mark = md->mark;
1609        if (md->match_function_type == MATCH_CONDASSERT)
1610          {
1611          condassert = TRUE;
1612          md->match_function_type = 0;
1613          }
1614        else condassert = FALSE;
1615    
1616      do      do
1617        {        {
1618        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1619          RM5);        md->mark = save_mark;
1620        if (rrc == MATCH_MATCH) RRETURN(MATCH_NOMATCH);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) RRETURN(MATCH_NOMATCH);
1621          if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1622            {
1623            do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1624            break;
1625            }
1626    
1627          /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1628          as NOMATCH. */
1629    
1630        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1631        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1632        }        }
1633      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1634    
1635      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1636    
1637      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1638      continue;      continue;
# Line 951  for (;;) Line 1643  for (;;)
1643      back a number of characters, not bytes. */      back a number of characters, not bytes. */
1644    
1645      case OP_REVERSE:      case OP_REVERSE:
1646  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1647      if (utf8)      if (utf)
1648        {        {
1649        i = GET(ecode, 1);        i = GET(ecode, 1);
1650        while (i-- > 0)        while (i-- > 0)
# Line 972  for (;;) Line 1664  for (;;)
1664        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1665        }        }
1666    
1667      /* Skip to next op code */      /* Save the earliest consulted character, then skip to next op code */
1668    
1669        if (eptr < md->start_used_ptr) md->start_used_ptr = eptr;
1670      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1671      break;      break;
1672    
# Line 982  for (;;) Line 1675  for (;;)
1675      function is able to force a failure. */      function is able to force a failure. */
1676    
1677      case OP_CALLOUT:      case OP_CALLOUT:
1678      if (pcre_callout != NULL)      if (PUBL(callout) != NULL)
1679        {        {
1680        pcre_callout_block cb;        PUBL(callout_block) cb;
1681        cb.version          = 1;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1682        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1683        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1684    #ifdef COMPILE_PCRE8
1685        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
1686        cb.subject_length   = md->end_subject - md->start_subject;  #else
1687        cb.start_match      = mstart - md->start_subject;        cb.subject          = (PCRE_SPTR16)md->start_subject;
1688        cb.current_position = eptr - md->start_subject;  #endif
1689          cb.subject_length   = (int)(md->end_subject - md->start_subject);
1690          cb.start_match      = (int)(mstart - md->start_subject);
1691          cb.current_position = (int)(eptr - md->start_subject);
1692        cb.pattern_position = GET(ecode, 2);        cb.pattern_position = GET(ecode, 2);
1693        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
1694        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1695        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last;
1696        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1697        if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);        cb.mark             = md->nomatch_mark;
1698          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1699        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1700        }        }
1701      ecode += 2 + 2*LINK_SIZE;      ecode += 2 + 2*LINK_SIZE;
# Line 1007  for (;;) Line 1705  for (;;)
1705      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
1706      whole pattern. (This is so that it works from duplicated subpatterns.)      whole pattern. (This is so that it works from duplicated subpatterns.)
1707    
1708      If there are any capturing brackets started but not finished, we have to      The state of the capturing groups is preserved over recursion, and
1709      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
1710      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
1711      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
1712      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
1713      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
1714      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.  
1715    
1716      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
1717      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
1718      for the original version of this logic. */      for the original version of this logic. It has, however, been hacked around
1719        a lot, so he is not to blame for the current way it works. */
1720    
1721      case OP_RECURSE:      case OP_RECURSE:
1722        {        {
1723          recursion_info *ri;
1724          int recno;
1725    
1726        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1727        new_recursive.group_num = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
1728          GET2(callpat, 1 + LINK_SIZE);          GET2(callpat, 1 + LINK_SIZE);
1729    
1730          /* Check for repeating a recursion without advancing the subject pointer.
1731          This should catch convoluted mutual recursions. (Some simple cases are
1732          caught at compile time.) */
1733    
1734          for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
1735            if (recno == ri->group_num && eptr == ri->subject_position)
1736              RRETURN(PCRE_ERROR_RECURSELOOP);
1737    
1738        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1739    
1740          new_recursive.group_num = recno;
1741          new_recursive.subject_position = eptr;
1742        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1743        md->recursive = &new_recursive;        md->recursive = &new_recursive;
1744    
1745        /* Find where to continue from afterwards */        /* Where to continue from afterwards */
1746    
1747        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       new_recursive.after_call = ecode;  
1748    
1749        /* Now save the offset data. */        /* Now save the offset data */
1750    
1751        new_recursive.saved_max = md->offset_end;        new_recursive.saved_max = md->offset_end;
1752        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
# Line 1046  for (;;) Line 1754  for (;;)
1754        else        else
1755          {          {
1756          new_recursive.offset_save =          new_recursive.offset_save =
1757            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
1758          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1759          }          }
   
1760        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1761              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
       new_recursive.save_start = mstart;  
       mstart = eptr;  
1762    
1763        /* OK, now we can do the recursion. For each top-level alternative we        /* OK, now we can do the recursion. After processing each alternative,
1764        restore the offset and recursion data. */        restore the offset data. If there were nested recursions, md->recursive
1765          might be changed, so reset it before looping. */
1766    
1767        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1768        flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;        cbegroup = (*callpat >= OP_SBRA);
1769        do        do
1770          {          {
1771          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1772            md, ims, eptrb, flags, RM6);          RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
1773          if (rrc == MATCH_MATCH)            md, eptrb, RM6);
1774            memcpy(md->offset_vector, new_recursive.offset_save,
1775                new_recursive.saved_max * sizeof(int));
1776            md->recursive = new_recursive.prevrec;
1777            if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1778            {            {
1779            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
           md->recursive = new_recursive.prevrec;  
1780            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1781              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1782            RRETURN(MATCH_MATCH);  
1783              /* Set where we got to in the subject, and reset the start in case
1784              it was changed by \K. This *is* propagated back out of a recursion,
1785              for Perl compatibility. */
1786    
1787              eptr = md->end_match_ptr;
1788              mstart = md->start_match_ptr;
1789              goto RECURSION_MATCHED;        /* Exit loop; end processing */
1790            }            }
1791          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)  
1792            /* PCRE does not allow THEN or COMMIT to escape beyond a recursion; it
1793            is treated as NOMATCH. */
1794    
1795            else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN &&
1796                     rrc != MATCH_COMMIT)
1797            {            {
1798            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1799              if (new_recursive.offset_save != stacksave)
1800                (PUBL(free))(new_recursive.offset_save);
1801            RRETURN(rrc);            RRETURN(rrc);
1802            }            }
1803    
1804          md->recursive = &new_recursive;          md->recursive = &new_recursive;
         memcpy(md->offset_vector, new_recursive.offset_save,  
             new_recursive.saved_max * sizeof(int));  
1805          callpat += GET(callpat, 1);          callpat += GET(callpat, 1);
1806          }          }
1807        while (*callpat == OP_ALT);        while (*callpat == OP_ALT);
# Line 1088  for (;;) Line 1809  for (;;)
1809        DPRINTF(("Recursion didn't match\n"));        DPRINTF(("Recursion didn't match\n"));
1810        md->recursive = new_recursive.prevrec;        md->recursive = new_recursive.prevrec;
1811        if (new_recursive.offset_save != stacksave)        if (new_recursive.offset_save != stacksave)
1812          (pcre_free)(new_recursive.offset_save);          (PUBL(free))(new_recursive.offset_save);
1813        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1814        }        }
     /* Control never reaches here */  
   
     /* "Once" brackets are like assertion brackets except that after a match,  
     the point in the subject string is not moved back. Thus there can never be  
     a move back into the brackets. Friedl calls these "atomic" subpatterns.  
     Check the alternative branches in turn - the matching won't pass the KET  
     for this kind of subpattern. If any one branch matches, we carry on as at  
     the end of a normal bracket, leaving the subject pointer. */  
   
     case OP_ONCE:  
     prev = ecode;  
     saved_eptr = eptr;  
   
     do  
       {  
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM7);  
       if (rrc == MATCH_MATCH) break;  
       if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);  
       ecode += GET(ecode,1);  
       }  
     while (*ecode == OP_ALT);  
   
     /* 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);  
1815    
1816      offset_top = md->end_offset_top;      RECURSION_MATCHED:
1817      eptr = md->end_match_ptr;      break;
   
     /* 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 */  
1818    
1819      /* 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
1820      bracketed group and go to there. */      bracketed group and go to there. */
# Line 1181  for (;;) Line 1830  for (;;)
1830      optional ones preceded by BRAZERO or BRAMINZERO. */      optional ones preceded by BRAZERO or BRAMINZERO. */
1831    
1832      case OP_BRAZERO:      case OP_BRAZERO:
1833        {      next = ecode + 1;
1834        next = ecode+1;      RMATCH(eptr, next, offset_top, md, eptrb, RM10);
1835        RMATCH(eptr, next, offset_top, md, ims, eptrb, 0, RM10);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1836        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      do next += GET(next, 1); while (*next == OP_ALT);
1837        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1838      break;      break;
1839    
1840      case OP_BRAMINZERO:      case OP_BRAMINZERO:
1841        {      next = ecode + 1;
1842        next = ecode+1;      do next += GET(next, 1); while (*next == OP_ALT);
1843        do next += GET(next, 1); while (*next == OP_ALT);      RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, eptrb, RM11);
1844        RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0, RM11);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1845        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      ecode++;
       ecode++;  
       }  
1846      break;      break;
1847    
1848      case OP_SKIPZERO:      case OP_SKIPZERO:
1849        {      next = ecode+1;
1850        next = ecode+1;      do next += GET(next,1); while (*next == OP_ALT);
1851        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1852      break;      break;
1853    
1854        /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
1855        here; just jump to the group, with allow_zero set TRUE. */
1856    
1857        case OP_BRAPOSZERO:
1858        op = *(++ecode);
1859        allow_zero = TRUE;
1860        if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
1861          goto POSSESSIVE_NON_CAPTURE;
1862    
1863      /* End of a group, repeated or non-repeating. */      /* End of a group, repeated or non-repeating. */
1864    
1865      case OP_KET:      case OP_KET:
1866      case OP_KETRMIN:      case OP_KETRMIN:
1867      case OP_KETRMAX:      case OP_KETRMAX:
1868        case OP_KETRPOS:
1869      prev = ecode - GET(ecode, 1);      prev = ecode - GET(ecode, 1);
1870    
1871      /* 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
1872      infinite repeats of empty string matches, retrieve the subject start from      infinite repeats of empty string matches, retrieve the subject start from
1873      the chain. Otherwise, set it NULL. */      the chain. Otherwise, set it NULL. */
1874    
1875      if (*prev >= OP_SBRA)      if (*prev >= OP_SBRA || *prev == OP_ONCE)
1876        {        {
1877        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
1878        eptrb = eptrb->epb_prev;              /* Backup to previous group */        eptrb = eptrb->epb_prev;              /* Backup to previous group */
1879        }        }
1880      else saved_eptr = NULL;      else saved_eptr = NULL;
1881    
1882      /* 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
1883      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
1884      assertions. Do this also for the "once" (atomic) groups. */      water mark for use by positive assertions. We also need to record the match
1885        start in case it was changed by \K. */
1886      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||  
1887          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||      if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
1888          *prev == OP_ONCE)           *prev == OP_ONCE_NC)
1889        {        {
1890        md->end_match_ptr = eptr;      /* For ONCE */        md->end_match_ptr = eptr;      /* For ONCE_NC */
1891        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1892        RRETURN(MATCH_MATCH);        md->start_match_ptr = mstart;
1893          RRETURN(MATCH_MATCH);         /* Sets md->mark */
1894        }        }
1895    
1896      /* 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
1897      and if necessary complete handling an extraction by setting the offsets and      and if necessary complete handling an extraction by setting the offsets and
1898      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
1899      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
1900      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
1901        the current subject position and start match pointer and give a MATCH
1902        return. */
1903    
1904      if (*prev == OP_CBRA || *prev == OP_SCBRA)      if (*prev == OP_CBRA || *prev == OP_SCBRA ||
1905            *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
1906        {        {
1907        number = GET2(prev, 1+LINK_SIZE);        number = GET2(prev, 1+LINK_SIZE);
1908        offset = number << 1;        offset = number << 1;
1909    
1910  #ifdef DEBUG  #ifdef PCRE_DEBUG
1911        printf("end bracket %d", number);        printf("end bracket %d", number);
1912        printf("\n");        printf("\n");
1913  #endif  #endif
1914    
1915          /* Handle a recursively called group. */
1916    
1917          if (md->recursive != NULL && md->recursive->group_num == number)
1918            {
1919            md->end_match_ptr = eptr;
1920            md->start_match_ptr = mstart;
1921            RRETURN(MATCH_MATCH);
1922            }
1923    
1924          /* Deal with capturing */
1925    
1926        md->capture_last = number;        md->capture_last = number;
1927        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
1928          {          {
1929            /* If offset is greater than offset_top, it means that we are
1930            "skipping" a capturing group, and that group's offsets must be marked
1931            unset. In earlier versions of PCRE, all the offsets were unset at the
1932            start of matching, but this doesn't work because atomic groups and
1933            assertions can cause a value to be set that should later be unset.
1934            Example: matching /(?>(a))b|(a)c/ against "ac". This sets group 1 as
1935            part of the atomic group, but this is not on the final matching path,
1936            so must be unset when 2 is set. (If there is no group 2, there is no
1937            problem, because offset_top will then be 2, indicating no capture.) */
1938    
1939            if (offset > offset_top)
1940              {
1941              register int *iptr = md->offset_vector + offset_top;
1942              register int *iend = md->offset_vector + offset;
1943              while (iptr < iend) *iptr++ = -1;
1944              }
1945    
1946            /* Now make the extraction */
1947    
1948          md->offset_vector[offset] =          md->offset_vector[offset] =
1949            md->offset_vector[md->offset_end - number];            md->offset_vector[md->offset_end - number];
1950          md->offset_vector[offset+1] = eptr - md->start_subject;          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1951          if (offset_top <= offset) offset_top = offset + 2;          if (offset_top <= offset) offset_top = offset + 2;
1952          }          }
1953          }
1954    
1955        /* Handle a recursively called group. Restore the offsets      /* For an ordinary non-repeating ket, just continue at this level. This
1956        appropriately and continue from after the call. */      also happens for a repeating ket if no characters were matched in the
1957        group. This is the forcible breaking of infinite loops as implemented in
1958        Perl 5.005. For a non-repeating atomic group that includes captures,
1959        establish a backup point by processing the rest of the pattern at a lower
1960        level. If this results in a NOMATCH return, pass MATCH_ONCE back to the
1961        original OP_ONCE level, thereby bypassing intermediate backup points, but
1962        resetting any captures that happened along the way. */
1963    
1964        if (md->recursive != NULL && md->recursive->group_num == number)      if (*ecode == OP_KET || eptr == saved_eptr)
1965          {
1966          if (*prev == OP_ONCE)
1967          {          {
1968          recursion_info *rec = md->recursive;          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
1969          DPRINTF(("Recursion (%d) succeeded - continuing\n", number));          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1970          md->recursive = rec->prevrec;          md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1971          mstart = rec->save_start;          RRETURN(MATCH_ONCE);
         memcpy(md->offset_vector, rec->offset_save,  
           rec->saved_max * sizeof(int));  
         ecode = rec->after_call;  
         ims = original_ims;  
         break;  
1972          }          }
1973          ecode += 1 + LINK_SIZE;    /* Carry on at this level */
1974          break;
1975        }        }
1976    
1977      /* For both capturing and non-capturing groups, reset the value of the ims      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
1978      flags, in case they got changed during the group. */      and return the MATCH_KETRPOS. This makes it possible to do the repeats one
1979        at a time from the outer level, thus saving stack. */
     ims = original_ims;  
     DPRINTF(("ims reset to %02lx\n", ims));  
1980    
1981      /* For a non-repeating ket, just continue at this level. This also      if (*ecode == OP_KETRPOS)
     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)  
1982        {        {
1983        ecode += 1 + LINK_SIZE;        md->end_match_ptr = eptr;
1984        break;        md->end_offset_top = offset_top;
1985          RRETURN(MATCH_KETRPOS);
1986        }        }
1987    
1988      /* 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
1989      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
1990      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
1991      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
1992        string. */
     flags = (*prev >= OP_SBRA)? match_cbegroup : 0;  
1993    
1994      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1995        {        {
1996        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM12);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
1997        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1998        if (flags != 0)    /* Could match an empty string */        if (*prev == OP_ONCE)
1999            {
2000            RMATCH(eptr, prev, offset_top, md, eptrb, RM8);
2001            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2002            md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
2003            RRETURN(MATCH_ONCE);
2004            }
2005          if (*prev >= OP_SBRA)    /* Could match an empty string */
2006          {          {
2007          RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM50);          md->match_function_type = MATCH_CBEGROUP;
2008            RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
2009          RRETURN(rrc);          RRETURN(rrc);
2010          }          }
2011        ecode = prev;        ecode = prev;
# Line 1320  for (;;) Line 2013  for (;;)
2013        }        }
2014      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
2015        {        {
2016        RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM13);        if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
2017          RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
2018          if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
2019        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2020          if (*prev == OP_ONCE)
2021            {
2022            RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM9);
2023            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2024            md->once_target = prev;
2025            RRETURN(MATCH_ONCE);
2026            }
2027        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       flags = 0;  
2028        goto TAIL_RECURSE;        goto TAIL_RECURSE;
2029        }        }
2030      /* Control never gets here */      /* Control never gets here */
2031    
2032      /* Start of subject unless notbol, or after internal newline if multiline */      /* Not multiline mode: start of subject assertion, unless notbol. */
2033    
2034      case OP_CIRC:      case OP_CIRC:
2035      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 */  
2036    
2037      /* Start of subject assertion */      /* Start of subject assertion */
2038    
# Line 1349  for (;;) Line 2041  for (;;)
2041      ecode++;      ecode++;
2042      break;      break;
2043    
2044        /* Multiline mode: start of subject unless notbol, or after any newline. */
2045    
2046        case OP_CIRCM:
2047        if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2048        if (eptr != md->start_subject &&
2049            (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
2050          RRETURN(MATCH_NOMATCH);
2051        ecode++;
2052        break;
2053    
2054      /* Start of match assertion */      /* Start of match assertion */
2055    
2056      case OP_SOM:      case OP_SOM:
# Line 1363  for (;;) Line 2065  for (;;)
2065      ecode++;      ecode++;
2066      break;      break;
2067    
2068      /* Assert before internal newline if multiline, or before a terminating      /* Multiline mode: assert before any newline, or before end of subject
2069      newline unless endonly is set, else end of subject unless noteol is set. */      unless noteol is set. */
2070    
2071      case OP_DOLL:      case OP_DOLLM:
2072      if ((ims & PCRE_MULTILINE) != 0)      if (eptr < md->end_subject)
2073        {        {
2074        if (eptr < md->end_subject)        if (!IS_NEWLINE(eptr))
2075          { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }          {
2076        else          if (md->partial != 0 &&
2077          { if (md->noteol) RRETURN(MATCH_NOMATCH); }              eptr + 1 >= md->end_subject &&
2078        ecode++;              NLBLOCK->nltype == NLTYPE_FIXED &&
2079        break;              NLBLOCK->nllen == 2 &&
2080                *eptr == NLBLOCK->nl[0])
2081              {
2082              md->hitend = TRUE;
2083              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2084              }
2085            RRETURN(MATCH_NOMATCH);
2086            }
2087        }        }
2088      else      else
2089        {        {
2090        if (md->noteol) RRETURN(MATCH_NOMATCH);        if (md->noteol) RRETURN(MATCH_NOMATCH);
2091        if (!md->endonly)        SCHECK_PARTIAL();
         {  
         if (eptr != md->end_subject &&  
             (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))  
           RRETURN(MATCH_NOMATCH);  
         ecode++;  
         break;  
         }  
2092        }        }
2093        ecode++;
2094        break;
2095    
2096        /* Not multiline mode: assert before a terminating newline or before end of
2097        subject unless noteol is set. */
2098    
2099        case OP_DOLL:
2100        if (md->noteol) RRETURN(MATCH_NOMATCH);
2101        if (!md->endonly) goto ASSERT_NL_OR_EOS;
2102    
2103      /* ... else fall through for endonly */      /* ... else fall through for endonly */
2104    
2105      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
2106    
2107      case OP_EOD:      case OP_EOD:
2108      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
2109        SCHECK_PARTIAL();
2110      ecode++;      ecode++;
2111      break;      break;
2112    
2113      /* End of subject or ending \n assertion (\Z) */      /* End of subject or ending \n assertion (\Z) */
2114    
2115      case OP_EODN:      case OP_EODN:
2116      if (eptr != md->end_subject &&      ASSERT_NL_OR_EOS:
2117        if (eptr < md->end_subject &&
2118          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
2119          {
2120          if (md->partial != 0 &&
2121              eptr + 1 >= md->end_subject &&
2122              NLBLOCK->nltype == NLTYPE_FIXED &&
2123              NLBLOCK->nllen == 2 &&
2124              *eptr == NLBLOCK->nl[0])
2125            {
2126            md->hitend = TRUE;
2127            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2128            }
2129        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2130          }
2131    
2132        /* Either at end of string or \n before end. */
2133    
2134        SCHECK_PARTIAL();
2135      ecode++;      ecode++;
2136      break;      break;
2137    
# Line 1414  for (;;) Line 2143  for (;;)
2143    
2144        /* Find out if the previous and current characters are "word" characters.        /* Find out if the previous and current characters are "word" characters.
2145        It takes a bit more work in UTF-8 mode. Characters > 255 are assumed to        It takes a bit more work in UTF-8 mode. Characters > 255 are assumed to
2146        be "non-word" characters. */        be "non-word" characters. Remember the earliest consulted character for
2147          partial matching. */
2148    
2149  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2150        if (utf8)        if (utf)
2151          {          {
2152            /* Get status of previous character */
2153    
2154          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
2155            {            {
2156            const uschar *lastptr = eptr - 1;            PCRE_PUCHAR lastptr = eptr - 1;
2157            while((*lastptr & 0xc0) == 0x80) lastptr--;            BACKCHAR(lastptr);
2158              if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
2159            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
2160    #ifdef SUPPORT_UCP
2161              if (md->use_ucp)
2162                {
2163                if (c == '_') prev_is_word = TRUE; else
2164                  {
2165                  int cat = UCD_CATEGORY(c);
2166                  prev_is_word = (cat == ucp_L || cat == ucp_N);
2167                  }
2168                }
2169              else
2170    #endif
2171            prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;            prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
2172            }            }
2173          if (eptr >= md->end_subject) cur_is_word = FALSE; else  
2174            /* Get status of next character */
2175    
2176            if (eptr >= md->end_subject)
2177              {
2178              SCHECK_PARTIAL();
2179              cur_is_word = FALSE;
2180              }
2181            else
2182            {            {
2183            GETCHAR(c, eptr);            GETCHAR(c, eptr);
2184    #ifdef SUPPORT_UCP
2185              if (md->use_ucp)
2186                {
2187                if (c == '_') cur_is_word = TRUE; else
2188                  {
2189                  int cat = UCD_CATEGORY(c);
2190                  cur_is_word = (cat == ucp_L || cat == ucp_N);
2191                  }
2192                }
2193              else
2194    #endif
2195            cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;            cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
2196            }            }
2197          }          }
2198        else        else
2199  #endif  #endif
2200    
2201        /* More streamlined when not in UTF-8 mode */        /* Not in UTF-8 mode, but we may still have PCRE_UCP set, and for
2202          consistency with the behaviour of \w we do use it in this case. */
2203    
2204          {          {
2205          prev_is_word = (eptr != md->start_subject) &&          /* Get status of previous character */
2206            ((md->ctypes[eptr[-1]] & ctype_word) != 0);  
2207          cur_is_word = (eptr < md->end_subject) &&          if (eptr == md->start_subject) prev_is_word = FALSE; else
2208            ((md->ctypes[*eptr] & ctype_word) != 0);            {
2209              if (eptr <= md->start_used_ptr) md->start_used_ptr = eptr - 1;
2210    #ifdef SUPPORT_UCP
2211              if (md->use_ucp)
2212                {
2213                c = eptr[-1];
2214                if (c == '_') prev_is_word = TRUE; else
2215                  {
2216                  int cat = UCD_CATEGORY(c);
2217                  prev_is_word = (cat == ucp_L || cat == ucp_N);
2218                  }
2219                }
2220              else
2221    #endif
2222              prev_is_word = MAX_255(eptr[-1])
2223                && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
2224              }
2225    
2226            /* Get status of next character */
2227    
2228            if (eptr >= md->end_subject)
2229              {
2230              SCHECK_PARTIAL();
2231              cur_is_word = FALSE;
2232              }
2233            else
2234    #ifdef SUPPORT_UCP
2235            if (md->use_ucp)
2236              {
2237              c = *eptr;
2238              if (c == '_') cur_is_word = TRUE; else
2239                {
2240                int cat = UCD_CATEGORY(c);
2241                cur_is_word = (cat == ucp_L || cat == ucp_N);
2242                }
2243              }
2244            else
2245    #endif
2246            cur_is_word = MAX_255(*eptr)
2247              && ((md->ctypes[*eptr] & ctype_word) != 0);
2248          }          }
2249    
2250        /* Now see if the situation is what we want */        /* Now see if the situation is what we want */
# Line 1452  for (;;) Line 2255  for (;;)
2255        }        }
2256      break;      break;
2257    
2258      /* Match a single character type; inline for speed */      /* Match any single character type except newline; have to take care with
2259        CRLF newlines and partial matching. */
2260    
2261      case OP_ANY:      case OP_ANY:
2262      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
2263        if (md->partial != 0 &&
2264            eptr + 1 >= md->end_subject &&
2265            NLBLOCK->nltype == NLTYPE_FIXED &&
2266            NLBLOCK->nllen == 2 &&
2267            *eptr == NLBLOCK->nl[0])
2268          {
2269          md->hitend = TRUE;
2270          if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2271          }
2272    
2273      /* Fall through */      /* Fall through */
2274    
2275        /* Match any single character whatsoever. */
2276    
2277      case OP_ALLANY:      case OP_ALLANY:
2278      if (eptr++ >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2279      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;        {                            /* not be updated before SCHECK_PARTIAL. */
2280          SCHECK_PARTIAL();
2281          RRETURN(MATCH_NOMATCH);
2282          }
2283        eptr++;
2284    #ifdef SUPPORT_UTF
2285        if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
2286    #endif
2287      ecode++;      ecode++;
2288      break;      break;
2289    
# Line 1468  for (;;) Line 2291  for (;;)
2291      any byte, even newline, independent of the setting of PCRE_DOTALL. */      any byte, even newline, independent of the setting of PCRE_DOTALL. */
2292    
2293      case OP_ANYBYTE:      case OP_ANYBYTE:
2294      if (eptr++ >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2295          {                            /* not be updated before SCHECK_PARTIAL. */
2296          SCHECK_PARTIAL();
2297          RRETURN(MATCH_NOMATCH);
2298          }
2299        eptr++;
2300      ecode++;      ecode++;
2301      break;      break;
2302    
2303      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
2304      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2305          {
2306          SCHECK_PARTIAL();
2307          RRETURN(MATCH_NOMATCH);
2308          }
2309      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2310      if (      if (
2311  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2312         c < 256 &&         c < 256 &&
2313  #endif  #endif
2314         (md->ctypes[c] & ctype_digit) != 0         (md->ctypes[c] & ctype_digit) != 0
# Line 1486  for (;;) Line 2318  for (;;)
2318      break;      break;
2319    
2320      case OP_DIGIT:      case OP_DIGIT:
2321      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2322          {
2323          SCHECK_PARTIAL();
2324          RRETURN(MATCH_NOMATCH);
2325          }
2326      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2327      if (      if (
2328  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2329         c >= 256 ||         c > 255 ||
2330  #endif  #endif
2331         (md->ctypes[c] & ctype_digit) == 0         (md->ctypes[c] & ctype_digit) == 0
2332         )         )
# Line 1499  for (;;) Line 2335  for (;;)
2335      break;      break;
2336    
2337      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
2338      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2339          {
2340          SCHECK_PARTIAL();
2341          RRETURN(MATCH_NOMATCH);
2342          }
2343      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2344      if (      if (
2345  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2346         c < 256 &&         c < 256 &&
2347  #endif  #endif
2348         (md->ctypes[c] & ctype_space) != 0         (md->ctypes[c] & ctype_space) != 0
# Line 1512  for (;;) Line 2352  for (;;)
2352      break;      break;
2353    
2354      case OP_WHITESPACE:      case OP_WHITESPACE:
2355      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2356          {
2357          SCHECK_PARTIAL();
2358          RRETURN(MATCH_NOMATCH);
2359          }
2360      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2361      if (      if (
2362  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2363         c >= 256 ||         c > 255 ||
2364  #endif  #endif
2365         (md->ctypes[c] & ctype_space) == 0         (md->ctypes[c] & ctype_space) == 0
2366         )         )
# Line 1525  for (;;) Line 2369  for (;;)
2369      break;      break;
2370    
2371      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
2372      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2373          {
2374          SCHECK_PARTIAL();
2375          RRETURN(MATCH_NOMATCH);
2376          }
2377      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2378      if (      if (
2379  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2380         c < 256 &&         c < 256 &&
2381  #endif  #endif
2382         (md->ctypes[c] & ctype_word) != 0         (md->ctypes[c] & ctype_word) != 0
# Line 1538  for (;;) Line 2386  for (;;)
2386      break;      break;
2387    
2388      case OP_WORDCHAR:      case OP_WORDCHAR:
2389      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2390          {
2391          SCHECK_PARTIAL();
2392          RRETURN(MATCH_NOMATCH);
2393          }
2394      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2395      if (      if (
2396  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2397         c >= 256 ||         c > 255 ||
2398  #endif  #endif
2399         (md->ctypes[c] & ctype_word) == 0         (md->ctypes[c] & ctype_word) == 0
2400         )         )
# Line 1551  for (;;) Line 2403  for (;;)
2403      break;      break;
2404    
2405      case OP_ANYNL:      case OP_ANYNL:
2406      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2407          {
2408          SCHECK_PARTIAL();
2409          RRETURN(MATCH_NOMATCH);
2410          }
2411      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2412      switch(c)      switch(c)
2413        {        {
2414        default: RRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2415    
2416        case 0x000d:        case 0x000d:
2417        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr >= md->end_subject)
2418            {
2419            SCHECK_PARTIAL();
2420            }
2421          else if (*eptr == 0x0a) eptr++;
2422        break;        break;
2423    
2424        case 0x000a:        case 0x000a:
# Line 1575  for (;;) Line 2436  for (;;)
2436      break;      break;
2437    
2438      case OP_NOT_HSPACE:      case OP_NOT_HSPACE:
2439      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2440          {
2441          SCHECK_PARTIAL();
2442          RRETURN(MATCH_NOMATCH);
2443          }
2444      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2445      switch(c)      switch(c)
2446        {        {
# Line 1605  for (;;) Line 2470  for (;;)
2470      break;      break;
2471    
2472      case OP_HSPACE:      case OP_HSPACE:
2473      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2474          {
2475          SCHECK_PARTIAL();
2476          RRETURN(MATCH_NOMATCH);
2477          }
2478      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2479      switch(c)      switch(c)
2480        {        {
# Line 1635  for (;;) Line 2504  for (;;)
2504      break;      break;
2505    
2506      case OP_NOT_VSPACE:      case OP_NOT_VSPACE:
2507      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2508          {
2509          SCHECK_PARTIAL();
2510          RRETURN(MATCH_NOMATCH);
2511          }
2512      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2513      switch(c)      switch(c)
2514        {        {
# Line 1653  for (;;) Line 2526  for (;;)
2526      break;      break;
2527    
2528      case OP_VSPACE:      case OP_VSPACE:
2529      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2530          {
2531          SCHECK_PARTIAL();
2532          RRETURN(MATCH_NOMATCH);
2533          }
2534      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2535      switch(c)      switch(c)
2536        {        {
# Line 1676  for (;;) Line 2553  for (;;)
2553    
2554      case OP_PROP:      case OP_PROP:
2555      case OP_NOTPROP:      case OP_NOTPROP:
2556      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2557          {
2558          SCHECK_PARTIAL();
2559          RRETURN(MATCH_NOMATCH);
2560          }
2561      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2562        {        {
2563        const ucd_record * prop = GET_UCD(c);        const ucd_record *prop = GET_UCD(c);
2564    
2565        switch(ecode[1])        switch(ecode[1])
2566          {          {
# Line 1692  for (;;) Line 2573  for (;;)
2573               prop->chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
2574               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
2575            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2576           break;          break;
2577    
2578          case PT_GC:          case PT_GC:
2579          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
2580            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2581          break;          break;
2582    
# Line 1709  for (;;) Line 2590  for (;;)
2590            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2591          break;          break;
2592    
2593            /* These are specials */
2594    
2595            case PT_ALNUM:
2596            if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2597                 PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2598              RRETURN(MATCH_NOMATCH);
2599            break;
2600    
2601            case PT_SPACE:    /* Perl space */
2602            if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2603                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2604                   == (op == OP_NOTPROP))
2605              RRETURN(MATCH_NOMATCH);
2606            break;
2607    
2608            case PT_PXSPACE:  /* POSIX space */
2609            if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2610                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2611                 c == CHAR_FF || c == CHAR_CR)
2612                   == (op == OP_NOTPROP))
2613              RRETURN(MATCH_NOMATCH);
2614            break;
2615    
2616            case PT_WORD:
2617            if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2618                 PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2619                 c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2620              RRETURN(MATCH_NOMATCH);
2621            break;
2622    
2623            /* This should never occur */
2624    
2625          default:          default:
2626          RRETURN(PCRE_ERROR_INTERNAL);          RRETURN(PCRE_ERROR_INTERNAL);
2627          }          }
# Line 1721  for (;;) Line 2634  for (;;)
2634      is in the binary; otherwise a compile-time error occurs. */      is in the binary; otherwise a compile-time error occurs. */
2635    
2636      case OP_EXTUNI:      case OP_EXTUNI:
2637      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject)
2638          {
2639          SCHECK_PARTIAL();
2640          RRETURN(MATCH_NOMATCH);
2641          }
2642      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2643        if (UCD_CATEGORY(c) == ucp_M) RRETURN(MATCH_NOMATCH);
2644        while (eptr < md->end_subject)
2645        {        {
2646        int category = UCD_CATEGORY(c);        int len = 1;
2647        if (category == ucp_M) RRETURN(MATCH_NOMATCH);        if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2648        while (eptr < md->end_subject)        if (UCD_CATEGORY(c) != ucp_M) break;
2649          {        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;  
         }  
2650        }        }
2651        CHECK_PARTIAL();
2652      ecode++;      ecode++;
2653      break;      break;
2654  #endif  #endif
# Line 1752  for (;;) Line 2663  for (;;)
2663      loops). */      loops). */
2664    
2665      case OP_REF:      case OP_REF:
2666        {      case OP_REFI:
2667        offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      caseless = op == OP_REFI;
2668        ecode += 3;      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2669        ecode += 1 + IMM2_SIZE;
2670    
2671        /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2672    
2673        (a) In the default, Perl-compatible state, set the length to be longer      (a) In the default, Perl-compatible state, set the length negative;
2674        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
2675        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.  
2676    
2677        (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
2678        so that the back reference matches an empty string.      so that the back reference matches an empty string.
2679    
2680        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
2681        referenced subpattern. */      referenced subpattern. */
2682    
2683        if (offset >= offset_top || md->offset_vector[offset] < 0)      if (offset >= offset_top || md->offset_vector[offset] < 0)
2684          length = (md->jscript_compat)? 0 : md->end_subject - eptr + 1;        length = (md->jscript_compat)? 0 : -1;
2685        else      else
2686          length = md->offset_vector[offset+1] - md->offset_vector[offset];        length = md->offset_vector[offset+1] - md->offset_vector[offset];
2687    
2688        /* Set up for repetition, or handle the non-repeated case */      /* Set up for repetition, or handle the non-repeated case */
2689    
2690        switch (*ecode)      switch (*ecode)
2691          {        {
2692          case OP_CRSTAR:        case OP_CRSTAR:
2693          case OP_CRMINSTAR:        case OP_CRMINSTAR:
2694          case OP_CRPLUS:        case OP_CRPLUS:
2695          case OP_CRMINPLUS:        case OP_CRMINPLUS:
2696          case OP_CRQUERY:        case OP_CRQUERY:
2697          case OP_CRMINQUERY:        case OP_CRMINQUERY:
2698          c = *ecode++ - OP_CRSTAR;        c = *ecode++ - OP_CRSTAR;
2699          minimize = (c & 1) != 0;        minimize = (c & 1) != 0;
2700          min = rep_min[c];                 /* Pick up values from tables; */        min = rep_min[c];                 /* Pick up values from tables; */
2701          max = rep_max[c];                 /* zero for max => infinity */        max = rep_max[c];                 /* zero for max => infinity */
2702          if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2703          break;        break;
2704    
2705          case OP_CRRANGE:        case OP_CRRANGE:
2706          case OP_CRMINRANGE:        case OP_CRMINRANGE:
2707          minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2708          min = GET2(ecode, 1);        min = GET2(ecode, 1);
2709          max = GET2(ecode, 3);        max = GET2(ecode, 1 + IMM2_SIZE);
2710          if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2711          ecode += 5;        ecode += 1 + 2 * IMM2_SIZE;
2712          break;        break;
2713    
2714          default:               /* No repeat follows */        default:               /* No repeat follows */
2715          if (!match_ref(offset, eptr, length, md, ims)) RRETURN(MATCH_NOMATCH);        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2716          eptr += length;          {
2717          continue;              /* With the main loop */          if (length == -2) eptr = md->end_subject;   /* Partial match */
2718            CHECK_PARTIAL();
2719            RRETURN(MATCH_NOMATCH);
2720          }          }
2721          eptr += length;
2722          continue;              /* With the main loop */
2723          }
2724    
2725        /* If the length of the reference is zero, just continue with the      /* Handle repeated back references. If the length of the reference is
2726        main loop. */      zero, just continue with the main loop. If the length is negative, it
2727        means the reference is unset in non-Java-compatible mode. If the minimum is
2728        zero, we can continue at the same level without recursion. For any other
2729        minimum, carrying on will result in NOMATCH. */
2730    
2731        if (length == 0) continue;      if (length == 0) continue;
2732        if (length < 0 && min == 0) continue;
2733    
2734        /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2735        the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
2736        address of eptr, so that eptr can be a register variable. */      address of eptr, so that eptr can be a register variable. */
2737    
2738        for (i = 1; i <= min; i++)      for (i = 1; i <= min; i++)
2739          {
2740          int slength;
2741          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2742          {          {
2743          if (!match_ref(offset, eptr, length, md, ims)) RRETURN(MATCH_NOMATCH);          if (slength == -2) eptr = md->end_subject;   /* Partial match */
2744          eptr += length;          CHECK_PARTIAL();
2745            RRETURN(MATCH_NOMATCH);
2746          }          }
2747          eptr += slength;
2748          }
2749    
2750        /* If min = max, continue at the same level without recursion.      /* If min = max, continue at the same level without recursion.
2751        They are not both allowed to be zero. */      They are not both allowed to be zero. */
2752    
2753        if (min == max) continue;      if (min == max) continue;
2754    
2755        /* If minimizing, keep trying and advancing the pointer */      /* If minimizing, keep trying and advancing the pointer */
2756    
2757        if (minimize)      if (minimize)
2758          {
2759          for (fi = min;; fi++)
2760          {          {
2761          for (fi = min;; fi++)          int slength;
2762            RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2763            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2764            if (fi >= max) RRETURN(MATCH_NOMATCH);
2765            if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2766            {            {
2767            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM14);            if (slength == -2) eptr = md->end_subject;   /* Partial match */
2768            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            CHECK_PARTIAL();
2769            if (fi >= max || !match_ref(offset, eptr, length, md, ims))            RRETURN(MATCH_NOMATCH);
             RRETURN(MATCH_NOMATCH);  
           eptr += length;  
2770            }            }
2771          /* Control never gets here */          eptr += slength;
2772          }          }
2773          /* Control never gets here */
2774          }
2775    
2776        /* If maximizing, find the longest string and work backwards */      /* If maximizing, find the longest string and work backwards */
2777    
2778        else      else
2779          {
2780          pp = eptr;
2781          for (i = min; i < max; i++)
2782          {          {
2783          pp = eptr;          int slength;
2784          for (i = min; i < max; i++)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
           {  
           if (!match_ref(offset, eptr, length, md, ims)) break;  
           eptr += length;  
           }  
         while (eptr >= pp)  
2785            {            {
2786            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM15);            /* Can't use CHECK_PARTIAL because we don't want to update eptr in
2787            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            the soft partial matching case. */
2788            eptr -= length;  
2789              if (slength == -2 && md->partial != 0 &&
2790                  md->end_subject > md->start_used_ptr)
2791                {
2792                md->hitend = TRUE;
2793                if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2794                }
2795              break;
2796            }            }
2797          RRETURN(MATCH_NOMATCH);          eptr += slength;
2798          }          }
2799    
2800          while (eptr >= pp)
2801            {
2802            RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2803            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2804            eptr -= length;
2805            }
2806          RRETURN(MATCH_NOMATCH);
2807        }        }
2808      /* Control never gets here */      /* Control never gets here */
2809    
   
   
2810      /* Match a bit-mapped character class, possibly repeatedly. This op code is      /* Match a bit-mapped character class, possibly repeatedly. This op code is
2811      used when all the characters in the class have values in the range 0-255,      used when all the characters in the class have values in the range 0-255,
2812      and either the matching is caseful, or the characters are in the range      and either the matching is caseful, or the characters are in the range
# Line 1878  for (;;) Line 2821  for (;;)
2821      case OP_NCLASS:      case OP_NCLASS:
2822      case OP_CLASS:      case OP_CLASS:
2823        {        {
2824          /* The data variable is saved across frames, so the byte map needs to
2825          be stored there. */
2826    #define BYTE_MAP ((pcre_uint8 *)data)
2827        data = ecode + 1;                /* Save for matching */        data = ecode + 1;                /* Save for matching */
2828        ecode += 33;                     /* Advance past the item */        ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
2829    
2830        switch (*ecode)        switch (*ecode)
2831          {          {
# Line 1900  for (;;) Line 2846  for (;;)
2846          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2847          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2848          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2849          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2850          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2851          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2852          break;          break;
2853    
2854          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 1912  for (;;) Line 2858  for (;;)
2858    
2859        /* First, ensure the minimum number of matches are present. */        /* First, ensure the minimum number of matches are present. */
2860    
2861  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2862        /* UTF-8 mode */        if (utf)
       if (utf8)  
2863          {          {
2864          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2865            {            {
2866            if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);            if (eptr >= md->end_subject)
2867                {
2868                SCHECK_PARTIAL();
2869                RRETURN(MATCH_NOMATCH);
2870                }
2871            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
2872            if (c > 255)            if (c > 255)
2873              {              {
2874              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2875              }              }
2876            else            else
2877              {              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
             if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);  
             }  
2878            }            }
2879          }          }
2880        else        else
2881  #endif  #endif
2882        /* Not UTF-8 mode */        /* Not UTF mode */
2883          {          {
2884          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2885            {            {
2886            if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);            if (eptr >= md->end_subject)
2887                {
2888                SCHECK_PARTIAL();
2889                RRETURN(MATCH_NOMATCH);
2890                }
2891            c = *eptr++;            c = *eptr++;
2892            if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2893              if (c > 255)
2894                {
2895                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2896                }
2897              else
2898    #endif
2899                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2900            }            }
2901          }          }
2902    
# Line 1952  for (;;) Line 2910  for (;;)
2910    
2911        if (minimize)        if (minimize)
2912          {          {
2913  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2914          /* UTF-8 mode */          if (utf)
         if (utf8)  
2915            {            {
2916            for (fi = min;; fi++)            for (fi = min;; fi++)
2917              {              {
2918              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2919              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2920              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2921                if (eptr >= md->end_subject)
2922                  {
2923                  SCHECK_PARTIAL();
2924                  RRETURN(MATCH_NOMATCH);
2925                  }
2926              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
2927              if (c > 255)              if (c > 255)
2928                {                {
2929                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2930                }                }
2931              else              else
2932                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
               if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);  
               }  
2933              }              }
2934            }            }
2935          else          else
2936  #endif  #endif
2937          /* Not UTF-8 mode */          /* Not UTF mode */
2938            {            {
2939            for (fi = min;; fi++)            for (fi = min;; fi++)
2940              {              {
2941              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2942              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2943              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2944                if (eptr >= md->end_subject)
2945                  {
2946                  SCHECK_PARTIAL();
2947                  RRETURN(MATCH_NOMATCH);
2948                  }
2949              c = *eptr++;              c = *eptr++;
2950              if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2951                if (c > 255)
2952                  {
2953                  if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2954                  }
2955                else
2956    #endif
2957                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2958              }              }
2959            }            }
2960          /* Control never gets here */          /* Control never gets here */
# Line 1994  for (;;) Line 2966  for (;;)
2966          {          {
2967          pp = eptr;          pp = eptr;
2968    
2969  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2970          /* UTF-8 mode */          if (utf)
         if (utf8)  
2971            {            {
2972            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2973              {              {
2974              int len = 1;              int len = 1;
2975              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject)
2976                  {
2977                  SCHECK_PARTIAL();
2978                  break;
2979                  }
2980              GETCHARLEN(c, eptr, len);              GETCHARLEN(c, eptr, len);
2981              if (c > 255)              if (c > 255)
2982                {                {
2983                if (op == OP_CLASS) break;                if (op == OP_CLASS) break;
2984                }                }
2985              else              else
2986                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
               if ((data[c/8] & (1 << (c&7))) == 0) break;  
               }  
2987              eptr += len;              eptr += len;
2988              }              }
2989            for (;;)            for (;;)
2990              {              {
2991              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM18);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
2992              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2993              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
2994              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2023  for (;;) Line 2996  for (;;)
2996            }            }
2997          else          else
2998  #endif  #endif
2999            /* Not UTF-8 mode */            /* Not UTF mode */
3000            {            {
3001            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3002              {              {
3003              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject)
3004                  {
3005                  SCHECK_PARTIAL();
3006                  break;
3007                  }
3008              c = *eptr;              c = *eptr;
3009              if ((data[c/8] & (1 << (c&7))) == 0) break;  #ifndef COMPILE_PCRE8
3010                if (c > 255)
3011                  {
3012                  if (op == OP_CLASS) break;
3013                  }
3014                else
3015    #endif
3016                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
3017              eptr++;              eptr++;
3018              }              }
3019            while (eptr >= pp)            while (eptr >= pp)
3020              {              {
3021              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM19);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
3022              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3023              eptr--;              eptr--;
3024              }              }
# Line 2042  for (;;) Line 3026  for (;;)
3026    
3027          RRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3028          }          }
3029    #undef BYTE_MAP
3030        }        }
3031      /* Control never gets here */      /* Control never gets here */
3032    
3033    
3034      /* Match an extended character class. This opcode is encountered only      /* Match an extended character class. This opcode is encountered only
3035      in UTF-8 mode, because that's the only time it is compiled. */      when UTF-8 mode mode is supported. Nevertheless, we may not be in UTF-8
3036        mode, because Unicode properties are supported in non-UTF-8 mode. */
3037    
3038  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3039      case OP_XCLASS:      case OP_XCLASS:
3040        {        {
3041        data = ecode + 1 + LINK_SIZE;                /* Save for matching */        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
# Line 2074  for (;;) Line 3060  for (;;)
3060          case OP_CRMINRANGE:          case OP_CRMINRANGE:
3061          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
3062          min = GET2(ecode, 1);          min = GET2(ecode, 1);
3063          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
3064          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
3065          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
3066          break;          break;
3067    
3068          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2088  for (;;) Line 3074  for (;;)
3074    
3075        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3076          {          {
3077          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);          if (eptr >= md->end_subject)
3078          GETCHARINC(c, eptr);            {
3079          if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);            SCHECK_PARTIAL();
3080              RRETURN(MATCH_NOMATCH);
3081              }
3082            GETCHARINCTEST(c, eptr);
3083            if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3084          }          }
3085    
3086        /* 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 2105  for (;;) Line 3095  for (;;)
3095          {          {
3096          for (fi = min;; fi++)          for (fi = min;; fi++)
3097            {            {
3098            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
3099            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3100            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3101            GETCHARINC(c, eptr);            if (eptr >= md->end_subject)
3102            if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);              {
3103                SCHECK_PARTIAL();
3104                RRETURN(MATCH_NOMATCH);
3105                }
3106              GETCHARINCTEST(c, eptr);
3107              if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3108            }            }
3109          /* Control never gets here */          /* Control never gets here */
3110          }          }
# Line 2122  for (;;) Line 3117  for (;;)
3117          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3118            {            {
3119            int len = 1;            int len = 1;
3120            if (eptr >= md->end_subject) break;            if (eptr >= md->end_subject)
3121            GETCHARLEN(c, eptr, len);              {
3122            if (!_pcre_xclass(c, data)) break;              SCHECK_PARTIAL();
3123                break;
3124                }
3125    #ifdef SUPPORT_UTF
3126              GETCHARLENTEST(c, eptr, len);
3127    #else
3128              c = *eptr;
3129    #endif
3130              if (!PRIV(xclass)(c, data, utf)) break;
3131            eptr += len;            eptr += len;
3132            }            }
3133          for(;;)          for(;;)
3134            {            {
3135            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
3136            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3137            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3138            if (utf8) BACKCHAR(eptr);  #ifdef SUPPORT_UTF
3139              if (utf) BACKCHAR(eptr);
3140    #endif
3141            }            }
3142          RRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3143          }          }
# Line 2144  for (;;) Line 3149  for (;;)
3149      /* Match a single character, casefully */      /* Match a single character, casefully */
3150    
3151      case OP_CHAR:      case OP_CHAR:
3152  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3153      if (utf8)      if (utf)
3154        {        {
3155        length = 1;        length = 1;
3156        ecode++;        ecode++;
3157        GETCHARLEN(fc, ecode, length);        GETCHARLEN(fc, ecode, length);
3158        if (length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);        if (length > md->end_subject - eptr)
3159            {
3160            CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
3161            RRETURN(MATCH_NOMATCH);
3162            }
3163        while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH);        while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH);
3164        }        }
3165      else      else
3166  #endif  #endif
3167        /* Not UTF mode */
     /* Non-UTF-8 mode */  
3168        {        {
3169        if (md->end_subject - eptr < 1) RRETURN(MATCH_NOMATCH);        if (md->end_subject - eptr < 1)
3170            {
3171            SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
3172            RRETURN(MATCH_NOMATCH);
3173            }
3174        if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);        if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
3175        ecode += 2;        ecode += 2;
3176        }        }
3177      break;      break;
3178    
3179      /* Match a single character, caselessly */      /* Match a single character, caselessly. If we are at the end of the
3180        subject, give up immediately. */
3181    
3182        case OP_CHARI:
3183        if (eptr >= md->end_subject)
3184          {
3185          SCHECK_PARTIAL();
3186          RRETURN(MATCH_NOMATCH);
3187          }
3188    
3189      case OP_CHARNC:  #ifdef SUPPORT_UTF
3190  #ifdef SUPPORT_UTF8      if (utf)
     if (utf8)  
3191        {        {
3192        length = 1;        length = 1;
3193        ecode++;        ecode++;
3194        GETCHARLEN(fc, ecode, length);        GETCHARLEN(fc, ecode, length);
3195    
       if (length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);  
   
3196        /* 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
3197        can use the fast lookup table. */        we know that its other case must also be one byte long, so we can use the
3198          fast lookup table. We know that there is at least one byte left in the
3199          subject. */
3200    
3201        if (fc < 128)        if (fc < 128)
3202          {          {
3203          if (md->lcc[*ecode++] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);          if (md->lcc[fc]
3204                != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3205            ecode++;
3206            eptr++;
3207          }          }
3208    
3209        /* Otherwise we must pick up the subject character */        /* Otherwise we must pick up the subject character. Note that we cannot
3210          use the value of "length" to check for sufficient bytes left, because the
3211          other case of the character may have more or fewer bytes.  */
3212    
3213        else        else
3214          {          {
# Line 2205  for (;;) Line 3229  for (;;)
3229          }          }
3230        }        }
3231      else      else
3232  #endif   /* SUPPORT_UTF8 */  #endif   /* SUPPORT_UTF */
3233    
3234      /* Non-UTF-8 mode */      /* Not UTF mode */
3235        {        {
3236        if (md->end_subject - eptr < 1) RRETURN(MATCH_NOMATCH);        if (TABLE_GET(ecode[1], md->lcc, ecode[1])
3237        if (md->lcc[ecode[1]] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);            != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3238          eptr++;
3239        ecode += 2;        ecode += 2;
3240        }        }
3241      break;      break;
# Line 2218  for (;;) Line 3243  for (;;)
3243      /* Match a single character repeatedly. */      /* Match a single character repeatedly. */
3244    
3245      case OP_EXACT:      case OP_EXACT:
3246        case OP_EXACTI:
3247      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3248      ecode += 3;      ecode += 1 + IMM2_SIZE;
3249      goto REPEATCHAR;      goto REPEATCHAR;
3250    
3251      case OP_POSUPTO:      case OP_POSUPTO:
3252        case OP_POSUPTOI:
3253      possessive = TRUE;      possessive = TRUE;
3254      /* Fall through */      /* Fall through */
3255    
3256      case OP_UPTO:      case OP_UPTO:
3257        case OP_UPTOI:
3258      case OP_MINUPTO:      case OP_MINUPTO:
3259        case OP_MINUPTOI:
3260      min = 0;      min = 0;
3261      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3262      minimize = *ecode == OP_MINUPTO;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
3263      ecode += 3;      ecode += 1 + IMM2_SIZE;
3264      goto REPEATCHAR;      goto REPEATCHAR;
3265    
3266      case OP_POSSTAR:      case OP_POSSTAR:
3267        case OP_POSSTARI:
3268      possessive = TRUE;      possessive = TRUE;
3269      min = 0;      min = 0;
3270      max = INT_MAX;      max = INT_MAX;
# Line 2242  for (;;) Line 3272  for (;;)
3272      goto REPEATCHAR;      goto REPEATCHAR;
3273    
3274      case OP_POSPLUS:      case OP_POSPLUS:
3275        case OP_POSPLUSI:
3276      possessive = TRUE;      possessive = TRUE;
3277      min = 1;      min = 1;
3278      max = INT_MAX;      max = INT_MAX;
# Line 2249  for (;;) Line 3280  for (;;)
3280      goto REPEATCHAR;      goto REPEATCHAR;
3281    
3282      case OP_POSQUERY:      case OP_POSQUERY:
3283        case OP_POSQUERYI:
3284      possessive = TRUE;      possessive = TRUE;
3285      min = 0;      min = 0;
3286      max = 1;      max = 1;
# Line 2256  for (;;) Line 3288  for (;;)
3288      goto REPEATCHAR;      goto REPEATCHAR;
3289    
3290      case OP_STAR:      case OP_STAR:
3291        case OP_STARI:
3292      case OP_MINSTAR:      case OP_MINSTAR:
3293        case OP_MINSTARI:
3294      case OP_PLUS:      case OP_PLUS:
3295        case OP_PLUSI:
3296      case OP_MINPLUS:      case OP_MINPLUS:
3297        case OP_MINPLUSI:
3298      case OP_QUERY:      case OP_QUERY:
3299        case OP_QUERYI:
3300      case OP_MINQUERY:      case OP_MINQUERY:
3301      c = *ecode++ - OP_STAR;      case OP_MINQUERYI:
3302        c = *ecode++ - ((op < OP_STARI)? OP_STAR : OP_STARI);
3303      minimize = (c & 1) != 0;      minimize = (c & 1) != 0;
3304      min = rep_min[c];                 /* Pick up values from tables; */      min = rep_min[c];                 /* Pick up values from tables; */
3305      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
3306      if (max == 0) max = INT_MAX;      if (max == 0) max = INT_MAX;
3307    
3308      /* Common code for all repeated single-character matches. We can give      /* Common code for all repeated single-character matches. */
     up quickly if there are fewer than the minimum number of characters left in  
     the subject. */  
3309    
3310      REPEATCHAR:      REPEATCHAR:
3311  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3312      if (utf8)      if (utf)
3313        {        {
3314        length = 1;        length = 1;
3315        charptr = ecode;        charptr = ecode;
3316        GETCHARLEN(fc, ecode, length);        GETCHARLEN(fc, ecode, length);
       if (min * length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);  
3317        ecode += length;        ecode += length;
3318    
3319        /* Handle multibyte character matching specially here. There is        /* Handle multibyte character matching specially here. There is
# Line 2288  for (;;) Line 3323  for (;;)
3323          {          {
3324  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3325          unsigned int othercase;          unsigned int othercase;
3326          if ((ims & PCRE_CASELESS) != 0 &&          if (op >= OP_STARI &&     /* Caseless */
3327              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3328            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = PRIV(ord2utf)(othercase, occhars);
3329          else oclength = 0;          else oclength = 0;
3330  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3331    
3332          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3333            {            {
3334            if (memcmp(eptr, charptr, length) == 0) eptr += length;            if (eptr <= md->end_subject - length &&
3335                memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3336  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3337            /* Need braces because of following else */            else if (oclength > 0 &&
3338            else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }                     eptr <= md->end_subject - oclength &&
3339                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3340    #endif  /* SUPPORT_UCP */
3341            else            else
3342              {              {
3343              if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);              CHECK_PARTIAL();
3344              eptr += oclength;              RRETURN(MATCH_NOMATCH);
3345              }              }
 #else   /* without SUPPORT_UCP */  
           else { RRETURN(MATCH_NOMATCH); }  
 #endif  /* SUPPORT_UCP */  
3346            }            }
3347    
3348          if (min == max) continue;          if (min == max) continue;
# Line 2316  for (;;) Line 3351  for (;;)
3351            {            {
3352            for (fi = min;; fi++)            for (fi = min;; fi++)
3353              {              {
3354              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3355              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3356              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3357              if (memcmp(eptr, charptr, length) == 0) eptr += length;              if (eptr <= md->end_subject - length &&
3358                  memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3359  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3360              /* Need braces because of following else */              else if (oclength > 0 &&
3361              else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }                       eptr <= md->end_subject - oclength &&
3362                         memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3363    #endif  /* SUPPORT_UCP */
3364              else              else
3365                {                {
3366                if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);                CHECK_PARTIAL();
3367                eptr += oclength;                RRETURN(MATCH_NOMATCH);
3368                }                }
 #else   /* without SUPPORT_UCP */  
             else { RRETURN (MATCH_NOMATCH); }  
 #endif  /* SUPPORT_UCP */  
3369              }              }
3370            /* Control never gets here */            /* Control never gets here */
3371            }            }
# Line 2340  for (;;) Line 3375  for (;;)
3375            pp = eptr;            pp = eptr;
3376            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3377              {              {
3378              if (eptr > md->end_subject - length) break;              if (eptr <= md->end_subject - length &&
3379              if (memcmp(eptr, charptr, length) == 0) eptr += length;                  memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3380  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3381              else if (oclength == 0) break;              else if (oclength > 0 &&
3382                         eptr <= md->end_subject - oclength &&
3383                         memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3384    #endif  /* SUPPORT_UCP */
3385              else              else
3386                {                {
3387                if (memcmp(eptr, occhars, oclength) != 0) break;                CHECK_PARTIAL();
3388                eptr += oclength;                break;
3389                }                }
 #else   /* without SUPPORT_UCP */  
             else break;  
 #endif  /* SUPPORT_UCP */  
3390              }              }
3391    
3392            if (possessive) continue;            if (possessive) continue;
3393    
3394            for(;;)            for(;;)
3395             {              {
3396             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3397             if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3398             if (eptr == pp) RRETURN(MATCH_NOMATCH);              if (eptr == pp) { RRETURN(MATCH_NOMATCH); }
3399  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3400             eptr--;              eptr--;
3401             BACKCHAR(eptr);              BACKCHAR(eptr);
3402  #else   /* without SUPPORT_UCP */  #else   /* without SUPPORT_UCP */
3403             eptr -= length;              eptr -= length;
3404  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3405             }              }
3406            }            }
3407          /* Control never gets here */          /* Control never gets here */
3408          }          }
# Line 2376  for (;;) Line 3412  for (;;)
3412        value of fc will always be < 128. */        value of fc will always be < 128. */
3413        }        }
3414      else      else
3415  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3416          /* When not in UTF-8 mode, load a single-byte character. */
     /* When not in UTF-8 mode, load a single-byte character. */  
       {  
       if (min > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);  
3417        fc = *ecode++;        fc = *ecode++;
       }  
3418    
3419      /* 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
3420      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
3421      caseful cases, for speed, since matching characters is likely to be quite      caseful cases, for speed, since matching characters is likely to be quite
3422      common. First, ensure the minimum number of matches are present. If min =      common. First, ensure the minimum number of matches are present. If min =
3423      max, continue at the same level without recursing. Otherwise, if      max, continue at the same level without recursing. Otherwise, if
# Line 2396  for (;;) Line 3428  for (;;)
3428      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3429        max, eptr));        max, eptr));
3430    
3431      if ((ims & PCRE_CASELESS) != 0)      if (op >= OP_STARI)  /* Caseless */
3432        {        {
3433        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3434          /* fc must be < 128 if UTF is enabled. */
3435          foc = md->fcc[fc];
3436    #else
3437    #ifdef SUPPORT_UTF
3438    #ifdef SUPPORT_UCP
3439          if (utf && fc > 127)
3440            foc = UCD_OTHERCASE(fc);
3441    #else
3442          if (utf && fc > 127)
3443            foc = fc;
3444    #endif /* SUPPORT_UCP */
3445          else
3446    #endif /* SUPPORT_UTF */
3447            foc = TABLE_GET(fc, md->fcc, fc);
3448    #endif /* COMPILE_PCRE8 */
3449    
3450        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3451          if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);          {
3452            if (eptr >= md->end_subject)
3453              {
3454              SCHECK_PARTIAL();
3455              RRETURN(MATCH_NOMATCH);
3456              }
3457            if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
3458            eptr++;
3459            }
3460        if (min == max) continue;        if (min == max) continue;
3461        if (minimize)        if (minimize)
3462          {          {
3463          for (fi = min;; fi++)          for (fi = min;; fi++)
3464            {            {
3465            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3466            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3467            if (fi >= max || eptr >= md->end_subject ||            if (fi >= max) RRETURN(MATCH_NOMATCH);
3468                fc != md->lcc[*eptr++])            if (eptr >= md->end_subject)
3469                {
3470                SCHECK_PARTIAL();
3471              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3472                }
3473              if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
3474              eptr++;
3475            }            }
3476          /* Control never gets here */          /* Control never gets here */
3477          }          }
# Line 2419  for (;;) Line 3480  for (;;)
3480          pp = eptr;          pp = eptr;
3481          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3482            {            {
3483            if (eptr >= md->end_subject || fc != md->lcc[*eptr]) break;            if (eptr >= md->end_subject)
3484                {
3485                SCHECK_PARTIAL();
3486                break;
3487                }
3488              if (fc != *eptr && foc != *eptr) break;
3489            eptr++;            eptr++;
3490            }            }
3491    
3492          if (possessive) continue;          if (possessive) continue;
3493    
3494          while (eptr >= pp)          while (eptr >= pp)
3495            {            {
3496            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM25);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
3497            eptr--;            eptr--;
3498            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3499            }            }
# Line 2438  for (;;) Line 3506  for (;;)
3506    
3507      else      else
3508        {        {
3509        for (i = 1; i <= min; i++) if (fc != *eptr++) RRETURN(MATCH_NOMATCH);        for (i = 1; i <= min; i++)
3510            {
3511            if (eptr >= md->end_subject)
3512              {
3513              SCHECK_PARTIAL();
3514              RRETURN(MATCH_NOMATCH);
3515              }
3516            if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
3517            }
3518    
3519        if (min == max) continue;        if (min == max) continue;
3520    
3521        if (minimize)        if (minimize)
3522          {          {
3523          for (fi = min;; fi++)          for (fi = min;; fi++)
3524            {            {
3525            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3526            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3527            if (fi >= max || eptr >= md->end_subject || fc != *eptr++)            if (fi >= max) RRETURN(MATCH_NOMATCH);
3528              if (eptr >= md->end_subject)
3529                {
3530                SCHECK_PARTIAL();
3531              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3532                }
3533              if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
3534            }            }
3535          /* Control never gets here */          /* Control never gets here */
3536          }          }
# Line 2456  for (;;) Line 3539  for (;;)
3539          pp = eptr;          pp = eptr;
3540          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3541            {            {
3542            if (eptr >= md->end_subject || fc != *eptr) break;            if (eptr >= md->end_subject)
3543                {
3544                SCHECK_PARTIAL();
3545                break;
3546                }
3547              if (fc != *eptr) break;
3548            eptr++;            eptr++;
3549            }            }
3550          if (possessive) continue;          if (possessive) continue;
3551    
3552          while (eptr >= pp)          while (eptr >= pp)
3553            {            {
3554            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM27);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
3555            eptr--;            eptr--;
3556            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3557            }            }
3558          RRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3559          }          }
3560        }        }
3561      /* Control never gets here */      /* Control never gets here */
3562    
3563      /* Match a negated single one-byte character. The character we are      /* Match a negated single one-byte character. The character we are
3564      checking can be multibyte. */      checking can be multibyte. */
3565    
3566      case OP_NOT:      case OP_NOT:
3567      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      case OP_NOTI:
3568      ecode++;      if (eptr >= md->end_subject)
3569      GETCHARINCTEST(c, eptr);        {
3570      if ((ims & PCRE_CASELESS) != 0)        SCHECK_PARTIAL();
3571        {        RRETURN(MATCH_NOMATCH);
3572  #ifdef SUPPORT_UTF8        }
3573        if (c < 256)  #ifdef SUPPORT_UTF
3574  #endif      if (utf)
3575        c = md->lcc[c];        {
3576        if (md->lcc[*ecode++] == c) RRETURN(MATCH_NOMATCH);        register unsigned int ch, och;
3577        }  
3578          ecode++;
3579          GETCHARINC(ch, ecode);
3580          GETCHARINC(c, eptr);
3581    
3582          if (op == OP_NOT)
3583            {
3584            if (ch == c) RRETURN(MATCH_NOMATCH);
3585            }
3586          else
3587            {
3588    #ifdef SUPPORT_UCP
3589            if (ch > 127)
3590              och = UCD_OTHERCASE(ch);
3591