/[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 630 by ph10, Fri Jul 22 10:00:10 2011 UTC revision 1397 by ph10, Mon Nov 11 18:33:23 2013 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2011 University of Cambridge             Copyright (c) 1997-2013 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 37  POSSIBILITY OF SUCH DAMAGE. Line 37  POSSIBILITY OF SUCH DAMAGE.
37  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
38  */  */
39    
   
40  /* This module contains pcre_exec(), the externally visible function that does  /* This module contains pcre_exec(), the externally visible function that does
41  pattern matching using an NFA algorithm, trying to mimic Perl as closely as  pattern matching using an NFA algorithm, trying to mimic Perl as closely as
42  possible. There are also some static supporting functions. */  possible. There are also some static supporting functions. */
# Line 57  possible. There are also some static sup Line 56  possible. There are also some static sup
56  #undef min  #undef min
57  #undef max  #undef max
58    
59    /* The md->capture_last field uses the lower 16 bits for the last captured
60    substring (which can never be greater than 65535) and a bit in the top half
61    to mean "capture vector overflowed". This odd way of doing things was
62    implemented when it was realized that preserving and restoring the overflow bit
63    whenever the last capture number was saved/restored made for a neater
64    interface, and doing it this way saved on (a) another variable, which would
65    have increased the stack frame size (a big NO-NO in PCRE) and (b) another
66    separate set of save/restore instructions. The following defines are used in
67    implementing this. */
68    
69    #define CAPLMASK    0x0000ffff    /* The bits used for last_capture */
70    #define OVFLMASK    0xffff0000    /* The bits used for the overflow flag */
71    #define OVFLBIT     0x00010000    /* The bit that is set for overflow */
72    
73  /* Values for setting in md->match_function_type to indicate two special types  /* Values for setting in md->match_function_type to indicate two special types
74  of call to match(). We do it this way to save on using another stack variable,  of call to match(). We do it this way to save on using another stack variable,
75  as stack usage is to be discouraged. */  as stack usage is to be discouraged. */
# Line 74  defined PCRE_ERROR_xxx codes, which are Line 87  defined PCRE_ERROR_xxx codes, which are
87  negative to avoid the external error codes. */  negative to avoid the external error codes. */
88    
89  #define MATCH_ACCEPT       (-999)  #define MATCH_ACCEPT       (-999)
90  #define MATCH_COMMIT       (-998)  #define MATCH_KETRPOS      (-998)
91  #define MATCH_KETRPOS      (-997)  #define MATCH_ONCE         (-997)
92  #define MATCH_ONCE         (-996)  /* The next 5 must be kept together and in sequence so that a test that checks
93    for any one of them can use a range. */
94    #define MATCH_COMMIT       (-996)
95  #define MATCH_PRUNE        (-995)  #define MATCH_PRUNE        (-995)
96  #define MATCH_SKIP         (-994)  #define MATCH_SKIP         (-994)
97  #define MATCH_SKIP_ARG     (-993)  #define MATCH_SKIP_ARG     (-993)
98  #define MATCH_THEN         (-992)  #define MATCH_THEN         (-992)
99    #define MATCH_BACKTRACK_MAX MATCH_THEN
100  /* This is a convenience macro for code that occurs many times. */  #define MATCH_BACKTRACK_MIN MATCH_COMMIT
   
 #define MRRETURN(ra) \  
   { \  
   md->mark = markptr; \  
   RRETURN(ra); \  
   }  
101    
102  /* 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.
103  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 98  because the offset vector is always a mu Line 107  because the offset vector is always a mu
107    
108  /* Min and max values for the common repeats; for the maxima, 0 => infinity */  /* Min and max values for the common repeats; for the maxima, 0 => infinity */
109    
110  static const char rep_min[] = { 0, 0, 1, 1, 0, 0 };  static const char rep_min[] = { 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, };
111  static const char rep_max[] = { 0, 0, 0, 0, 1, 1 };  static const char rep_max[] = { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, };
   
   
112    
113  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
114  /*************************************************  /*************************************************
# Line 121  Returns:     nothing Line 128  Returns:     nothing
128  */  */
129    
130  static void  static void
131  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)
132  {  {
133  unsigned int c;  pcre_uint32 c;
134    BOOL utf = md->utf;
135  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;
136  while (length-- > 0)  while (length-- > 0)
137    if (isprint(c = *(p++))) printf("%c", c); else printf("\\x%02x", c);    if (isprint(c = RAWUCHARINCTEST(p))) printf("%c", (char)c); else printf("\\x{%02x}", c);
138  }  }
139  #endif  #endif
140    
# Line 148  Arguments: Line 156  Arguments:
156    md          points to match data block    md          points to match data block
157    caseless    TRUE if caseless    caseless    TRUE if caseless
158    
159  Returns:      < 0 if not matched, otherwise the number of subject bytes matched  Returns:      >= 0 the number of subject bytes matched
160                  -1 no match
161                  -2 partial match; always given if at end subject
162  */  */
163    
164  static int  static int
165  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,
166    BOOL caseless)    BOOL caseless)
167  {  {
168  USPTR eptr_start = eptr;  PCRE_PUCHAR eptr_start = eptr;
169  register USPTR p = md->start_subject + md->offset_vector[offset];  register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
170    #ifdef SUPPORT_UTF
171    BOOL utf = md->utf;
172    #endif
173    
174  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
175  if (eptr >= md->end_subject)  if (eptr >= md->end_subject)
# Line 171  pchars(p, length, FALSE, md); Line 184  pchars(p, length, FALSE, md);
184  printf("\n");  printf("\n");
185  #endif  #endif
186    
187  /* Always fail if reference not set (and not JavaScript compatible). */  /* Always fail if reference not set (and not JavaScript compatible - in that
188    case the length is passed as zero). */
189    
190  if (length < 0) return -1;  if (length < 0) return -1;
191    
# Line 181  ASCII characters. */ Line 195  ASCII characters. */
195    
196  if (caseless)  if (caseless)
197    {    {
198  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
199  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
200    if (md->utf8)    if (utf)
201      {      {
202      /* Match characters up to the end of the reference. NOTE: the number of      /* Match characters up to the end of the reference. NOTE: the number of
203      bytes matched may differ, because there are some characters whose upper and      data units matched may differ, because in UTF-8 there are some characters
204      lower case versions code as different numbers of bytes. For example, U+023A      whose upper and lower case versions code have different numbers of bytes.
205      (2 bytes in UTF-8) is the upper case version of U+2C65 (3 bytes in UTF-8);      For example, U+023A (2 bytes in UTF-8) is the upper case version of U+2C65
206      a sequence of 3 of the former uses 6 bytes, as does a sequence of two of      (3 bytes in UTF-8); a sequence of 3 of the former uses 6 bytes, as does a
207      the latter. It is important, therefore, to check the length along the      sequence of two of the latter. It is important, therefore, to check the
208      reference, not along the subject (earlier code did this wrong). */      length along the reference, not along the subject (earlier code did this
209        wrong). */
210    
211      USPTR endptr = p + length;      PCRE_PUCHAR endptr = p + length;
212      while (p < endptr)      while (p < endptr)
213        {        {
214        int c, d;        pcre_uint32 c, d;
215        if (eptr >= md->end_subject) return -1;        const ucd_record *ur;
216          if (eptr >= md->end_subject) return -2;   /* Partial match */
217        GETCHARINC(c, eptr);        GETCHARINC(c, eptr);
218        GETCHARINC(d, p);        GETCHARINC(d, p);
219        if (c != d && c != UCD_OTHERCASE(d)) return -1;        ur = GET_UCD(d);
220          if (c != d && c != d + ur->other_case)
221            {
222            const pcre_uint32 *pp = PRIV(ucd_caseless_sets) + ur->caseset;
223            for (;;)
224              {
225              if (c < *pp) return -1;
226              if (c == *pp++) break;
227              }
228            }
229        }        }
230      }      }
231    else    else
# Line 210  if (caseless) Line 235  if (caseless)
235    /* 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
236    is no UCP support. */    is no UCP support. */
237      {      {
     if (eptr + length > md->end_subject) return -1;  
238      while (length-- > 0)      while (length-- > 0)
239        { if (md->lcc[*p++] != md->lcc[*eptr++]) return -1; }        {
240          pcre_uint32 cc, cp;
241          if (eptr >= md->end_subject) return -2;   /* Partial match */
242          cc = RAWUCHARTEST(eptr);
243          cp = RAWUCHARTEST(p);
244          if (TABLE_GET(cp, md->lcc, cp) != TABLE_GET(cc, md->lcc, cc)) return -1;
245          p++;
246          eptr++;
247          }
248      }      }
249    }    }
250    
# Line 221  are in UTF-8 mode. */ Line 253  are in UTF-8 mode. */
253    
254  else  else
255    {    {
256    if (eptr + length > md->end_subject) return -1;    while (length-- > 0)
257    while (length-- > 0) if (*p++ != *eptr++) return -1;      {
258        if (eptr >= md->end_subject) return -2;   /* Partial match */
259        if (RAWUCHARINCTEST(p) != RAWUCHARINCTEST(eptr)) return -1;
260        }
261    }    }
262    
263  return eptr - eptr_start;  return (int)(eptr - eptr_start);
264  }  }
265    
266    
# Line 277  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM Line 312  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
312         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
313         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
314         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
315         RM61,  RM62, RM63 };         RM61,  RM62, RM63, RM64, RM65, RM66, RM67, RM68 };
316    
317  /* 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
318  versions and production versions. Note that the "rw" argument of RMATCH isn't  versions and production versions. Note that the "rw" argument of RMATCH isn't
# Line 290  actually used in this definition. */ Line 325  actually used in this definition. */
325  #define RMATCH(ra,rb,rc,rd,re,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
326    { \    { \
327    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
328    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1); \    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1); \
329    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
330    }    }
331  #define RRETURN(ra) \  #define RRETURN(ra) \
332    { \    { \
333    printf("match() returned %d from line %d ", ra, __LINE__); \    printf("match() returned %d from line %d\n", ra, __LINE__); \
334    return ra; \    return ra; \
335    }    }
336  #else  #else
337  #define RMATCH(ra,rb,rc,rd,re,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
338    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1)    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1)
339  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
340  #endif  #endif
341    
# Line 315  argument of match(), which never changes Line 350  argument of match(), which never changes
350    
351  #define RMATCH(ra,rb,rc,rd,re,rw)\  #define RMATCH(ra,rb,rc,rd,re,rw)\
352    {\    {\
353    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = frame->Xnextframe;\
354    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\    if (newframe == NULL)\
355    frame->Xwhere = rw; \      {\
356        newframe = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));\
357        if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
358        newframe->Xnextframe = NULL;\
359        frame->Xnextframe = newframe;\
360        }\
361      frame->Xwhere = rw;\
362    newframe->Xeptr = ra;\    newframe->Xeptr = ra;\
363    newframe->Xecode = rb;\    newframe->Xecode = rb;\
364    newframe->Xmstart = mstart;\    newframe->Xmstart = mstart;\
   newframe->Xmarkptr = markptr;\  
365    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
366    newframe->Xeptrb = re;\    newframe->Xeptrb = re;\
367    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
# Line 337  argument of match(), which never changes Line 377  argument of match(), which never changes
377    {\    {\
378    heapframe *oldframe = frame;\    heapframe *oldframe = frame;\
379    frame = oldframe->Xprevframe;\    frame = oldframe->Xprevframe;\
   (pcre_stack_free)(oldframe);\  
380    if (frame != NULL)\    if (frame != NULL)\
381      {\      {\
382      rrc = ra;\      rrc = ra;\
# Line 351  argument of match(), which never changes Line 390  argument of match(), which never changes
390    
391  typedef struct heapframe {  typedef struct heapframe {
392    struct heapframe *Xprevframe;    struct heapframe *Xprevframe;
393      struct heapframe *Xnextframe;
394    
395    /* Function arguments that may change */    /* Function arguments that may change */
396    
397    USPTR Xeptr;    PCRE_PUCHAR Xeptr;
398    const uschar *Xecode;    const pcre_uchar *Xecode;
399    USPTR Xmstart;    PCRE_PUCHAR Xmstart;
   USPTR Xmarkptr;  
400    int Xoffset_top;    int Xoffset_top;
401    eptrblock *Xeptrb;    eptrblock *Xeptrb;
402    unsigned int Xrdepth;    unsigned int Xrdepth;
403    
404    /* Function local variables */    /* Function local variables */
405    
406    USPTR Xcallpat;    PCRE_PUCHAR Xcallpat;
407  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
408    USPTR Xcharptr;    PCRE_PUCHAR Xcharptr;
409  #endif  #endif
410    USPTR Xdata;    PCRE_PUCHAR Xdata;
411    USPTR Xnext;    PCRE_PUCHAR Xnext;
412    USPTR Xpp;    PCRE_PUCHAR Xpp;
413    USPTR Xprev;    PCRE_PUCHAR Xprev;
414    USPTR Xsaved_eptr;    PCRE_PUCHAR Xsaved_eptr;
415    
416    recursion_info Xnew_recursive;    recursion_info Xnew_recursive;
417    
# Line 382  typedef struct heapframe { Line 421  typedef struct heapframe {
421    
422  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
423    int Xprop_type;    int Xprop_type;
424    int Xprop_value;    unsigned int Xprop_value;
425    int Xprop_fail_result;    int Xprop_fail_result;
426    int Xoclength;    int Xoclength;
427    uschar Xocchars[8];    pcre_uchar Xocchars[6];
428  #endif  #endif
429    
430    int Xcodelink;    int Xcodelink;
# Line 395  typedef struct heapframe { Line 434  typedef struct heapframe {
434    int Xlength;    int Xlength;
435    int Xmax;    int Xmax;
436    int Xmin;    int Xmin;
437    int Xnumber;    unsigned int Xnumber;
438    int Xoffset;    int Xoffset;
439    int Xop;    unsigned int Xop;
440    int Xsave_capture_last;    pcre_int32 Xsave_capture_last;
441    int Xsave_offset1, Xsave_offset2, Xsave_offset3;    int Xsave_offset1, Xsave_offset2, Xsave_offset3;
442    int Xstacksave[REC_STACK_SAVE_MAX];    int Xstacksave[REC_STACK_SAVE_MAX];
443    
# Line 427  returns a negative (error) response, the Line 466  returns a negative (error) response, the
466  same response. */  same response. */
467    
468  /* These macros pack up tests that are used for partial matching, and which  /* These macros pack up tests that are used for partial matching, and which
469  appears several times in the code. We set the "hit end" flag if the pointer is  appear several times in the code. We set the "hit end" flag if the pointer is
470  at the end of the subject and also past the start of the subject (i.e.  at the end of the subject and also past the start of the subject (i.e.
471  something has been matched). For hard partial matching, we then return  something has been matched). For hard partial matching, we then return
472  immediately. The second one is used when we already know we are past the end of  immediately. The second one is used when we already know we are past the end of
# Line 438  the subject. */ Line 477  the subject. */
477        eptr > md->start_used_ptr) \        eptr > md->start_used_ptr) \
478      { \      { \
479      md->hitend = TRUE; \      md->hitend = TRUE; \
480      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
481      }      }
482    
483  #define SCHECK_PARTIAL()\  #define SCHECK_PARTIAL()\
484    if (md->partial != 0 && eptr > md->start_used_ptr) \    if (md->partial != 0 && eptr > md->start_used_ptr) \
485      { \      { \
486      md->hitend = TRUE; \      md->hitend = TRUE; \
487      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
488      }      }
489    
490    
491  /* Performance note: It might be tempting to extract commonly used fields from  /* Performance note: It might be tempting to extract commonly used fields from
492  the md structure (e.g. utf8, end_subject) into individual variables to improve  the md structure (e.g. utf, end_subject) into individual variables to improve
493  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
494  made performance worse.  made performance worse.
495    
# Line 459  Arguments: Line 498  Arguments:
498     ecode       pointer to current position in compiled code     ecode       pointer to current position in compiled code
499     mstart      pointer to the current match start position (can be modified     mstart      pointer to the current match start position (can be modified
500                   by encountering \K)                   by encountering \K)
    markptr     pointer to the most recent MARK name, or NULL  
501     offset_top  current top pointer     offset_top  current top pointer
502     md          pointer to "static" info for the match     md          pointer to "static" info for the match
503     eptrb       pointer to chain of blocks containing eptr at start of     eptrb       pointer to chain of blocks containing eptr at start of
# Line 474  Returns:       MATCH_MATCH if matched Line 512  Returns:       MATCH_MATCH if matched
512  */  */
513    
514  static int  static int
515  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,  match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
516    const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,    PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
517    unsigned int rdepth)    unsigned int rdepth)
518  {  {
519  /* These variables do not need to be preserved over recursion in this function,  /* These variables do not need to be preserved over recursion in this function,
# Line 484  so they can be ordinary variables in all Line 522  so they can be ordinary variables in all
522    
523  register int  rrc;         /* Returns from recursive calls */  register int  rrc;         /* Returns from recursive calls */
524  register int  i;           /* Used for loops not involving calls to RMATCH() */  register int  i;           /* Used for loops not involving calls to RMATCH() */
525  register unsigned int c;   /* Character values not kept over RMATCH() calls */  register pcre_uint32 c;    /* Character values not kept over RMATCH() calls */
526  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf;         /* Local copy of UTF flag for speed */
527    
528  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
529  BOOL caseless;  BOOL caseless;
530  int condcode;  int condcode;
531    
532  /* 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
533  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
534  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
535  heap whenever RMATCH() does a "recursion". See the macro definitions above. */  whenever RMATCH() does a "recursion". See the macro definitions above. Putting
536    the top-level on the stack rather than malloc-ing them all gives a performance
537    boost in many cases where there is not much "recursion". */
538    
539  #ifdef NO_RECURSE  #ifdef NO_RECURSE
540  heapframe *frame = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));  heapframe *frame = (heapframe *)md->match_frames_base;
 if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);  
 frame->Xprevframe = NULL;            /* Marks the top level */  
541    
542  /* Copy in the original argument variables */  /* Copy in the original argument variables */
543    
544  frame->Xeptr = eptr;  frame->Xeptr = eptr;
545  frame->Xecode = ecode;  frame->Xecode = ecode;
546  frame->Xmstart = mstart;  frame->Xmstart = mstart;
 frame->Xmarkptr = markptr;  
547  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
548  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
549  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
# Line 520  HEAP_RECURSE: Line 557  HEAP_RECURSE:
557  #define eptr               frame->Xeptr  #define eptr               frame->Xeptr
558  #define ecode              frame->Xecode  #define ecode              frame->Xecode
559  #define mstart             frame->Xmstart  #define mstart             frame->Xmstart
 #define markptr            frame->Xmarkptr  
560  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
561  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
562  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
563    
564  /* Ditto for the local variables */  /* Ditto for the local variables */
565    
566  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
567  #define charptr            frame->Xcharptr  #define charptr            frame->Xcharptr
568  #endif  #endif
569  #define callpat            frame->Xcallpat  #define callpat            frame->Xcallpat
# Line 585  declarations can be cut out in a block. Line 621  declarations can be cut out in a block.
621  below are for variables that do not have to be preserved over a recursive call  below are for variables that do not have to be preserved over a recursive call
622  to RMATCH(). */  to RMATCH(). */
623    
624  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
625  const uschar *charptr;  const pcre_uchar *charptr;
626  #endif  #endif
627  const uschar *callpat;  const pcre_uchar *callpat;
628  const uschar *data;  const pcre_uchar *data;
629  const uschar *next;  const pcre_uchar *next;
630  USPTR         pp;  PCRE_PUCHAR       pp;
631  const uschar *prev;  const pcre_uchar *prev;
632  USPTR         saved_eptr;  PCRE_PUCHAR       saved_eptr;
633    
634  recursion_info new_recursive;  recursion_info new_recursive;
635    
# Line 603  BOOL prev_is_word; Line 639  BOOL prev_is_word;
639    
640  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
641  int prop_type;  int prop_type;
642  int prop_value;  unsigned int prop_value;
643  int prop_fail_result;  int prop_fail_result;
644  int oclength;  int oclength;
645  uschar occhars[8];  pcre_uchar occhars[6];
646  #endif  #endif
647    
648  int codelink;  int codelink;
# Line 614  int ctype; Line 650  int ctype;
650  int length;  int length;
651  int max;  int max;
652  int min;  int min;
653  int number;  unsigned int number;
654  int offset;  int offset;
655  int op;  unsigned int op;
656  int save_capture_last;  pcre_int32 save_capture_last;
657  int save_offset1, save_offset2, save_offset3;  int save_offset1, save_offset2, save_offset3;
658  int stacksave[REC_STACK_SAVE_MAX];  int stacksave[REC_STACK_SAVE_MAX];
659    
660  eptrblock newptrb;  eptrblock newptrb;
661    
662    /* There is a special fudge for calling match() in a way that causes it to
663    measure the size of its basic stack frame when the stack is being used for
664    recursion. The second argument (ecode) being NULL triggers this behaviour. It
665    cannot normally ever be NULL. The return is the negated value of the frame
666    size. */
667    
668    if (ecode == NULL)
669      {
670      if (rdepth == 0)
671        return match((PCRE_PUCHAR)&rdepth, NULL, NULL, 0, NULL, NULL, 1);
672      else
673        {
674        int len = (char *)&rdepth - (char *)eptr;
675        return (len > 0)? -len : len;
676        }
677      }
678  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
679    
680  /* To save space on the stack and in the heap frame, I have doubled up on some  /* To save space on the stack and in the heap frame, I have doubled up on some
# Line 634  the alternative names that are used. */ Line 687  the alternative names that are used. */
687  #define code_offset   codelink  #define code_offset   codelink
688  #define condassert    condition  #define condassert    condition
689  #define matched_once  prev_is_word  #define matched_once  prev_is_word
690    #define foc           number
691    #define save_mark     data
692    
693  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
694  variables. */  variables. */
# Line 659  defined). However, RMATCH isn't like a f Line 714  defined). However, RMATCH isn't like a f
714  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,
715  however, impact performance when true recursion is being used. */  however, impact performance when true recursion is being used. */
716    
717  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
718  utf8 = md->utf8;       /* Local copy of the flag */  utf = md->utf;       /* Local copy of the flag */
719  #else  #else
720  utf8 = FALSE;  utf = FALSE;
721  #endif  #endif
722    
723  /* 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 701  for (;;) Line 756  for (;;)
756    switch(op)    switch(op)
757      {      {
758      case OP_MARK:      case OP_MARK:
759      markptr = ecode + 2;      md->nomatch_mark = ecode + 2;
760      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      md->mark = NULL;    /* In case previously set by assertion */
761        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
762        eptrb, RM55);        eptrb, RM55);
763        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
764             md->mark == NULL) md->mark = ecode + 2;
765    
766      /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an      /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
767      argument, and we must check whether that argument matches this MARK's      argument, and we must check whether that argument matches this MARK's
# Line 712  for (;;) Line 770  for (;;)
770      position and return MATCH_SKIP. Otherwise, pass back the return code      position and return MATCH_SKIP. Otherwise, pass back the return code
771      unaltered. */      unaltered. */
772    
773      if (rrc == MATCH_SKIP_ARG &&      else if (rrc == MATCH_SKIP_ARG &&
774          strcmp((char *)markptr, (char *)(md->start_match_ptr)) == 0)          STRCMP_UC_UC_TEST(ecode + 2, md->start_match_ptr) == 0)
775        {        {
776        md->start_match_ptr = eptr;        md->start_match_ptr = eptr;
777        RRETURN(MATCH_SKIP);        RRETURN(MATCH_SKIP);
778        }        }
   
     if (md->mark == NULL) md->mark = markptr;  
779      RRETURN(rrc);      RRETURN(rrc);
780    
781      case OP_FAIL:      case OP_FAIL:
782      MRRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
   
     /* COMMIT overrides PRUNE, SKIP, and THEN */  
783    
784      case OP_COMMIT:      case OP_COMMIT:
785      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
786        eptrb, RM52);        eptrb, RM52);
787      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
788          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&      RRETURN(MATCH_COMMIT);
         rrc != MATCH_THEN)  
       RRETURN(rrc);  
     MRRETURN(MATCH_COMMIT);  
   
     /* PRUNE overrides THEN */  
789    
790      case OP_PRUNE:      case OP_PRUNE:
791      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
792        eptrb, RM51);        eptrb, RM51);
793      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
794      MRRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
795    
796      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
797      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      md->nomatch_mark = ecode + 2;
798        md->mark = NULL;    /* In case previously set by assertion */
799        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
800        eptrb, RM56);        eptrb, RM56);
801      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
802      md->mark = ecode + 2;           md->mark == NULL) md->mark = ecode + 2;
803        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
804      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
805    
     /* SKIP overrides PRUNE and THEN */  
   
806      case OP_SKIP:      case OP_SKIP:
807      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
808        eptrb, RM53);        eptrb, RM53);
809      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
       RRETURN(rrc);  
810      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
811      MRRETURN(MATCH_SKIP);      RRETURN(MATCH_SKIP);
812    
813        /* Note that, for Perl compatibility, SKIP with an argument does NOT set
814        nomatch_mark. When a pattern match ends with a SKIP_ARG for which there was
815        not a matching mark, we have to re-run the match, ignoring the SKIP_ARG
816        that failed and any that precede it (either they also failed, or were not
817        triggered). To do this, we maintain a count of executed SKIP_ARGs. If a
818        SKIP_ARG gets to top level, the match is re-run with md->ignore_skip_arg
819        set to the count of the one that failed. */
820    
821      case OP_SKIP_ARG:      case OP_SKIP_ARG:
822      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      md->skip_arg_count++;
823        if (md->skip_arg_count <= md->ignore_skip_arg)
824          {
825          ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
826          break;
827          }
828        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
829        eptrb, RM57);        eptrb, RM57);
830      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
       RRETURN(rrc);  
831    
832      /* Pass back the current skip name by overloading md->start_match_ptr and      /* Pass back the current skip name by overloading md->start_match_ptr and
833      returning the special MATCH_SKIP_ARG return code. This will either be      returning the special MATCH_SKIP_ARG return code. This will either be
834      caught by a matching MARK, or get to the top, where it is treated the same      caught by a matching MARK, or get to the top, where it causes a rematch
835      as PRUNE. */      with md->ignore_skip_arg set to the value of md->skip_arg_count. */
836    
837      md->start_match_ptr = ecode + 2;      md->start_match_ptr = ecode + 2;
838      RRETURN(MATCH_SKIP_ARG);      RRETURN(MATCH_SKIP_ARG);
839    
840      /* For THEN (and THEN_ARG) we pass back the address of the bracket or      /* For THEN (and THEN_ARG) we pass back the address of the opcode, so that
841      the alt that is at the start of the current branch. This makes it possible      the branch in which it occurs can be determined. Overload the start of
842      to skip back past alternatives that precede the THEN within the current      match pointer to do this. */
     branch. */  
843    
844      case OP_THEN:      case OP_THEN:
845      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
846        eptrb, RM54);        eptrb, RM54);
847      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
848      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
849      MRRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
850    
851      case OP_THEN_ARG:      case OP_THEN_ARG:
852      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],      md->nomatch_mark = ecode + 2;
853        offset_top, md, eptrb, RM58);      md->mark = NULL;    /* In case previously set by assertion */
854        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top,
855          md, eptrb, RM58);
856        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
857             md->mark == NULL) md->mark = ecode + 2;
858      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
859      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
     md->mark = ecode + LINK_SIZE + 2;  
860      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
861    
862        /* Handle an atomic group that does not contain any capturing parentheses.
863        This can be handled like an assertion. Prior to 8.13, all atomic groups
864        were handled this way. In 8.13, the code was changed as below for ONCE, so
865        that backups pass through the group and thereby reset captured values.
866        However, this uses a lot more stack, so in 8.20, atomic groups that do not
867        contain any captures generate OP_ONCE_NC, which can be handled in the old,
868        less stack intensive way.
869    
870        Check the alternative branches in turn - the matching won't pass the KET
871        for this kind of subpattern. If any one branch matches, we carry on as at
872        the end of a normal bracket, leaving the subject pointer, but resetting
873        the start-of-match value in case it was changed by \K. */
874    
875        case OP_ONCE_NC:
876        prev = ecode;
877        saved_eptr = eptr;
878        save_mark = md->mark;
879        do
880          {
881          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
882          if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
883            {
884            mstart = md->start_match_ptr;
885            break;
886            }
887          if (rrc == MATCH_THEN)
888            {
889            next = ecode + GET(ecode,1);
890            if (md->start_match_ptr < next &&
891                (*ecode == OP_ALT || *next == OP_ALT))
892              rrc = MATCH_NOMATCH;
893            }
894    
895          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
896          ecode += GET(ecode,1);
897          md->mark = save_mark;
898          }
899        while (*ecode == OP_ALT);
900    
901        /* If hit the end of the group (which could be repeated), fail */
902    
903        if (*ecode != OP_ONCE_NC && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
904    
905        /* Continue as from after the group, updating the offsets high water
906        mark, since extracts may have been taken. */
907    
908        do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
909    
910        offset_top = md->end_offset_top;
911        eptr = md->end_match_ptr;
912    
913        /* For a non-repeating ket, just continue at this level. This also
914        happens for a repeating ket if no characters were matched in the group.
915        This is the forcible breaking of infinite loops as implemented in Perl
916        5.005. */
917    
918        if (*ecode == OP_KET || eptr == saved_eptr)
919          {
920          ecode += 1+LINK_SIZE;
921          break;
922          }
923    
924        /* The repeating kets try the rest of the pattern or restart from the
925        preceding bracket, in the appropriate order. The second "call" of match()
926        uses tail recursion, to avoid using another stack frame. */
927    
928        if (*ecode == OP_KETRMIN)
929          {
930          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM65);
931          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
932          ecode = prev;
933          goto TAIL_RECURSE;
934          }
935        else  /* OP_KETRMAX */
936          {
937          RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
938          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
939          ecode += 1 + LINK_SIZE;
940          goto TAIL_RECURSE;
941          }
942        /* Control never gets here */
943    
944      /* Handle a capturing bracket, other than those that are possessive with an      /* Handle a capturing bracket, other than those that are possessive with an
945      unlimited repeat. If there is space in the offset vector, save the current      unlimited repeat. If there is space in the offset vector, save the current
946      subject position in the working slot at the top of the vector. We mustn't      subject position in the working slot at the top of the vector. We mustn't
# Line 827  for (;;) Line 973  for (;;)
973        save_offset2 = md->offset_vector[offset+1];        save_offset2 = md->offset_vector[offset+1];
974        save_offset3 = md->offset_vector[md->offset_end - number];        save_offset3 = md->offset_vector[md->offset_end - number];
975        save_capture_last = md->capture_last;        save_capture_last = md->capture_last;
976          save_mark = md->mark;
977    
978        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
979        md->offset_vector[md->offset_end - number] =        md->offset_vector[md->offset_end - number] =
# Line 835  for (;;) Line 982  for (;;)
982        for (;;)        for (;;)
983          {          {
984          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
985          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
986            eptrb, RM1);            eptrb, RM1);
987          if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */          if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
988          if (rrc != MATCH_NOMATCH &&  
989              (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* If we backed up to a THEN, check whether it is within the current
990            RRETURN(rrc);          branch by comparing the address of the THEN that is passed back with
991            the end of the branch. If it is within the current branch, and the
992            branch is one of two or more alternatives (it either starts or ends
993            with OP_ALT), we have reached the limit of THEN's action, so convert
994            the return code to NOMATCH, which will cause normal backtracking to
995            happen from now on. Otherwise, THEN is passed back to an outer
996            alternative. This implements Perl's treatment of parenthesized groups,
997            where a group not containing | does not affect the current alternative,
998            that is, (X) is NOT the same as (X|(*F)). */
999    
1000            if (rrc == MATCH_THEN)
1001              {
1002              next = ecode + GET(ecode,1);
1003              if (md->start_match_ptr < next &&
1004                  (*ecode == OP_ALT || *next == OP_ALT))
1005                rrc = MATCH_NOMATCH;
1006              }
1007    
1008            /* Anything other than NOMATCH is passed back. */
1009    
1010            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1011          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
1012          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
1013            md->mark = save_mark;
1014          if (*ecode != OP_ALT) break;          if (*ecode != OP_ALT) break;
1015          }          }
1016    
# Line 851  for (;;) Line 1019  for (;;)
1019        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
1020        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
1021    
1022        /* At this point, rrc will be one of MATCH_ONCE, MATCH_NOMATCH, or        /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
       MATCH_THEN. */  
1023    
1024        if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;        RRETURN(rrc);
       RRETURN(((rrc == MATCH_ONCE)? MATCH_ONCE:MATCH_NOMATCH));  
1025        }        }
1026    
1027      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
# Line 870  for (;;) Line 1036  for (;;)
1036      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1037    
1038      /* Non-capturing or atomic group, except for possessive with unlimited      /* Non-capturing or atomic group, except for possessive with unlimited
1039      repeat. Loop for all the alternatives. When we get to the final alternative      repeat and ONCE group with no captures. Loop for all the alternatives.
1040      within the brackets, we used to return the result of a recursive call to  
1041      match() whatever happened so it was possible to reduce stack usage by      When we get to the final alternative within the brackets, we used to return
1042      turning this into a tail recursion, except in the case of a possibly empty      the result of a recursive call to match() whatever happened so it was
1043      group. However, now that there is the possiblity of (*THEN) occurring in      possible to reduce stack usage by turning this into a tail recursion,
1044      the final alternative, this optimization is no longer possible.      except in the case of a possibly empty group. However, now that there is
1045        the possiblity of (*THEN) occurring in the final alternative, this
1046        optimization is no longer always possible.
1047    
1048        We can optimize if we know there are no (*THEN)s in the pattern; at present
1049        this is the best that can be done.
1050    
1051      MATCH_ONCE is returned when the end of an atomic group is successfully      MATCH_ONCE is returned when the end of an atomic group is successfully
1052      reached, but subsequent matching fails. It passes back up the tree (causing      reached, but subsequent matching fails. It passes back up the tree (causing
# Line 891  for (;;) Line 1062  for (;;)
1062    
1063      for (;;)      for (;;)
1064        {        {
1065        if (op >= OP_SBRA || op == OP_ONCE) md->match_function_type = MATCH_CBEGROUP;        if (op >= OP_SBRA || op == OP_ONCE)
1066        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,          md->match_function_type = MATCH_CBEGROUP;
1067    
1068          /* If this is not a possibly empty group, and there are no (*THEN)s in
1069          the pattern, and this is the final alternative, optimize as described
1070          above. */
1071    
1072          else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
1073            {
1074            ecode += PRIV(OP_lengths)[*ecode];
1075            goto TAIL_RECURSE;
1076            }
1077    
1078          /* In all other cases, we have to make another call to match(). */
1079    
1080          save_mark = md->mark;
1081          save_capture_last = md->capture_last;
1082          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
1083          RM2);          RM2);
1084        if (rrc != MATCH_NOMATCH &&  
1085            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* See comment in the code for capturing groups above about handling
1086          THEN. */
1087    
1088          if (rrc == MATCH_THEN)
1089            {
1090            next = ecode + GET(ecode,1);
1091            if (md->start_match_ptr < next &&
1092                (*ecode == OP_ALT || *next == OP_ALT))
1093              rrc = MATCH_NOMATCH;
1094            }
1095    
1096          if (rrc != MATCH_NOMATCH)
1097          {          {
1098          if (rrc == MATCH_ONCE)          if (rrc == MATCH_ONCE)
1099            {            {
1100            const uschar *scode = ecode;            const pcre_uchar *scode = ecode;
1101            if (*scode != OP_ONCE)           /* If not at start, find it */            if (*scode != OP_ONCE)           /* If not at start, find it */
1102              {              {
1103              while (*scode == OP_ALT) scode += GET(scode, 1);              while (*scode == OP_ALT) scode += GET(scode, 1);
# Line 910  for (;;) Line 1108  for (;;)
1108          RRETURN(rrc);          RRETURN(rrc);
1109          }          }
1110        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1111          md->mark = save_mark;
1112        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1113          md->capture_last = save_capture_last;
1114        }        }
1115      if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;  
1116      RRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
1117    
1118      /* Handle possessive capturing brackets with an unlimited repeat. We come      /* Handle possessive capturing brackets with an unlimited repeat. We come
# Line 941  for (;;) Line 1141  for (;;)
1141      if (offset < md->offset_max)      if (offset < md->offset_max)
1142        {        {
1143        matched_once = FALSE;        matched_once = FALSE;
1144        code_offset = ecode - md->start_code;        code_offset = (int)(ecode - md->start_code);
1145    
1146        save_offset1 = md->offset_vector[offset];        save_offset1 = md->offset_vector[offset];
1147        save_offset2 = md->offset_vector[offset+1];        save_offset2 = md->offset_vector[offset+1];
# Line 964  for (;;) Line 1164  for (;;)
1164          md->offset_vector[md->offset_end - number] =          md->offset_vector[md->offset_end - number] =
1165            (int)(eptr - md->start_subject);            (int)(eptr - md->start_subject);
1166          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1167          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1168            eptrb, RM63);            eptrb, RM63);
1169          if (rrc == MATCH_KETRPOS)          if (rrc == MATCH_KETRPOS)
1170            {            {
# Line 973  for (;;) Line 1173  for (;;)
1173            ecode = md->start_code + code_offset;            ecode = md->start_code + code_offset;
1174            save_capture_last = md->capture_last;            save_capture_last = md->capture_last;
1175            matched_once = TRUE;            matched_once = TRUE;
1176              mstart = md->start_match_ptr;    /* In case \K changed it */
1177            continue;            continue;
1178            }            }
1179          if (rrc != MATCH_NOMATCH &&  
1180              (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* See comment in the code for capturing groups above about handling
1181            RRETURN(rrc);          THEN. */
1182    
1183            if (rrc == MATCH_THEN)
1184              {
1185              next = ecode + GET(ecode,1);
1186              if (md->start_match_ptr < next &&
1187                  (*ecode == OP_ALT || *next == OP_ALT))
1188                rrc = MATCH_NOMATCH;
1189              }
1190    
1191            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1192          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
1193          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
1194          if (*ecode != OP_ALT) break;          if (*ecode != OP_ALT) break;
# Line 990  for (;;) Line 1201  for (;;)
1201          md->offset_vector[md->offset_end - number] = save_offset3;          md->offset_vector[md->offset_end - number] = save_offset3;
1202          }          }
1203    
       if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;  
1204        if (allow_zero || matched_once)        if (allow_zero || matched_once)
1205          {          {
1206          ecode += 1 + LINK_SIZE;          ecode += 1 + LINK_SIZE;
# Line 1022  for (;;) Line 1232  for (;;)
1232    
1233      POSSESSIVE_NON_CAPTURE:      POSSESSIVE_NON_CAPTURE:
1234      matched_once = FALSE;      matched_once = FALSE;
1235      code_offset = ecode - md->start_code;      code_offset = (int)(ecode - md->start_code);
1236        save_capture_last = md->capture_last;
1237    
1238      for (;;)      for (;;)
1239        {        {
1240        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1241        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1242          eptrb, RM48);          eptrb, RM48);
1243        if (rrc == MATCH_KETRPOS)        if (rrc == MATCH_KETRPOS)
1244          {          {
# Line 1035  for (;;) Line 1246  for (;;)
1246          eptr = md->end_match_ptr;          eptr = md->end_match_ptr;
1247          ecode = md->start_code + code_offset;          ecode = md->start_code + code_offset;
1248          matched_once = TRUE;          matched_once = TRUE;
1249            mstart = md->start_match_ptr;   /* In case \K reset it */
1250          continue;          continue;
1251          }          }
1252        if (rrc != MATCH_NOMATCH &&  
1253            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* See comment in the code for capturing groups above about handling
1254          RRETURN(rrc);        THEN. */
1255    
1256          if (rrc == MATCH_THEN)
1257            {
1258            next = ecode + GET(ecode,1);
1259            if (md->start_match_ptr < next &&
1260                (*ecode == OP_ALT || *next == OP_ALT))
1261              rrc = MATCH_NOMATCH;
1262            }
1263    
1264          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1265        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1266        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1267          md->capture_last = save_capture_last;
1268        }        }
1269    
1270      if (matched_once || allow_zero)      if (matched_once || allow_zero)
# Line 1053  for (;;) Line 1276  for (;;)
1276    
1277      /* Control never reaches here. */      /* Control never reaches here. */
1278    
1279      /* Conditional group: compilation checked that there are no more than      /* Conditional group: compilation checked that there are no more than two
1280      two branches. If the condition is false, skipping the first branch takes us      branches. If the condition is false, skipping the first branch takes us
1281      past the end if there is only one branch, but that's OK because that is      past the end of the item if there is only one branch, but that's exactly
1282      exactly what going to the ket would do. */      what we want. */
1283    
1284      case OP_COND:      case OP_COND:
1285      case OP_SCOND:      case OP_SCOND:
1286      codelink = GET(ecode, 1);  
1287        /* The variable codelink will be added to ecode when the condition is
1288        false, to get to the second branch. Setting it to the offset to the ALT
1289        or KET, then incrementing ecode achieves this effect. We now have ecode
1290        pointing to the condition or callout. */
1291    
1292        codelink = GET(ecode, 1);   /* Offset to the second branch */
1293        ecode += 1 + LINK_SIZE;     /* From this opcode */
1294    
1295      /* Because of the way auto-callout works during compile, a callout item is      /* Because of the way auto-callout works during compile, a callout item is
1296      inserted between OP_COND and an assertion condition. */      inserted between OP_COND and an assertion condition. */
1297    
1298      if (ecode[LINK_SIZE+1] == OP_CALLOUT)      if (*ecode == OP_CALLOUT)
1299        {        {
1300        if (pcre_callout != NULL)        if (PUBL(callout) != NULL)
1301          {          {
1302          pcre_callout_block cb;          PUBL(callout_block) cb;
1303          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 2;   /* Version 1 of the callout block */
1304          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[1];
1305          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1306    #if defined COMPILE_PCRE8
1307          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
1308    #elif defined COMPILE_PCRE16
1309            cb.subject          = (PCRE_SPTR16)md->start_subject;
1310    #elif defined COMPILE_PCRE32
1311            cb.subject          = (PCRE_SPTR32)md->start_subject;
1312    #endif
1313          cb.subject_length   = (int)(md->end_subject - md->start_subject);          cb.subject_length   = (int)(md->end_subject - md->start_subject);
1314          cb.start_match      = (int)(mstart - md->start_subject);          cb.start_match      = (int)(mstart - md->start_subject);
1315          cb.current_position = (int)(eptr - md->start_subject);          cb.current_position = (int)(eptr - md->start_subject);
1316          cb.pattern_position = GET(ecode, LINK_SIZE + 3);          cb.pattern_position = GET(ecode, 2);
1317          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);          cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
1318          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1319          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last & CAPLMASK;
1320            /* Internal change requires this for API compatibility. */
1321            if (cb.capture_last == 0) cb.capture_last = -1;
1322          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1323          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);          cb.mark             = md->nomatch_mark;
1324            if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1325          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1326          }          }
       ecode += _pcre_OP_lengths[OP_CALLOUT];  
       }  
1327    
1328      condcode = ecode[LINK_SIZE+1];        /* Advance ecode past the callout, so it now points to the condition. We
1329          must adjust codelink so that the value of ecode+codelink is unchanged. */
1330    
1331      /* Now see what the actual condition is */        ecode += PRIV(OP_lengths)[OP_CALLOUT];
1332          codelink -= PRIV(OP_lengths)[OP_CALLOUT];
1333          }
1334    
1335      if (condcode == OP_RREF || condcode == OP_NRREF)    /* Recursion test */      /* Test the various possible conditions */
1336    
1337        condition = FALSE;
1338        switch(condcode = *ecode)
1339        {        {
1340        if (md->recursive == NULL)                /* Not recursing => FALSE */        case OP_RREF:         /* Numbered group recursion test */
1341          if (md->recursive != NULL)     /* Not recursing => FALSE */
1342          {          {
1343          condition = FALSE;          unsigned int recno = GET2(ecode, 1);   /* Recursion group number*/
1344          ecode += GET(ecode, 1);          condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1345          }          }
1346        else        break;
         {  
         int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/  
         condition =  (recno == RREF_ANY || recno == md->recursive->group_num);  
   
         /* If the test is for recursion into a specific subpattern, and it is  
         false, but the test was set up by name, scan the table to see if the  
         name refers to any other numbers, and test them. The condition is true  
         if any one is set. */  
   
         if (!condition && condcode == OP_NRREF && recno != RREF_ANY)  
           {  
           uschar *slotA = md->name_table;  
           for (i = 0; i < md->name_count; i++)  
             {  
             if (GET2(slotA, 0) == recno) break;  
             slotA += md->name_entry_size;  
             }  
   
           /* Found a name for the number - there can be only one; duplicate  
           names for different numbers are allowed, but not vice versa. First  
           scan down for duplicates. */  
   
           if (i < md->name_count)  
             {  
             uschar *slotB = slotA;  
             while (slotB > md->name_table)  
               {  
               slotB -= md->name_entry_size;  
               if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)  
                 {  
                 condition = GET2(slotB, 0) == md->recursive->group_num;  
                 if (condition) break;  
                 }  
               else break;  
               }  
   
             /* Scan up for duplicates */  
1347    
1348              if (!condition)        case OP_DNRREF:       /* Duplicate named group recursion test */
1349                {        if (md->recursive != NULL)
1350                slotB = slotA;          {
1351                for (i++; i < md->name_count; i++)          int count = GET2(ecode, 1 + IMM2_SIZE);
1352                  {          pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
1353                  slotB += md->name_entry_size;          while (count-- > 0)
1354                  if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)            {
1355                    {            unsigned int recno = GET2(slot, 0);
1356                    condition = GET2(slotB, 0) == md->recursive->group_num;            condition = recno == md->recursive->group_num;
1357                    if (condition) break;            if (condition) break;
1358                    }            slot += md->name_entry_size;
                 else break;  
                 }  
               }  
             }  
1359            }            }
   
         /* Chose branch according to the condition */  
   
         ecode += condition? 3 : GET(ecode, 1);  
1360          }          }
1361        }        break;
1362    
1363      else if (condcode == OP_CREF || condcode == OP_NCREF)  /* Group used test */        case OP_CREF:         /* Numbered group used test */
1364        {        offset = GET2(ecode, 1) << 1;  /* Doubled ref number */
       offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */  
1365        condition = offset < offset_top && md->offset_vector[offset] >= 0;        condition = offset < offset_top && md->offset_vector[offset] >= 0;
1366          break;
1367    
1368        /* If the numbered capture is unset, but the reference was by name,        case OP_DNCREF:      /* Duplicate named group used test */
       scan the table to see if the name refers to any other numbers, and test  
       them. The condition is true if any one is set. This is tediously similar  
       to the code above, but not close enough to try to amalgamate. */  
   
       if (!condition && condcode == OP_NCREF)  
1369          {          {
1370          int refno = offset >> 1;          int count = GET2(ecode, 1 + IMM2_SIZE);
1371          uschar *slotA = md->name_table;          pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
1372            while (count-- > 0)
1373          for (i = 0; i < md->name_count; i++)            {
1374            {            offset = GET2(slot, 0) << 1;
1375            if (GET2(slotA, 0) == refno) break;            condition = offset < offset_top && md->offset_vector[offset] >= 0;
1376            slotA += md->name_entry_size;            if (condition) break;
1377            }            slot += md->name_entry_size;
   
         /* Found a name for the number - there can be only one; duplicate names  
         for different numbers are allowed, but not vice versa. First scan down  
         for duplicates. */  
   
         if (i < md->name_count)  
           {  
           uschar *slotB = slotA;  
           while (slotB > md->name_table)  
             {  
             slotB -= md->name_entry_size;  
             if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)  
               {  
               offset = GET2(slotB, 0) << 1;  
               condition = offset < offset_top &&  
                 md->offset_vector[offset] >= 0;  
               if (condition) break;  
               }  
             else break;  
             }  
   
           /* Scan up for duplicates */  
   
           if (!condition)  
             {  
             slotB = slotA;  
             for (i++; i < md->name_count; i++)  
               {  
               slotB += md->name_entry_size;  
               if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)  
                 {  
                 offset = GET2(slotB, 0) << 1;  
                 condition = offset < offset_top &&  
                   md->offset_vector[offset] >= 0;  
                 if (condition) break;  
                 }  
               else break;  
               }  
             }  
1378            }            }
1379          }          }
1380          break;
1381    
1382        /* Chose branch according to the condition */        case OP_DEF:     /* DEFINE - always false */
1383          break;
       ecode += condition? 3 : GET(ecode, 1);  
       }  
   
     else if (condcode == OP_DEF)     /* DEFINE - always false */  
       {  
       condition = FALSE;  
       ecode += GET(ecode, 1);  
       }  
1384    
1385      /* The condition is an assertion. Call match() to evaluate it - setting        /* The condition is an assertion. Call match() to evaluate it - setting
1386      md->match_function_type to MATCH_CONDASSERT causes it to stop at the end of        md->match_function_type to MATCH_CONDASSERT causes it to stop at the end
1387      an assertion. */        of an assertion. */
1388    
1389      else        default:
       {  
1390        md->match_function_type = MATCH_CONDASSERT;        md->match_function_type = MATCH_CONDASSERT;
1391        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);        RMATCH(eptr, ecode, offset_top, md, NULL, RM3);
1392        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
1393          {          {
1394          if (md->end_offset_top > offset_top)          if (md->end_offset_top > offset_top)
1395            offset_top = md->end_offset_top;  /* Captures may have happened */            offset_top = md->end_offset_top;  /* Captures may have happened */
1396          condition = TRUE;          condition = TRUE;
1397          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);  
1398            /* Advance ecode past the assertion to the start of the first branch,
1399            but adjust it so that the general choosing code below works. */
1400    
1401            ecode += GET(ecode, 1);
1402          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1403            ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode];
1404          }          }
1405        else if (rrc != MATCH_NOMATCH &&  
1406                (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
1407          assertion; it is therefore treated as NOMATCH. Any other return is an
1408          error. */
1409    
1410          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1411          {          {
1412          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
1413          }          }
1414        else        break;
         {  
         condition = FALSE;  
         ecode += codelink;  
         }  
1415        }        }
1416    
1417      /* We are now at the branch that is to be obeyed. As there is only one,      /* Choose branch according to the condition */
1418      we used to use tail recursion to avoid using another stack frame, except  
1419      when there was unlimited repeat of a possibly empty group. However, that      ecode += condition? PRIV(OP_lengths)[condcode] : codelink;
     strategy no longer works because of the possibilty of (*THEN) being  
     encountered in the branch. A recursive call to match() is always required,  
     unless the second alternative doesn't exist, in which case we can just  
     plough on. */  
1420    
1421      if (condition || *ecode == OP_ALT)      /* We are now at the branch that is to be obeyed. As there is only one, we
1422        can use tail recursion to avoid using another stack frame, except when
1423        there is unlimited repeat of a possibly empty group. In the latter case, a
1424        recursive call to match() is always required, unless the second alternative
1425        doesn't exist, in which case we can just plough on. Note that, for
1426        compatibility with Perl, the | in a conditional group is NOT treated as
1427        creating two alternatives. If a THEN is encountered in the branch, it
1428        propagates out to the enclosing alternative (unless nested in a deeper set
1429        of alternatives, of course). */
1430    
1431        if (condition || ecode[-(1+LINK_SIZE)] == OP_ALT)
1432        {        {
1433        if (op == OP_SCOND) md->match_function_type = MATCH_CBEGROUP;        if (op != OP_SCOND)
1434        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);          {
1435        if (rrc == MATCH_THEN && md->start_match_ptr == ecode)          goto TAIL_RECURSE;
1436          rrc = MATCH_NOMATCH;          }
1437    
1438          md->match_function_type = MATCH_CBEGROUP;
1439          RMATCH(eptr, ecode, offset_top, md, eptrb, RM49);
1440        RRETURN(rrc);        RRETURN(rrc);
1441        }        }
1442      else                         /* Condition false & no alternative */  
1443         /* Condition false & no alternative; continue after the group. */
1444    
1445        else
1446        {        {
       ecode += 1 + LINK_SIZE;  
1447        }        }
1448      break;      break;
1449    
# Line 1289  for (;;) Line 1452  for (;;)
1452      to close any currently open capturing brackets. */      to close any currently open capturing brackets. */
1453    
1454      case OP_CLOSE:      case OP_CLOSE:
1455      number = GET2(ecode, 1);      number = GET2(ecode, 1);   /* Must be less than 65536 */
1456      offset = number << 1;      offset = number << 1;
1457    
1458  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 1297  for (;;) Line 1460  for (;;)
1460        printf("\n");        printf("\n");
1461  #endif  #endif
1462    
1463      md->capture_last = number;      md->capture_last = (md->capture_last & OVFLMASK) | number;
1464      if (offset >= md->offset_max) md->offset_overflow = TRUE; else      if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
1465        {        {
1466        md->offset_vector[offset] =        md->offset_vector[offset] =
1467          md->offset_vector[md->offset_end - number];          md->offset_vector[md->offset_end - number];
1468        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1469        if (offset_top <= offset) offset_top = offset + 2;        if (offset_top <= offset) offset_top = offset + 2;
1470        }        }
1471      ecode += 3;      ecode += 1 + IMM2_SIZE;
1472      break;      break;
1473    
1474    
# Line 1325  for (;;) Line 1488  for (;;)
1488           (md->notempty ||           (md->notempty ||
1489             (md->notempty_atstart &&             (md->notempty_atstart &&
1490               mstart == md->start_subject + md->start_offset)))               mstart == md->start_subject + md->start_offset)))
1491        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1492    
1493      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
1494    
# Line 1334  for (;;) Line 1497  for (;;)
1497      md->start_match_ptr = mstart;       /* and the start (\K can modify) */      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
1498    
1499      /* For some reason, the macros don't work properly if an expression is      /* For some reason, the macros don't work properly if an expression is
1500      given as the argument to MRRETURN when the heap is in use. */      given as the argument to RRETURN when the heap is in use. */
1501    
1502      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1503      MRRETURN(rrc);      RRETURN(rrc);
1504    
1505      /* Assertion brackets. Check the alternative branches in turn - the      /* Assertion brackets. Check the alternative branches in turn - the
1506      matching won't pass the KET for an assertion. If any one branch matches,      matching won't pass the KET for an assertion. If any one branch matches,
# Line 1352  for (;;) Line 1515  for (;;)
1515    
1516      case OP_ASSERT:      case OP_ASSERT:
1517      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1518        save_mark = md->mark;
1519      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1520        {        {
1521        condassert = TRUE;        condassert = TRUE;
# Line 1359  for (;;) Line 1523  for (;;)
1523        }        }
1524      else condassert = FALSE;      else condassert = FALSE;
1525    
1526        /* Loop for each branch */
1527    
1528      do      do
1529        {        {
1530        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
1531    
1532          /* A match means that the assertion is true; break out of the loop
1533          that matches its alternatives. */
1534    
1535        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1536          {          {
1537          mstart = md->start_match_ptr;   /* In case \K reset it */          mstart = md->start_match_ptr;   /* In case \K reset it */
         markptr = md->mark;  
1538          break;          break;
1539          }          }
1540        if (rrc != MATCH_NOMATCH &&  
1541            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* If not matched, restore the previous mark setting. */
1542          RRETURN(rrc);  
1543          md->mark = save_mark;
1544    
1545          /* See comment in the code for capturing groups above about handling
1546          THEN. */
1547    
1548          if (rrc == MATCH_THEN)
1549            {
1550            next = ecode + GET(ecode,1);
1551            if (md->start_match_ptr < next &&
1552                (*ecode == OP_ALT || *next == OP_ALT))
1553              rrc = MATCH_NOMATCH;
1554            }
1555    
1556          /* Anything other than NOMATCH causes the entire assertion to fail,
1557          passing back the return code. This includes COMMIT, SKIP, PRUNE and an
1558          uncaptured THEN, which means they take their normal effect. This
1559          consistent approach does not always have exactly the same effect as in
1560          Perl. */
1561    
1562          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1563        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1564        }        }
1565      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);   /* Continue for next alternative */
1566    
1567      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);      /* If we have tried all the alternative branches, the assertion has
1568        failed. If not, we broke out after a match. */
1569    
1570        if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
1571    
1572      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1573    
1574      if (condassert) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);
1575    
1576      /* Continue from after the assertion, updating the offsets high water      /* Continue from after a successful assertion, updating the offsets high
1577      mark, since extracts may have been taken during the assertion. */      water mark, since extracts may have been taken during the assertion. */
1578    
1579      do ecode += GET(ecode,1); while (*ecode == OP_ALT);      do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1580      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1581      offset_top = md->end_offset_top;      offset_top = md->end_offset_top;
1582      continue;      continue;
1583    
1584      /* Negative assertion: all branches must fail to match. Encountering SKIP,      /* Negative assertion: all branches must fail to match for the assertion to
1585      PRUNE, or COMMIT means we must assume failure without checking subsequent      succeed. */
     branches. */  
1586    
1587      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1588      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1589        save_mark = md->mark;
1590      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1591        {        {
1592        condassert = TRUE;        condassert = TRUE;
# Line 1402  for (;;) Line 1594  for (;;)
1594        }        }
1595      else condassert = FALSE;      else condassert = FALSE;
1596    
1597        /* Loop for each alternative branch. */
1598    
1599      do      do
1600        {        {
1601        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1602        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);        md->mark = save_mark;   /* Always restore the mark setting */
1603        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)  
1604          switch(rrc)
1605          {          {
1606          do ecode += GET(ecode,1); while (*ecode == OP_ALT);          case MATCH_MATCH:            /* A successful match means */
1607            case MATCH_ACCEPT:           /* the assertion has failed. */
1608            RRETURN(MATCH_NOMATCH);
1609    
1610            case MATCH_NOMATCH:          /* Carry on with next branch */
1611          break;          break;
1612          }  
1613        if (rrc != MATCH_NOMATCH &&          /* See comment in the code for capturing groups above about handling
1614            (rrc != MATCH_THEN || md->start_match_ptr != ecode))          THEN. */
1615    
1616            case MATCH_THEN:
1617            next = ecode + GET(ecode,1);
1618            if (md->start_match_ptr < next &&
1619                (*ecode == OP_ALT || *next == OP_ALT))
1620              {
1621              rrc = MATCH_NOMATCH;
1622              break;
1623              }
1624            /* Otherwise fall through. */
1625    
1626            /* COMMIT, SKIP, PRUNE, and an uncaptured THEN cause the whole
1627            assertion to fail to match, without considering any more alternatives.
1628            Failing to match means the assertion is true. This is a consistent
1629            approach, but does not always have the same effect as in Perl. */
1630    
1631            case MATCH_COMMIT:
1632            case MATCH_SKIP:
1633            case MATCH_SKIP_ARG:
1634            case MATCH_PRUNE:
1635            do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1636            goto NEG_ASSERT_TRUE;   /* Break out of alternation loop */
1637    
1638            /* Anything else is an error */
1639    
1640            default:
1641          RRETURN(rrc);          RRETURN(rrc);
1642            }
1643    
1644          /* Continue with next branch */
1645    
1646        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1647        }        }
1648      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1649    
1650      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */      /* All branches in the assertion failed to match. */
1651    
1652      ecode += 1 + LINK_SIZE;      NEG_ASSERT_TRUE:
1653        if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1654        ecode += 1 + LINK_SIZE;                /* Continue with current branch */
1655      continue;      continue;
1656    
1657      /* Move the subject pointer back. This occurs only at the start of      /* Move the subject pointer back. This occurs only at the start of
# Line 1429  for (;;) Line 1660  for (;;)
1660      back a number of characters, not bytes. */      back a number of characters, not bytes. */
1661    
1662      case OP_REVERSE:      case OP_REVERSE:
1663  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1664      if (utf8)      if (utf)
1665        {        {
1666        i = GET(ecode, 1);        i = GET(ecode, 1);
1667        while (i-- > 0)        while (i-- > 0)
1668          {          {
1669          eptr--;          eptr--;
1670          if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1671          BACKCHAR(eptr);          BACKCHAR(eptr);
1672          }          }
1673        }        }
# Line 1447  for (;;) Line 1678  for (;;)
1678    
1679        {        {
1680        eptr -= GET(ecode, 1);        eptr -= GET(ecode, 1);
1681        if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1682        }        }
1683    
1684      /* Save the earliest consulted character, then skip to next op code */      /* Save the earliest consulted character, then skip to next op code */
# Line 1461  for (;;) Line 1692  for (;;)
1692      function is able to force a failure. */      function is able to force a failure. */
1693    
1694      case OP_CALLOUT:      case OP_CALLOUT:
1695      if (pcre_callout != NULL)      if (PUBL(callout) != NULL)
1696        {        {
1697        pcre_callout_block cb;        PUBL(callout_block) cb;
1698        cb.version          = 1;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1699        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1700        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1701    #if defined COMPILE_PCRE8
1702        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
1703    #elif defined COMPILE_PCRE16
1704          cb.subject          = (PCRE_SPTR16)md->start_subject;
1705    #elif defined COMPILE_PCRE32
1706          cb.subject          = (PCRE_SPTR32)md->start_subject;
1707    #endif
1708        cb.subject_length   = (int)(md->end_subject - md->start_subject);        cb.subject_length   = (int)(md->end_subject - md->start_subject);
1709        cb.start_match      = (int)(mstart - md->start_subject);        cb.start_match      = (int)(mstart - md->start_subject);
1710        cb.current_position = (int)(eptr - md->start_subject);        cb.current_position = (int)(eptr - md->start_subject);
1711        cb.pattern_position = GET(ecode, 2);        cb.pattern_position = GET(ecode, 2);
1712        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
1713        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1714        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last & CAPLMASK;
1715          /* Internal change requires this for API compatibility. */
1716          if (cb.capture_last == 0) cb.capture_last = -1;
1717        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1718        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);        cb.mark             = md->nomatch_mark;
1719          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1720        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1721        }        }
1722      ecode += 2 + 2*LINK_SIZE;      ecode += 2 + 2*LINK_SIZE;
# Line 1501  for (;;) Line 1741  for (;;)
1741    
1742      case OP_RECURSE:      case OP_RECURSE:
1743        {        {
1744          recursion_info *ri;
1745          unsigned int recno;
1746    
1747        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1748        new_recursive.group_num = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
1749          GET2(callpat, 1 + LINK_SIZE);          GET2(callpat, 1 + LINK_SIZE);
1750    
1751          /* Check for repeating a recursion without advancing the subject pointer.
1752          This should catch convoluted mutual recursions. (Some simple cases are
1753          caught at compile time.) */
1754    
1755          for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
1756            if (recno == ri->group_num && eptr == ri->subject_position)
1757              RRETURN(PCRE_ERROR_RECURSELOOP);
1758    
1759        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1760    
1761          new_recursive.group_num = recno;
1762          new_recursive.saved_capture_last = md->capture_last;
1763          new_recursive.subject_position = eptr;
1764        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1765        md->recursive = &new_recursive;        md->recursive = &new_recursive;
1766    
# Line 1522  for (;;) Line 1776  for (;;)
1776        else        else
1777          {          {
1778          new_recursive.offset_save =          new_recursive.offset_save =
1779            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
1780          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1781          }          }
1782        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1783              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1784    
1785        /* OK, now we can do the recursion. After processing each alternative,        /* OK, now we can do the recursion. After processing each alternative,
1786        restore the offset data. If there were nested recursions, md->recursive        restore the offset data and the last captured value. If there were nested
1787        might be changed, so reset it before looping. */        recursions, md->recursive might be changed, so reset it before looping.
1788          */
1789    
1790        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1791        cbegroup = (*callpat >= OP_SBRA);        cbegroup = (*callpat >= OP_SBRA);
1792        do        do
1793          {          {
1794          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1795          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
1796            md, eptrb, RM6);            md, eptrb, RM6);
1797          memcpy(md->offset_vector, new_recursive.offset_save,          memcpy(md->offset_vector, new_recursive.offset_save,
1798              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1799            md->capture_last = new_recursive.saved_capture_last;
1800            md->recursive = new_recursive.prevrec;
1801          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1802            {            {
1803            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
           md->recursive = new_recursive.prevrec;  
1804            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1805              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1806    
1807            /* Set where we got to in the subject, and reset the start in case            /* Set where we got to in the subject, and reset the start in case
1808            it was changed by \K. This *is* propagated back out of a recursion,            it was changed by \K. This *is* propagated back out of a recursion,
# Line 1556  for (;;) Line 1812  for (;;)
1812            mstart = md->start_match_ptr;            mstart = md->start_match_ptr;
1813            goto RECURSION_MATCHED;        /* Exit loop; end processing */            goto RECURSION_MATCHED;        /* Exit loop; end processing */
1814            }            }
1815          else if (rrc != MATCH_NOMATCH &&  
1816                  (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* PCRE does not allow THEN, SKIP, PRUNE or COMMIT to escape beyond a
1817            recursion; they cause a NOMATCH for the entire recursion. These codes
1818            are defined in a range that can be tested for. */
1819    
1820            if (rrc >= MATCH_BACKTRACK_MIN && rrc <= MATCH_BACKTRACK_MAX)
1821              RRETURN(MATCH_NOMATCH);
1822    
1823            /* Any return code other than NOMATCH is an error. */
1824    
1825            if (rrc != MATCH_NOMATCH)
1826            {            {
1827            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1828            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1829              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1830            RRETURN(rrc);            RRETURN(rrc);
1831            }            }
1832    
# Line 1573  for (;;) Line 1838  for (;;)
1838        DPRINTF(("Recursion didn't match\n"));        DPRINTF(("Recursion didn't match\n"));
1839        md->recursive = new_recursive.prevrec;        md->recursive = new_recursive.prevrec;
1840        if (new_recursive.offset_save != stacksave)        if (new_recursive.offset_save != stacksave)
1841          (pcre_free)(new_recursive.offset_save);          (PUBL(free))(new_recursive.offset_save);
1842        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1843        }        }
1844    
1845      RECURSION_MATCHED:      RECURSION_MATCHED:
# Line 1643  for (;;) Line 1908  for (;;)
1908        }        }
1909      else saved_eptr = NULL;      else saved_eptr = NULL;
1910    
1911      /* 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
1912      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
1913      assertions. We also need to record the match start in case it was changed      water mark for use by positive assertions. We also need to record the match
1914      by \K. */      start in case it was changed by \K. */
1915    
1916      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||      if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
1917          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT)           *prev == OP_ONCE_NC)
1918        {        {
1919        md->end_match_ptr = eptr;      /* For ONCE */        md->end_match_ptr = eptr;      /* For ONCE_NC */
1920        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1921        md->start_match_ptr = mstart;        md->start_match_ptr = mstart;
1922        MRRETURN(MATCH_MATCH);         /* Sets md->mark */        RRETURN(MATCH_MATCH);         /* Sets md->mark */
1923        }        }
1924    
1925      /* 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
# Line 1687  for (;;) Line 1952  for (;;)
1952    
1953        /* Deal with capturing */        /* Deal with capturing */
1954    
1955        md->capture_last = number;        md->capture_last = (md->capture_last & OVFLMASK) | number;
1956        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
1957          {          {
1958          /* If offset is greater than offset_top, it means that we are          /* If offset is greater than offset_top, it means that we are
1959          "skipping" a capturing group, and that group's offsets must be marked          "skipping" a capturing group, and that group's offsets must be marked
# Line 1719  for (;;) Line 1984  for (;;)
1984      /* For an ordinary non-repeating ket, just continue at this level. This      /* For an ordinary non-repeating ket, just continue at this level. This
1985      also happens for a repeating ket if no characters were matched in the      also happens for a repeating ket if no characters were matched in the
1986      group. This is the forcible breaking of infinite loops as implemented in      group. This is the forcible breaking of infinite loops as implemented in
1987      Perl 5.005. For a non-repeating atomic group, establish a backup point by      Perl 5.005. For a non-repeating atomic group that includes captures,
1988      processing the rest of the pattern at a lower level. If this results in a      establish a backup point by processing the rest of the pattern at a lower
1989      NOMATCH return, pass MATCH_ONCE back to the original OP_ONCE level, thereby      level. If this results in a NOMATCH return, pass MATCH_ONCE back to the
1990      bypassing intermediate backup points, but resetting any captures that      original OP_ONCE level, thereby bypassing intermediate backup points, but
1991      happened along the way. */      resetting any captures that happened along the way. */
1992    
1993      if (*ecode == OP_KET || eptr == saved_eptr)      if (*ecode == OP_KET || eptr == saved_eptr)
1994        {        {
# Line 1744  for (;;) Line 2009  for (;;)
2009    
2010      if (*ecode == OP_KETRPOS)      if (*ecode == OP_KETRPOS)
2011        {        {
2012          md->start_match_ptr = mstart;    /* In case \K reset it */
2013        md->end_match_ptr = eptr;        md->end_match_ptr = eptr;
2014        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
2015        RRETURN(MATCH_KETRPOS);        RRETURN(MATCH_KETRPOS);
# Line 1768  for (;;) Line 2034  for (;;)
2034          }          }
2035        if (*prev >= OP_SBRA)    /* Could match an empty string */        if (*prev >= OP_SBRA)    /* Could match an empty string */
2036          {          {
         md->match_function_type = MATCH_CBEGROUP;  
2037          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
2038          RRETURN(rrc);          RRETURN(rrc);
2039          }          }
# Line 1777  for (;;) Line 2042  for (;;)
2042        }        }
2043      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
2044        {        {
       if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;  
2045        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
2046        if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;        if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
2047        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
# Line 1796  for (;;) Line 2060  for (;;)
2060      /* Not multiline mode: start of subject assertion, unless notbol. */      /* Not multiline mode: start of subject assertion, unless notbol. */
2061    
2062      case OP_CIRC:      case OP_CIRC:
2063      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2064    
2065      /* Start of subject assertion */      /* Start of subject assertion */
2066    
2067      case OP_SOD:      case OP_SOD:
2068      if (eptr != md->start_subject) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
2069      ecode++;      ecode++;
2070      break;      break;
2071    
2072      /* Multiline mode: start of subject unless notbol, or after any newline. */      /* Multiline mode: start of subject unless notbol, or after any newline. */
2073    
2074      case OP_CIRCM:      case OP_CIRCM:
2075      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2076      if (eptr != md->start_subject &&      if (eptr != md->start_subject &&
2077          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
2078        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2079      ecode++;      ecode++;
2080      break;      break;
2081    
2082      /* Start of match assertion */      /* Start of match assertion */
2083    
2084      case OP_SOM:      case OP_SOM:
2085      if (eptr != md->start_subject + md->start_offset) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
2086      ecode++;      ecode++;
2087      break;      break;
2088    
# Line 1834  for (;;) Line 2098  for (;;)
2098    
2099      case OP_DOLLM:      case OP_DOLLM:
2100      if (eptr < md->end_subject)      if (eptr < md->end_subject)
2101        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }        {
2102          if (!IS_NEWLINE(eptr))
2103            {
2104            if (md->partial != 0 &&
2105                eptr + 1 >= md->end_subject &&
2106                NLBLOCK->nltype == NLTYPE_FIXED &&
2107                NLBLOCK->nllen == 2 &&
2108                RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2109              {
2110              md->hitend = TRUE;
2111              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2112              }
2113            RRETURN(MATCH_NOMATCH);
2114            }
2115          }
2116      else      else
2117        {        {
2118        if (md->noteol) MRRETURN(MATCH_NOMATCH);        if (md->noteol) RRETURN(MATCH_NOMATCH);
2119        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2120        }        }
2121      ecode++;      ecode++;
# Line 1847  for (;;) Line 2125  for (;;)
2125      subject unless noteol is set. */      subject unless noteol is set. */
2126    
2127      case OP_DOLL:      case OP_DOLL:
2128      if (md->noteol) MRRETURN(MATCH_NOMATCH);      if (md->noteol) RRETURN(MATCH_NOMATCH);
2129      if (!md->endonly) goto ASSERT_NL_OR_EOS;      if (!md->endonly) goto ASSERT_NL_OR_EOS;
2130    
2131      /* ... else fall through for endonly */      /* ... else fall through for endonly */
# Line 1855  for (;;) Line 2133  for (;;)
2133      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
2134    
2135      case OP_EOD:      case OP_EOD:
2136      if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
2137      SCHECK_PARTIAL();      SCHECK_PARTIAL();
2138      ecode++;      ecode++;
2139      break;      break;
# Line 1866  for (;;) Line 2144  for (;;)
2144      ASSERT_NL_OR_EOS:      ASSERT_NL_OR_EOS:
2145      if (eptr < md->end_subject &&      if (eptr < md->end_subject &&
2146          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
2147        MRRETURN(MATCH_NOMATCH);        {
2148          if (md->partial != 0 &&
2149              eptr + 1 >= md->end_subject &&
2150              NLBLOCK->nltype == NLTYPE_FIXED &&
2151              NLBLOCK->nllen == 2 &&
2152              RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2153            {
2154            md->hitend = TRUE;
2155            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2156            }
2157          RRETURN(MATCH_NOMATCH);
2158          }
2159    
2160      /* Either at end of string or \n before end. */      /* Either at end of string or \n before end. */
2161    
# Line 1885  for (;;) Line 2174  for (;;)
2174        be "non-word" characters. Remember the earliest consulted character for        be "non-word" characters. Remember the earliest consulted character for
2175        partial matching. */        partial matching. */
2176    
2177  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2178        if (utf8)        if (utf)
2179          {          {
2180          /* Get status of previous character */          /* Get status of previous character */
2181    
2182          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
2183            {            {
2184            USPTR lastptr = eptr - 1;            PCRE_PUCHAR lastptr = eptr - 1;
2185            while((*lastptr & 0xc0) == 0x80) lastptr--;            BACKCHAR(lastptr);
2186            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
2187            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
2188  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 1958  for (;;) Line 2247  for (;;)
2247              }              }
2248            else            else
2249  #endif  #endif
2250            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);            prev_is_word = MAX_255(eptr[-1])
2251                && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
2252            }            }
2253    
2254          /* Get status of next character */          /* Get status of next character */
# Line 1981  for (;;) Line 2271  for (;;)
2271            }            }
2272          else          else
2273  #endif  #endif
2274          cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);          cur_is_word = MAX_255(*eptr)
2275              && ((md->ctypes[*eptr] & ctype_word) != 0);
2276          }          }
2277    
2278        /* Now see if the situation is what we want */        /* Now see if the situation is what we want */
2279    
2280        if ((*ecode++ == OP_WORD_BOUNDARY)?        if ((*ecode++ == OP_WORD_BOUNDARY)?
2281             cur_is_word == prev_is_word : cur_is_word != prev_is_word)             cur_is_word == prev_is_word : cur_is_word != prev_is_word)
2282          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2283        }        }
2284      break;      break;
2285    
2286      /* Match a single character type; inline for speed */      /* Match any single character type except newline; have to take care with
2287        CRLF newlines and partial matching. */
2288    
2289      case OP_ANY:      case OP_ANY:
2290      if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
2291        if (md->partial != 0 &&
2292            eptr + 1 >= md->end_subject &&
2293            NLBLOCK->nltype == NLTYPE_FIXED &&
2294            NLBLOCK->nllen == 2 &&
2295            RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2296          {
2297          md->hitend = TRUE;
2298          if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2299          }
2300    
2301      /* Fall through */      /* Fall through */
2302    
2303        /* Match any single character whatsoever. */
2304    
2305      case OP_ALLANY:      case OP_ALLANY:
2306      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2307        {        {                            /* not be updated before SCHECK_PARTIAL. */
2308        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2309        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2310        }        }
2311      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;      eptr++;
2312    #ifdef SUPPORT_UTF
2313        if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
2314    #endif
2315      ecode++;      ecode++;
2316      break;      break;
2317    
# Line 2012  for (;;) Line 2319  for (;;)
2319      any byte, even newline, independent of the setting of PCRE_DOTALL. */      any byte, even newline, independent of the setting of PCRE_DOTALL. */
2320    
2321      case OP_ANYBYTE:      case OP_ANYBYTE:
2322      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2323        {        {                            /* not be updated before SCHECK_PARTIAL. */
2324        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2325        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2326        }        }
2327        eptr++;
2328      ecode++;      ecode++;
2329      break;      break;
2330    
# Line 2024  for (;;) Line 2332  for (;;)
2332      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2333        {        {
2334        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2335        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2336        }        }
2337      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2338      if (      if (
2339  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2340         c < 256 &&         c < 256 &&
2341  #endif  #endif
2342         (md->ctypes[c] & ctype_digit) != 0         (md->ctypes[c] & ctype_digit) != 0
2343         )         )
2344        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2345      ecode++;      ecode++;
2346      break;      break;
2347    
# Line 2041  for (;;) Line 2349  for (;;)
2349      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2350        {        {
2351        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2352        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2353        }        }
2354      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2355      if (      if (
2356  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2357         c >= 256 ||         c > 255 ||
2358  #endif  #endif
2359         (md->ctypes[c] & ctype_digit) == 0         (md->ctypes[c] & ctype_digit) == 0
2360         )         )
2361        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2362      ecode++;      ecode++;
2363      break;      break;
2364    
# Line 2058  for (;;) Line 2366  for (;;)
2366      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2367        {        {
2368        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2369        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2370        }        }
2371      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2372      if (      if (
2373  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2374         c < 256 &&         c < 256 &&
2375  #endif  #endif
2376         (md->ctypes[c] & ctype_space) != 0         (md->ctypes[c] & ctype_space) != 0
2377         )         )
2378        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2379      ecode++;      ecode++;
2380      break;      break;
2381    
# Line 2075  for (;;) Line 2383  for (;;)
2383      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2384        {        {
2385        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2386        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2387        }        }
2388      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2389      if (      if (
2390  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2391         c >= 256 ||         c > 255 ||
2392  #endif  #endif
2393         (md->ctypes[c] & ctype_space) == 0         (md->ctypes[c] & ctype_space) == 0
2394         )         )
2395        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2396      ecode++;      ecode++;
2397      break;      break;
2398    
# Line 2092  for (;;) Line 2400  for (;;)
2400      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2401        {        {
2402        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2403        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2404        }        }
2405      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2406      if (      if (
2407  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2408         c < 256 &&         c < 256 &&
2409  #endif  #endif
2410         (md->ctypes[c] & ctype_word) != 0         (md->ctypes[c] & ctype_word) != 0
2411         )         )
2412        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2413      ecode++;      ecode++;
2414      break;      break;
2415    
# Line 2109  for (;;) Line 2417  for (;;)
2417      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2418        {        {
2419        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2420        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2421        }        }
2422      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2423      if (      if (
2424  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2425         c >= 256 ||         c > 255 ||
2426  #endif  #endif
2427         (md->ctypes[c] & ctype_word) == 0         (md->ctypes[c] & ctype_word) == 0
2428         )         )
2429        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2430      ecode++;      ecode++;
2431      break;      break;
2432    
# Line 2126  for (;;) Line 2434  for (;;)
2434      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2435        {        {
2436        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2437        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2438        }        }
2439      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2440      switch(c)      switch(c)
2441        {        {
2442        default: MRRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2443    
2444        case 0x000d:        case CHAR_CR:
2445        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr >= md->end_subject)
2446            {
2447            SCHECK_PARTIAL();
2448            }
2449          else if (RAWUCHARTEST(eptr) == CHAR_LF) eptr++;
2450        break;        break;
2451    
2452        case 0x000a:        case CHAR_LF:
2453        break;        break;
2454    
2455        case 0x000b:        case CHAR_VT:
2456        case 0x000c:        case CHAR_FF:
2457        case 0x0085:        case CHAR_NEL:
2458    #ifndef EBCDIC
2459        case 0x2028:        case 0x2028:
2460        case 0x2029:        case 0x2029:
2461        if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);  #endif  /* Not EBCDIC */
2462          if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
2463        break;        break;
2464        }        }
2465      ecode++;      ecode++;
# Line 2155  for (;;) Line 2469  for (;;)
2469      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2470        {        {
2471        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2472        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2473        }        }
2474      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2475      switch(c)      switch(c)
2476        {        {
2477          HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
2478        default: break;        default: break;
       case 0x09:      /* HT */  
       case 0x20:      /* SPACE */  
       case 0xa0:      /* NBSP */  
       case 0x1680:    /* OGHAM SPACE MARK */  
       case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */  
       case 0x2000:    /* EN QUAD */  
       case 0x2001:    /* EM QUAD */  
       case 0x2002:    /* EN SPACE */  
       case 0x2003:    /* EM SPACE */  
       case 0x2004:    /* THREE-PER-EM SPACE */  
       case 0x2005:    /* FOUR-PER-EM SPACE */  
       case 0x2006:    /* SIX-PER-EM SPACE */  
       case 0x2007:    /* FIGURE SPACE */  
       case 0x2008:    /* PUNCTUATION SPACE */  
       case 0x2009:    /* THIN SPACE */  
       case 0x200A:    /* HAIR SPACE */  
       case 0x202f:    /* NARROW NO-BREAK SPACE */  
       case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */  
       case 0x3000:    /* IDEOGRAPHIC SPACE */  
       MRRETURN(MATCH_NOMATCH);  
2479        }        }
2480      ecode++;      ecode++;
2481      break;      break;
# Line 2189  for (;;) Line 2484  for (;;)
2484      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2485        {        {
2486        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2487        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2488        }        }
2489      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2490      switch(c)      switch(c)
2491        {        {
2492        default: MRRETURN(MATCH_NOMATCH);        HSPACE_CASES: break;  /* Byte and multibyte cases */
2493        case 0x09:      /* HT */        default: RRETURN(MATCH_NOMATCH);
       case 0x20:      /* SPACE */  
       case 0xa0:      /* NBSP */  
       case 0x1680:    /* OGHAM SPACE MARK */  
       case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */  
       case 0x2000:    /* EN QUAD */  
       case 0x2001:    /* EM QUAD */  
       case 0x2002:    /* EN SPACE */  
       case 0x2003:    /* EM SPACE */  
       case 0x2004:    /* THREE-PER-EM SPACE */  
       case 0x2005:    /* FOUR-PER-EM SPACE */  
       case 0x2006:    /* SIX-PER-EM SPACE */  
       case 0x2007:    /* FIGURE SPACE */  
       case 0x2008:    /* PUNCTUATION SPACE */  
       case 0x2009:    /* THIN SPACE */  
       case 0x200A:    /* HAIR SPACE */  
       case 0x202f:    /* NARROW NO-BREAK SPACE */  
       case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */  
       case 0x3000:    /* IDEOGRAPHIC SPACE */  
       break;  
2494        }        }
2495      ecode++;      ecode++;
2496      break;      break;
# Line 2223  for (;;) Line 2499  for (;;)
2499      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2500        {        {
2501        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2502        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2503        }        }
2504      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2505      switch(c)      switch(c)
2506        {        {
2507          VSPACE_CASES: RRETURN(MATCH_NOMATCH);
2508        default: break;        default: break;
       case 0x0a:      /* LF */  
       case 0x0b:      /* VT */  
       case 0x0c:      /* FF */  
       case 0x0d:      /* CR */  
       case 0x85:      /* NEL */  
       case 0x2028:    /* LINE SEPARATOR */  
       case 0x2029:    /* PARAGRAPH SEPARATOR */  
       MRRETURN(MATCH_NOMATCH);  
2509        }        }
2510      ecode++;      ecode++;
2511      break;      break;
# Line 2245  for (;;) Line 2514  for (;;)
2514      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2515        {        {
2516        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2517        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2518        }        }
2519      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2520      switch(c)      switch(c)
2521        {        {
2522        default: MRRETURN(MATCH_NOMATCH);        VSPACE_CASES: break;
2523        case 0x0a:      /* LF */        default: RRETURN(MATCH_NOMATCH);
       case 0x0b:      /* VT */  
       case 0x0c:      /* FF */  
       case 0x0d:      /* CR */  
       case 0x85:      /* NEL */  
       case 0x2028:    /* LINE SEPARATOR */  
       case 0x2029:    /* PARAGRAPH SEPARATOR */  
       break;  
2524        }        }
2525      ecode++;      ecode++;
2526      break;      break;
# Line 2272  for (;;) Line 2534  for (;;)
2534      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2535        {        {
2536        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2537        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2538        }        }
2539      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2540        {        {
2541          const pcre_uint32 *cp;
2542        const ucd_record *prop = GET_UCD(c);        const ucd_record *prop = GET_UCD(c);
2543    
2544        switch(ecode[1])        switch(ecode[1])
2545          {          {
2546          case PT_ANY:          case PT_ANY:
2547          if (op == OP_NOTPROP) MRRETURN(MATCH_NOMATCH);          if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
2548          break;          break;
2549    
2550          case PT_LAMP:          case PT_LAMP:
2551          if ((prop->chartype == ucp_Lu ||          if ((prop->chartype == ucp_Lu ||
2552               prop->chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
2553               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
2554            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2555          break;          break;
2556    
2557          case PT_GC:          case PT_GC:
2558          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
2559            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2560          break;          break;
2561    
2562          case PT_PC:          case PT_PC:
2563          if ((ecode[2] != prop->chartype) == (op == OP_PROP))          if ((ecode[2] != prop->chartype) == (op == OP_PROP))
2564            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2565          break;          break;
2566    
2567          case PT_SC:          case PT_SC:
2568          if ((ecode[2] != prop->script) == (op == OP_PROP))          if ((ecode[2] != prop->script) == (op == OP_PROP))
2569            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2570          break;          break;
2571    
2572          /* These are specials */          /* These are specials */
2573    
2574          case PT_ALNUM:          case PT_ALNUM:
2575          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2576               _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))               PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2577            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2578            break;
2579    
2580            /* Perl space used to exclude VT, but from Perl 5.18 it is included,
2581            which means that Perl space and POSIX space are now identical. PCRE
2582            was changed at release 8.34. */
2583    
2584            case PT_SPACE:    /* Perl space */
2585            case PT_PXSPACE:  /* POSIX space */
2586            switch(c)
2587              {
2588              HSPACE_CASES:
2589              VSPACE_CASES:
2590              if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
2591              break;
2592    
2593              default:
2594              if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z) ==
2595                (op == OP_NOTPROP)) RRETURN(MATCH_NOMATCH);
2596              break;
2597              }
2598          break;          break;
2599    
2600          case PT_SPACE:    /* Perl space */          case PT_WORD:
2601          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2602               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)               PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2603                 == (op == OP_NOTPROP))               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2604            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2605          break;          break;
2606    
2607          case PT_PXSPACE:  /* POSIX space */          case PT_CLIST:
2608          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          cp = PRIV(ucd_caseless_sets) + ecode[2];
2609               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||          for (;;)
2610               c == CHAR_FF || c == CHAR_CR)            {
2611                 == (op == OP_NOTPROP))            if (c < *cp)
2612            MRRETURN(MATCH_NOMATCH);              { if (op == OP_PROP) { RRETURN(MATCH_NOMATCH); } else break; }
2613              if (c == *cp++)
2614                { if (op == OP_PROP) break; else { RRETURN(MATCH_NOMATCH); } }
2615              }
2616          break;          break;
2617    
2618          case PT_WORD:          case PT_UCNC:
2619          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
2620               _pcre_ucp_gentype[prop->chartype] == ucp_N ||               c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
2621               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))               c >= 0xe000) == (op == OP_NOTPROP))
2622            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2623          break;          break;
2624    
2625          /* This should never occur */          /* This should never occur */
# Line 2353  for (;;) Line 2639  for (;;)
2639      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2640        {        {
2641        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2642        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2643        }        }
2644      GETCHARINCTEST(c, eptr);      else
     if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);  
     while (eptr < md->end_subject)  
2645        {        {
2646        int len = 1;        int lgb, rgb;
2647        if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }        GETCHARINCTEST(c, eptr);
2648        if (UCD_CATEGORY(c) != ucp_M) break;        lgb = UCD_GRAPHBREAK(c);
2649        eptr += len;        while (eptr < md->end_subject)
2650            {
2651            int len = 1;
2652            if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2653            rgb = UCD_GRAPHBREAK(c);
2654            if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
2655            lgb = rgb;
2656            eptr += len;
2657            }
2658        }        }
2659        CHECK_PARTIAL();
2660      ecode++;      ecode++;
2661      break;      break;
2662  #endif  #endif  /* SUPPORT_UCP */
2663    
2664    
2665      /* Match a back reference, possibly repeatedly. Look past the end of the      /* Match a back reference, possibly repeatedly. Look past the end of the
# Line 2375  for (;;) Line 2668  for (;;)
2668      similar code to character type repeats - written out again for speed.      similar code to character type repeats - written out again for speed.
2669      However, if the referenced string is the empty string, always treat      However, if the referenced string is the empty string, always treat
2670      it as matched, any number of times (otherwise there could be infinite      it as matched, any number of times (otherwise there could be infinite
2671      loops). */      loops). If the reference is unset, there are two possibilities:
   
     case OP_REF:  
     case OP_REFI:  
     caseless = op == OP_REFI;  
     offset = GET2(ecode, 1) << 1;               /* Doubled ref number */  
     ecode += 3;  
   
     /* If the reference is unset, there are two possibilities:  
2672    
2673      (a) In the default, Perl-compatible state, set the length negative;      (a) In the default, Perl-compatible state, set the length negative;
2674      this ensures that every attempt at a match fails. We can't just fail      this ensures that every attempt at a match fails. We can't just fail
# Line 2393  for (;;) Line 2678  for (;;)
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        The OP_REF and OP_REFI opcodes are used for a reference to a numbered group
2684        or to a non-duplicated named group. For a duplicated named group, OP_DNREF
2685        and OP_DNREFI are used. In this case we must scan the list of groups to
2686        which the name refers, and use the first one that is set. */
2687    
2688        case OP_DNREF:
2689        case OP_DNREFI:
2690        caseless = op == OP_DNREFI;
2691          {
2692          int count = GET2(ecode, 1+IMM2_SIZE);
2693          pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
2694          ecode += 1 + 2*IMM2_SIZE;
2695    
2696          while (count-- > 0)
2697            {
2698            offset = GET2(slot, 0) << 1;
2699            if (offset < offset_top && md->offset_vector[offset] >= 0) break;
2700            slot += md->name_entry_size;
2701            }
2702          if (count < 0)
2703            length = (md->jscript_compat)? 0 : -1;
2704          else
2705            length = md->offset_vector[offset+1] - md->offset_vector[offset];
2706          }
2707        goto REF_REPEAT;
2708    
2709        case OP_REF:
2710        case OP_REFI:
2711        caseless = op == OP_REFI;
2712        offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2713        ecode += 1 + IMM2_SIZE;
2714      if (offset >= offset_top || md->offset_vector[offset] < 0)      if (offset >= offset_top || md->offset_vector[offset] < 0)
2715        length = (md->jscript_compat)? 0 : -1;        length = (md->jscript_compat)? 0 : -1;
2716      else      else
# Line 2402  for (;;) Line 2718  for (;;)
2718    
2719      /* Set up for repetition, or handle the non-repeated case */      /* Set up for repetition, or handle the non-repeated case */
2720    
2721        REF_REPEAT:
2722      switch (*ecode)      switch (*ecode)
2723        {        {
2724        case OP_CRSTAR:        case OP_CRSTAR:
# Line 2421  for (;;) Line 2738  for (;;)
2738        case OP_CRMINRANGE:        case OP_CRMINRANGE:
2739        minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2740        min = GET2(ecode, 1);        min = GET2(ecode, 1);
2741        max = GET2(ecode, 3);        max = GET2(ecode, 1 + IMM2_SIZE);
2742        if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2743        ecode += 5;        ecode += 1 + 2 * IMM2_SIZE;
2744        break;        break;
2745    
2746        default:               /* No repeat follows */        default:               /* No repeat follows */
2747        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2748          {          {
2749            if (length == -2) eptr = md->end_subject;   /* Partial match */
2750          CHECK_PARTIAL();          CHECK_PARTIAL();
2751          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2752          }          }
2753        eptr += length;        eptr += length;
2754        continue;              /* With the main loop */        continue;              /* With the main loop */
2755        }        }
2756    
2757      /* Handle repeated back references. If the length of the reference is      /* Handle repeated back references. If the length of the reference is
2758      zero, just continue with the main loop. */      zero, just continue with the main loop. If the length is negative, it
2759        means the reference is unset in non-Java-compatible mode. If the minimum is
2760        zero, we can continue at the same level without recursion. For any other
2761        minimum, carrying on will result in NOMATCH. */
2762    
2763      if (length == 0) continue;      if (length == 0) continue;
2764        if (length < 0 && min == 0) continue;
2765    
2766      /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2767      the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
# Line 2450  for (;;) Line 2772  for (;;)
2772        int slength;        int slength;
2773        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2774          {          {
2775            if (slength == -2) eptr = md->end_subject;   /* Partial match */
2776          CHECK_PARTIAL();          CHECK_PARTIAL();
2777          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2778          }          }
2779        eptr += slength;        eptr += slength;
2780        }        }
# Line 2470  for (;;) Line 2793  for (;;)
2793          int slength;          int slength;
2794          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2795          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2796          if (fi >= max) MRRETURN(MATCH_NOMATCH);          if (fi >= max) RRETURN(MATCH_NOMATCH);
2797          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2798            {            {
2799              if (slength == -2) eptr = md->end_subject;   /* Partial match */
2800            CHECK_PARTIAL();            CHECK_PARTIAL();
2801            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2802            }            }
2803          eptr += slength;          eptr += slength;
2804          }          }
# Line 2491  for (;;) Line 2815  for (;;)
2815          int slength;          int slength;
2816          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2817            {            {
2818            CHECK_PARTIAL();            /* Can't use CHECK_PARTIAL because we don't want to update eptr in
2819              the soft partial matching case. */
2820    
2821              if (slength == -2 && md->partial != 0 &&
2822                  md->end_subject > md->start_used_ptr)
2823                {
2824                md->hitend = TRUE;
2825                if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2826                }
2827            break;            break;
2828            }            }
2829          eptr += slength;          eptr += slength;
2830          }          }
2831    
2832        while (eptr >= pp)        while (eptr >= pp)
2833          {          {
2834          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2835          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2836          eptr -= length;          eptr -= length;
2837          }          }
2838        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2839        }        }
2840      /* Control never gets here */      /* Control never gets here */
2841    
# Line 2520  for (;;) Line 2853  for (;;)
2853      case OP_NCLASS:      case OP_NCLASS:
2854      case OP_CLASS:      case OP_CLASS:
2855        {        {
2856          /* The data variable is saved across frames, so the byte map needs to
2857          be stored there. */
2858    #define BYTE_MAP ((pcre_uint8 *)data)
2859        data = ecode + 1;                /* Save for matching */        data = ecode + 1;                /* Save for matching */
2860        ecode += 33;                     /* Advance past the item */        ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
2861    
2862        switch (*ecode)        switch (*ecode)
2863          {          {
# Line 2531  for (;;) Line 2867  for (;;)
2867          case OP_CRMINPLUS:          case OP_CRMINPLUS:
2868          case OP_CRQUERY:          case OP_CRQUERY:
2869          case OP_CRMINQUERY:          case OP_CRMINQUERY:
2870            case OP_CRPOSSTAR:
2871            case OP_CRPOSPLUS:
2872            case OP_CRPOSQUERY:
2873          c = *ecode++ - OP_CRSTAR;          c = *ecode++ - OP_CRSTAR;
2874          minimize = (c & 1) != 0;          if (c < OP_CRPOSSTAR - OP_CRSTAR) minimize = (c & 1) != 0;
2875            else possessive = TRUE;
2876          min = rep_min[c];                 /* Pick up values from tables; */          min = rep_min[c];                 /* Pick up values from tables; */
2877          max = rep_max[c];                 /* zero for max => infinity */          max = rep_max[c];                 /* zero for max => infinity */
2878          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
# Line 2540  for (;;) Line 2880  for (;;)
2880    
2881          case OP_CRRANGE:          case OP_CRRANGE:
2882          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2883            case OP_CRPOSRANGE:
2884          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2885            possessive = (*ecode == OP_CRPOSRANGE);
2886          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2887          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2888          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2889          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2890          break;          break;
2891    
2892          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2554  for (;;) Line 2896  for (;;)
2896    
2897        /* First, ensure the minimum number of matches are present. */        /* First, ensure the minimum number of matches are present. */
2898    
2899  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2900        /* UTF-8 mode */        if (utf)
       if (utf8)  
2901          {          {
2902          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2903            {            {
2904            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2905              {              {
2906              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2907              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2908              }              }
2909            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
2910            if (c > 255)            if (c > 255)
2911              {              {
2912              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2913              }              }
2914            else            else
2915              {              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
             if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
             }  
2916            }            }
2917          }          }
2918        else        else
2919  #endif  #endif
2920        /* Not UTF-8 mode */        /* Not UTF mode */
2921          {          {
2922          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2923            {            {
2924            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2925              {              {
2926              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2927              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2928              }              }
2929            c = *eptr++;            c = *eptr++;
2930            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2931              if (c > 255)
2932                {
2933                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2934                }
2935              else
2936    #endif
2937                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2938            }            }
2939          }          }
2940    
# Line 2602  for (;;) Line 2948  for (;;)
2948    
2949        if (minimize)        if (minimize)
2950          {          {
2951  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2952          /* UTF-8 mode */          if (utf)
         if (utf8)  
2953            {            {
2954            for (fi = min;; fi++)            for (fi = min;; fi++)
2955              {              {
2956              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2957              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2958              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2959              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2960                {                {
2961                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2962                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2963                }                }
2964              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
2965              if (c > 255)              if (c > 255)
2966                {                {
2967                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2968                }                }
2969              else              else
2970                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
               if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
               }  
2971              }              }
2972            }            }
2973          else          else
2974  #endif  #endif
2975          /* Not UTF-8 mode */          /* Not UTF mode */
2976            {            {
2977            for (fi = min;; fi++)            for (fi = min;; fi++)
2978              {              {
2979              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2980              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2981              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2982              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2983                {                {
2984                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2985                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2986                }                }
2987              c = *eptr++;              c = *eptr++;
2988              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2989                if (c > 255)
2990                  {
2991                  if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2992                  }
2993                else
2994    #endif
2995                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2996              }              }
2997            }            }
2998          /* Control never gets here */          /* Control never gets here */
# Line 2654  for (;;) Line 3004  for (;;)
3004          {          {
3005          pp = eptr;          pp = eptr;
3006    
3007  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3008          /* UTF-8 mode */          if (utf)
         if (utf8)  
3009            {            {
3010            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3011              {              {
# Line 2672  for (;;) Line 3021  for (;;)
3021                if (op == OP_CLASS) break;                if (op == OP_CLASS) break;
3022                }                }
3023              else              else
3024                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
               if ((data[c/8] & (1 << (c&7))) == 0) break;  
               }  
3025              eptr += len;              eptr += len;
3026              }              }
3027    
3028              if (possessive) continue;    /* No backtracking */
3029    
3030            for (;;)            for (;;)
3031              {              {
3032              RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
# Line 2687  for (;;) Line 3037  for (;;)
3037            }            }
3038          else          else
3039  #endif  #endif
3040            /* Not UTF-8 mode */            /* Not UTF mode */
3041            {            {
3042            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3043              {              {
# Line 2697  for (;;) Line 3047  for (;;)
3047                break;                break;
3048                }                }
3049              c = *eptr;              c = *eptr;
3050              if ((data[c/8] & (1 << (c&7))) == 0) break;  #ifndef COMPILE_PCRE8
3051                if (c > 255)
3052                  {
3053                  if (op == OP_CLASS) break;
3054                  }
3055                else
3056    #endif
3057                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
3058              eptr++;              eptr++;
3059              }              }
3060    
3061              if (possessive) continue;    /* No backtracking */
3062    
3063            while (eptr >= pp)            while (eptr >= pp)
3064              {              {
3065              RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
# Line 2708  for (;;) Line 3068  for (;;)
3068              }              }
3069            }            }
3070    
3071          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3072          }          }
3073    #undef BYTE_MAP
3074        }        }
3075      /* Control never gets here */      /* Control never gets here */
3076    
# Line 2718  for (;;) Line 3079  for (;;)
3079      when UTF-8 mode mode is supported. Nevertheless, we may not be in UTF-8      when UTF-8 mode mode is supported. Nevertheless, we may not be in UTF-8
3080      mode, because Unicode properties are supported in non-UTF-8 mode. */      mode, because Unicode properties are supported in non-UTF-8 mode. */
3081    
3082  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3083      case OP_XCLASS:      case OP_XCLASS:
3084        {        {
3085        data = ecode + 1 + LINK_SIZE;                /* Save for matching */        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
# Line 2732  for (;;) Line 3093  for (;;)
3093          case OP_CRMINPLUS:          case OP_CRMINPLUS:
3094          case OP_CRQUERY:          case OP_CRQUERY:
3095          case OP_CRMINQUERY:          case OP_CRMINQUERY:
3096            case OP_CRPOSSTAR:
3097            case OP_CRPOSPLUS:
3098            case OP_CRPOSQUERY:
3099          c = *ecode++ - OP_CRSTAR;          c = *ecode++ - OP_CRSTAR;
3100          minimize = (c & 1) != 0;          if (c < OP_CRPOSSTAR - OP_CRSTAR) minimize = (c & 1) != 0;
3101            else possessive = TRUE;
3102          min = rep_min[c];                 /* Pick up values from tables; */          min = rep_min[c];                 /* Pick up values from tables; */
3103          max = rep_max[c];                 /* zero for max => infinity */          max = rep_max[c];                 /* zero for max => infinity */
3104          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
# Line 2741  for (;;) Line 3106  for (;;)
3106    
3107          case OP_CRRANGE:          case OP_CRRANGE:
3108          case OP_CRMINRANGE:          case OP_CRMINRANGE:
3109            case OP_CRPOSRANGE:
3110          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
3111            possessive = (*ecode == OP_CRPOSRANGE);
3112          min = GET2(ecode, 1);          min = GET2(ecode, 1);
3113          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
3114          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
3115          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
3116          break;          break;
3117    
3118          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2760  for (;;) Line 3127  for (;;)
3127          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3128            {            {
3129            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3130            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3131            }            }
3132          GETCHARINCTEST(c, eptr);          GETCHARINCTEST(c, eptr);
3133          if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);          if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3134          }          }
3135    
3136        /* 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 2780  for (;;) Line 3147  for (;;)
3147            {            {
3148            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
3149            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3150            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3151            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3152              {              {
3153              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3154              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3155              }              }
3156            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3157            if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);            if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3158            }            }
3159          /* Control never gets here */          /* Control never gets here */
3160          }          }
# Line 2805  for (;;) Line 3172  for (;;)
3172              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3173              break;              break;
3174              }              }
3175    #ifdef SUPPORT_UTF
3176            GETCHARLENTEST(c, eptr, len);            GETCHARLENTEST(c, eptr, len);
3177            if (!_pcre_xclass(c, data)) break;  #else
3178              c = *eptr;
3179    #endif
3180              if (!PRIV(xclass)(c, data, utf)) break;
3181            eptr += len;            eptr += len;
3182            }            }
3183    
3184            if (possessive) continue;    /* No backtracking */
3185    
3186          for(;;)          for(;;)
3187            {            {
3188            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
3189            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3190            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3191            if (utf8) BACKCHAR(eptr);  #ifdef SUPPORT_UTF
3192              if (utf) BACKCHAR(eptr);
3193    #endif
3194            }            }
3195          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3196          }          }
3197    
3198        /* Control never gets here */        /* Control never gets here */
# Line 2826  for (;;) Line 3202  for (;;)
3202      /* Match a single character, casefully */      /* Match a single character, casefully */
3203    
3204      case OP_CHAR:      case OP_CHAR:
3205  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3206      if (utf8)      if (utf)
3207        {        {
3208        length = 1;        length = 1;
3209        ecode++;        ecode++;
# Line 2835  for (;;) Line 3211  for (;;)
3211        if (length > md->end_subject - eptr)        if (length > md->end_subject - eptr)
3212          {          {
3213          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
3214          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3215          }          }
3216        while (length-- > 0) if (*ecode++ != *eptr++) MRRETURN(MATCH_NOMATCH);        while (length-- > 0) if (*ecode++ != RAWUCHARINC(eptr)) RRETURN(MATCH_NOMATCH);
3217        }        }
3218      else      else
3219  #endif  #endif
3220        /* Not UTF mode */
     /* Non-UTF-8 mode */  
3221        {        {
3222        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
3223          {          {
3224          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
3225          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3226          }          }
3227        if (ecode[1] != *eptr++) MRRETURN(MATCH_NOMATCH);        if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
3228        ecode += 2;        ecode += 2;
3229        }        }
3230      break;      break;
3231    
3232      /* Match a single character, caselessly */      /* Match a single character, caselessly. If we are at the end of the
3233        subject, give up immediately. */
3234    
3235      case OP_CHARI:      case OP_CHARI:
3236  #ifdef SUPPORT_UTF8      if (eptr >= md->end_subject)
3237      if (utf8)        {
3238          SCHECK_PARTIAL();
3239          RRETURN(MATCH_NOMATCH);
3240          }
3241    
3242    #ifdef SUPPORT_UTF
3243        if (utf)
3244        {        {
3245        length = 1;        length = 1;
3246        ecode++;        ecode++;
3247        GETCHARLEN(fc, ecode, length);        GETCHARLEN(fc, ecode, length);
3248    
       if (length > md->end_subject - eptr)  
         {  
         CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */  
         MRRETURN(MATCH_NOMATCH);  
         }  
   
3249        /* 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
3250        can use the fast lookup table. */        we know that its other case must also be one byte long, so we can use the
3251          fast lookup table. We know that there is at least one byte left in the
3252          subject. */
3253    
3254        if (fc < 128)        if (fc < 128)
3255          {          {
3256          if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          pcre_uint32 cc = RAWUCHAR(eptr);
3257            if (md->lcc[fc] != TABLE_GET(cc, md->lcc, cc)) RRETURN(MATCH_NOMATCH);
3258            ecode++;
3259            eptr++;
3260          }          }
3261    
3262        /* Otherwise we must pick up the subject character */        /* Otherwise we must pick up the subject character. Note that we cannot
3263          use the value of "length" to check for sufficient bytes left, because the
3264          other case of the character may have more or fewer bytes.  */
3265    
3266        else        else
3267          {          {
3268          unsigned int dc;          pcre_uint32 dc;
3269          GETCHARINC(dc, eptr);          GETCHARINC(dc, eptr);
3270          ecode += length;          ecode += length;
3271    
# Line 2894  for (;;) Line 3277  for (;;)
3277  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3278            if (dc != UCD_OTHERCASE(fc))            if (dc != UCD_OTHERCASE(fc))
3279  #endif  #endif
3280              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3281            }            }
3282          }          }
3283        }        }
3284      else      else
3285  #endif   /* SUPPORT_UTF8 */  #endif   /* SUPPORT_UTF */
3286    
3287      /* Non-UTF-8 mode */      /* Not UTF mode */
3288        {        {
3289        if (md->end_subject - eptr < 1)        if (TABLE_GET(ecode[1], md->lcc, ecode[1])
3290          {            != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3291          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */        eptr++;
         MRRETURN(MATCH_NOMATCH);  
         }  
       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);  
3292        ecode += 2;        ecode += 2;
3293        }        }
3294      break;      break;
# Line 2918  for (;;) Line 3298  for (;;)
3298      case OP_EXACT:      case OP_EXACT:
3299      case OP_EXACTI:      case OP_EXACTI:
3300      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3301      ecode += 3;      ecode += 1 + IMM2_SIZE;
3302      goto REPEATCHAR;      goto REPEATCHAR;
3303    
3304      case OP_POSUPTO:      case OP_POSUPTO:
# Line 2933  for (;;) Line 3313  for (;;)
3313      min = 0;      min = 0;
3314      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3315      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
3316      ecode += 3;      ecode += 1 + IMM2_SIZE;
3317      goto REPEATCHAR;      goto REPEATCHAR;
3318    
3319      case OP_POSSTAR:      case OP_POSSTAR:
# Line 2978  for (;;) Line 3358  for (;;)
3358      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
3359      if (max == 0) max = INT_MAX;      if (max == 0) max = INT_MAX;
3360    
3361      /* Common code for all repeated single-character matches. */      /* Common code for all repeated single-character matches. We first check
3362        for the minimum number of characters. If the minimum equals the maximum, we
3363        are done. Otherwise, if minimizing, check the rest of the pattern for a
3364        match; if there isn't one, advance up to the maximum, one character at a
3365        time.
3366    
3367        If maximizing, advance up to the maximum number of matching characters,
3368        until eptr is past the end of the maximum run. If possessive, we are
3369        then done (no backing up). Otherwise, match at this position; anything
3370        other than no match is immediately returned. For nomatch, back up one
3371        character, unless we are matching \R and the last thing matched was
3372        \r\n, in which case, back up two bytes. When we reach the first optional
3373        character position, we can save stack by doing a tail recurse.
3374    
3375        The various UTF/non-UTF and caseful/caseless cases are handled separately,
3376        for speed. */
3377    
3378      REPEATCHAR:      REPEATCHAR:
3379  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3380      if (utf8)      if (utf)
3381        {        {
3382        length = 1;        length = 1;
3383        charptr = ecode;        charptr = ecode;
# Line 2995  for (;;) Line 3390  for (;;)
3390        if (length > 1)        if (length > 1)
3391          {          {
3392  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3393          unsigned int othercase;          pcre_uint32 othercase;
3394          if (op >= OP_STARI &&     /* Caseless */          if (op >= OP_STARI &&     /* Caseless */
3395              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3396            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = PRIV(ord2utf)(othercase, occhars);
3397          else oclength = 0;          else oclength = 0;
3398  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3399    
3400          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3401            {            {
3402            if (eptr <= md->end_subject - length &&            if (eptr <= md->end_subject - length &&
3403              memcmp(eptr, charptr, length) == 0) eptr += length;              memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3404  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3405            else if (oclength > 0 &&            else if (oclength > 0 &&
3406                     eptr <= md->end_subject - oclength &&                     eptr <= md->end_subject - oclength &&
3407                     memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3408  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3409            else            else
3410              {              {
3411              CHECK_PARTIAL();              CHECK_PARTIAL();
3412              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3413              }              }
3414            }            }
3415    
# Line 3026  for (;;) Line 3421  for (;;)
3421              {              {
3422              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3423              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3424              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3425              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3426                memcmp(eptr, charptr, length) == 0) eptr += length;                memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3427  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3428              else if (oclength > 0 &&              else if (oclength > 0 &&
3429                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3430                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3431  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3432              else              else
3433                {                {
3434                CHECK_PARTIAL();                CHECK_PARTIAL();
3435                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3436                }                }
3437              }              }
3438            /* Control never gets here */            /* Control never gets here */
# Line 3049  for (;;) Line 3444  for (;;)
3444            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3445              {              {
3446              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3447                  memcmp(eptr, charptr, length) == 0) eptr += length;                  memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3448  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3449              else if (oclength > 0 &&              else if (oclength > 0 &&
3450                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3451                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3452  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3453              else              else
3454                {                {
# Line 3062  for (;;) Line 3457  for (;;)
3457                }                }
3458              }              }
3459    
3460            if (possessive) continue;            if (possessive) continue;    /* No backtracking */
   
3461            for(;;)            for(;;)
3462              {              {
3463                if (eptr == pp) goto TAIL_RECURSE;
3464              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3465              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }  
3466  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3467              eptr--;              eptr--;
3468              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3085  for (;;) Line 3479  for (;;)
3479        value of fc will always be < 128. */        value of fc will always be < 128. */
3480        }        }
3481      else      else
3482  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3483          /* When not in UTF-8 mode, load a single-byte character. */
3484      /* When not in UTF-8 mode, load a single-byte character. */        fc = *ecode++;
3485    
3486      fc = *ecode++;      /* The value of fc at this point is always one character, though we may
3487        or may not be in UTF mode. The code is duplicated for the caseless and
     /* The value of fc at this point is always less than 256, though we may or  
     may not be in UTF-8 mode. The code is duplicated for the caseless and  
3488      caseful cases, for speed, since matching characters is likely to be quite      caseful cases, for speed, since matching characters is likely to be quite
3489      common. First, ensure the minimum number of matches are present. If min =      common. First, ensure the minimum number of matches are present. If min =
3490      max, continue at the same level without recursing. Otherwise, if      max, continue at the same level without recursing. Otherwise, if
# Line 3101  for (;;) Line 3493  for (;;)
3493      maximizing, find the maximum number of characters and work backwards. */      maximizing, find the maximum number of characters and work backwards. */
3494    
3495      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3496        max, eptr));        max, (char *)eptr));
3497    
3498      if (op >= OP_STARI)  /* Caseless */      if (op >= OP_STARI)  /* Caseless */
3499        {        {
3500        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3501          /* fc must be < 128 if UTF is enabled. */
3502          foc = md->fcc[fc];
3503    #else
3504    #ifdef SUPPORT_UTF
3505    #ifdef SUPPORT_UCP
3506          if (utf && fc > 127)
3507            foc = UCD_OTHERCASE(fc);
3508    #else
3509          if (utf && fc > 127)
3510            foc = fc;
3511    #endif /* SUPPORT_UCP */
3512          else
3513    #endif /* SUPPORT_UTF */
3514            foc = TABLE_GET(fc, md->fcc, fc);
3515    #endif /* COMPILE_PCRE8 */
3516    
3517        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3518          {          {
3519            pcre_uint32 cc;                 /* Faster than pcre_uchar */
3520          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3521            {            {
3522            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3523            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3524            }            }
3525          if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          cc = RAWUCHARTEST(eptr);
3526            if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
3527            eptr++;
3528          }          }
3529        if (min == max) continue;        if (min == max) continue;
3530        if (minimize)        if (minimize)
3531          {          {
3532          for (fi = min;; fi++)          for (fi = min;; fi++)
3533            {            {
3534              pcre_uint32 cc;               /* Faster than pcre_uchar */
3535            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3536            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3537            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3538            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3539              {              {
3540              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3541              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3542              }              }
3543            if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            cc = RAWUCHARTEST(eptr);
3544              if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
3545              eptr++;
3546            }            }
3547          /* Control never gets here */          /* Control never gets here */
3548          }          }
# Line 3137  for (;;) Line 3551  for (;;)
3551          pp = eptr;          pp = eptr;
3552          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3553            {            {
3554              pcre_uint32 cc;               /* Faster than pcre_uchar */
3555            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3556              {              {
3557              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3558              break;              break;
3559              }              }
3560            if (fc != md->lcc[*eptr]) break;            cc = RAWUCHARTEST(eptr);
3561              if (fc != cc && foc != cc) break;
3562            eptr++;            eptr++;
3563            }            }
3564            if (possessive) continue;       /* No backtracking */
3565          if (possessive) continue;          for (;;)
   
         while (eptr >= pp)  
3566            {            {
3567              if (eptr == pp) goto TAIL_RECURSE;
3568            RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
3569            eptr--;            eptr--;
3570            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3571            }            }
3572          MRRETURN(MATCH_NOMATCH);          /* Control never gets here */
3573          }          }
       /* Control never gets here */  
3574        }        }
3575    
3576      /* Caseful comparisons (includes all multi-byte characters) */      /* Caseful comparisons (includes all multi-byte characters) */
# Line 3168  for (;;) Line 3582  for (;;)
3582          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3583            {            {
3584            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3585            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3586            }            }
3587          if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);          if (fc != RAWUCHARINCTEST(eptr)) RRETURN(MATCH_NOMATCH);
3588          }          }
3589    
3590        if (min == max) continue;        if (min == max) continue;
# Line 3181  for (;;) Line 3595  for (;;)
3595            {            {
3596            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3597            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3598            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3599            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3600              {              {
3601              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3602              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3603              }              }
3604            if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc != RAWUCHARINCTEST(eptr)) RRETURN(MATCH_NOMATCH);
3605            }            }
3606          /* Control never gets here */          /* Control never gets here */
3607          }          }
# Line 3201  for (;;) Line 3615  for (;;)
3615              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3616              break;              break;
3617              }              }
3618            if (fc != *eptr) break;            if (fc != RAWUCHARTEST(eptr)) break;
3619            eptr++;            eptr++;
3620            }            }
3621          if (possessive) continue;          if (possessive) continue;    /* No backtracking */
3622            for (;;)
         while (eptr >= pp)  
3623            {            {
3624              if (eptr == pp) goto TAIL_RECURSE;
3625            RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
3626            eptr--;            eptr--;
3627            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3628            }            }
3629          MRRETURN(MATCH_NOMATCH);          /* Control never gets here */
3630          }          }
3631        }        }
3632      /* Control never gets here */      /* Control never gets here */
# Line 3225  for (;;) Line 3639  for (;;)
3639      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3640        {        {
3641        SCHECK_PARTIAL();        SCHECK_PARTIAL();
3642        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
3643        }        }
3644      ecode++;  #ifdef SUPPORT_UTF
3645      GETCHARINCTEST(c, eptr);      if (utf)
     if (op == OP_NOTI)         /* The caseless case */  
3646        {        {
3647  #ifdef SUPPORT_UTF8        register pcre_uint32 ch, och;
3648        if (c < 256)  
3649  #endif        ecode++;
3650        c = md->lcc[c];        GETCHARINC(ch, ecode);
3651        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);        GETCHARINC(c, eptr);
3652    
3653          if (op == OP_NOT)
3654            {
3655            if (ch == c) RRETURN(MATCH_NOMATCH);
3656            }
3657          else
3658            {
3659    #ifdef SUPPORT_UCP
3660            if (ch > 127)
3661              och = UCD_OTHERCASE(ch);
3662    #else
3663            if (ch > 127)
3664              och = ch;
3665    #endif /* SUPPORT_UCP */
3666            else
3667              och = TABLE_GET(ch, md->fcc, ch);
3668            if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
3669            }
3670        }        }
3671      else    /* Caseful */      else
3672    #endif
3673        {        {
3674        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);        register pcre_uint32 ch = ecode[1];
3675          c = *eptr++;
3676          if (ch == c || (op == OP_NOTI && TABLE_GET(ch, md->fcc, ch) == c))
3677            RRETURN(MATCH_NOMATCH);
3678          ecode += 2;
3679        }        }
3680      break;      break;
3681    
# Line 3253  for (;;) Line 3689  for (;;)
3689      case OP_NOTEXACT:      case OP_NOTEXACT:
3690      case OP_NOTEXACTI:      case OP_NOTEXACTI:
3691      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3692      ecode += 3;      ecode += 1 + IMM2_SIZE;
3693      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3694    
3695      case OP_NOTUPTO:      case OP_NOTUPTO:
# Line 3263  for (;;) Line 3699  for (;;)
3699      min = 0;      min = 0;
3700      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3701      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3702      ecode += 3;      ecode += 1 + IMM2_SIZE;
3703      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3704    
3705      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
# Line 3295  for (;;) Line 3731  for (;;)
3731      possessive = TRUE;      possessive = TRUE;
3732      min = 0;      min = 0;
3733      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3734      ecode += 3;      ecode += 1 + IMM2_SIZE;
3735      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3736    
3737      case OP_NOTSTAR:      case OP_NOTSTAR:
# Line 3319  for (;;) Line 3755  for (;;)
3755      /* Common code for all repeated single-byte matches. */      /* Common code for all repeated single-byte matches. */
3756    
3757      REPEATNOTCHAR:      REPEATNOTCHAR:
3758      fc = *ecode++;      GETCHARINCTEST(fc, ecode);
3759    
3760      /* The code is duplicated for the caseless and caseful cases, for speed,      /* The code is duplicated for the caseless and caseful cases, for speed,
3761      since matching characters is likely to be quite common. First, ensure the      since matching characters is likely to be quite common. First, ensure the
# Line 3330  for (;;) Line 3766  for (;;)
3766      characters and work backwards. */      characters and work backwards. */
3767    
3768      DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3769        max, eptr));        max, (char *)eptr));
3770    
3771      if (op >= OP_NOTSTARI)     /* Caseless */      if (op >= OP_NOTSTARI)     /* Caseless */
3772        {        {
3773        fc = md->lcc[fc];  #ifdef SUPPORT_UTF
3774    #ifdef SUPPORT_UCP
3775          if (utf && fc > 127)
3776            foc = UCD_OTHERCASE(fc);
3777    #else
3778          if (utf && fc > 127)
3779            foc = fc;
3780    #endif /* SUPPORT_UCP */
3781          else
3782    #endif /* SUPPORT_UTF */
3783            foc = TABLE_GET(fc, md->fcc, fc);
3784    
3785  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3786        /* UTF-8 mode */        if (utf)
       if (utf8)  
3787          {          {
3788          register unsigned int d;          register pcre_uint32 d;
3789          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3790            {            {
3791            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3792              {              {
3793              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3794              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3795              }              }
3796            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3797            if (d < 256) d = md->lcc[d];            if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
           if (fc == d) MRRETURN(MATCH_NOMATCH);  
3798            }            }
3799          }          }
3800        else        else
3801  #endif  #endif  /* SUPPORT_UTF */
3802          /* Not UTF mode */
       /* Not UTF-8 mode */  
3803          {          {
3804          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3805            {            {
3806            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3807              {              {
3808              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3809              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3810              }              }
3811            if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3812              eptr++;
3813            }            }
3814          }          }
3815    
# Line 3373  for (;;) Line 3817  for (;;)
3817    
3818        if (minimize)        if (minimize)
3819          {          {
3820  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3821          /* UTF-8 mode */          if (utf)
         if (utf8)  
3822            {            {
3823            register unsigned int d;            register pcre_uint32 d;
3824            for (fi = min;; fi++)            for (fi = min;; fi++)
3825              {              {
3826              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3827              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3828              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3829              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3830                {                {
3831                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3832                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3833                }                }
3834              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3835              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
             if (fc == d) MRRETURN(MATCH_NOMATCH);  
3836              }              }
3837            }            }
3838          else          else
3839  #endif  #endif  /*SUPPORT_UTF */
3840          /* Not UTF-8 mode */          /* Not UTF mode */
3841            {            {
3842            for (fi = min;; fi++)            for (fi = min;; fi++)
3843              {              {
3844              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3845              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3846              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3847              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3848                {                {
3849                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3850                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3851                }                }
3852              if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3853                eptr++;
3854              }              }
3855            }            }
3856          /* Control never gets here */          /* Control never gets here */
# Line 3419  for (;;) Line 3862  for (;;)
3862          {          {
3863          pp = eptr;          pp = eptr;
3864    
3865  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3866          /* UTF-8 mode */          if (utf)
         if (utf8)  
3867            {            {
3868            register unsigned int d;            register pcre_uint32 d;
3869            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3870              {              {
3871              int len = 1;              int len = 1;
# Line 3433  for (;;) Line 3875  for (;;)
3875                break;                break;
3876                }                }
3877              GETCHARLEN(d, eptr, len);              GETCHARLEN(d, eptr, len);
3878              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) break;
             if (fc == d) break;  
3879              eptr += len;              eptr += len;
3880              }              }
3881          if (possessive) continue;            if (possessive) continue;    /* No backtracking */
3882          for(;;)            for(;;)
3883              {              {
3884                if (eptr == pp) goto TAIL_RECURSE;
3885              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3886              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3887              if (eptr-- == pp) break;        /* Stop if tried at original pos */              eptr--;
3888              BACKCHAR(eptr);              BACKCHAR(eptr);
3889              }              }
3890            }            }
3891          else          else
3892  #endif  #endif  /* SUPPORT_UTF */
3893          /* Not UTF-8 mode */          /* Not UTF mode */
3894            {            {
3895            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3896              {              {
# Line 3457  for (;;) Line 3899  for (;;)
3899                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3900                break;                break;
3901                }                }
3902              if (fc == md->lcc[*eptr]) break;              if (fc == *eptr || foc == *eptr) break;
3903              eptr++;              eptr++;
3904              }              }
3905            if (possessive) continue;            if (possessive) continue;    /* No backtracking */
3906            while (eptr >= pp)            for (;;)
3907              {              {
3908                if (eptr == pp) goto TAIL_RECURSE;
3909              RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
3910              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3911              eptr--;              eptr--;
3912              }              }
3913            }            }
3914            /* Control never gets here */
         MRRETURN(MATCH_NOMATCH);  
3915          }          }
       /* Control never gets here */  
3916        }        }
3917    
3918      /* Caseful comparisons */      /* Caseful comparisons */
3919    
3920      else      else
3921        {        {
3922  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3923        /* UTF-8 mode */        if (utf)
       if (utf8)  
3924          {          {
3925          register unsigned int d;          register pcre_uint32 d;
3926          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3927            {            {
3928            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3929              {              {
3930              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3931              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3932              }              }
3933            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3934            if (fc == d) MRRETURN(MATCH_NOMATCH);            if (fc == d) RRETURN(MATCH_NOMATCH);
3935            }            }
3936          }          }
3937        else        else
3938  #endif  #endif
3939        /* Not UTF-8 mode */        /* Not UTF mode */
3940          {          {
3941          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3942            {            {
3943            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3944              {              {
3945              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3946              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3947              }              }
3948            if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3949            }            }
3950          }          }
3951    
# Line 3513  for (;;) Line 3953  for (;;)
3953    
3954        if (minimize)        if (minimize)
3955          {          {
3956  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3957          /* UTF-8 mode */          if (utf)
         if (utf8)  
3958            {            {
3959            register unsigned int d;            register pcre_uint32 d;
3960            for (fi = min;; fi++)            for (fi = min;; fi++)
3961              {              {
3962              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3963              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3964              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3965              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3966                {                {
3967                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3968                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3969                }                }
3970              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3971              if (fc == d) MRRETURN(MATCH_NOMATCH);              if (fc == d) RRETURN(MATCH_NOMATCH);
3972              }              }
3973            }            }
3974          else          else
3975  #endif  #endif
3976          /* Not UTF-8 mode */          /* Not UTF mode */
3977            {            {
3978            for (fi = min;; fi++)            for (fi = min;; fi++)
3979              {              {
3980              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3981              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3982              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3983              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3984                {                {
3985                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3986                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3987                }                }
3988              if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3989              }              }
3990            }            }
3991          /* Control never gets here */          /* Control never gets here */
# Line 3558  for (;;) Line 3997  for (;;)
3997          {          {
3998          pp = eptr;          pp = eptr;
3999    
4000  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4001          /* UTF-8 mode */          if (utf)
         if (utf8)  
4002            {            {
4003            register unsigned int d;            register pcre_uint32 d;
4004            for (i = min; i < max; i++)            for (i = min; i < max; i++)
4005              {              {
4006              int len = 1;              int len = 1;
# Line 3575  for (;;) Line 4013  for (;;)
4013              if (fc == d) break;              if (fc == d) break;
4014              eptr += len;              eptr += len;
4015              }              }
4016            if (possessive) continue;            if (possessive) continue;    /* No backtracking */
4017            for(;;)            for(;;)
4018              {              {
4019                if (eptr == pp) goto TAIL_RECURSE;
4020              RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);
4021              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4022              if (eptr-- == pp) break;        /* Stop if tried at original pos */              eptr--;
4023              BACKCHAR(eptr);              BACKCHAR(eptr);