/[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 723 by ph10, Sat Oct 8 15:55:23 2011 UTC revision 1298 by ph10, Fri Mar 22 16:13:13 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 101  because the offset vector is always a mu Line 110  because the offset vector is always a mu
110  static const char rep_min[] = { 0, 0, 1, 1, 0, 0 };  static const char rep_min[] = { 0, 0, 1, 1, 0, 0 };
111  static const char rep_max[] = { 0, 0, 0, 0, 1, 1 };  static const char rep_max[] = { 0, 0, 0, 0, 1, 1 };
112    
   
   
113  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
114  /*************************************************  /*************************************************
115  *        Debugging function to print chars       *  *        Debugging function to print chars       *
# 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, RM64, RM65, RM66 };         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 preceed 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);
831        RRETURN(rrc);  
   
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);
# Line 780  for (;;) Line 842  for (;;)
842      match pointer to do this. */      match pointer to do this. */
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;      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], offset_top,      md->nomatch_mark = ecode + 2;
853        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);        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;      md->start_match_ptr = ecode;
     md->mark = ecode + 2;  
860      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
861    
862      /* Handle an atomic group that does not contain any capturing parentheses.      /* 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      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      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.      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      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,      contain any captures generate OP_ONCE_NC, which can be handled in the old,
868      less stack intensive way.      less stack intensive way.
869    
870      Check the alternative branches in turn - the matching won't pass the KET      Check the alternative branches in turn - the matching won't pass the KET
# Line 810  for (;;) Line 875  for (;;)
875      case OP_ONCE_NC:      case OP_ONCE_NC:
876      prev = ecode;      prev = ecode;
877      saved_eptr = eptr;      saved_eptr = eptr;
878        save_mark = md->mark;
879      do      do
880        {        {
881        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
# Line 821  for (;;) Line 887  for (;;)
887        if (rrc == MATCH_THEN)        if (rrc == MATCH_THEN)
888          {          {
889          next = ecode + GET(ecode,1);          next = ecode + GET(ecode,1);
890          if (md->start_match_ptr < next &&          if (md->start_match_ptr < next &&
891              (*ecode == OP_ALT || *next == OP_ALT))              (*ecode == OP_ALT || *next == OP_ALT))
892            rrc = MATCH_NOMATCH;            rrc = MATCH_NOMATCH;
893          }          }
894    
895        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
896        ecode += GET(ecode,1);        ecode += GET(ecode,1);
897          md->mark = save_mark;
898        }        }
899      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
900    
# Line 867  for (;;) Line 934  for (;;)
934        }        }
935      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
936        {        {
       md->match_function_type = MATCH_CBEGROUP;  
937        RMATCH(eptr, prev, offset_top, md, eptrb, RM66);        RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
938        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
939        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
# Line 907  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 915  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    
989          /* If we backed up to a THEN, check whether it is within the current          /* If we backed up to a THEN, check whether it is within the current
990          branch by comparing the address of the THEN that is passed back with          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          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          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          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          the return code to NOMATCH, which will cause normal backtracking to
995          happen from now on. Otherwise, THEN is passed back to an outer          happen from now on. Otherwise, THEN is passed back to an outer
996          alternative. This implements Perl's treatment of parenthesized groups,          alternative. This implements Perl's treatment of parenthesized groups,
997          where a group not containing | does not affect the current alternative,          where a group not containing | does not affect the current alternative,
998          that is, (X) is NOT the same as (X|(*F)). */          that is, (X) is NOT the same as (X|(*F)). */
999    
1000          if (rrc == MATCH_THEN)          if (rrc == MATCH_THEN)
1001            {            {
1002            next = ecode + GET(ecode,1);            next = ecode + GET(ecode,1);
1003            if (md->start_match_ptr < next &&            if (md->start_match_ptr < next &&
1004                (*ecode == OP_ALT || *next == OP_ALT))                (*ecode == OP_ALT || *next == OP_ALT))
1005              rrc = MATCH_NOMATCH;              rrc = MATCH_NOMATCH;
1006            }            }
1007    
1008          /* Anything other than NOMATCH is passed back. */          /* Anything other than NOMATCH is passed back. */
1009    
1010          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          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 953  for (;;) Line 1021  for (;;)
1021    
1022        /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */        /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
1023    
       if (md->mark == NULL) md->mark = markptr;  
1024        RRETURN(rrc);        RRETURN(rrc);
1025        }        }
1026    
# Line 995  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            md->match_function_type = MATCH_CBEGROUP;
1067    
1068        /* If this is not a possibly empty group, and there are no (*THEN)s in        /* 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        the pattern, and this is the final alternative, optimize as described
# Line 1003  for (;;) Line 1071  for (;;)
1071    
1072        else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)        else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
1073          {          {
1074          ecode += _pcre_OP_lengths[*ecode];          ecode += PRIV(OP_lengths)[*ecode];
1075          goto TAIL_RECURSE;          goto TAIL_RECURSE;
1076          }          }
1077    
1078        /* In all other cases, we have to make another call to match(). */        /* In all other cases, we have to make another call to match(). */
1079    
1080        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,        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    
1085        /* See comment in the code for capturing groups above about handling        /* See comment in the code for capturing groups above about handling
1086        THEN. */        THEN. */
1087    
1088        if (rrc == MATCH_THEN)        if (rrc == MATCH_THEN)
1089          {          {
1090          next = ecode + GET(ecode,1);          next = ecode + GET(ecode,1);
1091          if (md->start_match_ptr < next &&          if (md->start_match_ptr < next &&
1092              (*ecode == OP_ALT || *next == OP_ALT))              (*ecode == OP_ALT || *next == OP_ALT))
1093            rrc = MATCH_NOMATCH;            rrc = MATCH_NOMATCH;
1094          }          }
1095    
1096        if (rrc != MATCH_NOMATCH)        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 1038  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 (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 1070  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 1093  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 1104  for (;;) Line 1175  for (;;)
1175            matched_once = TRUE;            matched_once = TRUE;
1176            continue;            continue;
1177            }            }
1178    
1179          /* See comment in the code for capturing groups above about handling          /* See comment in the code for capturing groups above about handling
1180          THEN. */          THEN. */
1181    
1182          if (rrc == MATCH_THEN)          if (rrc == MATCH_THEN)
1183            {            {
1184            next = ecode + GET(ecode,1);            next = ecode + GET(ecode,1);
1185            if (md->start_match_ptr < next &&            if (md->start_match_ptr < next &&
1186                (*ecode == OP_ALT || *next == OP_ALT))                (*ecode == OP_ALT || *next == OP_ALT))
1187              rrc = MATCH_NOMATCH;              rrc = MATCH_NOMATCH;
1188            }            }
1189    
1190          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1191          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
# Line 1129  for (;;) Line 1200  for (;;)
1200          md->offset_vector[md->offset_end - number] = save_offset3;          md->offset_vector[md->offset_end - number] = save_offset3;
1201          }          }
1202    
       if (md->mark == NULL) md->mark = markptr;  
1203        if (allow_zero || matched_once)        if (allow_zero || matched_once)
1204          {          {
1205          ecode += 1 + LINK_SIZE;          ecode += 1 + LINK_SIZE;
# Line 1161  for (;;) Line 1231  for (;;)
1231    
1232      POSSESSIVE_NON_CAPTURE:      POSSESSIVE_NON_CAPTURE:
1233      matched_once = FALSE;      matched_once = FALSE;
1234      code_offset = ecode - md->start_code;      code_offset = (int)(ecode - md->start_code);
1235        save_capture_last = md->capture_last;
1236    
1237      for (;;)      for (;;)
1238        {        {
1239        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1240        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1241          eptrb, RM48);          eptrb, RM48);
1242        if (rrc == MATCH_KETRPOS)        if (rrc == MATCH_KETRPOS)
1243          {          {
# Line 1176  for (;;) Line 1247  for (;;)
1247          matched_once = TRUE;          matched_once = TRUE;
1248          continue;          continue;
1249          }          }
1250    
1251        /* See comment in the code for capturing groups above about handling        /* See comment in the code for capturing groups above about handling
1252        THEN. */        THEN. */
1253    
1254        if (rrc == MATCH_THEN)        if (rrc == MATCH_THEN)
1255          {          {
1256          next = ecode + GET(ecode,1);          next = ecode + GET(ecode,1);
1257          if (md->start_match_ptr < next &&          if (md->start_match_ptr < next &&
1258              (*ecode == OP_ALT || *next == OP_ALT))              (*ecode == OP_ALT || *next == OP_ALT))
1259            rrc = MATCH_NOMATCH;            rrc = MATCH_NOMATCH;
1260          }          }
1261    
1262        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1263        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1264        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1265          md->capture_last = save_capture_last;
1266        }        }
1267    
1268      if (matched_once || allow_zero)      if (matched_once || allow_zero)
# Line 1216  for (;;) Line 1288  for (;;)
1288    
1289      if (ecode[LINK_SIZE+1] == OP_CALLOUT)      if (ecode[LINK_SIZE+1] == OP_CALLOUT)
1290        {        {
1291        if (pcre_callout != NULL)        if (PUBL(callout) != NULL)
1292          {          {
1293          pcre_callout_block cb;          PUBL(callout_block) cb;
1294          cb.version          = 2;   /* Version 1 of the callout block */          cb.version          = 2;   /* Version 1 of the callout block */
1295          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[LINK_SIZE+2];
1296          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1297    #if defined COMPILE_PCRE8
1298          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
1299    #elif defined COMPILE_PCRE16
1300            cb.subject          = (PCRE_SPTR16)md->start_subject;
1301    #elif defined COMPILE_PCRE32
1302            cb.subject          = (PCRE_SPTR32)md->start_subject;
1303    #endif
1304          cb.subject_length   = (int)(md->end_subject - md->start_subject);          cb.subject_length   = (int)(md->end_subject - md->start_subject);
1305          cb.start_match      = (int)(mstart - md->start_subject);          cb.start_match      = (int)(mstart - md->start_subject);
1306          cb.current_position = (int)(eptr - md->start_subject);          cb.current_position = (int)(eptr - md->start_subject);
1307          cb.pattern_position = GET(ecode, LINK_SIZE + 3);          cb.pattern_position = GET(ecode, LINK_SIZE + 3);
1308          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);
1309          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1310          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last & CAPLMASK;
1311            /* Internal change requires this for API compatibility. */
1312            if (cb.capture_last == 0) cb.capture_last = -1;
1313          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1314          cb.mark             = markptr;          cb.mark             = md->nomatch_mark;
1315          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1316          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1317          }          }
1318        ecode += _pcre_OP_lengths[OP_CALLOUT];        ecode += PRIV(OP_lengths)[OP_CALLOUT];
1319          codelink -= PRIV(OP_lengths)[OP_CALLOUT];
1320        }        }
1321    
1322      condcode = ecode[LINK_SIZE+1];      condcode = ecode[LINK_SIZE+1];
# Line 1251  for (;;) Line 1332  for (;;)
1332          }          }
1333        else        else
1334          {          {
1335          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/          unsigned int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
1336          condition =  (recno == RREF_ANY || recno == md->recursive->group_num);          condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1337    
1338          /* If the test is for recursion into a specific subpattern, and it is          /* If the test is for recursion into a specific subpattern, and it is
1339          false, but the test was set up by name, scan the table to see if the          false, but the test was set up by name, scan the table to see if the
1340          name refers to any other numbers, and test them. The condition is true          name refers to any other numbers, and test them. The condition is true
1341          if any one is set. */          if any one is set. */
1342    
1343          if (!condition && condcode == OP_NRREF && recno != RREF_ANY)          if (!condition && condcode == OP_NRREF)
1344            {            {
1345            uschar *slotA = md->name_table;            pcre_uchar *slotA = md->name_table;
1346            for (i = 0; i < md->name_count; i++)            for (i = 0; i < md->name_count; i++)
1347              {              {
1348              if (GET2(slotA, 0) == recno) break;              if (GET2(slotA, 0) == recno) break;
# Line 1274  for (;;) Line 1355  for (;;)
1355    
1356            if (i < md->name_count)            if (i < md->name_count)
1357              {              {
1358              uschar *slotB = slotA;              pcre_uchar *slotB = slotA;
1359              while (slotB > md->name_table)              while (slotB > md->name_table)
1360                {                {
1361                slotB -= md->name_entry_size;                slotB -= md->name_entry_size;
1362                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1363                  {                  {
1364                  condition = GET2(slotB, 0) == md->recursive->group_num;                  condition = GET2(slotB, 0) == md->recursive->group_num;
1365                  if (condition) break;                  if (condition) break;
# Line 1294  for (;;) Line 1375  for (;;)
1375                for (i++; i < md->name_count; i++)                for (i++; i < md->name_count; i++)
1376                  {                  {
1377                  slotB += md->name_entry_size;                  slotB += md->name_entry_size;
1378                  if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                  if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1379                    {                    {
1380                    condition = GET2(slotB, 0) == md->recursive->group_num;                    condition = GET2(slotB, 0) == md->recursive->group_num;
1381                    if (condition) break;                    if (condition) break;
# Line 1307  for (;;) Line 1388  for (;;)
1388    
1389          /* Chose branch according to the condition */          /* Chose branch according to the condition */
1390    
1391          ecode += condition? 3 : GET(ecode, 1);          ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1392          }          }
1393        }        }
1394    
# Line 1323  for (;;) Line 1404  for (;;)
1404    
1405        if (!condition && condcode == OP_NCREF)        if (!condition && condcode == OP_NCREF)
1406          {          {
1407          int refno = offset >> 1;          unsigned int refno = offset >> 1;
1408          uschar *slotA = md->name_table;          pcre_uchar *slotA = md->name_table;
1409    
1410          for (i = 0; i < md->name_count; i++)          for (i = 0; i < md->name_count; i++)
1411            {            {
# Line 1338  for (;;) Line 1419  for (;;)
1419    
1420          if (i < md->name_count)          if (i < md->name_count)
1421            {            {
1422            uschar *slotB = slotA;            pcre_uchar *slotB = slotA;
1423            while (slotB > md->name_table)            while (slotB > md->name_table)
1424              {              {
1425              slotB -= md->name_entry_size;              slotB -= md->name_entry_size;
1426              if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)              if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1427                {                {
1428                offset = GET2(slotB, 0) << 1;                offset = GET2(slotB, 0) << 1;
1429                condition = offset < offset_top &&                condition = offset < offset_top &&
# Line 1360  for (;;) Line 1441  for (;;)
1441              for (i++; i < md->name_count; i++)              for (i++; i < md->name_count; i++)
1442                {                {
1443                slotB += md->name_entry_size;                slotB += md->name_entry_size;
1444                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1445                  {                  {
1446                  offset = GET2(slotB, 0) << 1;                  offset = GET2(slotB, 0) << 1;
1447                  condition = offset < offset_top &&                  condition = offset < offset_top &&
# Line 1375  for (;;) Line 1456  for (;;)
1456    
1457        /* Chose branch according to the condition */        /* Chose branch according to the condition */
1458    
1459        ecode += condition? 3 : GET(ecode, 1);        ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1460        }        }
1461    
1462      else if (condcode == OP_DEF)     /* DEFINE - always false */      else if (condcode == OP_DEF)     /* DEFINE - always false */
# Line 1400  for (;;) Line 1481  for (;;)
1481          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
1482          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1483          }          }
1484    
1485        /* PCRE doesn't allow the effect of (*THEN) to escape beyond an        /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
1486        assertion; it is therefore treated as NOMATCH. */        assertion; it is therefore treated as NOMATCH. */
1487    
1488        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1489          {          {
1490          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
1491          }          }
# Line 1432  for (;;) Line 1513  for (;;)
1513          ecode += 1 + LINK_SIZE;          ecode += 1 + LINK_SIZE;
1514          goto TAIL_RECURSE;          goto TAIL_RECURSE;
1515          }          }
1516    
1517        md->match_function_type = MATCH_CBEGROUP;        md->match_function_type = MATCH_CBEGROUP;
1518        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
1519        RRETURN(rrc);        RRETURN(rrc);
# Line 1451  for (;;) Line 1532  for (;;)
1532      to close any currently open capturing brackets. */      to close any currently open capturing brackets. */
1533    
1534      case OP_CLOSE:      case OP_CLOSE:
1535      number = GET2(ecode, 1);      number = GET2(ecode, 1);   /* Must be less than 65536 */
1536      offset = number << 1;      offset = number << 1;
1537    
1538  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 1459  for (;;) Line 1540  for (;;)
1540        printf("\n");        printf("\n");
1541  #endif  #endif
1542    
1543      md->capture_last = number;      md->capture_last = (md->capture_last & OVFLMASK) | number;
1544      if (offset >= md->offset_max) md->offset_overflow = TRUE; else      if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
1545        {        {
1546        md->offset_vector[offset] =        md->offset_vector[offset] =
1547          md->offset_vector[md->offset_end - number];          md->offset_vector[md->offset_end - number];
1548        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1549        if (offset_top <= offset) offset_top = offset + 2;        if (offset_top <= offset) offset_top = offset + 2;
1550        }        }
1551      ecode += 3;      ecode += 1 + IMM2_SIZE;
1552      break;      break;
1553    
1554    
# Line 1487  for (;;) Line 1568  for (;;)
1568           (md->notempty ||           (md->notempty ||
1569             (md->notempty_atstart &&             (md->notempty_atstart &&
1570               mstart == md->start_subject + md->start_offset)))               mstart == md->start_subject + md->start_offset)))
1571        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1572    
1573      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
1574    
# Line 1496  for (;;) Line 1577  for (;;)
1577      md->start_match_ptr = mstart;       /* and the start (\K can modify) */      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
1578    
1579      /* 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
1580      given as the argument to MRRETURN when the heap is in use. */      given as the argument to RRETURN when the heap is in use. */
1581    
1582      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1583      MRRETURN(rrc);      RRETURN(rrc);
1584    
1585      /* Assertion brackets. Check the alternative branches in turn - the      /* Assertion brackets. Check the alternative branches in turn - the
1586      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 1514  for (;;) Line 1595  for (;;)
1595    
1596      case OP_ASSERT:      case OP_ASSERT:
1597      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1598        save_mark = md->mark;
1599      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1600        {        {
1601        condassert = TRUE;        condassert = TRUE;
# Line 1521  for (;;) Line 1603  for (;;)
1603        }        }
1604      else condassert = FALSE;      else condassert = FALSE;
1605    
1606        /* Loop for each branch */
1607    
1608      do      do
1609        {        {
1610        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
1611        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1612          {          {
1613          mstart = md->start_match_ptr;   /* In case \K reset it */          mstart = md->start_match_ptr;   /* In case \K reset it */
         markptr = md->mark;  
1614          break;          break;
1615          }          }
1616          md->mark = save_mark;
1617        /* PCRE does not allow THEN to escape beyond an assertion; it is treated  
1618        as NOMATCH. */        /* See comment in the code for capturing groups above about handling
1619          THEN. */
1620        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);  
1621          if (rrc == MATCH_THEN)
1622            {
1623            next = ecode + GET(ecode,1);
1624            if (md->start_match_ptr < next &&
1625                (*ecode == OP_ALT || *next == OP_ALT))
1626              rrc = MATCH_NOMATCH;
1627            }
1628    
1629          /* Anything other than NOMATCH causes the assertion to fail. This
1630          includes COMMIT, SKIP, and PRUNE. However, this consistent approach does
1631          not always have exactly the same effect as in Perl. */
1632    
1633          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1634        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1635        }        }
1636      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1637    
1638        /* If we have tried all the alternative branches, the assertion has
1639        failed. */
1640    
1641      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
1642    
1643      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1644    
1645      if (condassert) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);
1646    
1647      /* Continue from after the assertion, updating the offsets high water      /* Continue from after a successful assertion, updating the offsets high
1648      mark, since extracts may have been taken during the assertion. */      water mark, since extracts may have been taken during the assertion. */
1649    
1650      do ecode += GET(ecode,1); while (*ecode == OP_ALT);      do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1651      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1652      offset_top = md->end_offset_top;      offset_top = md->end_offset_top;
1653      continue;      continue;
1654    
1655      /* Negative assertion: all branches must fail to match. Encountering SKIP,      /* Negative assertion: all branches must fail to match for the assertion to
1656      PRUNE, or COMMIT means we must assume failure without checking subsequent      succeed. */
     branches. */  
1657    
1658      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1659      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1660        save_mark = md->mark;
1661      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1662        {        {
1663        condassert = TRUE;        condassert = TRUE;
# Line 1566  for (;;) Line 1665  for (;;)
1665        }        }
1666      else condassert = FALSE;      else condassert = FALSE;
1667    
1668        /* Loop for each alternative branch. */
1669    
1670      do      do
1671        {        {
1672        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1673        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);        md->mark = save_mark;
1674        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)  
1675          /* A successful match means the assertion has failed. */
1676    
1677          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) RRETURN(MATCH_NOMATCH);
1678    
1679          /* See comment in the code for capturing groups above about handling
1680          THEN. */
1681    
1682          if (rrc == MATCH_THEN)
1683          {          {
1684          do ecode += GET(ecode,1); while (*ecode == OP_ALT);          next = ecode + GET(ecode,1);
1685          break;          if (md->start_match_ptr < next &&
1686                (*ecode == OP_ALT || *next == OP_ALT))
1687              rrc = MATCH_NOMATCH;
1688          }          }
1689    
1690          /* No match on a branch means we must carry on and try the next branch.
1691          Anything else, in particular, SKIP, PRUNE, etc. causes a failure in the
1692          enclosing branch. This is a consistent approach, but does not always have
1693          the same effect as in Perl. */
1694    
1695        /* PCRE does not allow THEN to escape beyond an assertion; it is treated        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
       as NOMATCH. */  
   
       if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);  
1696        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1697        }        }
1698      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1699    
1700        /* All branches in the assertion failed to match. */
1701    
1702      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1703        ecode += 1 + LINK_SIZE;                /* Continue with current branch */
     ecode += 1 + LINK_SIZE;  
1704      continue;      continue;
1705    
1706      /* 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 1595  for (;;) Line 1709  for (;;)
1709      back a number of characters, not bytes. */      back a number of characters, not bytes. */
1710    
1711      case OP_REVERSE:      case OP_REVERSE:
1712  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1713      if (utf8)      if (utf)
1714        {        {
1715        i = GET(ecode, 1);        i = GET(ecode, 1);
1716        while (i-- > 0)        while (i-- > 0)
1717          {          {
1718          eptr--;          eptr--;
1719          if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1720          BACKCHAR(eptr);          BACKCHAR(eptr);
1721          }          }
1722        }        }
# Line 1613  for (;;) Line 1727  for (;;)
1727    
1728        {        {
1729        eptr -= GET(ecode, 1);        eptr -= GET(ecode, 1);
1730        if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1731        }        }
1732    
1733      /* Save the earliest consulted character, then skip to next op code */      /* Save the earliest consulted character, then skip to next op code */
# Line 1627  for (;;) Line 1741  for (;;)
1741      function is able to force a failure. */      function is able to force a failure. */
1742    
1743      case OP_CALLOUT:      case OP_CALLOUT:
1744      if (pcre_callout != NULL)      if (PUBL(callout) != NULL)
1745        {        {
1746        pcre_callout_block cb;        PUBL(callout_block) cb;
1747        cb.version          = 2;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1748        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1749        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1750    #if defined COMPILE_PCRE8
1751        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
1752    #elif defined COMPILE_PCRE16
1753          cb.subject          = (PCRE_SPTR16)md->start_subject;
1754    #elif defined COMPILE_PCRE32
1755          cb.subject          = (PCRE_SPTR32)md->start_subject;
1756    #endif
1757        cb.subject_length   = (int)(md->end_subject - md->start_subject);        cb.subject_length   = (int)(md->end_subject - md->start_subject);
1758        cb.start_match      = (int)(mstart - md->start_subject);        cb.start_match      = (int)(mstart - md->start_subject);
1759        cb.current_position = (int)(eptr - md->start_subject);        cb.current_position = (int)(eptr - md->start_subject);
1760        cb.pattern_position = GET(ecode, 2);        cb.pattern_position = GET(ecode, 2);
1761        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
1762        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1763        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last & CAPLMASK;
1764          /* Internal change requires this for API compatibility. */
1765          if (cb.capture_last == 0) cb.capture_last = -1;
1766        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1767        cb.mark             = markptr;        cb.mark             = md->nomatch_mark;
1768        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);        if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1769        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1770        }        }
1771      ecode += 2 + 2*LINK_SIZE;      ecode += 2 + 2*LINK_SIZE;
# Line 1669  for (;;) Line 1791  for (;;)
1791      case OP_RECURSE:      case OP_RECURSE:
1792        {        {
1793        recursion_info *ri;        recursion_info *ri;
1794        int recno;        unsigned int recno;
1795    
1796        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1797        recno = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
# Line 1686  for (;;) Line 1808  for (;;)
1808        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1809    
1810        new_recursive.group_num = recno;        new_recursive.group_num = recno;
1811          new_recursive.saved_capture_last = md->capture_last;
1812        new_recursive.subject_position = eptr;        new_recursive.subject_position = eptr;
1813        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1814        md->recursive = &new_recursive;        md->recursive = &new_recursive;
# Line 1702  for (;;) Line 1825  for (;;)
1825        else        else
1826          {          {
1827          new_recursive.offset_save =          new_recursive.offset_save =
1828            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
1829          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1830          }          }
1831        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1832              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1833    
1834        /* OK, now we can do the recursion. After processing each alternative,        /* OK, now we can do the recursion. After processing each alternative,
1835        restore the offset data. If there were nested recursions, md->recursive        restore the offset data and the last captured value. If there were nested
1836        might be changed, so reset it before looping. */        recursions, md->recursive might be changed, so reset it before looping.
1837          */
1838    
1839        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1840        cbegroup = (*callpat >= OP_SBRA);        cbegroup = (*callpat >= OP_SBRA);
1841        do        do
1842          {          {
1843          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1844          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
1845            md, eptrb, RM6);            md, eptrb, RM6);
1846          memcpy(md->offset_vector, new_recursive.offset_save,          memcpy(md->offset_vector, new_recursive.offset_save,
1847              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1848            md->capture_last = new_recursive.saved_capture_last;
1849          md->recursive = new_recursive.prevrec;          md->recursive = new_recursive.prevrec;
1850          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1851            {            {
1852            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
1853            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1854              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1855    
1856            /* 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
1857            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 1737  for (;;) Line 1862  for (;;)
1862            goto RECURSION_MATCHED;        /* Exit loop; end processing */            goto RECURSION_MATCHED;        /* Exit loop; end processing */
1863            }            }
1864    
1865          /* PCRE does not allow THEN to escape beyond a recursion; it is treated          /* PCRE does not allow THEN, SKIP, PRUNE or COMMIT to escape beyond a
1866          as NOMATCH. */          recursion; they cause a NOMATCH for the entire recursion. These codes
1867            are defined in a range that can be tested for. */
1868    
1869            if (rrc >= MATCH_BACKTRACK_MIN && rrc <= MATCH_BACKTRACK_MAX)
1870              RRETURN(MATCH_NOMATCH);
1871    
1872            /* Any return code other than NOMATCH is an error. */
1873    
1874          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)          if (rrc != MATCH_NOMATCH)
1875            {            {
1876            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1877            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1878              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1879            RRETURN(rrc);            RRETURN(rrc);
1880            }            }
1881    
# Line 1756  for (;;) Line 1887  for (;;)
1887        DPRINTF(("Recursion didn't match\n"));        DPRINTF(("Recursion didn't match\n"));
1888        md->recursive = new_recursive.prevrec;        md->recursive = new_recursive.prevrec;
1889        if (new_recursive.offset_save != stacksave)        if (new_recursive.offset_save != stacksave)
1890          (pcre_free)(new_recursive.offset_save);          (PUBL(free))(new_recursive.offset_save);
1891        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1892        }        }
1893    
1894      RECURSION_MATCHED:      RECURSION_MATCHED:
# Line 1826  for (;;) Line 1957  for (;;)
1957        }        }
1958      else saved_eptr = NULL;      else saved_eptr = NULL;
1959    
1960      /* If we are at the end of an assertion group or a non-capturing atomic      /* If we are at the end of an assertion group or a non-capturing atomic
1961      group, stop matching and return MATCH_MATCH, but record the current high      group, stop matching and return MATCH_MATCH, but record the current high
1962      water mark for use by positive assertions. We also need to record the match      water mark for use by positive assertions. We also need to record the match
1963      start in case it was changed by \K. */      start in case it was changed by \K. */
1964    
1965      if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||      if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
1966           *prev == OP_ONCE_NC)           *prev == OP_ONCE_NC)
1967        {        {
1968        md->end_match_ptr = eptr;      /* For ONCE_NC */        md->end_match_ptr = eptr;      /* For ONCE_NC */
1969        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1970        md->start_match_ptr = mstart;        md->start_match_ptr = mstart;
1971        MRRETURN(MATCH_MATCH);         /* Sets md->mark */        RRETURN(MATCH_MATCH);         /* Sets md->mark */
1972        }        }
1973    
1974      /* 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 1870  for (;;) Line 2001  for (;;)
2001    
2002        /* Deal with capturing */        /* Deal with capturing */
2003    
2004        md->capture_last = number;        md->capture_last = (md->capture_last & OVFLMASK) | number;
2005        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
2006          {          {
2007          /* If offset is greater than offset_top, it means that we are          /* If offset is greater than offset_top, it means that we are
2008          "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 1951  for (;;) Line 2082  for (;;)
2082          }          }
2083        if (*prev >= OP_SBRA)    /* Could match an empty string */        if (*prev >= OP_SBRA)    /* Could match an empty string */
2084          {          {
         md->match_function_type = MATCH_CBEGROUP;  
2085          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
2086          RRETURN(rrc);          RRETURN(rrc);
2087          }          }
# Line 1960  for (;;) Line 2090  for (;;)
2090        }        }
2091      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
2092        {        {
       if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;  
2093        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
2094        if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;        if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
2095        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
# Line 1979  for (;;) Line 2108  for (;;)
2108      /* Not multiline mode: start of subject assertion, unless notbol. */      /* Not multiline mode: start of subject assertion, unless notbol. */
2109    
2110      case OP_CIRC:      case OP_CIRC:
2111      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2112    
2113      /* Start of subject assertion */      /* Start of subject assertion */
2114    
2115      case OP_SOD:      case OP_SOD:
2116      if (eptr != md->start_subject) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
2117      ecode++;      ecode++;
2118      break;      break;
2119    
2120      /* Multiline mode: start of subject unless notbol, or after any newline. */      /* Multiline mode: start of subject unless notbol, or after any newline. */
2121    
2122      case OP_CIRCM:      case OP_CIRCM:
2123      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2124      if (eptr != md->start_subject &&      if (eptr != md->start_subject &&
2125          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
2126        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2127      ecode++;      ecode++;
2128      break;      break;
2129    
2130      /* Start of match assertion */      /* Start of match assertion */
2131    
2132      case OP_SOM:      case OP_SOM:
2133      if (eptr != md->start_subject + md->start_offset) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
2134      ecode++;      ecode++;
2135      break;      break;
2136    
# Line 2017  for (;;) Line 2146  for (;;)
2146    
2147      case OP_DOLLM:      case OP_DOLLM:
2148      if (eptr < md->end_subject)      if (eptr < md->end_subject)
2149        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }        {
2150          if (!IS_NEWLINE(eptr))
2151            {
2152            if (md->partial != 0 &&
2153                eptr + 1 >= md->end_subject &&
2154                NLBLOCK->nltype == NLTYPE_FIXED &&
2155                NLBLOCK->nllen == 2 &&
2156                RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2157              {
2158              md->hitend = TRUE;
2159              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2160              }
2161            RRETURN(MATCH_NOMATCH);
2162            }
2163          }
2164      else      else
2165        {        {
2166        if (md->noteol) MRRETURN(MATCH_NOMATCH);        if (md->noteol) RRETURN(MATCH_NOMATCH);
2167        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2168        }        }
2169      ecode++;      ecode++;
# Line 2030  for (;;) Line 2173  for (;;)
2173      subject unless noteol is set. */      subject unless noteol is set. */
2174    
2175      case OP_DOLL:      case OP_DOLL:
2176      if (md->noteol) MRRETURN(MATCH_NOMATCH);      if (md->noteol) RRETURN(MATCH_NOMATCH);
2177      if (!md->endonly) goto ASSERT_NL_OR_EOS;      if (!md->endonly) goto ASSERT_NL_OR_EOS;
2178    
2179      /* ... else fall through for endonly */      /* ... else fall through for endonly */
# Line 2038  for (;;) Line 2181  for (;;)
2181      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
2182    
2183      case OP_EOD:      case OP_EOD:
2184      if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
2185      SCHECK_PARTIAL();      SCHECK_PARTIAL();
2186      ecode++;      ecode++;
2187      break;      break;
# Line 2049  for (;;) Line 2192  for (;;)
2192      ASSERT_NL_OR_EOS:      ASSERT_NL_OR_EOS:
2193      if (eptr < md->end_subject &&      if (eptr < md->end_subject &&
2194          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
2195        MRRETURN(MATCH_NOMATCH);        {
2196          if (md->partial != 0 &&
2197              eptr + 1 >= md->end_subject &&
2198              NLBLOCK->nltype == NLTYPE_FIXED &&
2199              NLBLOCK->nllen == 2 &&
2200              RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2201            {
2202            md->hitend = TRUE;
2203            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2204            }
2205          RRETURN(MATCH_NOMATCH);
2206          }
2207    
2208      /* Either at end of string or \n before end. */      /* Either at end of string or \n before end. */
2209    
# Line 2068  for (;;) Line 2222  for (;;)
2222        be "non-word" characters. Remember the earliest consulted character for        be "non-word" characters. Remember the earliest consulted character for
2223        partial matching. */        partial matching. */
2224    
2225  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2226        if (utf8)        if (utf)
2227          {          {
2228          /* Get status of previous character */          /* Get status of previous character */
2229    
2230          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
2231            {            {
2232            USPTR lastptr = eptr - 1;            PCRE_PUCHAR lastptr = eptr - 1;
2233            while((*lastptr & 0xc0) == 0x80) lastptr--;            BACKCHAR(lastptr);
2234            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
2235            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
2236  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 2141  for (;;) Line 2295  for (;;)
2295              }              }
2296            else            else
2297  #endif  #endif
2298            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);            prev_is_word = MAX_255(eptr[-1])
2299                && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
2300            }            }
2301    
2302          /* Get status of next character */          /* Get status of next character */
# Line 2164  for (;;) Line 2319  for (;;)
2319            }            }
2320          else          else
2321  #endif  #endif
2322          cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);          cur_is_word = MAX_255(*eptr)
2323              && ((md->ctypes[*eptr] & ctype_word) != 0);
2324          }          }
2325    
2326        /* Now see if the situation is what we want */        /* Now see if the situation is what we want */
2327    
2328        if ((*ecode++ == OP_WORD_BOUNDARY)?        if ((*ecode++ == OP_WORD_BOUNDARY)?
2329             cur_is_word == prev_is_word : cur_is_word != prev_is_word)             cur_is_word == prev_is_word : cur_is_word != prev_is_word)
2330          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2331        }        }
2332      break;      break;
2333    
2334      /* Match a single character type; inline for speed */      /* Match any single character type except newline; have to take care with
2335        CRLF newlines and partial matching. */
2336    
2337      case OP_ANY:      case OP_ANY:
2338      if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
2339        if (md->partial != 0 &&
2340            eptr + 1 >= md->end_subject &&
2341            NLBLOCK->nltype == NLTYPE_FIXED &&
2342            NLBLOCK->nllen == 2 &&
2343            RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2344          {
2345          md->hitend = TRUE;
2346          if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2347          }
2348    
2349      /* Fall through */      /* Fall through */
2350    
2351        /* Match any single character whatsoever. */
2352    
2353      case OP_ALLANY:      case OP_ALLANY:
2354      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2355        {                            /* not be updated before SCHECK_PARTIAL. */        {                            /* not be updated before SCHECK_PARTIAL. */
2356        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2357        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2358        }        }
2359      eptr++;      eptr++;
2360      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;  #ifdef SUPPORT_UTF
2361        if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
2362    #endif
2363      ecode++;      ecode++;
2364      break;      break;
2365    
# Line 2199  for (;;) Line 2370  for (;;)
2370      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2371        {                            /* not be updated before SCHECK_PARTIAL. */        {                            /* not be updated before SCHECK_PARTIAL. */
2372        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2373        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2374        }        }
2375      eptr++;      eptr++;
2376      ecode++;      ecode++;
# Line 2209  for (;;) Line 2380  for (;;)
2380      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2381        {        {
2382        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2383        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2384        }        }
2385      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2386      if (      if (
2387  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2388         c < 256 &&         c < 256 &&
2389  #endif  #endif
2390         (md->ctypes[c] & ctype_digit) != 0         (md->ctypes[c] & ctype_digit) != 0
2391         )         )
2392        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2393      ecode++;      ecode++;
2394      break;      break;
2395    
# Line 2226  for (;;) Line 2397  for (;;)
2397      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2398        {        {
2399        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2400        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2401        }        }
2402      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2403      if (      if (
2404  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2405         c >= 256 ||         c > 255 ||
2406  #endif  #endif
2407         (md->ctypes[c] & ctype_digit) == 0         (md->ctypes[c] & ctype_digit) == 0
2408         )         )
2409        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2410      ecode++;      ecode++;
2411      break;      break;
2412    
# Line 2243  for (;;) Line 2414  for (;;)
2414      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2415        {        {
2416        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2417        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2418        }        }
2419      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2420      if (      if (
2421  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2422         c < 256 &&         c < 256 &&
2423  #endif  #endif
2424         (md->ctypes[c] & ctype_space) != 0         (md->ctypes[c] & ctype_space) != 0
2425         )         )
2426        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2427      ecode++;      ecode++;
2428      break;      break;
2429    
# Line 2260  for (;;) Line 2431  for (;;)
2431      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2432        {        {
2433        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2434        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2435        }        }
2436      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2437      if (      if (
2438  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2439         c >= 256 ||         c > 255 ||
2440  #endif  #endif
2441         (md->ctypes[c] & ctype_space) == 0         (md->ctypes[c] & ctype_space) == 0
2442         )         )
2443        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2444      ecode++;      ecode++;
2445      break;      break;
2446    
# Line 2277  for (;;) Line 2448  for (;;)
2448      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2449        {        {
2450        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2451        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2452        }        }
2453      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2454      if (      if (
2455  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2456         c < 256 &&         c < 256 &&
2457  #endif  #endif
2458         (md->ctypes[c] & ctype_word) != 0         (md->ctypes[c] & ctype_word) != 0
2459         )         )
2460        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2461      ecode++;      ecode++;
2462      break;      break;
2463    
# Line 2294  for (;;) Line 2465  for (;;)
2465      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2466        {        {
2467        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2468        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2469        }        }
2470      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2471      if (      if (
2472  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2473         c >= 256 ||         c > 255 ||
2474  #endif  #endif
2475         (md->ctypes[c] & ctype_word) == 0         (md->ctypes[c] & ctype_word) == 0
2476         )         )
2477        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2478      ecode++;      ecode++;
2479      break;      break;
2480    
# Line 2311  for (;;) Line 2482  for (;;)
2482      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2483        {        {
2484        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2485        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2486        }        }
2487      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2488      switch(c)      switch(c)
2489        {        {
2490        default: MRRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2491    
2492        case 0x000d:        case CHAR_CR:
2493        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr >= md->end_subject)
2494            {
2495            SCHECK_PARTIAL();
2496            }
2497          else if (RAWUCHARTEST(eptr) == CHAR_LF) eptr++;
2498        break;        break;
2499    
2500        case 0x000a:        case CHAR_LF:
2501        break;        break;
2502    
2503        case 0x000b:        case CHAR_VT:
2504        case 0x000c:        case CHAR_FF:
2505        case 0x0085:        case CHAR_NEL:
2506    #ifndef EBCDIC
2507        case 0x2028:        case 0x2028:
2508        case 0x2029:        case 0x2029:
2509        if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);  #endif  /* Not EBCDIC */
2510          if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
2511        break;        break;
2512        }        }
2513      ecode++;      ecode++;
# Line 2340  for (;;) Line 2517  for (;;)
2517      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2518        {        {
2519        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2520        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2521        }        }
2522      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2523      switch(c)      switch(c)
2524        {        {
2525          HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
2526        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);  
2527        }        }
2528      ecode++;      ecode++;
2529      break;      break;
# Line 2374  for (;;) Line 2532  for (;;)
2532      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2533        {        {
2534        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2535        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2536        }        }
2537      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2538      switch(c)      switch(c)
2539        {        {
2540        default: MRRETURN(MATCH_NOMATCH);        HSPACE_CASES: break;  /* Byte and multibyte cases */
2541        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;  
2542        }        }
2543      ecode++;      ecode++;
2544      break;      break;
# Line 2408  for (;;) Line 2547  for (;;)
2547      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2548        {        {
2549        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2550        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2551        }        }
2552      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2553      switch(c)      switch(c)
2554        {        {
2555          VSPACE_CASES: RRETURN(MATCH_NOMATCH);
2556        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);  
2557        }        }
2558      ecode++;      ecode++;
2559      break;      break;
# Line 2430  for (;;) Line 2562  for (;;)
2562      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2563        {        {
2564        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2565        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2566        }        }
2567      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2568      switch(c)      switch(c)
2569        {        {
2570        default: MRRETURN(MATCH_NOMATCH);        VSPACE_CASES: break;
2571        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;  
2572        }        }
2573      ecode++;      ecode++;
2574      break;      break;
# Line 2457  for (;;) Line 2582  for (;;)
2582      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2583        {        {
2584        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2585        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2586        }        }
2587      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2588        {        {
2589          const pcre_uint32 *cp;
2590        const ucd_record *prop = GET_UCD(c);        const ucd_record *prop = GET_UCD(c);
2591    
2592        switch(ecode[1])        switch(ecode[1])
2593          {          {
2594          case PT_ANY:          case PT_ANY:
2595          if (op == OP_NOTPROP) MRRETURN(MATCH_NOMATCH);          if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
2596          break;          break;
2597    
2598          case PT_LAMP:          case PT_LAMP:
2599          if ((prop->chartype == ucp_Lu ||          if ((prop->chartype == ucp_Lu ||
2600               prop->chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
2601               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
2602            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2603          break;          break;
2604    
2605          case PT_GC:          case PT_GC:
2606          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
2607            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2608          break;          break;
2609    
2610          case PT_PC:          case PT_PC:
2611          if ((ecode[2] != prop->chartype) == (op == OP_PROP))          if ((ecode[2] != prop->chartype) == (op == OP_PROP))
2612            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2613          break;          break;
2614    
2615          case PT_SC:          case PT_SC:
2616          if ((ecode[2] != prop->script) == (op == OP_PROP))          if ((ecode[2] != prop->script) == (op == OP_PROP))
2617            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2618          break;          break;
2619    
2620          /* These are specials */          /* These are specials */
2621    
2622          case PT_ALNUM:          case PT_ALNUM:
2623          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2624               _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))               PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2625            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2626          break;          break;
2627    
2628          case PT_SPACE:    /* Perl space */          case PT_SPACE:    /* Perl space */
2629          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2630               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2631                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2632            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2633          break;          break;
2634    
2635          case PT_PXSPACE:  /* POSIX space */          case PT_PXSPACE:  /* POSIX space */
2636          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2637               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2638               c == CHAR_FF || c == CHAR_CR)               c == CHAR_FF || c == CHAR_CR)
2639                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2640            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2641          break;          break;
2642    
2643          case PT_WORD:          case PT_WORD:
2644          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2645               _pcre_ucp_gentype[prop->chartype] == ucp_N ||               PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2646               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2647            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2648            break;
2649    
2650            case PT_CLIST:
2651            cp = PRIV(ucd_caseless_sets) + ecode[2];
2652            for (;;)
2653              {
2654              if (c < *cp)
2655                { if (op == OP_PROP) { RRETURN(MATCH_NOMATCH); } else break; }
2656              if (c == *cp++)
2657                { if (op == OP_PROP) break; else { RRETURN(MATCH_NOMATCH); } }
2658              }
2659            break;
2660    
2661            case PT_UCNC:
2662            if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
2663                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
2664                 c >= 0xe000) == (op == OP_NOTPROP))
2665              RRETURN(MATCH_NOMATCH);
2666          break;          break;
2667    
2668          /* This should never occur */          /* This should never occur */
# Line 2538  for (;;) Line 2682  for (;;)
2682      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2683        {        {
2684        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2685        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2686        }        }
2687      GETCHARINCTEST(c, eptr);      else
     if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);  
     while (eptr < md->end_subject)  
2688        {        {
2689        int len = 1;        int lgb, rgb;
2690        if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }        GETCHARINCTEST(c, eptr);
2691        if (UCD_CATEGORY(c) != ucp_M) break;        lgb = UCD_GRAPHBREAK(c);
2692        eptr += len;        while (eptr < md->end_subject)
2693            {
2694            int len = 1;
2695            if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2696            rgb = UCD_GRAPHBREAK(c);
2697            if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
2698            lgb = rgb;
2699            eptr += len;
2700            }
2701        }        }
2702        CHECK_PARTIAL();
2703      ecode++;      ecode++;
2704      break;      break;
2705  #endif  #endif  /* SUPPORT_UCP */
2706    
2707    
2708      /* 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 2566  for (;;) Line 2717  for (;;)
2717      case OP_REFI:      case OP_REFI:
2718      caseless = op == OP_REFI;      caseless = op == OP_REFI;
2719      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2720      ecode += 3;      ecode += 1 + IMM2_SIZE;
2721    
2722      /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2723    
# Line 2606  for (;;) Line 2757  for (;;)
2757        case OP_CRMINRANGE:        case OP_CRMINRANGE:
2758        minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2759        min = GET2(ecode, 1);        min = GET2(ecode, 1);
2760        max = GET2(ecode, 3);        max = GET2(ecode, 1 + IMM2_SIZE);
2761        if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2762        ecode += 5;        ecode += 1 + 2 * IMM2_SIZE;
2763        break;        break;
2764    
2765        default:               /* No repeat follows */        default:               /* No repeat follows */
2766        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2767          {          {
2768            if (length == -2) eptr = md->end_subject;   /* Partial match */
2769          CHECK_PARTIAL();          CHECK_PARTIAL();
2770          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2771          }          }
2772        eptr += length;        eptr += length;
2773        continue;              /* With the main loop */        continue;              /* With the main loop */
2774        }        }
2775    
2776      /* Handle repeated back references. If the length of the reference is      /* Handle repeated back references. If the length of the reference is
2777      zero, just continue with the main loop. */      zero, just continue with the main loop. If the length is negative, it
2778        means the reference is unset in non-Java-compatible mode. If the minimum is
2779        zero, we can continue at the same level without recursion. For any other
2780        minimum, carrying on will result in NOMATCH. */
2781    
2782      if (length == 0) continue;      if (length == 0) continue;
2783        if (length < 0 && min == 0) continue;
2784    
2785      /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2786      the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
# Line 2635  for (;;) Line 2791  for (;;)
2791        int slength;        int slength;
2792        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2793          {          {
2794            if (slength == -2) eptr = md->end_subject;   /* Partial match */
2795          CHECK_PARTIAL();          CHECK_PARTIAL();
2796          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2797          }          }
2798        eptr += slength;        eptr += slength;
2799        }        }
# Line 2655  for (;;) Line 2812  for (;;)
2812          int slength;          int slength;
2813          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2814          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2815          if (fi >= max) MRRETURN(MATCH_NOMATCH);          if (fi >= max) RRETURN(MATCH_NOMATCH);
2816          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2817            {            {
2818              if (slength == -2) eptr = md->end_subject;   /* Partial match */
2819            CHECK_PARTIAL();            CHECK_PARTIAL();
2820            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2821            }            }
2822          eptr += slength;          eptr += slength;
2823          }          }
# Line 2676  for (;;) Line 2834  for (;;)
2834          int slength;          int slength;
2835          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2836            {            {
2837            CHECK_PARTIAL();            /* Can't use CHECK_PARTIAL because we don't want to update eptr in
2838              the soft partial matching case. */
2839    
2840              if (slength == -2 && md->partial != 0 &&
2841                  md->end_subject > md->start_used_ptr)
2842                {
2843                md->hitend = TRUE;
2844                if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2845                }
2846            break;            break;
2847            }            }
2848          eptr += slength;          eptr += slength;
2849          }          }
2850    
2851        while (eptr >= pp)        while (eptr >= pp)
2852          {          {
2853          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2854          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2855          eptr -= length;          eptr -= length;
2856          }          }
2857        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2858        }        }
2859      /* Control never gets here */      /* Control never gets here */
2860    
# Line 2705  for (;;) Line 2872  for (;;)
2872      case OP_NCLASS:      case OP_NCLASS:
2873      case OP_CLASS:      case OP_CLASS:
2874        {        {
2875          /* The data variable is saved across frames, so the byte map needs to
2876          be stored there. */
2877    #define BYTE_MAP ((pcre_uint8 *)data)
2878        data = ecode + 1;                /* Save for matching */        data = ecode + 1;                /* Save for matching */
2879        ecode += 33;                     /* Advance past the item */        ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
2880    
2881        switch (*ecode)        switch (*ecode)
2882          {          {
# Line 2727  for (;;) Line 2897  for (;;)
2897          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2898          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2899          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2900          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2901          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2902          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2903          break;          break;
2904    
2905          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2739  for (;;) Line 2909  for (;;)
2909    
2910        /* First, ensure the minimum number of matches are present. */        /* First, ensure the minimum number of matches are present. */
2911    
2912  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2913        /* UTF-8 mode */        if (utf)
       if (utf8)  
2914          {          {
2915          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2916            {            {
2917            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2918              {              {
2919              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2920              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2921              }              }
2922            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
2923            if (c > 255)            if (c > 255)
2924              {              {
2925              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2926              }              }
2927            else            else
2928              {              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
             if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
             }  
2929            }            }
2930          }          }
2931        else        else
2932  #endif  #endif
2933        /* Not UTF-8 mode */        /* Not UTF mode */
2934          {          {
2935          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2936            {            {
2937            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2938              {              {
2939              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2940              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2941              }              }
2942            c = *eptr++;            c = *eptr++;
2943            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2944              if (c > 255)
2945                {
2946                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2947                }
2948              else
2949    #endif
2950                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2951            }            }
2952          }          }
2953    
# Line 2787  for (;;) Line 2961  for (;;)
2961    
2962        if (minimize)        if (minimize)
2963          {          {
2964  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2965          /* UTF-8 mode */          if (utf)
         if (utf8)  
2966            {            {
2967            for (fi = min;; fi++)            for (fi = min;; fi++)
2968              {              {
2969              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2970              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2971              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2972              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2973                {                {
2974                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2975                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2976                }                }
2977              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
2978              if (c > 255)              if (c > 255)
2979                {                {
2980                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2981                }                }
2982              else              else
2983                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
               if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
               }  
2984              }              }
2985            }            }
2986          else          else
2987  #endif  #endif
2988          /* Not UTF-8 mode */          /* Not UTF mode */
2989            {            {
2990            for (fi = min;; fi++)            for (fi = min;; fi++)
2991              {              {
2992              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2993              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2994              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2995              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2996                {                {
2997                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2998                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2999                }                }
3000              c = *eptr++;              c = *eptr++;
3001              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
3002                if (c > 255)
3003                  {
3004                  if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
3005                  }
3006                else
3007    #endif
3008                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
3009              }              }
3010            }            }
3011          /* Control never gets here */          /* Control never gets here */
# Line 2839  for (;;) Line 3017  for (;;)
3017          {          {
3018          pp = eptr;          pp = eptr;
3019    
3020  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3021          /* UTF-8 mode */          if (utf)
         if (utf8)  
3022            {            {
3023            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3024              {              {
# Line 2857  for (;;) Line 3034  for (;;)
3034                if (op == OP_CLASS) break;                if (op == OP_CLASS) break;
3035                }                }
3036              else              else
3037                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
               if ((data[c/8] & (1 << (c&7))) == 0) break;  
               }  
3038              eptr += len;              eptr += len;
3039              }              }
3040            for (;;)            for (;;)
# Line 2872  for (;;) Line 3047  for (;;)
3047            }            }
3048          else          else
3049  #endif  #endif
3050            /* Not UTF-8 mode */            /* Not UTF mode */
3051            {            {
3052            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3053              {              {
# Line 2882  for (;;) Line 3057  for (;;)
3057                break;                break;
3058                }                }
3059              c = *eptr;              c = *eptr;
3060              if ((data[c/8] & (1 << (c&7))) == 0) break;  #ifndef COMPILE_PCRE8
3061                if (c > 255)
3062                  {
3063                  if (op == OP_CLASS) break;
3064                  }
3065                else
3066    #endif
3067                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
3068              eptr++;              eptr++;
3069              }              }
3070            while (eptr >= pp)            while (eptr >= pp)
# Line 2893  for (;;) Line 3075  for (;;)
3075              }              }
3076            }            }
3077    
3078          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3079          }          }
3080    #undef BYTE_MAP
3081        }        }
3082      /* Control never gets here */      /* Control never gets here */
3083    
# Line 2903  for (;;) Line 3086  for (;;)
3086      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
3087      mode, because Unicode properties are supported in non-UTF-8 mode. */      mode, because Unicode properties are supported in non-UTF-8 mode. */
3088    
3089  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3090      case OP_XCLASS:      case OP_XCLASS:
3091        {        {
3092        data = ecode + 1 + LINK_SIZE;                /* Save for matching */        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
# Line 2928  for (;;) Line 3111  for (;;)
3111          case OP_CRMINRANGE:          case OP_CRMINRANGE:
3112          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
3113          min = GET2(ecode, 1);          min = GET2(ecode, 1);
3114          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
3115          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
3116          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
3117          break;          break;
3118    
3119          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2945  for (;;) Line 3128  for (;;)
3128          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3129            {            {
3130            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3131            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3132            }            }
3133          GETCHARINCTEST(c, eptr);          GETCHARINCTEST(c, eptr);
3134          if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);          if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3135          }          }
3136    
3137        /* 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 2965  for (;;) Line 3148  for (;;)
3148            {            {
3149            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
3150            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3151            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3152            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3153              {              {
3154              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3155              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3156              }              }
3157            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3158            if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);            if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3159            }            }
3160          /* Control never gets here */          /* Control never gets here */
3161          }          }
# Line 2990  for (;;) Line 3173  for (;;)
3173              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3174              break;              break;
3175              }              }
3176    #ifdef SUPPORT_UTF
3177            GETCHARLENTEST(c, eptr, len);            GETCHARLENTEST(c, eptr, len);
3178            if (!_pcre_xclass(c, data)) break;  #else
3179              c = *eptr;
3180    #endif
3181              if (!PRIV(xclass)(c, data, utf)) break;
3182            eptr += len;            eptr += len;
3183            }            }
3184          for(;;)          for(;;)
# Line 2999  for (;;) Line 3186  for (;;)
3186            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
3187            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3188            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3189            if (utf8) BACKCHAR(eptr);  #ifdef SUPPORT_UTF
3190              if (utf) BACKCHAR(eptr);
3191    #endif
3192            }            }
3193          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3194          }          }
3195    
3196        /* Control never gets here */        /* Control never gets here */
# Line 3011  for (;;) Line 3200  for (;;)
3200      /* Match a single character, casefully */      /* Match a single character, casefully */
3201    
3202      case OP_CHAR:      case OP_CHAR:
3203  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3204      if (utf8)      if (utf)
3205        {        {
3206        length = 1;        length = 1;
3207        ecode++;        ecode++;
# Line 3020  for (;;) Line 3209  for (;;)
3209        if (length > md->end_subject - eptr)        if (length > md->end_subject - eptr)
3210          {          {
3211          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
3212          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3213          }          }
3214        while (length-- > 0) if (*ecode++ != *eptr++) MRRETURN(MATCH_NOMATCH);        while (length-- > 0) if (*ecode++ != RAWUCHARINC(eptr)) RRETURN(MATCH_NOMATCH);
3215        }        }
3216      else      else
3217  #endif  #endif
3218        /* Not UTF mode */
     /* Non-UTF-8 mode */  
3219        {        {
3220        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
3221          {          {
3222          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
3223          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3224          }          }
3225        if (ecode[1] != *eptr++) MRRETURN(MATCH_NOMATCH);        if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
3226        ecode += 2;        ecode += 2;
3227        }        }
3228      break;      break;
3229    
3230      /* Match a single character, caselessly */      /* Match a single character, caselessly. If we are at the end of the
3231        subject, give up immediately. */
3232    
3233      case OP_CHARI:      case OP_CHARI:
3234  #ifdef SUPPORT_UTF8      if (eptr >= md->end_subject)
3235      if (utf8)        {
3236          SCHECK_PARTIAL();
3237          RRETURN(MATCH_NOMATCH);
3238          }
3239    
3240    #ifdef SUPPORT_UTF
3241        if (utf)
3242        {        {
3243        length = 1;        length = 1;
3244        ecode++;        ecode++;
3245        GETCHARLEN(fc, ecode, length);        GETCHARLEN(fc, ecode, length);
3246    
       if (length > md->end_subject - eptr)  
         {  
         CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */  
         MRRETURN(MATCH_NOMATCH);  
         }  
   
3247        /* 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
3248        can use the fast lookup table. */        we know that its other case must also be one byte long, so we can use the
3249          fast lookup table. We know that there is at least one byte left in the
3250          subject. */
3251    
3252        if (fc < 128)        if (fc < 128)
3253          {          {
3254          if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          pcre_uint32 cc = RAWUCHAR(eptr);
3255            if (md->lcc[fc] != TABLE_GET(cc, md->lcc, cc)) RRETURN(MATCH_NOMATCH);
3256            ecode++;
3257            eptr++;
3258          }          }
3259    
3260        /* Otherwise we must pick up the subject character */        /* Otherwise we must pick up the subject character. Note that we cannot
3261          use the value of "length" to check for sufficient bytes left, because the
3262          other case of the character may have more or fewer bytes.  */
3263    
3264        else        else
3265          {          {
3266          unsigned int dc;          pcre_uint32 dc;
3267          GETCHARINC(dc, eptr);          GETCHARINC(dc, eptr);
3268          ecode += length;          ecode += length;
3269    
# Line 3079  for (;;) Line 3275  for (;;)
3275  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3276            if (dc != UCD_OTHERCASE(fc))            if (dc != UCD_OTHERCASE(fc))
3277  #endif  #endif
3278              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3279            }            }
3280          }          }
3281        }        }
3282      else      else
3283  #endif   /* SUPPORT_UTF8 */  #endif   /* SUPPORT_UTF */
3284    
3285      /* Non-UTF-8 mode */      /* Not UTF mode */
3286        {        {
3287        if (md->end_subject - eptr < 1)        if (TABLE_GET(ecode[1], md->lcc, ecode[1])
3288          {            != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3289          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */        eptr++;
         MRRETURN(MATCH_NOMATCH);  
         }  
       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);  
3290        ecode += 2;        ecode += 2;
3291        }        }
3292      break;      break;
# Line 3103  for (;;) Line 3296  for (;;)
3296      case OP_EXACT:      case OP_EXACT:
3297      case OP_EXACTI:      case OP_EXACTI:
3298      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3299      ecode += 3;      ecode += 1 + IMM2_SIZE;
3300      goto REPEATCHAR;      goto REPEATCHAR;
3301    
3302      case OP_POSUPTO:      case OP_POSUPTO:
# Line 3118  for (;;) Line 3311  for (;;)
3311      min = 0;      min = 0;
3312      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3313      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
3314      ecode += 3;      ecode += 1 + IMM2_SIZE;
3315      goto REPEATCHAR;      goto REPEATCHAR;
3316    
3317      case OP_POSSTAR:      case OP_POSSTAR:
# Line 3166  for (;;) Line 3359  for (;;)
3359      /* Common code for all repeated single-character matches. */      /* Common code for all repeated single-character matches. */
3360    
3361      REPEATCHAR:      REPEATCHAR:
3362  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3363      if (utf8)      if (utf)
3364        {        {
3365        length = 1;        length = 1;
3366        charptr = ecode;        charptr = ecode;
# Line 3180  for (;;) Line 3373  for (;;)
3373        if (length > 1)        if (length > 1)
3374          {          {
3375  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3376          unsigned int othercase;          pcre_uint32 othercase;
3377          if (op >= OP_STARI &&     /* Caseless */          if (op >= OP_STARI &&     /* Caseless */
3378              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3379            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = PRIV(ord2utf)(othercase, occhars);
3380          else oclength = 0;          else oclength = 0;
3381  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3382    
3383          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3384            {            {
3385            if (eptr <= md->end_subject - length &&            if (eptr <= md->end_subject - length &&
3386              memcmp(eptr, charptr, length) == 0) eptr += length;              memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3387  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3388            else if (oclength > 0 &&            else if (oclength > 0 &&
3389                     eptr <= md->end_subject - oclength &&                     eptr <= md->end_subject - oclength &&
3390                     memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3391  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3392            else            else
3393              {              {
3394              CHECK_PARTIAL();              CHECK_PARTIAL();
3395              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3396              }              }
3397            }            }
3398    
# Line 3211  for (;;) Line 3404  for (;;)
3404              {              {
3405              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3406              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3407              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3408              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3409                memcmp(eptr, charptr, length) == 0) eptr += length;                memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3410  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3411              else if (oclength > 0 &&              else if (oclength > 0 &&
3412                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3413                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3414  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3415              else              else
3416                {                {
3417                CHECK_PARTIAL();                CHECK_PARTIAL();
3418                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3419                }                }
3420              }              }
3421            /* Control never gets here */            /* Control never gets here */
# Line 3234  for (;;) Line 3427  for (;;)
3427            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3428              {              {
3429              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3430                  memcmp(eptr, charptr, length) == 0) eptr += length;                  memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3431  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3432              else if (oclength > 0 &&              else if (oclength > 0 &&
3433                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3434                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3435  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3436              else              else
3437                {                {
# Line 3253  for (;;) Line 3446  for (;;)
3446              {              {
3447              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3448              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3449              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }              if (eptr == pp) { RRETURN(MATCH_NOMATCH); }
3450  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3451              eptr--;              eptr--;
3452              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3270  for (;;) Line 3463  for (;;)
3463        value of fc will always be < 128. */        value of fc will always be < 128. */
3464        }        }
3465      else      else
3466  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3467          /* When not in UTF-8 mode, load a single-byte character. */
3468          fc = *ecode++;
3469    
3470      /* When not in UTF-8 mode, load a single-byte character. */      /* The value of fc at this point is always one character, though we may
3471        or may not be in UTF mode. The code is duplicated for the caseless and
     fc = *ecode++;  
   
     /* 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  
3472      caseful cases, for speed, since matching characters is likely to be quite      caseful cases, for speed, since matching characters is likely to be quite
3473      common. First, ensure the minimum number of matches are present. If min =      common. First, ensure the minimum number of matches are present. If min =
3474      max, continue at the same level without recursing. Otherwise, if      max, continue at the same level without recursing. Otherwise, if
# Line 3286  for (;;) Line 3477  for (;;)
3477      maximizing, find the maximum number of characters and work backwards. */      maximizing, find the maximum number of characters and work backwards. */
3478    
3479      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3480        max, eptr));        max, (char *)eptr));
3481    
3482      if (op >= OP_STARI)  /* Caseless */      if (op >= OP_STARI)  /* Caseless */
3483        {        {
3484        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3485          /* fc must be < 128 if UTF is enabled. */
3486          foc = md->fcc[fc];
3487    #else
3488    #ifdef SUPPORT_UTF
3489    #ifdef SUPPORT_UCP
3490          if (utf && fc > 127)
3491            foc = UCD_OTHERCASE(fc);
3492    #else
3493          if (utf && fc > 127)
3494            foc = fc;
3495    #endif /* SUPPORT_UCP */
3496          else
3497    #endif /* SUPPORT_UTF */
3498            foc = TABLE_GET(fc, md->fcc, fc);
3499    #endif /* COMPILE_PCRE8 */
3500    
3501        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3502          {          {
3503            pcre_uint32 cc;                 /* Faster than pcre_uchar */
3504          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3505            {            {
3506            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3507            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3508            }            }
3509          if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          cc = RAWUCHARTEST(eptr);
3510            if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
3511            eptr++;
3512          }          }
3513        if (min == max) continue;        if (min == max) continue;
3514        if (minimize)        if (minimize)
3515          {          {
3516          for (fi = min;; fi++)          for (fi = min;; fi++)
3517            {            {
3518              pcre_uint32 cc;               /* Faster than pcre_uchar */
3519            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3520            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3521            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3522            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3523              {              {
3524              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3525              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3526              }              }
3527            if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            cc = RAWUCHARTEST(eptr);
3528              if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
3529              eptr++;
3530            }            }
3531          /* Control never gets here */          /* Control never gets here */
3532          }          }
# Line 3322  for (;;) Line 3535  for (;;)
3535          pp = eptr;          pp = eptr;
3536          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3537            {            {
3538              pcre_uint32 cc;               /* Faster than pcre_uchar */
3539            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3540              {              {
3541              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3542              break;              break;
3543              }              }
3544            if (fc != md->lcc[*eptr]) break;            cc = RAWUCHARTEST(eptr);
3545              if (fc != cc && foc != cc) break;
3546            eptr++;            eptr++;
3547            }            }
3548    
# Line 3339  for (;;) Line 3554  for (;;)
3554            eptr--;            eptr--;
3555            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3556            }            }
3557          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3558          }          }
3559        /* Control never gets here */        /* Control never gets here */
3560        }        }
# Line 3353  for (;;) Line 3568  for (;;)
3568          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3569            {            {
3570            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3571            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3572            }            }
3573          if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);          if (fc != RAWUCHARINCTEST(eptr)) RRETURN(MATCH_NOMATCH);
3574          }          }
3575    
3576        if (min == max) continue;        if (min == max) continue;
# Line 3366  for (;;) Line 3581  for (;;)
3581            {            {
3582            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3583            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3584            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3585            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3586              {              {
3587              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3588              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3589              }              }
3590            if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc != RAWUCHARINCTEST(eptr)) RRETURN(MATCH_NOMATCH);
3591            }            }
3592          /* Control never gets here */          /* Control never gets here */
3593          }          }
# Line 3386  for (;;) Line 3601  for (;;)
3601              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3602              break;              break;
3603              }              }
3604            if (fc != *eptr) break;            if (fc != RAWUCHARTEST(eptr)) break;
3605            eptr++;            eptr++;
3606            }            }
3607          if (possessive) continue;          if (possessive) continue;
# Line 3397  for (;;) Line 3612  for (;;)
3612            eptr--;            eptr--;
3613            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3614            }            }
3615          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3616          }          }
3617        }        }
3618      /* Control never gets here */      /* Control never gets here */
# Line 3410  for (;;) Line 3625  for (;;)
3625      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3626        {        {
3627        SCHECK_PARTIAL();        SCHECK_PARTIAL();
3628        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
3629        }        }
3630      ecode++;  #ifdef SUPPORT_UTF
3631      GETCHARINCTEST(c, eptr);      if (utf)
     if (op == OP_NOTI)         /* The caseless case */  
3632        {        {
3633  #ifdef SUPPORT_UTF8        register pcre_uint32 ch, och;
3634        if (c < 256)  
3635  #endif        ecode++;
3636        c = md->lcc[c];        GETCHARINC(ch, ecode);
3637        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);        GETCHARINC(c, eptr);
3638    
3639          if (op == OP_NOT)
3640            {
3641            if (ch == c) RRETURN(MATCH_NOMATCH);
3642            }
3643          else
3644            {
3645    #ifdef SUPPORT_UCP
3646            if (ch > 127)
3647              och = UCD_OTHERCASE(ch);
3648    #else
3649            if (ch > 127)
3650              och = ch;
3651    #endif /* SUPPORT_UCP */
3652            else
3653              och = TABLE_GET(ch, md->fcc, ch);
3654            if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
3655            }
3656        }        }
3657      else    /* Caseful */      else
3658    #endif
3659        {        {
3660        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);        register pcre_uint32 ch = ecode[1];
3661          c = *eptr++;
3662          if (ch == c || (op == OP_NOTI && TABLE_GET(ch, md->fcc, ch) == c))
3663            RRETURN(MATCH_NOMATCH);
3664          ecode += 2;
3665        }        }
3666      break;      break;
3667    
# Line 3438  for (;;) Line 3675  for (;;)
3675      case OP_NOTEXACT:      case OP_NOTEXACT:
3676      case OP_NOTEXACTI:      case OP_NOTEXACTI:
3677      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3678      ecode += 3;      ecode += 1 + IMM2_SIZE;
3679      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3680    
3681      case OP_NOTUPTO:      case OP_NOTUPTO:
# Line 3448  for (;;) Line 3685  for (;;)
3685      min = 0;      min = 0;
3686      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3687      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3688      ecode += 3;      ecode += 1 + IMM2_SIZE;
3689      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3690    
3691      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
# Line 3480  for (;;) Line 3717  for (;;)
3717      possessive = TRUE;      possessive = TRUE;
3718      min = 0;      min = 0;
3719      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3720      ecode += 3;      ecode += 1 + IMM2_SIZE;
3721      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3722    
3723      case OP_NOTSTAR:      case OP_NOTSTAR:
# Line 3504  for (;;) Line 3741  for (;;)
3741      /* Common code for all repeated single-byte matches. */      /* Common code for all repeated single-byte matches. */
3742    
3743      REPEATNOTCHAR:      REPEATNOTCHAR:
3744      fc = *ecode++;      GETCHARINCTEST(fc, ecode);
3745    
3746      /* The code is duplicated for the caseless and caseful cases, for speed,      /* The code is duplicated for the caseless and caseful cases, for speed,
3747      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 3515  for (;;) Line 3752  for (;;)
3752      characters and work backwards. */      characters and work backwards. */
3753    
3754      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,
3755        max, eptr));        max, (char *)eptr));
3756    
3757      if (op >= OP_NOTSTARI)     /* Caseless */      if (op >= OP_NOTSTARI)     /* Caseless */
3758        {        {
3759        fc = md->lcc[fc];  #ifdef SUPPORT_UTF
3760    #ifdef SUPPORT_UCP
3761          if (utf && fc > 127)
3762            foc = UCD_OTHERCASE(fc);
3763    #else
3764          if (utf && fc > 127)
3765            foc = fc;
3766    #endif /* SUPPORT_UCP */
3767          else
3768    #endif /* SUPPORT_UTF */
3769            foc = TABLE_GET(fc, md->fcc, fc);
3770    
3771  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3772        /* UTF-8 mode */        if (utf)
       if (utf8)  
3773          {          {
3774          register unsigned int d;          register pcre_uint32 d;
3775          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3776            {            {
3777            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3778              {              {
3779              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3780              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3781              }              }
3782            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3783            if (d < 256) d = md->lcc[d];            if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
           if (fc == d) MRRETURN(MATCH_NOMATCH);  
3784            }            }
3785          }          }
3786        else        else
3787  #endif  #endif
3788          /* Not UTF mode */
       /* Not UTF-8 mode */  
3789          {          {
3790          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3791            {            {
3792            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3793              {              {
3794              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3795              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3796              }              }
3797            if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3798              eptr++;
3799            }            }
3800          }          }
3801    
# Line 3558  for (;;) Line 3803  for (;;)
3803    
3804        if (minimize)        if (minimize)
3805          {          {
3806  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3807          /* UTF-8 mode */          if (utf)
         if (utf8)  
3808            {            {
3809            register unsigned int d;            register pcre_uint32 d;
3810            for (fi = min;; fi++)            for (fi = min;; fi++)
3811              {              {
3812              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3813              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3814              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3815              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3816                {                {
3817                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3818                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3819                }                }
3820              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3821              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
             if (fc == d) MRRETURN(MATCH_NOMATCH);  
3822              }              }
3823            }            }
3824          else          else
3825  #endif  #endif
3826          /* Not UTF-8 mode */          /* Not UTF mode */
3827            {            {
3828            for (fi = min;; fi++)            for (fi = min;; fi++)
3829              {              {
3830              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3831              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3832              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3833              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3834                {                {
3835                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3836                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3837                }                }
3838              if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3839                eptr++;
3840              }              }
3841            }            }
3842          /* Control never gets here */          /* Control never gets here */
# Line 3604  for (;;) Line 3848  for (;;)
3848          {          {
3849          pp = eptr;          pp = eptr;
3850    
3851  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3852          /* UTF-8 mode */          if (utf)
         if (utf8)  
3853            {            {
3854            register unsigned int d;            register pcre_uint32 d;
3855            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3856              {              {
3857              int len = 1;              int len = 1;
# Line 3618  for (;;) Line 3861  for (;;)
3861                break;                break;
3862                }                }
3863              GETCHARLEN(d, eptr, len);              GETCHARLEN(d, eptr, len);
3864              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) break;
             if (fc == d) break;  
3865              eptr += len;              eptr += len;
3866              }              }
3867          if (possessive) continue;            if (possessive) continue;
3868          for(;;)            for(;;)
3869              {              {
3870              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3871              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
# Line 3633  for (;;) Line 3875  for (;;)
3875            }            }
3876          else          else
3877  #endif  #endif
3878          /* Not UTF-8 mode */          /* Not UTF mode */
3879            {            {
3880            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3881              {              {
# Line 3642  for (;;) Line 3884  for (;;)
3884                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3885                break;                break;
3886                }                }
3887              if (fc == md->lcc[*eptr]) break;              if (fc == *eptr || foc == *eptr) break;
3888              eptr++;              eptr++;
3889              }              }
3890            if (possessive) continue;            if (possessive) continue;
# Line 3654  for (;;) Line 3896  for (;;)
3896              }              }
3897            }            }
3898    
3899          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3900          }          }
3901        /* Control never gets here */        /* Control never gets here */
3902        }        }
# Line 3663  for (;;) Line 3905  for (;;)
3905    
3906      else      else
3907        {        {
3908  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3909        /* UTF-8 mode */        if (utf)
       if (utf8)  
3910          {          {
3911          register unsigned int d;          register pcre_uint32 d;
3912          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3913            {            {
3914            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3915              {              {
3916              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3917              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3918              }              }
3919            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3920            if (fc == d) MRRETURN(MATCH_NOMATCH);            if (fc == d) RRETURN(MATCH_NOMATCH);
3921            }            }
3922          }          }
3923        else        else
3924  #endif  #endif
3925        /* Not UTF-8 mode */        /* Not UTF mode */
3926          {          {
3927          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3928            {            {
3929            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3930              {              {
3931              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3932              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3933              }              }
3934            if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3935            }            }
3936          }          }
3937    
# Line 3698  for (;;) Line 3939  for (;;)
3939    
3940        if (minimize)        if (minimize)
3941          {          {
3942  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3943          /* UTF-8 mode */          if (utf)
         if (utf8)  
3944            {            {
3945            register unsigned int d;            register pcre_uint32 d;
3946            for (fi = min;; fi++)            for (fi = min;; fi++)
3947              {              {
3948              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3949              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3950              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3951              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3952                {                {
3953                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3954                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3955                }                }
3956              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3957              if (fc == d) MRRETURN(MATCH_NOMATCH);              if (fc == d) RRETURN(MATCH_NOMATCH);
3958              }              }
3959            }            }
3960          else          else
3961  #endif  #endif
3962          /* Not UTF-8 mode */          /* Not UTF mode */
3963            {            {
3964            for (fi = min;; fi++)            for (fi = min;; fi++)
3965              {              {
3966              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3967              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3968              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3969              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3970                {                {
3971                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3972                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3973                }                }
3974              if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3975              }              }
3976            }            }
3977          /* Control never gets here */          /* Control never gets here */
# Line 3743  for (;;) Line 3983  for (;;)
3983          {          {
3984          pp = eptr;          pp = eptr;
3985    
3986  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3987          /* UTF-8 mode */          if (utf)
         if (utf8)  
3988            {            {
3989            register unsigned int d;            register pcre_uint32 d;
3990            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3991              {              {
3992              int len = 1;              int len = 1;
# Line 3771  for (;;) Line 4010  for (;;)
4010            }            }
4011          else          else
4012  #endif  #endif
4013          /* Not UTF-8 mode */          /* Not UTF mode */
4014            {            {
4015            for (i = min; i < max; i++)            for (i = min; i < max; i++)
4016              {              {
# Line 3792  for (;;) Line 4031  for (;;)
4031              }              }
4032            }            }
4033    
4034          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
4035          }          }
4036        }        }
4037      /* Control never gets here */      /* Control never gets here */
# Line 3804  for (;;) Line 4043  for (;;)
4043      case OP_TYPEEXACT:      case OP_TYPEEXACT:
4044      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
4045      minimize = TRUE;      minimize = TRUE;
4046      ecode += 3;      ecode += 1 + IMM2_SIZE;
4047      goto REPEATTYPE;      goto REPEATTYPE;
4048    
4049      case OP_TYPEUPTO:      case OP_TYPEUPTO:
# Line 3812  for (;;) Line 4051  for (;;)
4051      min = 0;      min = 0;
4052      max = GET2(ecode, 1);      max = GET2(ecode, 1);
4053      minimize = *ecode == OP_TYPEMINUPTO;      minimize = *ecode == OP_TYPEMINUPTO;
4054      ecode += 3;      ecode += 1 + IMM2_SIZE;
4055      goto REPEATTYPE;      goto REPEATTYPE;
4056    
4057      case OP_TYPEPOSSTAR:      case OP_TYPEPOSSTAR:
# Line 3840  for (;;) Line 4079  for (;;)
4079      possessive = TRUE;      possessive = TRUE;
4080      min = 0;      min = 0;
4081      max = GET2(ecode, 1);      max = GET2(ecode, 1);
4082      ecode += 3;      ecode += 1 + IMM2_SIZE;
4083      goto REPEATTYPE;      goto REPEATTYPE;
4084    
4085      case OP_TYPESTAR:      case OP_TYPESTAR:
# Line 3886  for (;;) Line 4125  for (;;)
4125          switch(prop_type)          switch(prop_type)
4126            {            {
4127            case PT_ANY:            case PT_ANY:
4128            if (prop_fail_result) MRRETURN(MATCH_NOMATCH);            if (prop_fail_result) RRETURN(MATCH_NOMATCH);
4129            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
4130              {              {
4131              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4132                {                {
4133                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4134                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4135                }                }
4136              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4137              }              }
# Line 3905  for (;;) Line 4144  for (;;)
4144              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4145                {                {
4146                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4147                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4148                }                }
4149              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4150              chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
4151              if ((chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
4152                   chartype == ucp_Ll ||                   chartype == ucp_Ll ||
4153                   chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
4154                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4155              }              }
4156            break;            break;
4157    
# Line 3922  for (;;) Line 4161  for (;;)
4161              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4162                {                {
4163                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4164                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4165                }                }
4166              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4167              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
4168                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4169              }              }
4170            break;            break;
4171    
# Line 3936  for (;;) Line 4175  for (;;)
4175              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4176                {                {
4177                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4178                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4179                }                }
4180              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4181              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
4182                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4183              }              }
4184            break;            break;
4185    
# Line 3950  for (;;) Line 4189  for (;;)
4189              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4190                {                {
4191                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4192                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4193                }                }
4194              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4195              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
4196                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4197              }              }
4198            break;            break;
4199    
# Line 3965  for (;;) Line 4204  for (;;)
4204              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4205                {                {
4206                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4207                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4208                }                }
4209              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4210              category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4211              if ((category == ucp_L || category == ucp_N) == prop_fail_result)              if ((category == ucp_L || category == ucp_N) == prop_fail_result)
4212                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4213              }              }
4214            break;            break;
4215    
# Line 3980  for (;;) Line 4219  for (;;)
4219              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4220                {                {
4221                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4222                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4223                }                }
4224              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4225              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
4226                   c == CHAR_FF || c == CHAR_CR)                   c == CHAR_FF || c == CHAR_CR)
4227                     == prop_fail_result)                     == prop_fail_result)
4228                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4229              }              }
4230            break;            break;
4231    
# Line 3996  for (;;) Line 4235  for (;;)
4235              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4236                {                {
4237                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4238                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4239                }                }
4240              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4241              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
4242                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
4243                     == prop_fail_result)                     == prop_fail_result)
4244                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4245              }              }
4246            break;            break;
4247    
# Line 4013  for (;;) Line 4252  for (;;)
4252              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4253                {                {
4254                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4255                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4256                }                }
4257              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4258              category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4259              if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)              if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)
4260                     == prop_fail_result)                     == prop_fail_result)
4261                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4262                }
4263              break;
4264    
4265              case PT_CLIST:
4266              for (i = 1; i <= min; i++)
4267                {
4268                const pcre_uint32 *cp;
4269                if (eptr >= md->end_subject)
4270                  {
4271                  SCHECK_PARTIAL();
4272                  RRETURN(MATCH_NOMATCH);
4273                  }
4274                GETCHARINCTEST(c, eptr);
4275                cp = PRIV(ucd_caseless_sets) + prop_value;
4276                for (;;)
4277                  {
4278                  if (c < *cp)
4279                    { if (prop_fail_result) break; else { RRETURN(MATCH_NOMATCH); } }
4280                  if (c == *cp++)
4281                    { if (prop_fail_result) { RRETURN(MATCH_NOMATCH); } else break; }
4282                  }
4283                }
4284              break;
4285    
4286              case PT_UCNC:
4287              for (i = 1; i <= min; i++)
4288                {
4289                if (eptr >= md->end_subject)
4290                  {
4291                  SCHECK_PARTIAL();
4292                  RRETURN(MATCH_NOMATCH);
4293                  }
4294                GETCHARINCTEST(c, eptr);
4295                if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
4296                     c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
4297                     c >= 0xe000) == prop_fail_result)
4298                  RRETURN(MATCH_NOMATCH);
4299              }              }
4300            break;            break;
4301    
# Line 4040  for (;;) Line 4316  for (;;)
4316            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4317              {              {
4318              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4319              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4320              }              }
4321            GETCHARINCTEST(c, eptr);            else
           if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);  
           while (eptr < md->end_subject)  
4322              {              {
4323              int len = 1;              int lgb, rgb;
4324              if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }              GETCHARINCTEST(c, eptr);
4325              if (UCD_CATEGORY(c) != ucp_M) break;              lgb = UCD_GRAPHBREAK(c);
4326              eptr += len;             while (eptr < md->end_subject)
4327                  {
4328                  int len = 1;
4329                  if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
4330                  rgb = UCD_GRAPHBREAK(c);
4331                  if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
4332                  lgb = rgb;
4333                  eptr += len;
4334                  }
4335              }              }
4336              CHECK_PARTIAL();
4337            }            }
4338          }          }
4339    
# Line 4059  for (;;) Line 4342  for (;;)
4342    
4343  /* Handle all other cases when the coding is UTF-8 */  /* Handle all other cases when the coding is UTF-8 */
4344    
4345  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4346        if (utf8) switch(ctype)        if (utf) switch(ctype)
4347          {          {
4348          case OP_ANY:          case OP_ANY:
4349          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 4068  for (;;) Line 4351  for (;;)
4351            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4352              {              {
4353              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4354              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4355                }
4356              if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
4357              if (md->partial != 0 &&
4358                  eptr + 1 >= md->end_subject &&
4359                  NLBLOCK->nltype == NLTYPE_FIXED &&
4360                  NLBLOCK->nllen == 2 &&
4361                  RAWUCHAR(eptr) == NLBLOCK->nl[0])
4362                {
4363                md->hitend = TRUE;
4364                if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
4365              }              }
           if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);  
4366            eptr++;            eptr++;
4367            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4368            }            }
4369          break;          break;
4370    
# Line 4082  for (;;) Line 4374  for (;;)
4374            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4375              {              {
4376              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4377              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4378              }              }
4379            eptr++;            eptr++;
4380            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4381            }            }
4382          break;          break;
4383    
4384          case OP_ANYBYTE:          case OP_ANYBYTE:
4385          if (eptr > md->end_subject - min) MRRETURN(MATCH_NOMATCH);          if (eptr > md->end_subject - min) RRETURN(MATCH_NOMATCH);
4386          eptr += min;          eptr += min;
4387          break;          break;
4388    
# Line 4100  for (;;) Line 4392  for (;;)
4392            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4393              {              {
4394              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4395              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4396              }              }
4397            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4398            switch(c)            switch(c)
4399              {              {
4400              default: MRRETURN(MATCH_NOMATCH);              default: RRETURN(MATCH_NOMATCH);
4401    
4402              case 0x000d:              case CHAR_CR:
4403              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && RAWUCHAR(eptr) == CHAR_LF) eptr++;
4404              break;              break;
4405    
4406              case 0x000a:              case CHAR_LF:
4407              break;              break;
4408    
4409              case 0x000b:              case CHAR_VT:
4410              case 0x000c:              case CHAR_FF:
4411              case 0x0085:              case CHAR_NEL:
4412    #ifndef EBCDIC
4413              case 0x2028:              case 0x2028:
4414              case 0x2029:              case 0x2029:
4415              if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);  #endif  /* Not EBCDIC */
4416                if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
4417              break;              break;
4418              }              }
4419            }            }
# Line 4131  for (;;) Line 4425  for (;;)
4425            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4426              {              {
4427              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4428              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4429              }              }
4430            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4431            switch(c)            switch(c)
4432              {              {
4433                HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
4434              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);  
4435              }              }
4436            }            }
4437          break;          break;
# Line 4167  for (;;) Line 4442  for (;;)
4442            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4443              {              {
4444              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4445              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4446              }              }
4447            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4448            switch(c)            switch(c)
4449              {              {
4450              default: MRRETURN(MATCH_NOMATCH);              HSPACE_CASES: break;  /* Byte and multibyte cases */
4451              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;  
4452              }              }
4453            }            }
4454          break;          break;
# Line 4203  for (;;) Line 4459  for (;;)
4459            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4460              {              {
4461              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4462              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4463              }              }
4464            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4465            switch(c)            switch(c)
4466              {              {
4467                VSPACE_CASES: RRETURN(MATCH_NOMATCH);
4468              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);  
4469              }              }
4470            }            }
4471          break;          break;
# Line 4227  for (;;) Line 4476  for (;;)
4476            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4477              {              {
4478              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4479              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4480              }              }
4481            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4482            switch(c)            switch(c)
4483              {              {
4484              default: MRRETURN(MATCH_NOMATCH);              VSPACE_CASES: break;
4485              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;  
4486              }              }
4487            }            }
4488          break;          break;
# Line 4251  for (;;) Line 4493  for (;;)
4493            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4494              {              {
4495              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4496              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4497              }              }
4498            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4499            if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)            if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)
4500              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4501            }            }
4502          break;          break;
4503    
4504          case OP_DIGIT:          case OP_DIGIT:
4505          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4506            {            {
4507              pcre_uint32 cc;
4508            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4509              {              {
4510              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4511              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4512              }              }
4513            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_digit) == 0)            cc = RAWUCHAR(eptr);
4514              MRRETURN(MATCH_NOMATCH);            if (cc >= 128 || (md->ctypes[cc] & ctype_digit) == 0)
4515                RRETURN(MATCH_NOMATCH);
4516              eptr++;
4517            /* No need to skip more bytes - we know it's a 1-byte character */            /* No need to skip more bytes - we know it's a 1-byte character */
4518            }            }
4519          break;          break;
# Line 4276  for (;;) Line 4521  for (;;)
4521          case OP_NOT_WHITESPACE:          case OP_NOT_WHITESPACE:
4522          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4523            {            {
4524              pcre_uint32 cc;
4525            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4526              {              {
4527              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4528              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4529              }              }
4530            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_space) != 0)            cc = RAWUCHAR(eptr);
4531              MRRETURN(MATCH_NOMATCH);            if (cc < 128 && (md->ctypes[cc] & ctype_space) != 0)
4532            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);              RRETURN(MATCH_NOMATCH);
4533              eptr++;
4534              ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4535            }            }
4536          break;          break;
4537    
4538          case OP_WHITESPACE:          case OP_WHITESPACE:
4539          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4540            {            {
4541              pcre_uint32 cc;
4542            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4543              {              {
4544              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4545              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4546              }              }
4547            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_space) == 0)            cc = RAWUCHAR(eptr);
4548              MRRETURN(MATCH_NOMATCH);            if (cc >= 128 || (md->ctypes[cc] & ctype_space) == 0)
4549                RRETURN(MATCH_NOMATCH);
4550              eptr++;
4551            /* No need to skip more bytes - we know it's a 1-byte character */            /* No need to skip more bytes - we know it's a 1-byte character */
4552            }            }
4553          break;          break;
# Line 4304  for (;;) Line 4555  for (;;)
4555          case OP_NOT_WORDCHAR:          case OP_NOT_WORDCHAR:
4556          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4557            {            {
4558              pcre_uint32 cc;
4559            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4560              {              {
4561              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4562              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4563              }              }
4564            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0)            cc = RAWUCHAR(eptr);
4565              MRRETURN(MATCH_NOMATCH);            if (cc < 128 && (md->ctypes[cc] & ctype_word) != 0)
4566            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);              RRETURN(MATCH_NOMATCH);
4567              eptr++;
4568              ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4569            }            }
4570          break;          break;
4571    
4572          case OP_WORDCHAR:          case OP_WORDCHAR:
4573          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4574            {            {
4575              pcre_uint32 cc;
4576            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4577              {              {
4578              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4579              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4580              }              }
4581            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_word) == 0)            cc = RAWUCHAR(eptr);
4582              MRRETURN(MATCH_NOMATCH);            if (cc >= 128 || (md->ctypes[cc] & ctype_word) == 0)
4583                RRETURN(MATCH_NOMATCH);
4584              eptr++;
4585            /* No need to skip more bytes - we know it's a 1-byte character */            /* No need to skip more bytes - we know it's a 1-byte character */
4586            }            }
4587          break;          break;
# Line 4334  for (;;) Line 4591  for (;;)
4591          }  /* End switch(ctype) */          }  /* End switch(ctype) */
4592    
4593        else        else
4594  #endif     /* SUPPORT_UTF8 */  #endif     /* SUPPORT_UTF */
4595    
4596        /* Code for the non-UTF-8 case for minimum matching of operators other        /* Code for the non-UTF-8 case for minimum matching of operators other
4597        than OP_PROP and OP_NOTPROP. */        than OP_PROP and OP_NOTPROP. */
# Line 4347  for (;;) Line 4604  for (;;)
4604            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4605              {              {
4606              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4607              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4608                }
4609              if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
4610              if (md->partial != 0 &&
4611                  eptr + 1 >= md->end_subject &&
4612