/[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 835 by ph10, Wed Dec 28 16:10:09 2011 UTC revision 1320 by ph10, Wed May 1 16:39:35 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);
       RRETURN(rrc);  
831    
832      /* Pass back the current skip name by overloading md->start_match_ptr and      /* Pass back the current skip name by overloading md->start_match_ptr and
833      returning the special MATCH_SKIP_ARG return code. This will either be      returning the special MATCH_SKIP_ARG return code. This will either be
834      caught by a matching MARK, or get to the top, where it is treated the same      caught by a matching MARK, or get to the top, where it causes a rematch
835      as PRUNE. */      with md->ignore_skip_arg set to the value of md->skip_arg_count. */
836    
837      md->start_match_ptr = ecode + 2;      md->start_match_ptr = ecode + 2;
838      RRETURN(MATCH_SKIP_ARG);      RRETURN(MATCH_SKIP_ARG);
# 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.
# 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);
882        if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */        if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
883          {          {
884          mstart = md->start_match_ptr;          mstart = md->start_match_ptr;
         markptr = md->mark;  
885          break;          break;
886          }          }
887        if (rrc == MATCH_THEN)        if (rrc == MATCH_THEN)
# Line 829  for (;;) Line 894  for (;;)
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 868  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 908  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 916  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    
# Line 944  for (;;) Line 1010  for (;;)
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 954  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 996  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 1004  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
# Line 1028  for (;;) Line 1097  for (;;)
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 1039  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 1071  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 1094  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 1130  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 1162  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 1192  for (;;) Line 1262  for (;;)
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 1217  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 1252  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
# Line 1262  for (;;) Line 1342  for (;;)
1342    
1343          if (!condition && condcode == OP_NRREF)          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 1275  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 1295  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 1308  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 1324  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 1339  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 1361  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 1376  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 1452  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 1460  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 1488  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 1497  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 1515  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 1522  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    
1612          /* A match means that the assertion is true; break out of the loop
1613          that matches its alternatives. */
1614    
1615        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1616          {          {
1617          mstart = md->start_match_ptr;   /* In case \K reset it */          mstart = md->start_match_ptr;   /* In case \K reset it */
         markptr = md->mark;  
1618          break;          break;
1619          }          }
1620    
1621        /* PCRE does not allow THEN to escape beyond an assertion; it is treated        /* If not matched, restore the previous mark setting. */
1622        as NOMATCH. */  
1623          md->mark = save_mark;
1624    
1625          /* See comment in the code for capturing groups above about handling
1626          THEN. */
1627    
1628          if (rrc == MATCH_THEN)
1629            {
1630            next = ecode + GET(ecode,1);
1631            if (md->start_match_ptr < next &&
1632                (*ecode == OP_ALT || *next == OP_ALT))
1633              rrc = MATCH_NOMATCH;
1634            }
1635    
1636          /* Anything other than NOMATCH causes the entire assertion to fail,
1637          passing back the return code. This includes COMMIT, SKIP, PRUNE and an
1638          uncaptured THEN, which means they take their normal effect. This
1639          consistent approach does not always have exactly the same effect as in
1640          Perl. */
1641    
1642        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1643        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1644        }        }
1645      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);   /* Continue for next alternative */
1646    
1647        /* If we have tried all the alternative branches, the assertion has
1648        failed. If not, we broke out after a match. */
1649    
1650      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
1651    
1652      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1653    
1654      if (condassert) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);
1655    
1656      /* Continue from after the assertion, updating the offsets high water      /* Continue from after a successful assertion, updating the offsets high
1657      mark, since extracts may have been taken during the assertion. */      water mark, since extracts may have been taken during the assertion. */
1658    
1659      do ecode += GET(ecode,1); while (*ecode == OP_ALT);      do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1660      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1661      offset_top = md->end_offset_top;      offset_top = md->end_offset_top;
1662      continue;      continue;
1663    
1664      /* Negative assertion: all branches must fail to match. Encountering SKIP,      /* Negative assertion: all branches must fail to match for the assertion to
1665      PRUNE, or COMMIT means we must assume failure without checking subsequent      succeed. */
     branches. */  
1666    
1667      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1668      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1669        save_mark = md->mark;
1670      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1671        {        {
1672        condassert = TRUE;        condassert = TRUE;
# Line 1567  for (;;) Line 1674  for (;;)
1674        }        }
1675      else condassert = FALSE;      else condassert = FALSE;
1676    
1677        /* Loop for each alternative branch. */
1678    
1679      do      do
1680        {        {
1681        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1682        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);        md->mark = save_mark;   /* Always restore the mark setting */
1683        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)  
1684          switch(rrc)
1685          {          {
1686          do ecode += GET(ecode,1); while (*ecode == OP_ALT);          case MATCH_MATCH:            /* A successful match means */
1687            case MATCH_ACCEPT:           /* the assertion has failed. */
1688            RRETURN(MATCH_NOMATCH);
1689    
1690            case MATCH_NOMATCH:          /* Carry on with next branch */
1691          break;          break;
1692    
1693            /* See comment in the code for capturing groups above about handling
1694            THEN. */
1695    
1696            case MATCH_THEN:
1697            next = ecode + GET(ecode,1);
1698            if (md->start_match_ptr < next &&
1699                (*ecode == OP_ALT || *next == OP_ALT))
1700              {
1701              rrc = MATCH_NOMATCH;
1702              break;
1703              }
1704            /* Otherwise fall through. */
1705    
1706            /* COMMIT, SKIP, PRUNE, and an uncaptured THEN cause the whole
1707            assertion to fail to match, without considering any more alternatives.
1708            Failing to match means the assertion is true. This is a consistent
1709            approach, but does not always have the same effect as in Perl. */
1710    
1711            case MATCH_COMMIT:
1712            case MATCH_SKIP:
1713            case MATCH_SKIP_ARG:
1714            case MATCH_PRUNE:
1715            do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1716            goto NEG_ASSERT_TRUE;   /* Break out of alternation loop */
1717    
1718            /* Anything else is an error */
1719    
1720            default:
1721            RRETURN(rrc);
1722          }          }
1723    
1724        /* PCRE does not allow THEN to escape beyond an assertion; it is treated        /* Continue with next branch */
       as NOMATCH. */  
1725    
       if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);  
1726        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1727        }        }
1728      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1729    
1730      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */      /* All branches in the assertion failed to match. */
1731    
1732      ecode += 1 + LINK_SIZE;      NEG_ASSERT_TRUE:
1733        if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1734        ecode += 1 + LINK_SIZE;                /* Continue with current branch */
1735      continue;      continue;
1736    
1737      /* 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 1596  for (;;) Line 1740  for (;;)
1740      back a number of characters, not bytes. */      back a number of characters, not bytes. */
1741    
1742      case OP_REVERSE:      case OP_REVERSE:
1743  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1744      if (utf8)      if (utf)
1745        {        {
1746        i = GET(ecode, 1);        i = GET(ecode, 1);
1747        while (i-- > 0)        while (i-- > 0)
1748          {          {
1749          eptr--;          eptr--;
1750          if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1751          BACKCHAR(eptr);          BACKCHAR(eptr);
1752          }          }
1753        }        }
# Line 1614  for (;;) Line 1758  for (;;)
1758    
1759        {        {
1760        eptr -= GET(ecode, 1);        eptr -= GET(ecode, 1);
1761        if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1762        }        }
1763    
1764      /* Save the earliest consulted character, then skip to next op code */      /* Save the earliest consulted character, then skip to next op code */
# Line 1628  for (;;) Line 1772  for (;;)
1772      function is able to force a failure. */      function is able to force a failure. */
1773    
1774      case OP_CALLOUT:      case OP_CALLOUT:
1775      if (pcre_callout != NULL)      if (PUBL(callout) != NULL)
1776        {        {
1777        pcre_callout_block cb;        PUBL(callout_block) cb;
1778        cb.version          = 2;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1779        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1780        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1781    #if defined COMPILE_PCRE8
1782        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
1783    #elif defined COMPILE_PCRE16
1784          cb.subject          = (PCRE_SPTR16)md->start_subject;
1785    #elif defined COMPILE_PCRE32
1786          cb.subject          = (PCRE_SPTR32)md->start_subject;
1787    #endif
1788        cb.subject_length   = (int)(md->end_subject - md->start_subject);        cb.subject_length   = (int)(md->end_subject - md->start_subject);
1789        cb.start_match      = (int)(mstart - md->start_subject);        cb.start_match      = (int)(mstart - md->start_subject);
1790        cb.current_position = (int)(eptr - md->start_subject);        cb.current_position = (int)(eptr - md->start_subject);
1791        cb.pattern_position = GET(ecode, 2);        cb.pattern_position = GET(ecode, 2);
1792        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
1793        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1794        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last & CAPLMASK;
1795          /* Internal change requires this for API compatibility. */
1796          if (cb.capture_last == 0) cb.capture_last = -1;
1797        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1798        cb.mark             = markptr;        cb.mark             = md->nomatch_mark;
1799        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);        if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1800        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1801        }        }
1802      ecode += 2 + 2*LINK_SIZE;      ecode += 2 + 2*LINK_SIZE;
# Line 1670  for (;;) Line 1822  for (;;)
1822      case OP_RECURSE:      case OP_RECURSE:
1823        {        {
1824        recursion_info *ri;        recursion_info *ri;
1825        int recno;        unsigned int recno;
1826    
1827        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1828        recno = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
# Line 1687  for (;;) Line 1839  for (;;)
1839        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1840    
1841        new_recursive.group_num = recno;        new_recursive.group_num = recno;
1842          new_recursive.saved_capture_last = md->capture_last;
1843        new_recursive.subject_position = eptr;        new_recursive.subject_position = eptr;
1844        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1845        md->recursive = &new_recursive;        md->recursive = &new_recursive;
# Line 1703  for (;;) Line 1856  for (;;)
1856        else        else
1857          {          {
1858          new_recursive.offset_save =          new_recursive.offset_save =
1859            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
1860          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1861          }          }
1862        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1863              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1864    
1865        /* OK, now we can do the recursion. After processing each alternative,        /* OK, now we can do the recursion. After processing each alternative,
1866        restore the offset data. If there were nested recursions, md->recursive        restore the offset data and the last captured value. If there were nested
1867        might be changed, so reset it before looping. */        recursions, md->recursive might be changed, so reset it before looping.
1868          */
1869    
1870        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1871        cbegroup = (*callpat >= OP_SBRA);        cbegroup = (*callpat >= OP_SBRA);
1872        do        do
1873          {          {
1874          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1875          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
1876            md, eptrb, RM6);            md, eptrb, RM6);
1877          memcpy(md->offset_vector, new_recursive.offset_save,          memcpy(md->offset_vector, new_recursive.offset_save,
1878              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1879            md->capture_last = new_recursive.saved_capture_last;
1880          md->recursive = new_recursive.prevrec;          md->recursive = new_recursive.prevrec;
1881          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1882            {            {
1883            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
1884            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1885              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1886    
1887            /* 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
1888            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 1738  for (;;) Line 1893  for (;;)
1893            goto RECURSION_MATCHED;        /* Exit loop; end processing */            goto RECURSION_MATCHED;        /* Exit loop; end processing */
1894            }            }
1895    
1896          /* 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
1897          as NOMATCH. */          recursion; they cause a NOMATCH for the entire recursion. These codes
1898            are defined in a range that can be tested for. */
1899    
1900            if (rrc >= MATCH_BACKTRACK_MIN && rrc <= MATCH_BACKTRACK_MAX)
1901              RRETURN(MATCH_NOMATCH);
1902    
1903          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)          /* Any return code other than NOMATCH is an error. */
1904    
1905            if (rrc != MATCH_NOMATCH)
1906            {            {
1907            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1908            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1909              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1910            RRETURN(rrc);            RRETURN(rrc);
1911            }            }
1912    
# Line 1757  for (;;) Line 1918  for (;;)
1918        DPRINTF(("Recursion didn't match\n"));        DPRINTF(("Recursion didn't match\n"));
1919        md->recursive = new_recursive.prevrec;        md->recursive = new_recursive.prevrec;
1920        if (new_recursive.offset_save != stacksave)        if (new_recursive.offset_save != stacksave)
1921          (pcre_free)(new_recursive.offset_save);          (PUBL(free))(new_recursive.offset_save);
1922        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1923        }        }
1924    
1925      RECURSION_MATCHED:      RECURSION_MATCHED:
# Line 1838  for (;;) Line 1999  for (;;)
1999        md->end_match_ptr = eptr;      /* For ONCE_NC */        md->end_match_ptr = eptr;      /* For ONCE_NC */
2000        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
2001        md->start_match_ptr = mstart;        md->start_match_ptr = mstart;
2002        MRRETURN(MATCH_MATCH);         /* Sets md->mark */        RRETURN(MATCH_MATCH);         /* Sets md->mark */
2003        }        }
2004    
2005      /* 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 1871  for (;;) Line 2032  for (;;)
2032    
2033        /* Deal with capturing */        /* Deal with capturing */
2034    
2035        md->capture_last = number;        md->capture_last = (md->capture_last & OVFLMASK) | number;
2036        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
2037          {          {
2038          /* If offset is greater than offset_top, it means that we are          /* If offset is greater than offset_top, it means that we are
2039          "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 1952  for (;;) Line 2113  for (;;)
2113          }          }
2114        if (*prev >= OP_SBRA)    /* Could match an empty string */        if (*prev >= OP_SBRA)    /* Could match an empty string */
2115          {          {
         md->match_function_type = MATCH_CBEGROUP;  
2116          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
2117          RRETURN(rrc);          RRETURN(rrc);
2118          }          }
# Line 1961  for (;;) Line 2121  for (;;)
2121        }        }
2122      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
2123        {        {
       if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;  
2124        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
2125        if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;        if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
2126        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
# Line 1980  for (;;) Line 2139  for (;;)
2139      /* Not multiline mode: start of subject assertion, unless notbol. */      /* Not multiline mode: start of subject assertion, unless notbol. */
2140    
2141      case OP_CIRC:      case OP_CIRC:
2142      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2143    
2144      /* Start of subject assertion */      /* Start of subject assertion */
2145    
2146      case OP_SOD:      case OP_SOD:
2147      if (eptr != md->start_subject) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
2148      ecode++;      ecode++;
2149      break;      break;
2150    
2151      /* Multiline mode: start of subject unless notbol, or after any newline. */      /* Multiline mode: start of subject unless notbol, or after any newline. */
2152    
2153      case OP_CIRCM:      case OP_CIRCM:
2154      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2155      if (eptr != md->start_subject &&      if (eptr != md->start_subject &&
2156          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
2157        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2158      ecode++;      ecode++;
2159      break;      break;
2160    
2161      /* Start of match assertion */      /* Start of match assertion */
2162    
2163      case OP_SOM:      case OP_SOM:
2164      if (eptr != md->start_subject + md->start_offset) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
2165      ecode++;      ecode++;
2166      break;      break;
2167    
# Line 2018  for (;;) Line 2177  for (;;)
2177    
2178      case OP_DOLLM:      case OP_DOLLM:
2179      if (eptr < md->end_subject)      if (eptr < md->end_subject)
2180        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }        {
2181          if (!IS_NEWLINE(eptr))
2182            {
2183            if (md->partial != 0 &&
2184                eptr + 1 >= md->end_subject &&
2185                NLBLOCK->nltype == NLTYPE_FIXED &&
2186                NLBLOCK->nllen == 2 &&
2187                RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2188              {
2189              md->hitend = TRUE;
2190              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2191              }
2192            RRETURN(MATCH_NOMATCH);
2193            }
2194          }
2195      else      else
2196        {        {
2197        if (md->noteol) MRRETURN(MATCH_NOMATCH);        if (md->noteol) RRETURN(MATCH_NOMATCH);
2198        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2199        }        }
2200      ecode++;      ecode++;
# Line 2031  for (;;) Line 2204  for (;;)
2204      subject unless noteol is set. */      subject unless noteol is set. */
2205    
2206      case OP_DOLL:      case OP_DOLL:
2207      if (md->noteol) MRRETURN(MATCH_NOMATCH);      if (md->noteol) RRETURN(MATCH_NOMATCH);
2208      if (!md->endonly) goto ASSERT_NL_OR_EOS;      if (!md->endonly) goto ASSERT_NL_OR_EOS;
2209    
2210      /* ... else fall through for endonly */      /* ... else fall through for endonly */
# Line 2039  for (;;) Line 2212  for (;;)
2212      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
2213    
2214      case OP_EOD:      case OP_EOD:
2215      if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
2216      SCHECK_PARTIAL();      SCHECK_PARTIAL();
2217      ecode++;      ecode++;
2218      break;      break;
# Line 2050  for (;;) Line 2223  for (;;)
2223      ASSERT_NL_OR_EOS:      ASSERT_NL_OR_EOS:
2224      if (eptr < md->end_subject &&      if (eptr < md->end_subject &&
2225          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
2226        MRRETURN(MATCH_NOMATCH);        {
2227          if (md->partial != 0 &&
2228              eptr + 1 >= md->end_subject &&
2229              NLBLOCK->nltype == NLTYPE_FIXED &&
2230              NLBLOCK->nllen == 2 &&
2231              RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2232            {
2233            md->hitend = TRUE;
2234            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2235            }
2236          RRETURN(MATCH_NOMATCH);
2237          }
2238    
2239      /* Either at end of string or \n before end. */      /* Either at end of string or \n before end. */
2240    
# Line 2069  for (;;) Line 2253  for (;;)
2253        be "non-word" characters. Remember the earliest consulted character for        be "non-word" characters. Remember the earliest consulted character for
2254        partial matching. */        partial matching. */
2255    
2256  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2257        if (utf8)        if (utf)
2258          {          {
2259          /* Get status of previous character */          /* Get status of previous character */
2260    
2261          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
2262            {            {
2263            USPTR lastptr = eptr - 1;            PCRE_PUCHAR lastptr = eptr - 1;
2264            while((*lastptr & 0xc0) == 0x80) lastptr--;            BACKCHAR(lastptr);
2265            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
2266            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
2267  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 2142  for (;;) Line 2326  for (;;)
2326              }              }
2327            else            else
2328  #endif  #endif
2329            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);            prev_is_word = MAX_255(eptr[-1])
2330                && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
2331            }            }
2332    
2333          /* Get status of next character */          /* Get status of next character */
# Line 2165  for (;;) Line 2350  for (;;)
2350            }            }
2351          else          else
2352  #endif  #endif
2353          cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);          cur_is_word = MAX_255(*eptr)
2354              && ((md->ctypes[*eptr] & ctype_word) != 0);
2355          }          }
2356    
2357        /* Now see if the situation is what we want */        /* Now see if the situation is what we want */
2358    
2359        if ((*ecode++ == OP_WORD_BOUNDARY)?        if ((*ecode++ == OP_WORD_BOUNDARY)?
2360             cur_is_word == prev_is_word : cur_is_word != prev_is_word)             cur_is_word == prev_is_word : cur_is_word != prev_is_word)
2361          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2362        }        }
2363      break;      break;
2364    
2365      /* Match a single character type; inline for speed */      /* Match any single character type except newline; have to take care with
2366        CRLF newlines and partial matching. */
2367    
2368      case OP_ANY:      case OP_ANY:
2369      if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
2370        if (md->partial != 0 &&
2371            eptr + 1 >= md->end_subject &&
2372            NLBLOCK->nltype == NLTYPE_FIXED &&
2373            NLBLOCK->nllen == 2 &&
2374            RAWUCHARTEST(eptr) == NLBLOCK->nl[0])
2375          {
2376          md->hitend = TRUE;
2377          if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2378          }
2379    
2380      /* Fall through */      /* Fall through */
2381    
2382        /* Match any single character whatsoever. */
2383    
2384      case OP_ALLANY:      case OP_ALLANY:
2385      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 */
2386        {                            /* not be updated before SCHECK_PARTIAL. */        {                            /* not be updated before SCHECK_PARTIAL. */
2387        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2388        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2389        }        }
2390      eptr++;      eptr++;
2391      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;  #ifdef SUPPORT_UTF
2392        if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
2393    #endif
2394      ecode++;      ecode++;
2395      break;      break;
2396    
# Line 2200  for (;;) Line 2401  for (;;)
2401      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 */
2402        {                            /* not be updated before SCHECK_PARTIAL. */        {                            /* not be updated before SCHECK_PARTIAL. */
2403        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2404        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2405        }        }
2406      eptr++;      eptr++;
2407      ecode++;      ecode++;
# Line 2210  for (;;) Line 2411  for (;;)
2411      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2412        {        {
2413        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2414        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2415        }        }
2416      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2417      if (      if (
2418  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2419         c < 256 &&         c < 256 &&
2420  #endif  #endif
2421         (md->ctypes[c] & ctype_digit) != 0         (md->ctypes[c] & ctype_digit) != 0
2422         )         )
2423        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2424      ecode++;      ecode++;
2425      break;      break;
2426    
# Line 2227  for (;;) Line 2428  for (;;)
2428      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2429        {        {
2430        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2431        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2432        }        }
2433      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2434      if (      if (
2435  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2436         c >= 256 ||         c > 255 ||
2437  #endif  #endif
2438         (md->ctypes[c] & ctype_digit) == 0         (md->ctypes[c] & ctype_digit) == 0
2439         )         )
2440        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2441      ecode++;      ecode++;
2442      break;      break;
2443    
# Line 2244  for (;;) Line 2445  for (;;)
2445      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2446        {        {
2447        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2448        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2449        }        }
2450      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2451      if (      if (
2452  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2453         c < 256 &&         c < 256 &&
2454  #endif  #endif
2455         (md->ctypes[c] & ctype_space) != 0         (md->ctypes[c] & ctype_space) != 0
2456         )         )
2457        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2458      ecode++;      ecode++;
2459      break;      break;
2460    
# Line 2261  for (;;) Line 2462  for (;;)
2462      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2463        {        {
2464        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2465        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2466        }        }
2467      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2468      if (      if (
2469  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2470         c >= 256 ||         c > 255 ||
2471  #endif  #endif
2472         (md->ctypes[c] & ctype_space) == 0         (md->ctypes[c] & ctype_space) == 0
2473         )         )
2474        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2475      ecode++;      ecode++;
2476      break;      break;
2477    
# Line 2278  for (;;) Line 2479  for (;;)
2479      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2480        {        {
2481        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2482        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2483        }        }
2484      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2485      if (      if (
2486  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2487         c < 256 &&         c < 256 &&
2488  #endif  #endif
2489         (md->ctypes[c] & ctype_word) != 0         (md->ctypes[c] & ctype_word) != 0
2490         )         )
2491        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2492      ecode++;      ecode++;
2493      break;      break;
2494    
# Line 2295  for (;;) Line 2496  for (;;)
2496      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2497        {        {
2498        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2499        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2500        }        }
2501      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2502      if (      if (
2503  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2504         c >= 256 ||         c > 255 ||
2505  #endif  #endif
2506         (md->ctypes[c] & ctype_word) == 0         (md->ctypes[c] & ctype_word) == 0
2507         )         )
2508        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2509      ecode++;      ecode++;
2510      break;      break;
2511    
# Line 2312  for (;;) Line 2513  for (;;)
2513      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2514        {        {
2515        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2516        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2517        }        }
2518      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2519      switch(c)      switch(c)
2520        {        {
2521        default: MRRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2522    
2523        case 0x000d:        case CHAR_CR:
2524        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr >= md->end_subject)
2525            {
2526            SCHECK_PARTIAL();
2527            }
2528          else if (RAWUCHARTEST(eptr) == CHAR_LF) eptr++;
2529        break;        break;
2530    
2531        case 0x000a:        case CHAR_LF:
2532        break;        break;
2533    
2534        case 0x000b:        case CHAR_VT:
2535        case 0x000c:        case CHAR_FF:
2536        case 0x0085:        case CHAR_NEL:
2537    #ifndef EBCDIC
2538        case 0x2028:        case 0x2028:
2539        case 0x2029:        case 0x2029:
2540        if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);  #endif  /* Not EBCDIC */
2541          if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
2542        break;        break;
2543        }        }
2544      ecode++;      ecode++;
# Line 2341  for (;;) Line 2548  for (;;)
2548      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2549        {        {
2550        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2551        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2552        }        }
2553      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2554      switch(c)      switch(c)
2555        {        {
2556          HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
2557        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);  
2558        }        }
2559      ecode++;      ecode++;
2560      break;      break;
# Line 2375  for (;;) Line 2563  for (;;)
2563      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2564        {        {
2565        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2566        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2567        }        }
2568      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2569      switch(c)      switch(c)
2570        {        {
2571        default: MRRETURN(MATCH_NOMATCH);        HSPACE_CASES: break;  /* Byte and multibyte cases */
2572        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;  
2573        }        }
2574      ecode++;      ecode++;
2575      break;      break;
# Line 2409  for (;;) Line 2578  for (;;)
2578      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2579        {        {
2580        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2581        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2582        }        }
2583      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2584      switch(c)      switch(c)
2585        {        {
2586          VSPACE_CASES: RRETURN(MATCH_NOMATCH);
2587        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);  
2588        }        }
2589      ecode++;      ecode++;
2590      break;      break;
# Line 2431  for (;;) Line 2593  for (;;)
2593      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2594        {        {
2595        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2596        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2597        }        }
2598      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2599      switch(c)      switch(c)
2600        {        {
2601        default: MRRETURN(MATCH_NOMATCH);        VSPACE_CASES: break;
2602        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;  
2603        }        }
2604      ecode++;      ecode++;
2605      break;      break;
# Line 2458  for (;;) Line 2613  for (;;)
2613      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2614        {        {
2615        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2616        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2617        }        }
2618      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2619        {        {
2620          const pcre_uint32 *cp;
2621        const ucd_record *prop = GET_UCD(c);        const ucd_record *prop = GET_UCD(c);
2622    
2623        switch(ecode[1])        switch(ecode[1])
2624          {          {
2625          case PT_ANY:          case PT_ANY:
2626          if (op == OP_NOTPROP) MRRETURN(MATCH_NOMATCH);          if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
2627          break;          break;
2628    
2629          case PT_LAMP:          case PT_LAMP:
2630          if ((prop->chartype == ucp_Lu ||          if ((prop->chartype == ucp_Lu ||
2631               prop->chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
2632               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
2633            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2634          break;          break;
2635    
2636          case PT_GC:          case PT_GC:
2637          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
2638            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2639          break;          break;
2640    
2641          case PT_PC:          case PT_PC:
2642          if ((ecode[2] != prop->chartype) == (op == OP_PROP))          if ((ecode[2] != prop->chartype) == (op == OP_PROP))
2643            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2644          break;          break;
2645    
2646          case PT_SC:          case PT_SC:
2647          if ((ecode[2] != prop->script) == (op == OP_PROP))          if ((ecode[2] != prop->script) == (op == OP_PROP))
2648            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2649          break;          break;
2650    
2651          /* These are specials */          /* These are specials */
2652    
2653          case PT_ALNUM:          case PT_ALNUM:
2654          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2655               _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))               PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2656            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2657          break;          break;
2658    
2659          case PT_SPACE:    /* Perl space */          case PT_SPACE:    /* Perl space */
2660          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2661               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2662                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2663            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2664          break;          break;
2665    
2666          case PT_PXSPACE:  /* POSIX space */          case PT_PXSPACE:  /* POSIX space */
2667          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2668               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2669               c == CHAR_FF || c == CHAR_CR)               c == CHAR_FF || c == CHAR_CR)
2670                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2671            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2672          break;          break;
2673    
2674          case PT_WORD:          case PT_WORD:
2675          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2676               _pcre_ucp_gentype[prop->chartype] == ucp_N ||               PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2677               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2678            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2679            break;
2680    
2681            case PT_CLIST:
2682            cp = PRIV(ucd_caseless_sets) + ecode[2];
2683            for (;;)
2684              {
2685              if (c < *cp)
2686                { if (op == OP_PROP) { RRETURN(MATCH_NOMATCH); } else break; }
2687              if (c == *cp++)
2688                { if (op == OP_PROP) break; else { RRETURN(MATCH_NOMATCH); } }
2689              }
2690            break;
2691    
2692            case PT_UCNC:
2693            if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
2694                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
2695                 c >= 0xe000) == (op == OP_NOTPROP))
2696              RRETURN(MATCH_NOMATCH);
2697          break;          break;
2698    
2699          /* This should never occur */          /* This should never occur */
# Line 2539  for (;;) Line 2713  for (;;)
2713      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2714        {        {
2715        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2716        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2717        }        }
2718      GETCHARINCTEST(c, eptr);      else
     if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);  
     while (eptr < md->end_subject)  
2719        {        {
2720        int len = 1;        int lgb, rgb;
2721        if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }        GETCHARINCTEST(c, eptr);
2722        if (UCD_CATEGORY(c) != ucp_M) break;        lgb = UCD_GRAPHBREAK(c);
2723        eptr += len;        while (eptr < md->end_subject)
2724            {
2725            int len = 1;
2726            if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2727            rgb = UCD_GRAPHBREAK(c);
2728            if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
2729            lgb = rgb;
2730            eptr += len;
2731            }
2732        }        }
2733        CHECK_PARTIAL();
2734      ecode++;      ecode++;
2735      break;      break;
2736  #endif  #endif  /* SUPPORT_UCP */
2737    
2738    
2739      /* 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 2567  for (;;) Line 2748  for (;;)
2748      case OP_REFI:      case OP_REFI:
2749      caseless = op == OP_REFI;      caseless = op == OP_REFI;
2750      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2751      ecode += 3;      ecode += 1 + IMM2_SIZE;
2752    
2753      /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2754    
# Line 2607  for (;;) Line 2788  for (;;)
2788        case OP_CRMINRANGE:        case OP_CRMINRANGE:
2789        minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2790        min = GET2(ecode, 1);        min = GET2(ecode, 1);
2791        max = GET2(ecode, 3);        max = GET2(ecode, 1 + IMM2_SIZE);
2792        if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2793        ecode += 5;        ecode += 1 + 2 * IMM2_SIZE;
2794        break;        break;
2795    
2796        default:               /* No repeat follows */        default:               /* No repeat follows */
2797        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2798          {          {
2799            if (length == -2) eptr = md->end_subject;   /* Partial match */
2800          CHECK_PARTIAL();          CHECK_PARTIAL();
2801          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2802          }          }
2803        eptr += length;        eptr += length;
2804        continue;              /* With the main loop */        continue;              /* With the main loop */
2805        }        }
2806    
2807      /* Handle repeated back references. If the length of the reference is      /* Handle repeated back references. If the length of the reference is
2808      zero, just continue with the main loop. */      zero, just continue with the main loop. If the length is negative, it
2809        means the reference is unset in non-Java-compatible mode. If the minimum is
2810        zero, we can continue at the same level without recursion. For any other
2811        minimum, carrying on will result in NOMATCH. */
2812    
2813      if (length == 0) continue;      if (length == 0) continue;
2814        if (length < 0 && min == 0) continue;
2815    
2816      /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2817      the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
# Line 2636  for (;;) Line 2822  for (;;)
2822        int slength;        int slength;
2823        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2824          {          {
2825            if (slength == -2) eptr = md->end_subject;   /* Partial match */
2826          CHECK_PARTIAL();          CHECK_PARTIAL();
2827          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2828          }          }
2829        eptr += slength;        eptr += slength;
2830        }        }
# Line 2656  for (;;) Line 2843  for (;;)
2843          int slength;          int slength;
2844          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2845          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2846          if (fi >= max) MRRETURN(MATCH_NOMATCH);          if (fi >= max) RRETURN(MATCH_NOMATCH);
2847          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2848            {            {
2849              if (slength == -2) eptr = md->end_subject;   /* Partial match */
2850            CHECK_PARTIAL();            CHECK_PARTIAL();
2851            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2852            }            }
2853          eptr += slength;          eptr += slength;
2854          }          }
# Line 2677  for (;;) Line 2865  for (;;)
2865          int slength;          int slength;
2866          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2867            {            {
2868            CHECK_PARTIAL();            /* Can't use CHECK_PARTIAL because we don't want to update eptr in
2869              the soft partial matching case. */
2870    
2871              if (slength == -2 && md->partial != 0 &&
2872                  md->end_subject > md->start_used_ptr)
2873                {
2874                md->hitend = TRUE;
2875                if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
2876                }
2877            break;            break;
2878            }            }
2879          eptr += slength;          eptr += slength;
2880          }          }
2881    
2882        while (eptr >= pp)        while (eptr >= pp)
2883          {          {
2884          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2885          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2886          eptr -= length;          eptr -= length;
2887          }          }
2888        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2889        }        }
2890      /* Control never gets here */      /* Control never gets here */
2891    
# Line 2706  for (;;) Line 2903  for (;;)
2903      case OP_NCLASS:      case OP_NCLASS:
2904      case OP_CLASS:      case OP_CLASS:
2905        {        {
2906          /* The data variable is saved across frames, so the byte map needs to
2907          be stored there. */
2908    #define BYTE_MAP ((pcre_uint8 *)data)
2909        data = ecode + 1;                /* Save for matching */        data = ecode + 1;                /* Save for matching */
2910        ecode += 33;                     /* Advance past the item */        ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
2911    
2912        switch (*ecode)        switch (*ecode)
2913          {          {
# Line 2728  for (;;) Line 2928  for (;;)
2928          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2929          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2930          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2931          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2932          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2933          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2934          break;          break;
2935    
2936          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2740  for (;;) Line 2940  for (;;)
2940    
2941        /* First, ensure the minimum number of matches are present. */        /* First, ensure the minimum number of matches are present. */
2942    
2943  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2944        /* UTF-8 mode */        if (utf)
       if (utf8)  
2945          {          {
2946          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2947            {            {
2948            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2949              {              {
2950              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2951              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2952              }              }
2953            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
2954            if (c > 255)            if (c > 255)
2955              {              {
2956              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2957              }              }
2958            else            else
2959              {              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
             if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
             }  
2960            }            }
2961          }          }
2962        else        else
2963  #endif  #endif
2964        /* Not UTF-8 mode */        /* Not UTF mode */
2965          {          {
2966          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2967            {            {
2968            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2969              {              {
2970              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2971              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2972              }              }
2973            c = *eptr++;            c = *eptr++;
2974            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2975              if (c > 255)
2976                {
2977                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2978                }
2979              else
2980    #endif
2981                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2982            }            }
2983          }          }
2984    
# Line 2788  for (;;) Line 2992  for (;;)
2992    
2993        if (minimize)        if (minimize)
2994          {          {
2995  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2996          /* UTF-8 mode */          if (utf)
         if (utf8)  
2997            {            {
2998            for (fi = min;; fi++)            for (fi = min;; fi++)
2999              {              {
3000              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
3001              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3002              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3003              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3004                {                {
3005                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3006                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3007                }                }
3008              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
3009              if (c > 255)              if (c > 255)
3010                {                {
3011                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
3012                }                }
3013              else              else
3014                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
               if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
               }  
3015              }              }
3016            }            }
3017          else          else
3018  #endif  #endif
3019          /* Not UTF-8 mode */          /* Not UTF mode */
3020            {            {
3021            for (fi = min;; fi++)            for (fi = min;; fi++)
3022              {              {
3023              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
3024              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3025              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3026              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3027                {                {
3028                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3029                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3030                }                }
3031              c = *eptr++;              c = *eptr++;
3032              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
3033                if (c > 255)
3034                  {
3035                  if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
3036                  }
3037                else
3038    #endif
3039                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
3040              }              }
3041            }            }
3042          /* Control never gets here */          /* Control never gets here */
# Line 2840  for (;;) Line 3048  for (;;)
3048          {          {
3049          pp = eptr;          pp = eptr;
3050    
3051  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3052          /* UTF-8 mode */          if (utf)
         if (utf8)  
3053            {            {
3054            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3055              {              {
# Line 2858  for (;;) Line 3065  for (;;)
3065                if (op == OP_CLASS) break;                if (op == OP_CLASS) break;
3066                }                }
3067              else              else
3068                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
               if ((data[c/8] & (1 << (c&7))) == 0) break;  
               }  
3069              eptr += len;              eptr += len;
3070              }              }
3071            for (;;)            for (;;)
# Line 2873  for (;;) Line 3078  for (;;)
3078            }            }
3079          else          else
3080  #endif  #endif
3081            /* Not UTF-8 mode */            /* Not UTF mode */
3082            {            {
3083            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3084              {              {
# Line 2883  for (;;) Line 3088  for (;;)
3088                break;                break;
3089                }                }
3090              c = *eptr;              c = *eptr;
3091              if ((data[c/8] & (1 << (c&7))) == 0) break;  #ifndef COMPILE_PCRE8
3092                if (c > 255)
3093                  {
3094                  if (op == OP_CLASS) break;
3095                  }
3096                else
3097    #endif
3098                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
3099              eptr++;              eptr++;
3100              }              }
3101            while (eptr >= pp)            while (eptr >= pp)
# Line 2894  for (;;) Line 3106  for (;;)
3106              }              }
3107            }            }
3108    
3109          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3110          }          }
3111    #undef BYTE_MAP
3112        }        }
3113      /* Control never gets here */      /* Control never gets here */
3114    
# Line 2904  for (;;) Line 3117  for (;;)
3117      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
3118      mode, because Unicode properties are supported in non-UTF-8 mode. */      mode, because Unicode properties are supported in non-UTF-8 mode. */
3119    
3120  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3121      case OP_XCLASS:      case OP_XCLASS:
3122        {        {
3123        data = ecode + 1 + LINK_SIZE;                /* Save for matching */        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
# Line 2929  for (;;) Line 3142  for (;;)
3142          case OP_CRMINRANGE:          case OP_CRMINRANGE:
3143          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
3144          min = GET2(ecode, 1);          min = GET2(ecode, 1);
3145          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
3146          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
3147          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
3148          break;          break;
3149    
3150          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2946  for (;;) Line 3159  for (;;)
3159          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3160            {            {
3161            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3162            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3163            }            }
3164          GETCHARINCTEST(c, eptr);          GETCHARINCTEST(c, eptr);
3165          if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);          if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3166          }          }
3167    
3168        /* 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 2966  for (;;) Line 3179  for (;;)
3179            {            {
3180            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
3181            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3182            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3183            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3184              {              {
3185              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3186              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3187              }              }
3188            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3189            if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);            if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3190            }            }
3191          /* Control never gets here */          /* Control never gets here */
3192          }          }
# Line 2991  for (;;) Line 3204  for (;;)
3204              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3205              break;              break;
3206              }              }
3207    #ifdef SUPPORT_UTF
3208            GETCHARLENTEST(c, eptr, len);            GETCHARLENTEST(c, eptr, len);
3209            if (!_pcre_xclass(c, data)) break;  #else
3210              c = *eptr;
3211    #endif
3212              if (!PRIV(xclass)(c, data, utf)) break;
3213            eptr += len;            eptr += len;
3214            }            }
3215          for(;;)          for(;;)
# Line 3000  for (;;) Line 3217  for (;;)
3217            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
3218            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3219            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3220            if (utf8) BACKCHAR(eptr);  #ifdef SUPPORT_UTF
3221              if (utf) BACKCHAR(eptr);
3222    #endif
3223            }            }
3224          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3225          }          }
3226    
3227        /* Control never gets here */        /* Control never gets here */
# Line 3012  for (;;) Line 3231  for (;;)
3231      /* Match a single character, casefully */      /* Match a single character, casefully */
3232    
3233      case OP_CHAR:      case OP_CHAR:
3234  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3235      if (utf8)      if (utf)
3236        {        {
3237        length = 1;        length = 1;
3238        ecode++;        ecode++;
# Line 3021  for (;;) Line 3240  for (;;)
3240        if (length > md->end_subject - eptr)        if (length > md->end_subject - eptr)
3241          {          {
3242          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
3243          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3244          }          }
3245        while (length-- > 0) if (*ecode++ != *eptr++) MRRETURN(MATCH_NOMATCH);        while (length-- > 0) if (*ecode++ != RAWUCHARINC(eptr)) RRETURN(MATCH_NOMATCH);
3246        }        }
3247      else      else
3248  #endif  #endif
3249        /* Not UTF mode */
     /* Non-UTF-8 mode */  
3250        {        {
3251        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
3252          {          {
3253          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
3254          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3255          }          }
3256        if (ecode[1] != *eptr++) MRRETURN(MATCH_NOMATCH);        if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
3257        ecode += 2;        ecode += 2;
3258        }        }
3259      break;      break;
3260    
3261      /* Match a single character, caselessly */      /* Match a single character, caselessly. If we are at the end of the
3262        subject, give up immediately. */
3263    
3264      case OP_CHARI:      case OP_CHARI:
3265  #ifdef SUPPORT_UTF8      if (eptr >= md->end_subject)
3266      if (utf8)        {
3267          SCHECK_PARTIAL();
3268          RRETURN(MATCH_NOMATCH);
3269          }
3270    
3271    #ifdef SUPPORT_UTF
3272        if (utf)
3273        {        {
3274        length = 1;        length = 1;
3275        ecode++;        ecode++;
3276        GETCHARLEN(fc, ecode, length);        GETCHARLEN(fc, ecode, length);
3277    
       if (length > md->end_subject - eptr)  
         {  
         CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */  
         MRRETURN(MATCH_NOMATCH);  
         }  
   
3278        /* 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
3279        can use the fast lookup table. */        we know that its other case must also be one byte long, so we can use the
3280          fast lookup table. We know that there is at least one byte left in the
3281          subject. */
3282    
3283        if (fc < 128)        if (fc < 128)
3284          {          {
3285          if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          pcre_uint32 cc = RAWUCHAR(eptr);
3286            if (md->lcc[fc] != TABLE_GET(cc, md->lcc, cc)) RRETURN(MATCH_NOMATCH);
3287            ecode++;
3288            eptr++;
3289          }          }
3290    
3291        /* Otherwise we must pick up the subject character */        /* Otherwise we must pick up the subject character. Note that we cannot
3292          use the value of "length" to check for sufficient bytes left, because the
3293          other case of the character may have more or fewer bytes.  */
3294    
3295        else        else
3296          {          {
3297          unsigned int dc;          pcre_uint32 dc;
3298          GETCHARINC(dc, eptr);          GETCHARINC(dc, eptr);
3299          ecode += length;          ecode += length;
3300    
# Line 3080  for (;;) Line 3306  for (;;)
3306  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3307            if (dc != UCD_OTHERCASE(fc))            if (dc != UCD_OTHERCASE(fc))
3308  #endif  #endif
3309              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3310            }            }
3311          }          }
3312        }        }
3313      else      else
3314  #endif   /* SUPPORT_UTF8 */  #endif   /* SUPPORT_UTF */
3315    
3316      /* Non-UTF-8 mode */      /* Not UTF mode */
3317        {        {
3318        if (md->end_subject - eptr < 1)        if (TABLE_GET(ecode[1], md->lcc, ecode[1])
3319          {            != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3320          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */        eptr++;
         MRRETURN(MATCH_NOMATCH);  
         }  
       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);  
3321        ecode += 2;        ecode += 2;
3322        }        }
3323      break;      break;
# Line 3104  for (;;) Line 3327  for (;;)
3327      case OP_EXACT:      case OP_EXACT:
3328      case OP_EXACTI:      case OP_EXACTI:
3329      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3330      ecode += 3;      ecode += 1 + IMM2_SIZE;
3331      goto REPEATCHAR;      goto REPEATCHAR;
3332    
3333      case OP_POSUPTO:      case OP_POSUPTO:
# Line 3119  for (;;) Line 3342  for (;;)
3342      min = 0;      min = 0;
3343      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3344      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
3345      ecode += 3;      ecode += 1 + IMM2_SIZE;
3346      goto REPEATCHAR;      goto REPEATCHAR;
3347    
3348      case OP_POSSTAR:      case OP_POSSTAR:
# Line 3164  for (;;) Line 3387  for (;;)
3387      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
3388      if (max == 0) max = INT_MAX;      if (max == 0) max = INT_MAX;
3389    
3390      /* Common code for all repeated single-character matches. */      /* Common code for all repeated single-character matches. We first check
3391        for the minimum number of characters. If the minimum equals the maximum, we
3392        are done. Otherwise, if minimizing, check the rest of the pattern for a
3393        match; if there isn't one, advance up to the maximum, one character at a
3394        time.
3395    
3396        If maximizing, advance up to the maximum number of matching characters,
3397        until eptr is past the end of the maximum run. If possessive, we are
3398        then done (no backing up). Otherwise, match at this position; anything
3399        other than no match is immediately returned. For nomatch, back up one
3400        character, unless we are matching \R and the last thing matched was
3401        \r\n, in which case, back up two bytes. When we reach the first optional
3402        character position, we can save stack by doing a tail recurse.
3403    
3404        The various UTF/non-UTF and caseful/caseless cases are handled separately,
3405        for speed. */
3406    
3407      REPEATCHAR:      REPEATCHAR:
3408  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3409      if (utf8)      if (utf)
3410        {        {
3411        length = 1;        length = 1;
3412        charptr = ecode;        charptr = ecode;
# Line 3181  for (;;) Line 3419  for (;;)
3419        if (length > 1)        if (length > 1)
3420          {          {
3421  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3422          unsigned int othercase;          pcre_uint32 othercase;
3423          if (op >= OP_STARI &&     /* Caseless */          if (op >= OP_STARI &&     /* Caseless */
3424              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3425            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = PRIV(ord2utf)(othercase, occhars);
3426          else oclength = 0;          else oclength = 0;
3427  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3428    
3429          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3430            {            {
3431            if (eptr <= md->end_subject - length &&            if (eptr <= md->end_subject - length &&
3432              memcmp(eptr, charptr, length) == 0) eptr += length;              memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3433  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3434            else if (oclength > 0 &&            else if (oclength > 0 &&
3435                     eptr <= md->end_subject - oclength &&                     eptr <= md->end_subject - oclength &&
3436                     memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3437  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3438            else            else
3439              {              {
3440              CHECK_PARTIAL();              CHECK_PARTIAL();
3441              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3442              }              }
3443            }            }
3444    
# Line 3212  for (;;) Line 3450  for (;;)
3450              {              {
3451              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3452              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3453              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3454              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3455                memcmp(eptr, charptr, length) == 0) eptr += length;                memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3456  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3457              else if (oclength > 0 &&              else if (oclength > 0 &&
3458                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3459                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3460  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3461              else              else
3462                {                {
3463                CHECK_PARTIAL();                CHECK_PARTIAL();
3464                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3465                }                }
3466              }              }
3467            /* Control never gets here */            /* Control never gets here */
# Line 3235  for (;;) Line 3473  for (;;)
3473            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3474              {              {
3475              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3476                  memcmp(eptr, charptr, length) == 0) eptr += length;                  memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3477  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3478              else if (oclength > 0 &&              else if (oclength > 0 &&
3479                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3480                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3481  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3482              else              else
3483                {                {
# Line 3248  for (;;) Line 3486  for (;;)
3486                }                }
3487              }              }
3488    
3489            if (possessive) continue;            if (possessive) continue;    /* No backtracking */
   
3490            for(;;)            for(;;)
3491              {              {
3492                if (eptr == pp) goto TAIL_RECURSE;
3493              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3494              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }  
3495  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3496              eptr--;              eptr--;
3497              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3271  for (;;) Line 3508  for (;;)
3508        value of fc will always be < 128. */        value of fc will always be < 128. */
3509        }        }
3510      else      else
3511  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3512          /* When not in UTF-8 mode, load a single-byte character. */
3513      /* When not in UTF-8 mode, load a single-byte character. */        fc = *ecode++;
   
     fc = *ecode++;  
3514    
3515      /* The value of fc at this point is always less than 256, though we may or      /* The value of fc at this point is always one character, though we may
3516      may not be in UTF-8 mode. The code is duplicated for the caseless and      or may not be in UTF mode. The code is duplicated for the caseless and
3517      caseful cases, for speed, since matching characters is likely to be quite      caseful cases, for speed, since matching characters is likely to be quite
3518      common. First, ensure the minimum number of matches are present. If min =      common. First, ensure the minimum number of matches are present. If min =
3519      max, continue at the same level without recursing. Otherwise, if      max, continue at the same level without recursing. Otherwise, if
# Line 3287  for (;;) Line 3522  for (;;)
3522      maximizing, find the maximum number of characters and work backwards. */      maximizing, find the maximum number of characters and work backwards. */
3523    
3524      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3525        max, eptr));        max, (char *)eptr));
3526    
3527      if (op >= OP_STARI)  /* Caseless */      if (op >= OP_STARI)  /* Caseless */
3528        {        {
3529        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3530          /* fc must be < 128 if UTF is enabled. */
3531          foc = md->fcc[fc];
3532    #else
3533    #ifdef SUPPORT_UTF
3534    #ifdef SUPPORT_UCP
3535          if (utf && fc > 127)
3536            foc = UCD_OTHERCASE(fc);
3537    #else
3538          if (utf && fc > 127)
3539            foc = fc;
3540    #endif /* SUPPORT_UCP */
3541          else
3542    #endif /* SUPPORT_UTF */
3543            foc = TABLE_GET(fc, md->fcc, fc);
3544    #endif /* COMPILE_PCRE8 */
3545    
3546        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3547          {          {
3548            pcre_uint32 cc;                 /* Faster than pcre_uchar */
3549          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3550            {            {
3551            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3552            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3553            }            }
3554          if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          cc = RAWUCHARTEST(eptr);
3555            if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
3556            eptr++;
3557          }          }
3558        if (min == max) continue;        if (min == max) continue;
3559        if (minimize)        if (minimize)
3560          {          {
3561          for (fi = min;; fi++)          for (fi = min;; fi++)
3562            {            {
3563              pcre_uint32 cc;               /* Faster than pcre_uchar */
3564            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3565            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3566            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3567            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3568              {              {
3569              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3570              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3571              }              }
3572            if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            cc = RAWUCHARTEST(eptr);
3573              if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
3574              eptr++;
3575            }            }
3576          /* Control never gets here */          /* Control never gets here */
3577          }          }
# Line 3323  for (;;) Line 3580  for (;;)
3580          pp = eptr;          pp = eptr;
3581          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3582            {            {
3583              pcre_uint32 cc;               /* Faster than pcre_uchar */
3584            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3585              {              {
3586              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3587              break;              break;
3588              }              }
3589            if (fc != md->lcc[*eptr]) break;            cc = RAWUCHARTEST(eptr);
3590              if (fc != cc && foc != cc) break;
3591            eptr++;            eptr++;
3592            }            }
3593    
3594          if (possessive) continue;          if (possessive) continue;       /* No backtracking */
3595            for (;;)
         while (eptr >= pp)  
3596            {            {
3597              if (eptr == pp) goto TAIL_RECURSE;
3598            RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
3599            eptr--;            eptr--;
3600            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3601            }            }
3602          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3603          }          }
3604        /* Control never gets here */        /* Control never gets here */
3605        }        }
# Line 3354  for (;;) Line 3613  for (;;)
3613          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3614            {            {
3615            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3616            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3617            }            }
3618          if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);          if (fc != RAWUCHARINCTEST(eptr)) RRETURN(MATCH_NOMATCH);
3619          }          }
3620    
3621        if (min == max) continue;        if (min == max) continue;
# Line 3367  for (;;) Line 3626  for (;;)
3626            {            {
3627            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3628            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3629            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3630            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3631              {              {
3632              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3633              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3634              }              }
3635            if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc != RAWUCHARINCTEST(eptr)) RRETURN(MATCH_NOMATCH);
3636            }            }
3637          /* Control never gets here */          /* Control never gets here */
3638          }          }
# Line 3387  for (;;) Line 3646  for (;;)
3646              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3647              break;              break;
3648              }              }
3649            if (fc != *eptr) break;            if (fc != RAWUCHARTEST(eptr)) break;
3650            eptr++;            eptr++;
3651            }            }
3652          if (possessive) continue;          if (possessive) continue;    /* No backtracking */
3653            for (;;)
         while (eptr >= pp)  
3654            {            {
3655              if (eptr == pp) goto TAIL_RECURSE;
3656            RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
3657            eptr--;            eptr--;
3658            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3659            }            }
3660          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3661          }          }
3662        }        }
3663      /* Control never gets here */      /* Control never gets here */
# Line 3411  for (;;) Line 3670  for (;;)
3670      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3671        {        {
3672        SCHECK_PARTIAL();        SCHECK_PARTIAL();
3673        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
3674        }        }
3675      ecode++;  #ifdef SUPPORT_UTF
3676      GETCHARINCTEST(c, eptr);      if (utf)
     if (op == OP_NOTI)         /* The caseless case */  
3677        {        {
3678  #ifdef SUPPORT_UTF8        register pcre_uint32 ch, och;
3679        if (c < 256)  
3680  #endif        ecode++;
3681        c = md->lcc[c];        GETCHARINC(ch, ecode);
3682        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);        GETCHARINC(c, eptr);
3683    
3684          if (op == OP_NOT)
3685            {
3686            if (ch == c) RRETURN(MATCH_NOMATCH);
3687            }
3688          else
3689            {
3690    #ifdef SUPPORT_UCP
3691            if (ch > 127)
3692              och = UCD_OTHERCASE(ch);
3693    #else
3694            if (ch > 127)
3695              och = ch;
3696    #endif /* SUPPORT_UCP */
3697            else
3698              och = TABLE_GET(ch, md->fcc, ch);
3699            if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
3700            }
3701        }        }
3702      else    /* Caseful */      else
3703    #endif
3704        {        {
3705        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);        register pcre_uint32 ch = ecode[1];
3706          c = *eptr++;
3707          if (ch == c || (op == OP_NOTI && TABLE_GET(ch, md->fcc, ch) == c))
3708            RRETURN(MATCH_NOMATCH);
3709          ecode += 2;
3710        }        }
3711      break;      break;
3712    
# Line 3439  for (;;) Line 3720  for (;;)
3720      case OP_NOTEXACT:      case OP_NOTEXACT:
3721      case OP_NOTEXACTI:      case OP_NOTEXACTI:
3722      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3723      ecode += 3;      ecode += 1 + IMM2_SIZE;
3724      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3725    
3726      case OP_NOTUPTO:      case OP_NOTUPTO:
# Line 3449  for (;;) Line 3730  for (;;)
3730      min = 0;      min = 0;
3731      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3732      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3733      ecode += 3;      ecode += 1 + IMM2_SIZE;
3734      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3735    
3736      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
# Line 3481  for (;;) Line 3762  for (;;)
3762      possessive = TRUE;      possessive = TRUE;
3763      min = 0;      min = 0;
3764      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3765      ecode += 3;      ecode += 1 + IMM2_SIZE;
3766      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3767    
3768      case OP_NOTSTAR:      case OP_NOTSTAR:
# Line 3505  for (;;) Line 3786  for (;;)
3786      /* Common code for all repeated single-byte matches. */      /* Common code for all repeated single-byte matches. */
3787    
3788      REPEATNOTCHAR:      REPEATNOTCHAR:
3789      fc = *ecode++;      GETCHARINCTEST(fc, ecode);
3790    
3791      /* The code is duplicated for the caseless and caseful cases, for speed,      /* The code is duplicated for the caseless and caseful cases, for speed,
3792      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 3516  for (;;) Line 3797  for (;;)
3797      characters and work backwards. */      characters and work backwards. */
3798    
3799      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,
3800        max, eptr));        max, (char *)eptr));
3801    
3802      if (op >= OP_NOTSTARI)     /* Caseless */      if (op >= OP_NOTSTARI)     /* Caseless */
3803        {        {
3804        fc = md->lcc[fc];  #ifdef SUPPORT_UTF
3805    #ifdef SUPPORT_UCP
3806          if (utf && fc > 127)
3807            foc = UCD_OTHERCASE(fc);
3808    #else
3809          if (utf && fc > 127)
3810            foc = fc;
3811    #endif /* SUPPORT_UCP */
3812          else
3813    #endif /* SUPPORT_UTF */
3814            foc = TABLE_GET(fc, md->fcc, fc);
3815    
3816  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3817        /* UTF-8 mode */        if (utf)
       if (utf8)  
3818          {          {
3819          register unsigned int d;          register pcre_uint32 d;
3820          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3821            {            {
3822            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3823              {              {
3824              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3825              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3826              }              }
3827            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3828            if (d < 256) d = md->lcc[d];            if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
           if (fc == d) MRRETURN(MATCH_NOMATCH);  
3829            }            }
3830          }          }
3831        else        else
3832  #endif  #endif  /* SUPPORT_UTF */
3833          /* Not UTF mode */
       /* Not UTF-8 mode */  
3834          {          {
3835          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3836            {            {
3837            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3838              {              {
3839              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3840              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3841              }              }
3842            if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3843              eptr++;
3844            }            }
3845          }          }
3846    
# Line 3559  for (;;) Line 3848  for (;;)
3848    
3849        if (minimize)        if (minimize)
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 (fi = min;; fi++)            for (fi = min;; fi++)
3856              {              {
3857              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3858              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3859              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3860              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3861                {                {
3862                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3863                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3864                }                }
3865              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3866              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
             if (fc == d) MRRETURN(MATCH_NOMATCH);  
3867              }              }
3868            }            }
3869          else          else
3870  #endif  #endif  /*SUPPORT_UTF */
3871          /* Not UTF-8 mode */          /* Not UTF mode */
3872            {            {
3873            for (fi = min;; fi++)            for (fi = min;; fi++)
3874              {              {
3875              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3876              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3877              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3878              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3879                {                {
3880                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3881                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3882                }                }
3883              if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3884                eptr++;
3885              }              }
3886            }            }
3887          /* Control never gets here */          /* Control never gets here */
# Line 3605  for (;;) Line 3893  for (;;)
3893          {          {
3894          pp = eptr;          pp = eptr;
3895    
3896  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3897          /* UTF-8 mode */          if (utf)
         if (utf8)  
3898            {            {
3899            register unsigned int d;            register pcre_uint32 d;
3900            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3901              {              {
3902              int len = 1;              int len = 1;
# Line 3619  for (;;) Line 3906  for (;;)
3906                break;                break;
3907                }                }
3908              GETCHARLEN(d, eptr, len);              GETCHARLEN(d, eptr, len);
3909              if (d < 256) d = md->lcc[d];              if (fc == d || (unsigned int)foc == d) break;
             if (fc == d) break;  
3910              eptr += len;              eptr += len;
3911              }              }
3912          if (possessive) continue;            if (possessive) continue;    /* No backtracking */
3913          for(;;)            for(;;)
3914              {              {
3915                if (eptr == pp) goto TAIL_RECURSE;
3916              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3917              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3918              if (eptr-- == pp) break;        /* Stop if tried at original pos */              eptr--;
3919              BACKCHAR(eptr);              BACKCHAR(eptr);
3920              }              }
3921            }            }
3922          else          else
3923  #endif  #endif  /* SUPPORT_UTF */
3924          /* Not UTF-8 mode */          /* Not UTF mode */
3925            {            {
3926            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3927              {              {
# Line 3643  for (;;) Line 3930  for (;;)
3930                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3931                break;                break;
3932                }                }
3933              if (fc == md->lcc[*eptr]) break;              if (fc == *eptr || foc == *eptr) break;
3934              eptr++;              eptr++;
3935              }              }
3936            if (possessive) continue;            if (possessive) continue;    /* No backtracking */
3937            while (eptr >= pp)            for (;;)
3938              {              {
3939                if (eptr == pp) goto TAIL_RECURSE;
3940              RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
3941              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3942              eptr--;              eptr--;
3943              }              }
3944            }            }
3945    
3946          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3947          }          }
3948        /* Control never gets here */        /* Control never gets here */
3949        }        }
# Line 3664  for (;;) Line 3952  for (;;)
3952    
3953      else      else
3954        {        {
3955  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3956        /* UTF-8 mode */        if (utf)
       if (utf8)  
3957          {          {
3958          register unsigned int d;          register pcre_uint32 d;
3959          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3960            {            {
3961            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3962              {              {
3963              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3964              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3965              }              }
3966            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3967            if (fc == d) MRRETURN(MATCH_NOMATCH);            if (fc == d) RRETURN(MATCH_NOMATCH);
3968            }            }
3969          }          }
3970        else        else
3971  #endif  #endif
3972        /* Not UTF-8 mode */        /* Not UTF mode */
3973          {          {
3974          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3975            {            {
3976            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3977              {              {
3978              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3979              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3980              }              }
3981            if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3982            }            }
3983          }          }
3984    
# Line 3699  for (;;) Line 3986  for (;;)
3986    
3987        if (minimize)        if (minimize)
3988          {          {
3989  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3990          /* UTF-8 mode */          if (utf)
         if (utf8)  
3991            {            {
3992            register unsigned int d;            register pcre_uint32 d;
3993            for (fi = min;; fi++)            for (fi = min;; fi++)
3994              {              {
3995              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3996              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3997              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3998              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3999                {                {
4000                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4001                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4002                }                }
4003              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
4004              if (fc == d) MRRETURN(MATCH_NOMATCH);              if (fc == d) RRETURN(MATCH_NOMATCH);
4005              }              }
4006            }            }
4007          else          else
4008  #endif  #endif
4009          /* Not UTF-8 mode */          /* Not UTF mode */
4010            {            {
4011            for (fi = min;; fi++)            for (fi = min;; fi++)
4012              {              {
4013              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
4014              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4015              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
4016              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4017                {                {
4018                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4019                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4020                }                }
4021              if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
4022              }              }
4023            }            }
4024          /* Control never gets here */          /* Control never gets here */
# Line 3744  for (;;) Line 4030  for (;;)
4030          {          {
4031          pp = eptr;          pp = eptr;
4032    
4033  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4034          /* UTF-8 mode */          if (utf)
         if (utf8)  
4035            {            {
4036            register unsigned int d;            register pcre_uint32 d;
4037            for (i = min; i < max; i++)            for (i = min; i < max; i++)
4038              {              {
4039              int len = 1;              int len = 1;
# Line 3761  for (;;) Line 4046  for (;;)
4046              if (fc == d) break;              if (fc == d) break;
4047              eptr += len;              eptr += len;
4048              }              }
4049            if (possessive) continue;            if (possessive) continue;    /* No backtracking */
4050            for(;;)            for(;;)
4051              {              {
4052                if (eptr == pp) goto TAIL_RECURSE;
4053              RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);
4054              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4055              if (eptr-- == pp) break;        /* Stop if tried at original pos */              eptr--;
4056              BACKCHAR(eptr);              BACKCHAR(eptr);
4057              }              }
4058            }            }
4059          else          else
4060  #endif  #endif
4061          /* Not UTF-8 mode */          /* Not UTF mode */
4062            {            {
4063            for (i = min; i < max; i++)            for (i = min; i < max; i++)
4064              {              {
# Line 3784  for (;;) Line 4070  for (;;)
4070              if (fc == *eptr) break;              if (fc == *eptr) break;
4071              eptr++;              eptr++;
4072              }              }
4073            if (possessive) continue;            if (possessive) continue;    /* No backtracking */
4074            while (eptr >= pp)            for (;;)
4075              {              {
4076                if (eptr == pp) goto TAIL_RECURSE;
4077              RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);
4078              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4079              eptr--;              eptr--;
4080              }              }
4081            }            }
4082    
4083          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
4084          }          }
4085        }        }
4086      /* Control never gets here */      /* Control never gets here */
# Line 3805  for (;;) Line 4092  for (;;)
4092      case OP_TYPEEXACT:      case OP_TYPEEXACT:
4093      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
4094      minimize = TRUE;      minimize = TRUE;
4095      ecode += 3;      ecode += 1 + IMM2_SIZE;
4096      goto REPEATTYPE;      goto REPEATTYPE;
4097    
4098      case OP_TYPEUPTO:      case OP_TYPEUPTO:
# Line 3813  for (;;) Line 4100  for (;;)
4100      min = 0;      min = 0;
4101      max = GET2(ecode, 1);      max = GET2(ecode, 1);
4102      minimize = *ecode == OP_TYPEMINUPTO;      minimize = *ecode == OP_TYPEMINUPTO;
4103      ecode += 3;      ecode += 1 + IMM2_SIZE;
4104      goto REPEATTYPE;      goto REPEATTYPE;
4105    
4106      case OP_TYPEPOSSTAR:      case OP_TYPEPOSSTAR:
# Line 3841  for (;;) Line 4128  for (;;)
4128      possessive = TRUE;      possessive = TRUE;
4129      min = 0;      min = 0;
4130      max = GET2(ecode, 1);      max = GET2(ecode, 1);
4131      ecode += 3;      ecode += 1 + IMM2_SIZE;
4132      goto REPEATTYPE;      goto REPEATTYPE;
4133    
4134      case OP_TYPESTAR:      case OP_TYPESTAR:
# Line 3887  for (;;) Line 4174  for (;;)
4174          switch(prop_type)          switch(prop_type)
4175            {            {
4176            case PT_ANY:            case PT_ANY:
4177            if (prop_fail_result) MRRETURN(MATCH_NOMATCH);            if (prop_fail_result) RRETURN(MATCH_NOMATCH);
4178            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
4179              {              {
4180              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4181                {                {
4182                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4183                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4184                }                }
4185              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4186              }              }
# Line 3906  for (;;) Line 4193  for (;;)
4193              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4194                {                {
4195                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4196                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4197                }                }
4198              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4199              chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
4200              if ((chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
4201                   chartype == ucp_Ll ||                   chartype == ucp_Ll ||
4202                   chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
4203                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4204              }              }
4205            break;            break;
4206    
# Line 3923  for (;;) Line 4210  for (;;)
4210              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4211                {                {
4212                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4213                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4214                }                }
4215              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4216              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
4217                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4218              }              }
4219            break;            break;
4220    
# Line 3937  for (;;) Line 4224  for (;;)
4224              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4225                {                {
4226                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4227                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4228                }                }
4229              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4230              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
4231                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4232              }              }
4233            break;            break;
4234    
# Line 3951  for (;;) Line 4238  for (;;)
4238              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4239                {                {
4240                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4241                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4242                }                }
4243              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4244              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
4245                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4246              }              }
4247            break;            break;
4248    
# Line 3966  for (;;) Line 4253  for (;;)
4253              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4254                {                {
4255                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4256                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4257                }                }
4258              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4259              category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4260              if ((category == ucp_L || category == ucp_N) == prop_fail_result)              if ((category == ucp_L || category == ucp_N) == prop_fail_result)
4261                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4262              }              }
4263            break;            break;
4264    
# Line 3981  for (;;) Line 4268  for (;;)
4268              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4269                {                {
4270                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4271                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4272                }                }
4273              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4274              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
4275                   c == CHAR_FF || c == CHAR_CR)                   c == CHAR_FF || c == CHAR_CR)
4276                     == prop_fail_result)                     == prop_fail_result)
4277                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4278              }              }
4279            break;            break;
4280    
# Line 3997  for (;;) Line 4284  for (;;)
4284              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4285                {                {
4286                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4287                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4288                }                }
4289              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4290              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
4291                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
4292                     == prop_fail_result)                     == prop_fail_result)
4293                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4294              }              }
4295            break;            break;
4296    
# Line 4014  for (;;) Line 4301  for (;;)
4301              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4302                {                {
4303                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4304                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4305                }                }
4306              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4307              category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4308              if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)              if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)
4309                     == prop_fail_result)                     == prop_fail_result)
4310                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4311              }              }
4312            break;            break;
4313    
4314            /* This should not occur */            case PT_CLIST:
4315              for (i = 1; i <= min; i++)
4316            default:              {
4317            RRETURN(PCRE_ERROR_INTERNAL);              const pcre_uint32 *cp;
4318            }              if (eptr >= md->end_subject)
4319                  {
4320                  SCHECK_PARTIAL();
4321                  RRETURN(MATCH_NOMATCH);
4322                  }
4323                GETCHARINCTEST(c, eptr);
4324                cp = PRIV(ucd_caseless_sets) + prop_value;
4325                for (;;)
4326                  {
4327                  if (c < *cp)
4328                    { if (prop_fail_result) break; else { RRETURN(MATCH_NOMATCH); } }
4329                  if (c == *cp++)
4330                    { if (prop_fail_result) { RRETURN(MATCH_NOMATCH); } else break; }
4331                  }
4332                }
4333              break;
4334    
4335              case PT_UCNC:
4336              for (i = 1; i <= min; i++)
4337                {
4338                if (eptr >= md->end_subject)
4339                  {
4340                  SCHECK_PARTIAL();
4341                  RRETURN(MATCH_NOMATCH);
4342                  }
4343                GETCHARINCTEST(c, eptr);
4344                if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
4345                     c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
4346                     c >= 0xe000) == prop_fail_result)
4347                  RRETURN(MATCH_NOMATCH);
4348                }
4349              break;
4350    
4351              /* This should not occur */
4352    
4353              default:
4354              RRETURN(PCRE_ERROR_INTERNAL);
4355              }
4356          }          }
4357    
4358        /* Match extended Unicode sequences. We will get here only if the        /* Match extended Unicode sequences. We will get here only if the
# Line 4041  for (;;) Line 4365  for (;;)
4365            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4366              {              {
4367              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4368              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4369              }              }
4370            GETCHARINCTEST(c, eptr);            else
           if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);  
           while (eptr < md->end_subject)  
4371              {              {
4372              int len = 1;              int lgb, rgb;
4373              if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }              GETCHARINCTEST(c, eptr);
4374              if (UCD_CATEGORY(c) != ucp_M) break;              lgb = UCD_GRAPHBREAK(c);
4375              eptr += len;             while (eptr < md->end_subject)
4376                  {
4377                  int len = 1;
4378                  if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
4379                  rgb = UCD_GRAPHBREAK(c);
4380                  if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
4381                  lgb = rgb;
4382                  eptr += len;
4383                  }
4384              }              }
4385              CHECK_PARTIAL();
4386            }            }
4387          }          }
4388    
# Line 4060  for (;;) Line 4391  for (;;)
4391    
4392  /* Handle all other cases when the coding is UTF-8 */  /* Handle all other cases when the coding is UTF-8 */
4393    
4394  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4395        if (utf8) switch(ctype)        if (utf) switch(ctype)
4396          {          {
4397          case OP_ANY:          case OP_ANY:
4398          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 4069  for (;;) Line 4400  for (;;)
4400            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4401              {              {
4402              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4403              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4404                }
4405              if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
4406              if (md->partial != 0 &&
4407                  eptr + 1 >= md->end_subject &&
4408                  NLBLOCK->nltype == NLTYPE_FIXED &&
4409                  NLBLOCK->nllen == 2 &&
4410                  RAWUCHAR(eptr) == NLBLOCK->nl[0])
4411                {
4412                md->hitend = TRUE;
4413                if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
4414              }              }
           if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);  
4415            eptr++;            eptr++;
4416            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4417            }            }
4418          break;          break;
4419    
# Line 4083  for (;;) Line 4423  for (;;)
4423            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4424              {              {
4425              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4426              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4427              }              }
4428            eptr++;            eptr++;
4429            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4430            }            }
4431          break;          break;
4432    
4433          case OP_ANYBYTE:          case OP_ANYBYTE:
4434          if (eptr > md->end_subject - min) MRRETURN(MATCH_NOMATCH);          if (eptr > md->end_subject - min) RRETURN(MATCH_NOMATCH);
4435          eptr += min;          eptr += min;
4436          break;          break;
4437    
# Line 4101  for (;;) Line 4441  for (;;)
4441            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4442              {              {
4443              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4444              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4445              }              }
4446            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4447            switch(c)            switch(c)
4448              {              {
4449              default: MRRETURN(MATCH_NOMATCH);              default: RRETURN(MATCH_NOMATCH);
4450    
4451              case 0x000d:              case CHAR_CR:
4452              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && RAWUCHAR(eptr) == CHAR_LF) eptr++;
4453              break;              break;
4454    
4455              case 0x000a:              case CHAR_LF:
4456              break;              break;
4457    
4458              case 0x000b:              case CHAR_VT:
4459              case 0x000c:              case CHAR_FF:
4460              case 0x0085:              case CHAR_NEL:
4461    #ifndef EBCDIC
4462              case 0x2028:              case 0x2028:
4463              case 0x2029:              case 0x2029:
4464              if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);  #endif  /* Not EBCDIC */
4465                if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
4466              break;              break;
4467              }              }
4468            }            }
# Line 4132  for (;;) Line 4474  for (;;)
4474            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4475              {              {
4476              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4477              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4478              }              }
4479            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4480            switch(c)            switch(c)
4481              {              {
4482                HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
4483              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);  
4484              }              }
4485            }            }
4486          break;          break;
# Line 4168  for (;;) Line 4491  for (;;)
4491            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4492              {              {
4493              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4494              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4495              }              }
4496            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4497            switch(c)            switch(c)
4498              {              {
4499              default: MRRETURN(MATCH_NOMATCH);              HSPACE_CASES: break;  /* Byte and multibyte cases */
4500              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;  
4501              }              }
4502            }            }
4503          break;          break;
# Line 4204  for (;;) Line 4508  for (;;)
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            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4514            switch(c)            switch(c)
4515              {              {
4516                VSPACE_CASES: RRETURN(MATCH_NOMATCH);
4517              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);  
4518              }              }
4519            }            }
4520          break;          break;
# Line 4228  for (;;) Line 4525  for (;;)
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            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4531            switch(c)            switch(c)
4532              {              {
4533              default: MRRETURN(MATCH_NOMATCH);              VSPACE_CASES: break;
4534              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;  
4535              }              }
4536            }            }
4537          break;          break;
# Line 4252  for (;;) Line 4542  for (;;)
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            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4548            if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)            if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)
4549              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4550            }            }
4551          break;          break;
4552    
4553          case OP_DIGIT:          case OP_DIGIT:
4554          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4555            {            {
4556              pcre_uint32 cc;
4557            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4558              {              {
4559              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4560              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4561              }              }
4562            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_digit) == 0)            cc = RAWUCHAR(eptr);
4563              MRRETURN(MATCH_NOMATCH);            if (cc >= 128 || (md->ctypes[cc] & ctype_digit) == 0)
4564                RRETURN(MATCH_NOMATCH);
4565              eptr++;
4566            /* 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 */
4567            }            }
4568          break;          break;
# Line 4277  for (;;) Line 4570  for (;;)
4570          case OP_NOT_WHITESPACE:          case OP_NOT_WHITESPACE:
4571          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4572            {            {
4573              pcre_uint32 cc;
4574            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4575              {              {
4576              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4577              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4578              }              }
4579            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_space) != 0)            cc = RAWUCHAR(eptr);
4580              MRRETURN(MATCH_NOMATCH);            if (cc < 128 && (md->ctypes[cc] & ctype_space) != 0)
4581            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);              RRETURN(MATCH_NOMATCH);
4582              eptr++;
4583              ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4584            }            }
4585          break;          break;
4586    
4587          case OP_WHITESPACE:          case OP_WHITESPACE:
4588          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4589            {            {
4590              pcre_uint32 cc;
4591            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4592              {              {
4593              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4594              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4595              }              }
4596            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_space) == 0)            cc = RAWUCHAR(eptr);
4597              MRRETURN(MATCH_NOMATCH);            if (cc >= 128 || (md->ctypes[cc] & ctype_space) == 0)
4598                RRETURN(MATCH_NOMATCH);
4599              eptr++;
4600            /* 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 */
4601            }            }
4602          break;          break;
# Line 4305  for (;;) Line 4604  for (;;)
4604          case OP_NOT_WORDCHAR:          case OP_NOT_WORDCHAR:
4605          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4606            {            {
4607              pcre_uint32 cc;
4608            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4609              {              {
4610              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4611              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4612              }              }
4613            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0)            cc = RAWUCHAR(eptr);
4614              MRRETURN(MATCH_NOMATCH);            if (cc < 128 && (md->ctypes[cc] & ctype_word) != 0)
4615            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);              RRETURN(MATCH_NOMATCH);
4616              eptr++;
4617              ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4618            }            }
4619          break;          break;
4620    
4621          case OP_WORDCHAR:          case OP_WORDCHAR:
4622          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4623            {            {
4624              pcre_uint32 cc;
4625            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4626              {              {
4627              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4628              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4629              }              }
4630            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_word) == 0)            cc = RAWUCHAR(eptr);
4631              MRRETURN(MATCH_NOMATCH);            if (cc >= 128 || (md->ctypes[cc] & ctype_word) == 0)
4632                RRETURN(MATCH_NOMATCH);
4633              eptr++;
4634            /* 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 */
4635            }            }
4636          break;          break;
# Line 4335  for (;;) Line 4640  for (;;)
4640          }  /* End switch(ctype) */          }  /* End switch(ctype) */
4641    
4642        else        else
4643  #endif     /* SUPPORT_UTF8 */  #endif     /* SUPPORT_UTF */
4644    
4645        /* 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
4646        than OP_PROP and OP_NOTPROP. */        than OP_PROP and OP_NOTPROP. */
# Line 4348  for (;;) Line 4653  for (;;)
4653            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4654              {              {
4655              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4656              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4657                }
4658              if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
4659              if (md->partial != 0 &&
4660                  eptr + 1 >= md->end_subject &&
4661                  NLBLOCK->nltype == NLTYPE_FIXED &&
4662                  NLBLOCK->nllen == 2 &&
4663                  *eptr == NLBLOCK->nl[0])
4664                {
4665                md->hitend = TRUE;
4666                if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
4667              }              }
           if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);  
4668            eptr++;            eptr++;
4669            }            }
4670          break;          break;
# Line 4359  for (;;) Line 4673  for (;;)
4673          if (eptr > md->end_subject - min)          if (eptr > md->end_subject - min)
4674            {            {
4675            SCHECK_PARTIAL();            SCHECK_PARTIAL();