/[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 604 by ph10, Thu Jun 2 19:04:54 2011 UTC revision 850 by zherczeg, Wed Jan 4 17:29:11 2012 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2011 University of Cambridge             Copyright (c) 1997-2012 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 57  possible. There are also some static sup Line 57  possible. There are also some static sup
57  #undef min  #undef min
58  #undef max  #undef max
59    
60  /* 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
61  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,
62  as stack usage is to be discouraged. */  as stack usage is to be discouraged. */
63    
64  #define MATCH_CONDASSERT     1  /* Called to check a condition assertion */  #define MATCH_CONDASSERT     1  /* Called to check a condition assertion */
# Line 76  negative to avoid the external error cod Line 76  negative to avoid the external error cod
76  #define MATCH_ACCEPT       (-999)  #define MATCH_ACCEPT       (-999)
77  #define MATCH_COMMIT       (-998)  #define MATCH_COMMIT       (-998)
78  #define MATCH_KETRPOS      (-997)  #define MATCH_KETRPOS      (-997)
79  #define MATCH_PRUNE        (-996)  #define MATCH_ONCE         (-996)
80  #define MATCH_SKIP         (-995)  #define MATCH_PRUNE        (-995)
81  #define MATCH_SKIP_ARG     (-994)  #define MATCH_SKIP         (-994)
82  #define MATCH_THEN         (-993)  #define MATCH_SKIP_ARG     (-993)
83    #define MATCH_THEN         (-992)
 /* This is a convenience macro for code that occurs many times. */  
   
 #define MRRETURN(ra) \  
   { \  
   md->mark = markptr; \  
   RRETURN(ra); \  
   }  
84    
85  /* Maximum number of ints of offset to save on the stack for recursive calls.  /* Maximum number of ints of offset to save on the stack for recursive calls.
86  If the offset vector is bigger, malloc is used. This should be a multiple of 3,  If the offset vector is bigger, malloc is used. This should be a multiple of 3,
# Line 120  Returns: nothing Line 113  Returns: nothing
113  */  */
114    
115  static void  static void
116  pchars(const uschar *p, int length, BOOL is_subject, match_data *md)  pchars(const pcre_uchar *p, int length, BOOL is_subject, match_data *md)
117  {  {
118  unsigned int c;  unsigned int c;
119  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
# Line 137  while (length-- > 0) Line 130  while (length-- > 0)
130    
131  /* Normally, if a back reference hasn't been set, the length that is passed is  /* Normally, if a back reference hasn't been set, the length that is passed is
132  negative, so the match always fails. However, in JavaScript compatibility mode,  negative, so the match always fails. However, in JavaScript compatibility mode,
133  the length passed is zero. Note that in caseless UTF-8 mode, the number of  the length passed is zero. Note that in caseless UTF-8 mode, the number of
134  subject bytes matched may be different to the number of reference bytes.  subject bytes matched may be different to the number of reference bytes.
135    
136  Arguments:  Arguments:
# Line 151  Returns: < 0 if not matched, otherw Line 144  Returns: < 0 if not matched, otherw
144  */  */
145    
146  static int  static int
147  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,
148    BOOL caseless)    BOOL caseless)
149  {  {
150  USPTR eptr_start = eptr;  PCRE_PUCHAR eptr_start = eptr;
151  register USPTR p = md->start_subject + md->offset_vector[offset];  register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
152    
153  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
154  if (eptr >= md->end_subject)  if (eptr >= md->end_subject)
# Line 180  ASCII characters. */ Line 173  ASCII characters. */
173    
174  if (caseless)  if (caseless)
175    {    {
176  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
177  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
178    if (md->utf8)    if (md->utf)
179      {      {
180      /* 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
181      bytes matched may differ, because there are some characters whose upper and      bytes matched may differ, because there are some characters whose upper and
182      lower case versions code as different numbers of bytes. For example, U+023A      lower case versions code as different numbers of bytes. For example, U+023A
183      (2 bytes in UTF-8) is the upper case version of U+2C65 (3 bytes in UTF-8);      (2 bytes in UTF-8) is the upper case version of U+2C65 (3 bytes in UTF-8);
184      a sequence of 3 of the former uses 6 bytes, as does a sequence of two of      a sequence of 3 of the former uses 6 bytes, as does a sequence of two of
185      the latter. It is important, therefore, to check the length along the      the latter. It is important, therefore, to check the length along the
186      reference, not along the subject (earlier code did this wrong). */      reference, not along the subject (earlier code did this wrong). */
187    
188      USPTR endptr = p + length;      PCRE_PUCHAR endptr = p + length;
189      while (p < endptr)      while (p < endptr)
190        {        {
191        int c, d;        int c, d;
# Line 209  if (caseless) Line 202  if (caseless)
202    /* 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
203    is no UCP support. */    is no UCP support. */
204      {      {
205      if (eptr + length > md->end_subject) return -1;      if (eptr + length > md->end_subject) return -1;
206      while (length-- > 0)      while (length-- > 0)
207        { if (md->lcc[*p++] != md->lcc[*eptr++]) return -1; }        {
208      }        if (TABLE_GET(*p, md->lcc, *p) != TABLE_GET(*eptr, md->lcc, *eptr)) return -1;
209          p++;
210          eptr++;
211          }
212        }
213    }    }
214    
215  /* In the caseful case, we can just compare the bytes, whether or not we  /* In the caseful case, we can just compare the bytes, whether or not we
216  are in UTF-8 mode. */  are in UTF-8 mode. */
217    
218  else  else
219    {    {
220    if (eptr + length > md->end_subject) return -1;    if (eptr + length > md->end_subject) return -1;
221    while (length-- > 0) if (*p++ != *eptr++) return -1;    while (length-- > 0) if (*p++ != *eptr++) return -1;
222    }    }
223    
224  return eptr - eptr_start;  return (int)(eptr - eptr_start);
225  }  }
226    
227    
# Line 276  enum { RM1=1, RM2, RM3, RM4, RM5, RM Line 273  enum { RM1=1, RM2, RM3, RM4, RM5, RM
273         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
274         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
275         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
276         RM61,  RM62, RM63, RM64 };         RM61,  RM62, RM63, RM64, RM65, RM66 };
277    
278  /* 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
279  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 289  actually used in this definition. */ Line 286  actually used in this definition. */
286  #define RMATCH(ra,rb,rc,rd,re,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
287    { \    { \
288    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
289    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1); \    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1); \
290    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
291    }    }
292  #define RRETURN(ra) \  #define RRETURN(ra) \
# Line 299  actually used in this definition. */ Line 296  actually used in this definition. */
296    }    }
297  #else  #else
298  #define RMATCH(ra,rb,rc,rd,re,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
299    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1)    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1)
300  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
301  #endif  #endif
302    
# Line 314  argument of match(), which never changes Line 311  argument of match(), which never changes
311    
312  #define RMATCH(ra,rb,rc,rd,re,rw)\  #define RMATCH(ra,rb,rc,rd,re,rw)\
313    {\    {\
314    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));\
315    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
316    frame->Xwhere = rw; \    frame->Xwhere = rw; \
317    newframe->Xeptr = ra;\    newframe->Xeptr = ra;\
318    newframe->Xecode = rb;\    newframe->Xecode = rb;\
319    newframe->Xmstart = mstart;\    newframe->Xmstart = mstart;\
   newframe->Xmarkptr = markptr;\  
320    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
321    newframe->Xeptrb = re;\    newframe->Xeptrb = re;\
322    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
# Line 336  argument of match(), which never changes Line 332  argument of match(), which never changes
332    {\    {\
333    heapframe *oldframe = frame;\    heapframe *oldframe = frame;\
334    frame = oldframe->Xprevframe;\    frame = oldframe->Xprevframe;\
335    (pcre_stack_free)(oldframe);\    (PUBL(stack_free))(oldframe);\
336    if (frame != NULL)\    if (frame != NULL)\
337      {\      {\
338      rrc = ra;\      rrc = ra;\
# Line 353  typedef struct heapframe { Line 349  typedef struct heapframe {
349    
350    /* Function arguments that may change */    /* Function arguments that may change */
351    
352    USPTR Xeptr;    PCRE_PUCHAR Xeptr;
353    const uschar *Xecode;    const pcre_uchar *Xecode;
354    USPTR Xmstart;    PCRE_PUCHAR Xmstart;
   USPTR Xmarkptr;  
355    int Xoffset_top;    int Xoffset_top;
356    eptrblock *Xeptrb;    eptrblock *Xeptrb;
357    unsigned int Xrdepth;    unsigned int Xrdepth;
358    
359    /* Function local variables */    /* Function local variables */
360    
361    USPTR Xcallpat;    PCRE_PUCHAR Xcallpat;
362  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
363    USPTR Xcharptr;    PCRE_PUCHAR Xcharptr;
364  #endif  #endif
365    USPTR Xdata;    PCRE_PUCHAR Xdata;
366    USPTR Xnext;    PCRE_PUCHAR Xnext;
367    USPTR Xpp;    PCRE_PUCHAR Xpp;
368    USPTR Xprev;    PCRE_PUCHAR Xprev;
369    USPTR Xsaved_eptr;    PCRE_PUCHAR Xsaved_eptr;
370    
371    recursion_info Xnew_recursive;    recursion_info Xnew_recursive;
372    
# Line 383  typedef struct heapframe { Line 378  typedef struct heapframe {
378    int Xprop_type;    int Xprop_type;
379    int Xprop_value;    int Xprop_value;
380    int Xprop_fail_result;    int Xprop_fail_result;
   int Xprop_category;  
   int Xprop_chartype;  
   int Xprop_script;  
381    int Xoclength;    int Xoclength;
382    uschar Xocchars[8];    pcre_uchar Xocchars[6];
383  #endif  #endif
384    
385    int Xcodelink;    int Xcodelink;
# Line 429  returns a negative (error) response, the Line 421  returns a negative (error) response, the
421  same response. */  same response. */
422    
423  /* 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
424  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
425  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.
426  something has been matched). For hard partial matching, we then return  something has been matched). For hard partial matching, we then return
427  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 440  the subject. */ Line 432  the subject. */
432        eptr > md->start_used_ptr) \        eptr > md->start_used_ptr) \
433      { \      { \
434      md->hitend = TRUE; \      md->hitend = TRUE; \
435      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
436      }      }
437    
438  #define SCHECK_PARTIAL()\  #define SCHECK_PARTIAL()\
439    if (md->partial != 0 && eptr > md->start_used_ptr) \    if (md->partial != 0 && eptr > md->start_used_ptr) \
440      { \      { \
441      md->hitend = TRUE; \      md->hitend = TRUE; \
442      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
443      }      }
444    
445    
446  /* Performance note: It might be tempting to extract commonly used fields from  /* Performance note: It might be tempting to extract commonly used fields from
447  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
448  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
449  made performance worse.  made performance worse.
450    
# Line 461  Arguments: Line 453  Arguments:
453     ecode       pointer to current position in compiled code     ecode       pointer to current position in compiled code
454     mstart      pointer to the current match start position (can be modified     mstart      pointer to the current match start position (can be modified
455                   by encountering \K)                   by encountering \K)
    markptr     pointer to the most recent MARK name, or NULL  
456     offset_top  current top pointer     offset_top  current top pointer
457     md          pointer to "static" info for the match     md          pointer to "static" info for the match
458     eptrb       pointer to chain of blocks containing eptr at start of     eptrb       pointer to chain of blocks containing eptr at start of
# Line 476  Returns: MATCH_MATCH if matched Line 467  Returns: MATCH_MATCH if matched
467  */  */
468    
469  static int  static int
470  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,  match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
471    const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,    PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
472    unsigned int rdepth)    unsigned int rdepth)
473  {  {
474  /* 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 487  so they can be ordinary variables in all Line 478  so they can be ordinary variables in all
478  register int  rrc;         /* Returns from recursive calls */  register int  rrc;         /* Returns from recursive calls */
479  register int  i;           /* Used for loops not involving calls to RMATCH() */  register int  i;           /* Used for loops not involving calls to RMATCH() */
480  register unsigned int c;   /* Character values not kept over RMATCH() calls */  register unsigned int c;   /* Character values not kept over RMATCH() calls */
481  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf;         /* Local copy of UTF flag for speed */
482    
483  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
484  BOOL caseless;  BOOL caseless;
# Line 499  heap storage. Set up the top-level frame Line 490  heap storage. Set up the top-level frame
490  heap whenever RMATCH() does a "recursion". See the macro definitions above. */  heap whenever RMATCH() does a "recursion". See the macro definitions above. */
491    
492  #ifdef NO_RECURSE  #ifdef NO_RECURSE
493  heapframe *frame = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));  heapframe *frame = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));
494  if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);  if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
495  frame->Xprevframe = NULL;            /* Marks the top level */  frame->Xprevframe = NULL;            /* Marks the top level */
496    
# Line 508  frame->Xprevframe = NULL; /* Line 499  frame->Xprevframe = NULL; /*
499  frame->Xeptr = eptr;  frame->Xeptr = eptr;
500  frame->Xecode = ecode;  frame->Xecode = ecode;
501  frame->Xmstart = mstart;  frame->Xmstart = mstart;
 frame->Xmarkptr = markptr;  
502  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
503  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
504  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
# Line 522  HEAP_RECURSE: Line 512  HEAP_RECURSE:
512  #define eptr               frame->Xeptr  #define eptr               frame->Xeptr
513  #define ecode              frame->Xecode  #define ecode              frame->Xecode
514  #define mstart             frame->Xmstart  #define mstart             frame->Xmstart
 #define markptr            frame->Xmarkptr  
515  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
516  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
517  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
518    
519  /* Ditto for the local variables */  /* Ditto for the local variables */
520    
521  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
522  #define charptr            frame->Xcharptr  #define charptr            frame->Xcharptr
523  #endif  #endif
524  #define callpat            frame->Xcallpat  #define callpat            frame->Xcallpat
# Line 550  HEAP_RECURSE: Line 539  HEAP_RECURSE:
539  #define prop_type          frame->Xprop_type  #define prop_type          frame->Xprop_type
540  #define prop_value         frame->Xprop_value  #define prop_value         frame->Xprop_value
541  #define prop_fail_result   frame->Xprop_fail_result  #define prop_fail_result   frame->Xprop_fail_result
 #define prop_category      frame->Xprop_category  
 #define prop_chartype      frame->Xprop_chartype  
 #define prop_script        frame->Xprop_script  
542  #define oclength           frame->Xoclength  #define oclength           frame->Xoclength
543  #define occhars            frame->Xocchars  #define occhars            frame->Xocchars
544  #endif  #endif
# Line 590  declarations can be cut out in a block. Line 576  declarations can be cut out in a block.
576  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
577  to RMATCH(). */  to RMATCH(). */
578    
579  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
580  const uschar *charptr;  const pcre_uchar *charptr;
581  #endif  #endif
582  const uschar *callpat;  const pcre_uchar *callpat;
583  const uschar *data;  const pcre_uchar *data;
584  const uschar *next;  const pcre_uchar *next;
585  USPTR         pp;  PCRE_PUCHAR       pp;
586  const uschar *prev;  const pcre_uchar *prev;
587  USPTR         saved_eptr;  PCRE_PUCHAR       saved_eptr;
588    
589  recursion_info new_recursive;  recursion_info new_recursive;
590    
591  BOOL cur_is_word;  BOOL cur_is_word;
592  BOOL condition;  BOOL condition;
593  BOOL prev_is_word;  BOOL prev_is_word;
594    
# Line 610  BOOL prev_is_word; Line 596  BOOL prev_is_word;
596  int prop_type;  int prop_type;
597  int prop_value;  int prop_value;
598  int prop_fail_result;  int prop_fail_result;
 int prop_category;  
 int prop_chartype;  
 int prop_script;  
599  int oclength;  int oclength;
600  uschar occhars[8];  pcre_uchar occhars[6];
601  #endif  #endif
602    
603  int codelink;  int codelink;
# Line 632  int stacksave[REC_STACK_SAVE_MAX]; Line 615  int stacksave[REC_STACK_SAVE_MAX];
615  eptrblock newptrb;  eptrblock newptrb;
616  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
617    
618  /* 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
619  of the local variables that are used only in localised parts of the code, but  of the local variables that are used only in localised parts of the code, but
620  still need to be preserved over recursive calls of match(). These macros define  still need to be preserved over recursive calls of match(). These macros define
621  the alternative names that are used. */  the alternative names that are used. */
622    
623  #define allow_zero    cur_is_word  #define allow_zero    cur_is_word
# Line 642  the alternative names that are used. */ Line 625  the alternative names that are used. */
625  #define code_offset   codelink  #define code_offset   codelink
626  #define condassert    condition  #define condassert    condition
627  #define matched_once  prev_is_word  #define matched_once  prev_is_word
628    #define foc           number
629    
630  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
631  variables. */  variables. */
# Line 667  defined). However, RMATCH isn't like a f Line 651  defined). However, RMATCH isn't like a f
651  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,
652  however, impact performance when true recursion is being used. */  however, impact performance when true recursion is being used. */
653    
654  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
655  utf8 = md->utf8;       /* Local copy of the flag */  utf = md->utf;       /* Local copy of the flag */
656  #else  #else
657  utf8 = FALSE;  utf = FALSE;
658  #endif  #endif
659    
660  /* 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 680  if (md->match_call_count++ >= md->match_ Line 664  if (md->match_call_count++ >= md->match_
664  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
665    
666  /* At the start of a group with an unlimited repeat that may match an empty  /* At the start of a group with an unlimited repeat that may match an empty
667  string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is  string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is
668  done this way to save having to use another function argument, which would take  done this way to save having to use another function argument, which would take
669  up space on the stack. See also MATCH_CONDASSERT below.  up space on the stack. See also MATCH_CONDASSERT below.
670    
671  When MATCH_CBEGROUP is set, add the current subject pointer to the chain of  When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
# Line 705  for (;;) Line 689  for (;;)
689    {    {
690    minimize = possessive = FALSE;    minimize = possessive = FALSE;
691    op = *ecode;    op = *ecode;
692    
693    switch(op)    switch(op)
694      {      {
695      case OP_MARK:      case OP_MARK:
696      markptr = ecode + 2;      md->nomatch_mark = ecode + 2;
697      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      md->mark = NULL;    /* In case previously set by assertion */
698        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
699        eptrb, RM55);        eptrb, RM55);
700        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
701             md->mark == NULL) md->mark = ecode + 2;
702    
703      /* 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
704      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 720  for (;;) Line 707  for (;;)
707      position and return MATCH_SKIP. Otherwise, pass back the return code      position and return MATCH_SKIP. Otherwise, pass back the return code
708      unaltered. */      unaltered. */
709    
710      if (rrc == MATCH_SKIP_ARG &&      else if (rrc == MATCH_SKIP_ARG &&
711          strcmp((char *)markptr, (char *)(md->start_match_ptr)) == 0)          STRCMP_UC_UC(ecode + 2, md->start_match_ptr) == 0)
712        {        {
713        md->start_match_ptr = eptr;        md->start_match_ptr = eptr;
714        RRETURN(MATCH_SKIP);        RRETURN(MATCH_SKIP);
715        }        }
   
     if (md->mark == NULL) md->mark = markptr;  
716      RRETURN(rrc);      RRETURN(rrc);
717    
718      case OP_FAIL:      case OP_FAIL:
719      MRRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
720    
721      /* COMMIT overrides PRUNE, SKIP, and THEN */      /* COMMIT overrides PRUNE, SKIP, and THEN */
722    
723      case OP_COMMIT:      case OP_COMMIT:
724      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
725        eptrb, RM52);        eptrb, RM52);
726      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
727          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
728          rrc != MATCH_THEN)          rrc != MATCH_THEN)
729        RRETURN(rrc);        RRETURN(rrc);
730      MRRETURN(MATCH_COMMIT);      RRETURN(MATCH_COMMIT);
731    
732      /* PRUNE overrides THEN */      /* PRUNE overrides THEN */
733    
734      case OP_PRUNE:      case OP_PRUNE:
735      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
736        eptrb, RM51);        eptrb, RM51);
737      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
738      MRRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
739    
740      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
741      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      md->nomatch_mark = ecode + 2;
742        md->mark = NULL;    /* In case previously set by assertion */
743        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
744        eptrb, RM56);        eptrb, RM56);
745        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
746             md->mark == NULL) md->mark = ecode + 2;
747      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
     md->mark = ecode + 2;  
748      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
749    
750      /* SKIP overrides PRUNE and THEN */      /* SKIP overrides PRUNE and THEN */
751    
752      case OP_SKIP:      case OP_SKIP:
753      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
754        eptrb, RM53);        eptrb, RM53);
755      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
756        RRETURN(rrc);        RRETURN(rrc);
757      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
758      MRRETURN(MATCH_SKIP);      RRETURN(MATCH_SKIP);
759    
760        /* Note that, for Perl compatibility, SKIP with an argument does NOT set
761        nomatch_mark. There is a flag that disables this opcode when re-matching a
762        pattern that ended with a SKIP for which there was not a matching MARK. */
763    
764      case OP_SKIP_ARG:      case OP_SKIP_ARG:
765      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      if (md->ignore_skip_arg)
766          {
767          ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
768          break;
769          }
770        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
771        eptrb, RM57);        eptrb, RM57);
772      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
773        RRETURN(rrc);        RRETURN(rrc);
774    
775      /* 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
776      returning the special MATCH_SKIP_ARG return code. This will either be      returning the special MATCH_SKIP_ARG return code. This will either be
777      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
778      as PRUNE. */      with the md->ignore_skip_arg flag set. */
779    
780      md->start_match_ptr = ecode + 2;      md->start_match_ptr = ecode + 2;
781      RRETURN(MATCH_SKIP_ARG);      RRETURN(MATCH_SKIP_ARG);
782    
783      /* For THEN (and THEN_ARG) we pass back the address of the bracket or      /* For THEN (and THEN_ARG) we pass back the address of the opcode, so that
784      the alt that is at the start of the current branch. This makes it possible      the branch in which it occurs can be determined. Overload the start of
785      to skip back past alternatives that precede the THEN within the current      match pointer to do this. */
     branch. */  
786    
787      case OP_THEN:      case OP_THEN:
788      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
789        eptrb, RM54);        eptrb, RM54);
790      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
791      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
792      MRRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
793    
794      case OP_THEN_ARG:      case OP_THEN_ARG:
795      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],      md->nomatch_mark = ecode + 2;
796        offset_top, md, eptrb, RM58);      md->mark = NULL;    /* In case previously set by assertion */
797        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top,
798          md, eptrb, RM58);
799        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
800             md->mark == NULL) md->mark = ecode + 2;
801      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
802      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
     md->mark = ecode + LINK_SIZE + 2;  
803      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
804    
805        /* Handle an atomic group that does not contain any capturing parentheses.
806        This can be handled like an assertion. Prior to 8.13, all atomic groups
807        were handled this way. In 8.13, the code was changed as below for ONCE, so
808        that backups pass through the group and thereby reset captured values.
809        However, this uses a lot more stack, so in 8.20, atomic groups that do not
810        contain any captures generate OP_ONCE_NC, which can be handled in the old,
811        less stack intensive way.
812    
813        Check the alternative branches in turn - the matching won't pass the KET
814        for this kind of subpattern. If any one branch matches, we carry on as at
815        the end of a normal bracket, leaving the subject pointer, but resetting
816        the start-of-match value in case it was changed by \K. */
817    
818        case OP_ONCE_NC:
819        prev = ecode;
820        saved_eptr = eptr;
821        do
822          {
823          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
824          if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
825            {
826            mstart = md->start_match_ptr;
827            break;
828            }
829          if (rrc == MATCH_THEN)
830            {
831            next = ecode + GET(ecode,1);
832            if (md->start_match_ptr < next &&
833                (*ecode == OP_ALT || *next == OP_ALT))
834              rrc = MATCH_NOMATCH;
835            }
836    
837          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
838          ecode += GET(ecode,1);
839          }
840        while (*ecode == OP_ALT);
841    
842        /* If hit the end of the group (which could be repeated), fail */
843    
844        if (*ecode != OP_ONCE_NC && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
845    
846        /* Continue as from after the group, updating the offsets high water
847        mark, since extracts may have been taken. */
848    
849        do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
850    
851        offset_top = md->end_offset_top;
852        eptr = md->end_match_ptr;
853    
854        /* For a non-repeating ket, just continue at this level. This also
855        happens for a repeating ket if no characters were matched in the group.
856        This is the forcible breaking of infinite loops as implemented in Perl
857        5.005. */
858    
859        if (*ecode == OP_KET || eptr == saved_eptr)
860          {
861          ecode += 1+LINK_SIZE;
862          break;
863          }
864    
865        /* The repeating kets try the rest of the pattern or restart from the
866        preceding bracket, in the appropriate order. The second "call" of match()
867        uses tail recursion, to avoid using another stack frame. */
868    
869        if (*ecode == OP_KETRMIN)
870          {
871          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM65);
872          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
873          ecode = prev;
874          goto TAIL_RECURSE;
875          }
876        else  /* OP_KETRMAX */
877          {
878          md->match_function_type = MATCH_CBEGROUP;
879          RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
880          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
881          ecode += 1 + LINK_SIZE;
882          goto TAIL_RECURSE;
883          }
884        /* Control never gets here */
885    
886      /* Handle a capturing bracket, other than those that are possessive with an      /* Handle a capturing bracket, other than those that are possessive with an
887      unlimited repeat. If there is space in the offset vector, save the current      unlimited repeat. If there is space in the offset vector, save the current
888      subject position in the working slot at the top of the vector. We mustn't      subject position in the working slot at the top of the vector. We mustn't
889      change the current values of the data slot, because they may be set from a      change the current values of the data slot, because they may be set from a
890      previous iteration of this group, and be referred to by a reference inside      previous iteration of this group, and be referred to by a reference inside
891      the group. If we fail to match, we need to restore this value and also the      the group. A failure to match might occur after the group has succeeded,
892      values of the final offsets, in case they were set by a previous iteration      if something later on doesn't match. For this reason, we need to restore
893      of the same bracket.      the working value and also the values of the final offsets, in case they
894        were set by a previous iteration of the same bracket.
895    
896      If there isn't enough space in the offset vector, treat this as if it were      If there isn't enough space in the offset vector, treat this as if it were
897      a non-capturing bracket. Don't worry about setting the flag for the error      a non-capturing bracket. Don't worry about setting the flag for the error
# Line 820  for (;;) Line 901  for (;;)
901      case OP_SCBRA:      case OP_SCBRA:
902      number = GET2(ecode, 1+LINK_SIZE);      number = GET2(ecode, 1+LINK_SIZE);
903      offset = number << 1;      offset = number << 1;
904    
905  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
906      printf("start bracket %d\n", number);      printf("start bracket %d\n", number);
907      printf("subject=");      printf("subject=");
# Line 841  for (;;) Line 922  for (;;)
922    
923        for (;;)        for (;;)
924          {          {
925          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
926          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
927            eptrb, RM1);            eptrb, RM1);
928          if (rrc != MATCH_NOMATCH &&          if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
929              (rrc != MATCH_THEN || md->start_match_ptr != ecode))  
930            RRETURN(rrc);          /* If we backed up to a THEN, check whether it is within the current
931            branch by comparing the address of the THEN that is passed back with
932            the end of the branch. If it is within the current branch, and the
933            branch is one of two or more alternatives (it either starts or ends
934            with OP_ALT), we have reached the limit of THEN's action, so convert
935            the return code to NOMATCH, which will cause normal backtracking to
936            happen from now on. Otherwise, THEN is passed back to an outer
937            alternative. This implements Perl's treatment of parenthesized groups,
938            where a group not containing | does not affect the current alternative,
939            that is, (X) is NOT the same as (X|(*F)). */
940    
941            if (rrc == MATCH_THEN)
942              {
943              next = ecode + GET(ecode,1);
944              if (md->start_match_ptr < next &&
945                  (*ecode == OP_ALT || *next == OP_ALT))
946                rrc = MATCH_NOMATCH;
947              }
948    
949            /* Anything other than NOMATCH is passed back. */
950    
951            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
952          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
953          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
954          if (*ecode != OP_ALT) break;          if (*ecode != OP_ALT) break;
955          }          }
956    
957        DPRINTF(("bracket %d failed\n", number));        DPRINTF(("bracket %d failed\n", number));
   
958        md->offset_vector[offset] = save_offset1;        md->offset_vector[offset] = save_offset1;
959        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
960        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
961    
962        if (rrc != MATCH_THEN) md->mark = markptr;        /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
963        RRETURN(MATCH_NOMATCH);  
964          RRETURN(rrc);
965        }        }
966    
967      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
# Line 873  for (;;) Line 975  for (;;)
975      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
976      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
977    
978      /* Non-capturing bracket, except for possessive with unlimited repeat. Loop      /* Non-capturing or atomic group, except for possessive with unlimited
979      for all the alternatives. When we get to the final alternative within the      repeat and ONCE group with no captures. Loop for all the alternatives.
980      brackets, we would return the result of a recursive call to match()  
981      whatever happened. We can reduce stack usage by turning this into a tail      When we get to the final alternative within the brackets, we used to return
982      recursion, except in the case of a possibly empty group.*/      the result of a recursive call to match() whatever happened so it was
983        possible to reduce stack usage by turning this into a tail recursion,
984        except in the case of a possibly empty group. However, now that there is
985        the possiblity of (*THEN) occurring in the final alternative, this
986        optimization is no longer always possible.
987    
988        We can optimize if we know there are no (*THEN)s in the pattern; at present
989        this is the best that can be done.
990    
991        MATCH_ONCE is returned when the end of an atomic group is successfully
992        reached, but subsequent matching fails. It passes back up the tree (causing
993        captured values to be reset) until the original atomic group level is
994        reached. This is tested by comparing md->once_target with the start of the
995        group. At this point, the return is converted into MATCH_NOMATCH so that
996        previous backup points can be taken. */
997    
998        case OP_ONCE:
999      case OP_BRA:      case OP_BRA:
1000      case OP_SBRA:      case OP_SBRA:
1001      DPRINTF(("start non-capturing bracket\n"));      DPRINTF(("start non-capturing bracket\n"));
1002    
1003      for (;;)      for (;;)
1004        {        {
1005        if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */        if (op >= OP_SBRA || op == OP_ONCE) md->match_function_type = MATCH_CBEGROUP;
1006    
1007          /* If this is not a possibly empty group, and there are no (*THEN)s in
1008          the pattern, and this is the final alternative, optimize as described
1009          above. */
1010    
1011          else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
1012          {          {
1013          if (op >= OP_SBRA)   /* Possibly empty group */          ecode += PRIV(OP_lengths)[*ecode];
           {  
           md->match_function_type = MATCH_CBEGROUP;  
           RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,  
             RM48);  
           if (rrc == MATCH_NOMATCH) md->mark = markptr;  
           RRETURN(rrc);  
           }  
         /* Not a possibly empty group; use tail recursion */  
         ecode += _pcre_OP_lengths[*ecode];  
         DPRINTF(("bracket 0 tail recursion\n"));  
1014          goto TAIL_RECURSE;          goto TAIL_RECURSE;
1015          }          }
1016    
1017        /* For non-final alternatives, continue the loop for a NOMATCH result;        /* In all other cases, we have to make another call to match(). */
       otherwise return. */  
1018    
1019        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
       RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,  
1020          RM2);          RM2);
1021        if (rrc != MATCH_NOMATCH &&  
1022            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* See comment in the code for capturing groups above about handling
1023          THEN. */
1024    
1025          if (rrc == MATCH_THEN)
1026            {
1027            next = ecode + GET(ecode,1);
1028            if (md->start_match_ptr < next &&
1029                (*ecode == OP_ALT || *next == OP_ALT))
1030              rrc = MATCH_NOMATCH;
1031            }
1032    
1033          if (rrc != MATCH_NOMATCH)
1034            {
1035            if (rrc == MATCH_ONCE)
1036              {
1037              const pcre_uchar *scode = ecode;
1038              if (*scode != OP_ONCE)           /* If not at start, find it */
1039                {
1040                while (*scode == OP_ALT) scode += GET(scode, 1);
1041                scode -= GET(scode, 1);
1042                }
1043              if (md->once_target == scode) rrc = MATCH_NOMATCH;
1044              }
1045          RRETURN(rrc);          RRETURN(rrc);
1046            }
1047        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1048          if (*ecode != OP_ALT) break;
1049        }        }
     /* Control never reaches here. */  
1050    
1051      /* Handle possessive capturing brackets with an unlimited repeat. We come      RRETURN(MATCH_NOMATCH);
1052    
1053        /* Handle possessive capturing brackets with an unlimited repeat. We come
1054      here from BRAZERO with allow_zero set TRUE. The offset_vector values are      here from BRAZERO with allow_zero set TRUE. The offset_vector values are
1055      handled similarly to the normal case above. However, the matching is      handled similarly to the normal case above. However, the matching is
1056      different. The end of these brackets will always be OP_KETRPOS, which      different. The end of these brackets will always be OP_KETRPOS, which
1057      returns MATCH_KETRPOS without going further in the pattern. By this means      returns MATCH_KETRPOS without going further in the pattern. By this means
1058      we can handle the group by iteration rather than recursion, thereby      we can handle the group by iteration rather than recursion, thereby
1059      reducing the amount of stack needed. */      reducing the amount of stack needed. */
1060    
1061      case OP_CBRAPOS:      case OP_CBRAPOS:
1062      case OP_SCBRAPOS:      case OP_SCBRAPOS:
1063      allow_zero = FALSE;      allow_zero = FALSE;
1064    
1065      POSSESSIVE_CAPTURE:      POSSESSIVE_CAPTURE:
1066      number = GET2(ecode, 1+LINK_SIZE);      number = GET2(ecode, 1+LINK_SIZE);
1067      offset = number << 1;      offset = number << 1;
# Line 939  for (;;) Line 1076  for (;;)
1076      if (offset < md->offset_max)      if (offset < md->offset_max)
1077        {        {
1078        matched_once = FALSE;        matched_once = FALSE;
1079        code_offset = ecode - md->start_code;        code_offset = (int)(ecode - md->start_code);
1080    
1081        save_offset1 = md->offset_vector[offset];        save_offset1 = md->offset_vector[offset];
1082        save_offset2 = md->offset_vector[offset+1];        save_offset2 = md->offset_vector[offset+1];
# Line 947  for (;;) Line 1084  for (;;)
1084        save_capture_last = md->capture_last;        save_capture_last = md->capture_last;
1085    
1086        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
1087    
1088        /* Each time round the loop, save the current subject position for use        /* Each time round the loop, save the current subject position for use
1089        when the group matches. For MATCH_MATCH, the group has matched, so we        when the group matches. For MATCH_MATCH, the group has matched, so we
1090        restart it with a new subject starting position, remembering that we had        restart it with a new subject starting position, remembering that we had
1091        at least one match. For MATCH_NOMATCH, carry on with the alternatives, as        at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
1092        usual. If we haven't matched any alternatives in any iteration, check to        usual. If we haven't matched any alternatives in any iteration, check to
1093        see if a previous iteration matched. If so, the group has matched;        see if a previous iteration matched. If so, the group has matched;
1094        continue from afterwards. Otherwise it has failed; restore the previous        continue from afterwards. Otherwise it has failed; restore the previous
1095        capture values before returning NOMATCH. */        capture values before returning NOMATCH. */
1096    
1097        for (;;)        for (;;)
1098          {          {
1099          md->offset_vector[md->offset_end - number] =          md->offset_vector[md->offset_end - number] =
1100            (int)(eptr - md->start_subject);            (int)(eptr - md->start_subject);
1101          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1102          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1103            eptrb, RM63);            eptrb, RM63);
1104          if (rrc == MATCH_KETRPOS)          if (rrc == MATCH_KETRPOS)
1105            {            {
1106            offset_top = md->end_offset_top;            offset_top = md->end_offset_top;
1107            eptr = md->end_match_ptr;            eptr = md->end_match_ptr;
1108            ecode = md->start_code + code_offset;            ecode = md->start_code + code_offset;
1109            save_capture_last = md->capture_last;            save_capture_last = md->capture_last;
1110            matched_once = TRUE;            matched_once = TRUE;
1111            continue;            continue;
1112            }            }
1113          if (rrc != MATCH_NOMATCH &&  
1114              (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* See comment in the code for capturing groups above about handling
1115            RRETURN(rrc);          THEN. */
1116    
1117            if (rrc == MATCH_THEN)
1118              {
1119              next = ecode + GET(ecode,1);
1120              if (md->start_match_ptr < next &&
1121                  (*ecode == OP_ALT || *next == OP_ALT))
1122                rrc = MATCH_NOMATCH;
1123              }
1124    
1125            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1126          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
1127          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
1128          if (*ecode != OP_ALT) break;          if (*ecode != OP_ALT) break;
1129          }          }
1130    
1131        if (!matched_once)        if (!matched_once)
1132          {          {
1133          md->offset_vector[offset] = save_offset1;          md->offset_vector[offset] = save_offset1;
1134          md->offset_vector[offset+1] = save_offset2;          md->offset_vector[offset+1] = save_offset2;
1135          md->offset_vector[md->offset_end - number] = save_offset3;          md->offset_vector[md->offset_end - number] = save_offset3;
1136          }          }
1137    
       if (rrc != MATCH_THEN) md->mark = markptr;  
1138        if (allow_zero || matched_once)        if (allow_zero || matched_once)
1139          {          {
1140          ecode += 1 + LINK_SIZE;          ecode += 1 + LINK_SIZE;
1141          break;          break;
1142          }          }
1143    
1144        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1145        }        }
1146    
1147      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
1148      as a non-capturing bracket. */      as a non-capturing bracket. */
1149    
# Line 1009  for (;;) Line 1155  for (;;)
1155      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1156      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1157    
1158      /* Non-capturing possessive bracket with unlimited repeat. We come here      /* Non-capturing possessive bracket with unlimited repeat. We come here
1159      from BRAZERO with allow_zero = TRUE. The code is similar to the above,      from BRAZERO with allow_zero = TRUE. The code is similar to the above,
1160      without the capturing complication. It is written out separately for speed      without the capturing complication. It is written out separately for speed
1161      and cleanliness. */      and cleanliness. */
1162    
1163      case OP_BRAPOS:      case OP_BRAPOS:
1164      case OP_SBRAPOS:      case OP_SBRAPOS:
1165      allow_zero = FALSE;      allow_zero = FALSE;
1166    
1167      POSSESSIVE_NON_CAPTURE:      POSSESSIVE_NON_CAPTURE:
1168      matched_once = FALSE;      matched_once = FALSE;
1169      code_offset = ecode - md->start_code;      code_offset = (int)(ecode - md->start_code);
1170    
1171      for (;;)      for (;;)
1172        {        {
1173        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1174        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1175          eptrb, RM64);          eptrb, RM48);
1176        if (rrc == MATCH_KETRPOS)        if (rrc == MATCH_KETRPOS)
1177          {          {
1178            offset_top = md->end_offset_top;
1179          eptr = md->end_match_ptr;          eptr = md->end_match_ptr;
1180          ecode = md->start_code + code_offset;          ecode = md->start_code + code_offset;
1181          matched_once = TRUE;          matched_once = TRUE;
1182          continue;          continue;
1183          }          }
1184        if (rrc != MATCH_NOMATCH &&  
1185            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* See comment in the code for capturing groups above about handling
1186          RRETURN(rrc);        THEN. */
1187    
1188          if (rrc == MATCH_THEN)
1189            {
1190            next = ecode + GET(ecode,1);
1191            if (md->start_match_ptr < next &&
1192                (*ecode == OP_ALT || *next == OP_ALT))
1193              rrc = MATCH_NOMATCH;
1194            }
1195    
1196          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1197        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1198        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1199        }        }
1200    
1201      if (matched_once || allow_zero)      if (matched_once || allow_zero)
1202        {        {
1203        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1204        break;        break;
1205        }        }
1206      RRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
1207    
1208      /* Control never reaches here. */      /* Control never reaches here. */
# Line 1053  for (;;) Line 1210  for (;;)
1210      /* Conditional group: compilation checked that there are no more than      /* Conditional group: compilation checked that there are no more than
1211      two branches. If the condition is false, skipping the first branch takes us      two branches. If the condition is false, skipping the first branch takes us
1212      past the end if there is only one branch, but that's OK because that is      past the end if there is only one branch, but that's OK because that is
1213      exactly what going to the ket would do. As there is only one branch to be      exactly what going to the ket would do. */
     obeyed, we can use tail recursion to avoid using another stack frame. */  
1214    
1215      case OP_COND:      case OP_COND:
1216      case OP_SCOND:      case OP_SCOND:
# Line 1065  for (;;) Line 1221  for (;;)
1221    
1222      if (ecode[LINK_SIZE+1] == OP_CALLOUT)      if (ecode[LINK_SIZE+1] == OP_CALLOUT)
1223        {        {
1224        if (pcre_callout != NULL)        if (PUBL(callout) != NULL)
1225          {          {
1226          pcre_callout_block cb;          PUBL(callout_block) cb;
1227          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 2;   /* Version 1 of the callout block */
1228          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[LINK_SIZE+2];
1229          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1230          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
# Line 1080  for (;;) Line 1236  for (;;)
1236          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1237          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last;
1238          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1239          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);          cb.mark             = md->nomatch_mark;
1240            if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1241          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1242          }          }
1243        ecode += _pcre_OP_lengths[OP_CALLOUT];        ecode += PRIV(OP_lengths)[OP_CALLOUT];
1244        }        }
1245    
1246      condcode = ecode[LINK_SIZE+1];      condcode = ecode[LINK_SIZE+1];
# Line 1100  for (;;) Line 1257  for (;;)
1257        else        else
1258          {          {
1259          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
1260          condition =  (recno == RREF_ANY || recno == md->recursive->group_num);          condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1261    
1262          /* 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
1263          false, but the test was set up by name, scan the table to see if the          false, but the test was set up by name, scan the table to see if the
1264          name refers to any other numbers, and test them. The condition is true          name refers to any other numbers, and test them. The condition is true
1265          if any one is set. */          if any one is set. */
1266    
1267          if (!condition && condcode == OP_NRREF && recno != RREF_ANY)          if (!condition && condcode == OP_NRREF)
1268            {            {
1269            uschar *slotA = md->name_table;            pcre_uchar *slotA = md->name_table;
1270            for (i = 0; i < md->name_count; i++)            for (i = 0; i < md->name_count; i++)
1271              {              {
1272              if (GET2(slotA, 0) == recno) break;              if (GET2(slotA, 0) == recno) break;
# Line 1122  for (;;) Line 1279  for (;;)
1279    
1280            if (i < md->name_count)            if (i < md->name_count)
1281              {              {
1282              uschar *slotB = slotA;              pcre_uchar *slotB = slotA;
1283              while (slotB > md->name_table)              while (slotB > md->name_table)
1284                {                {
1285                slotB -= md->name_entry_size;                slotB -= md->name_entry_size;
1286                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1287                  {                  {
1288                  condition = GET2(slotB, 0) == md->recursive->group_num;                  condition = GET2(slotB, 0) == md->recursive->group_num;
1289                  if (condition) break;                  if (condition) break;
# Line 1142  for (;;) Line 1299  for (;;)
1299                for (i++; i < md->name_count; i++)                for (i++; i < md->name_count; i++)
1300                  {                  {
1301                  slotB += md->name_entry_size;                  slotB += md->name_entry_size;
1302                  if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                  if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1303                    {                    {
1304                    condition = GET2(slotB, 0) == md->recursive->group_num;                    condition = GET2(slotB, 0) == md->recursive->group_num;
1305                    if (condition) break;                    if (condition) break;
# Line 1155  for (;;) Line 1312  for (;;)
1312    
1313          /* Chose branch according to the condition */          /* Chose branch according to the condition */
1314    
1315          ecode += condition? 3 : GET(ecode, 1);          ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1316          }          }
1317        }        }
1318    
# Line 1172  for (;;) Line 1329  for (;;)
1329        if (!condition && condcode == OP_NCREF)        if (!condition && condcode == OP_NCREF)
1330          {          {
1331          int refno = offset >> 1;          int refno = offset >> 1;
1332          uschar *slotA = md->name_table;          pcre_uchar *slotA = md->name_table;
1333    
1334          for (i = 0; i < md->name_count; i++)          for (i = 0; i < md->name_count; i++)
1335            {            {
# Line 1186  for (;;) Line 1343  for (;;)
1343    
1344          if (i < md->name_count)          if (i < md->name_count)
1345            {            {
1346            uschar *slotB = slotA;            pcre_uchar *slotB = slotA;
1347            while (slotB > md->name_table)            while (slotB > md->name_table)
1348              {              {
1349              slotB -= md->name_entry_size;              slotB -= md->name_entry_size;
1350              if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)              if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1351                {                {
1352                offset = GET2(slotB, 0) << 1;                offset = GET2(slotB, 0) << 1;
1353                condition = offset < offset_top &&                condition = offset < offset_top &&
# Line 1208  for (;;) Line 1365  for (;;)
1365              for (i++; i < md->name_count; i++)              for (i++; i < md->name_count; i++)
1366                {                {
1367                slotB += md->name_entry_size;                slotB += md->name_entry_size;
1368                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1369                  {                  {
1370                  offset = GET2(slotB, 0) << 1;                  offset = GET2(slotB, 0) << 1;
1371                  condition = offset < offset_top &&                  condition = offset < offset_top &&
# Line 1223  for (;;) Line 1380  for (;;)
1380    
1381        /* Chose branch according to the condition */        /* Chose branch according to the condition */
1382    
1383        ecode += condition? 3 : GET(ecode, 1);        ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1384        }        }
1385    
1386      else if (condcode == OP_DEF)     /* DEFINE - always false */      else if (condcode == OP_DEF)     /* DEFINE - always false */
# Line 1238  for (;;) Line 1395  for (;;)
1395    
1396      else      else
1397        {        {
1398        md->match_function_type = MATCH_CONDASSERT;        md->match_function_type = MATCH_CONDASSERT;
1399        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);
1400        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
1401          {          {
1402            if (md->end_offset_top > offset_top)
1403              offset_top = md->end_offset_top;  /* Captures may have happened */
1404          condition = TRUE;          condition = TRUE;
1405          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
1406          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1407          }          }
1408        else if (rrc != MATCH_NOMATCH &&  
1409                (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
1410          assertion; it is therefore treated as NOMATCH. */
1411    
1412          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1413          {          {
1414          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
1415          }          }
# Line 1258  for (;;) Line 1420  for (;;)
1420          }          }
1421        }        }
1422    
1423      /* We are now at the branch that is to be obeyed. As there is only one,      /* We are now at the branch that is to be obeyed. As there is only one, can
1424      we can use tail recursion to avoid using another stack frame, except when      use tail recursion to avoid using another stack frame, except when there is
1425      we have an unlimited repeat of a possibly empty group. If the second      unlimited repeat of a possibly empty group. In the latter case, a recursive
1426      alternative doesn't exist, we can just plough on. */      call to match() is always required, unless the second alternative doesn't
1427        exist, in which case we can just plough on. Note that, for compatibility
1428        with Perl, the | in a conditional group is NOT treated as creating two
1429        alternatives. If a THEN is encountered in the branch, it propagates out to
1430        the enclosing alternative (unless nested in a deeper set of alternatives,
1431        of course). */
1432    
1433      if (condition || *ecode == OP_ALT)      if (condition || *ecode == OP_ALT)
1434        {        {
1435        ecode += 1 + LINK_SIZE;        if (op != OP_SCOND)
       if (op == OP_SCOND)        /* Possibly empty group */  
1436          {          {
1437          md->match_function_type = MATCH_CBEGROUP;          ecode += 1 + LINK_SIZE;
1438          RMATCH(eptr, ecode, offset_top, md, eptrb, RM49);          goto TAIL_RECURSE;
         RRETURN(rrc);  
1439          }          }
1440        else goto TAIL_RECURSE;  
1441          md->match_function_type = MATCH_CBEGROUP;
1442          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
1443          RRETURN(rrc);
1444        }        }
1445      else                         /* Condition false & no alternative */  
1446         /* Condition false & no alternative; continue after the group. */
1447    
1448        else
1449        {        {
1450        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1451        }        }
# Line 1301  for (;;) Line 1472  for (;;)
1472        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1473        if (offset_top <= offset) offset_top = offset + 2;        if (offset_top <= offset) offset_top = offset + 2;
1474        }        }
1475      ecode += 3;      ecode += 1 + IMM2_SIZE;
1476      break;      break;
1477    
1478    
1479      /* End of the pattern, either real or forced. If we are in a top-level      /* End of the pattern, either real or forced. */
     recursion, we should restore the offsets appropriately and continue from  
     after the call. */  
1480    
     case OP_ACCEPT:  
1481      case OP_END:      case OP_END:
1482      if (md->recursive != NULL && md->recursive->group_num == 0)      case OP_ACCEPT:
1483        {      case OP_ASSERT_ACCEPT:
       recursion_info *rec = md->recursive;  
       DPRINTF(("End of pattern in a (?0) recursion\n"));  
       md->recursive = rec->prevrec;  
       memmove(md->offset_vector, rec->offset_save,  
         rec->saved_max * sizeof(int));  
       offset_top = rec->save_offset_top;  
       ecode = rec->after_call;  
       break;  
       }  
1484    
1485      /* Otherwise, if we have matched an empty string, fail if PCRE_NOTEMPTY is      /* If we have matched an empty string, fail if not in an assertion and not
1486      set, or if PCRE_NOTEMPTY_ATSTART is set and we have matched at the start of      in a recursion if either PCRE_NOTEMPTY is set, or if PCRE_NOTEMPTY_ATSTART
1487      the subject. In both cases, backtracking will then try other alternatives,      is set and we have matched at the start of the subject. In both cases,
1488      if any. */      backtracking will then try other alternatives, if any. */
1489    
1490      if (eptr == mstart &&      if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
1491          (md->notempty ||           md->recursive == NULL &&
1492            (md->notempty_atstart &&           (md->notempty ||
1493              mstart == md->start_subject + md->start_offset)))             (md->notempty_atstart &&
1494        MRRETURN(MATCH_NOMATCH);               mstart == md->start_subject + md->start_offset)))
1495          RRETURN(MATCH_NOMATCH);
1496    
1497      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
1498    
# Line 1341  for (;;) Line 1501  for (;;)
1501      md->start_match_ptr = mstart;       /* and the start (\K can modify) */      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
1502    
1503      /* 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
1504      given as the argument to MRRETURN when the heap is in use. */      given as the argument to RRETURN when the heap is in use. */
1505    
1506      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1507      MRRETURN(rrc);      RRETURN(rrc);
1508    
1509      /* Assertion brackets. Check the alternative branches in turn - the      /* Assertion brackets. Check the alternative branches in turn - the
1510      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,
1511      the assertion is true. Lookbehind assertions have an OP_REVERSE item at the      the assertion is true. Lookbehind assertions have an OP_REVERSE item at the
1512      start of each branch to move the current point backwards, so the code at      start of each branch to move the current point backwards, so the code at
1513      this level is identical to the lookahead case. When the assertion is part      this level is identical to the lookahead case. When the assertion is part
1514      of a condition, we want to return immediately afterwards. The caller of      of a condition, we want to return immediately afterwards. The caller of
1515      this incarnation of the match() function will have set MATCH_CONDASSERT in      this incarnation of the match() function will have set MATCH_CONDASSERT in
1516      md->match_function type, and one of these opcodes will be the first opcode      md->match_function type, and one of these opcodes will be the first opcode
1517      that is processed. We use a local variable that is preserved over calls to      that is processed. We use a local variable that is preserved over calls to
1518      match() to remember this case. */      match() to remember this case. */
1519    
1520      case OP_ASSERT:      case OP_ASSERT:
# Line 1364  for (;;) Line 1524  for (;;)
1524        condassert = TRUE;        condassert = TRUE;
1525        md->match_function_type = 0;        md->match_function_type = 0;
1526        }        }
1527      else condassert = FALSE;      else condassert = FALSE;
1528    
1529      do      do
1530        {        {
1531        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
# Line 1374  for (;;) Line 1534  for (;;)
1534          mstart = md->start_match_ptr;   /* In case \K reset it */          mstart = md->start_match_ptr;   /* In case \K reset it */
1535          break;          break;
1536          }          }
1537        if (rrc != MATCH_NOMATCH &&  
1538            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1539          RRETURN(rrc);        as NOMATCH. */
1540    
1541          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1542        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1543        }        }
1544      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1545    
1546      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
1547    
1548      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1549    
# Line 1406  for (;;) Line 1568  for (;;)
1568        condassert = TRUE;        condassert = TRUE;
1569        md->match_function_type = 0;        md->match_function_type = 0;
1570        }        }
1571      else condassert = FALSE;      else condassert = FALSE;
1572    
1573      do      do
1574        {        {
1575        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1576        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) RRETURN(MATCH_NOMATCH);
1577        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1578          {          {
1579          do ecode += GET(ecode,1); while (*ecode == OP_ALT);          do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1580          break;          break;
1581          }          }
1582        if (rrc != MATCH_NOMATCH &&  
1583            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1584          RRETURN(rrc);        as NOMATCH. */
1585    
1586          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1587        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1588        }        }
1589      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1590    
1591      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1592    
1593      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1594      continue;      continue;
1595    
# Line 1435  for (;;) Line 1599  for (;;)
1599      back a number of characters, not bytes. */      back a number of characters, not bytes. */
1600    
1601      case OP_REVERSE:      case OP_REVERSE:
1602  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1603      if (utf8)      if (utf)
1604        {        {
1605        i = GET(ecode, 1);        i = GET(ecode, 1);
1606        while (i-- > 0)        while (i-- > 0)
1607          {          {
1608          eptr--;          eptr--;
1609          if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1610          BACKCHAR(eptr);          BACKCHAR(eptr);
1611          }          }
1612        }        }
# Line 1453  for (;;) Line 1617  for (;;)
1617    
1618        {        {
1619        eptr -= GET(ecode, 1);        eptr -= GET(ecode, 1);
1620        if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1621        }        }
1622    
1623      /* Save the earliest consulted character, then skip to next op code */      /* Save the earliest consulted character, then skip to next op code */
# Line 1467  for (;;) Line 1631  for (;;)
1631      function is able to force a failure. */      function is able to force a failure. */
1632    
1633      case OP_CALLOUT:      case OP_CALLOUT:
1634      if (pcre_callout != NULL)      if (PUBL(callout) != NULL)
1635        {        {
1636        pcre_callout_block cb;        PUBL(callout_block) cb;
1637        cb.version          = 1;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1638        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1639        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1640        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
# Line 1482  for (;;) Line 1646  for (;;)
1646        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1647        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last;
1648        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1649        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);        cb.mark             = md->nomatch_mark;
1650          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1651        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1652        }        }
1653      ecode += 2 + 2*LINK_SIZE;      ecode += 2 + 2*LINK_SIZE;
# Line 1492  for (;;) Line 1657  for (;;)
1657      offset data is the offset to the starting bracket from the start of the      offset data is the offset to the starting bracket from the start of the
1658      whole pattern. (This is so that it works from duplicated subpatterns.)      whole pattern. (This is so that it works from duplicated subpatterns.)
1659    
1660      If there are any capturing brackets started but not finished, we have to      The state of the capturing groups is preserved over recursion, and
1661      save their starting points and reinstate them after the recursion. However,      re-instated afterwards. We don't know how many are started and not yet
1662      we don't know how many such there are (offset_top records the completed      finished (offset_top records the completed total) so we just have to save
1663      total) so we just have to save all the potential data. There may be up to      all the potential data. There may be up to 65535 such values, which is too
1664      65535 such values, which is too large to put on the stack, but using malloc      large to put on the stack, but using malloc for small numbers seems
1665      for small numbers seems expensive. As a compromise, the stack is used when      expensive. As a compromise, the stack is used when there are no more than
1666      there are no more than REC_STACK_SAVE_MAX values to store; otherwise malloc      REC_STACK_SAVE_MAX values to store; otherwise malloc is used.
     is used. A problem is what to do if the malloc fails ... there is no way of  
     returning to the top level with an error. Save the top REC_STACK_SAVE_MAX  
     values on the stack, and accept that the rest may be wrong.  
1667    
1668      There are also other values that have to be saved. We use a chained      There are also other values that have to be saved. We use a chained
1669      sequence of blocks that actually live on the stack. Thanks to Robin Houston      sequence of blocks that actually live on the stack. Thanks to Robin Houston
1670      for the original version of this logic. */      for the original version of this logic. It has, however, been hacked around
1671        a lot, so he is not to blame for the current way it works. */
1672    
1673      case OP_RECURSE:      case OP_RECURSE:
1674        {        {
1675          recursion_info *ri;
1676          int recno;
1677    
1678        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1679        new_recursive.group_num = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
1680          GET2(callpat, 1 + LINK_SIZE);          GET2(callpat, 1 + LINK_SIZE);
1681    
1682          /* Check for repeating a recursion without advancing the subject pointer.
1683          This should catch convoluted mutual recursions. (Some simple cases are
1684          caught at compile time.) */
1685    
1686          for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
1687            if (recno == ri->group_num && eptr == ri->subject_position)
1688              RRETURN(PCRE_ERROR_RECURSELOOP);
1689    
1690        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1691    
1692          new_recursive.group_num = recno;
1693          new_recursive.subject_position = eptr;
1694        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1695        md->recursive = &new_recursive;        md->recursive = &new_recursive;
1696    
1697        /* Find where to continue from afterwards */        /* Where to continue from afterwards */
1698    
1699        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       new_recursive.after_call = ecode;  
1700    
1701        /* Now save the offset data. */        /* Now save the offset data */
1702    
1703        new_recursive.saved_max = md->offset_end;        new_recursive.saved_max = md->offset_end;
1704        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
# Line 1531  for (;;) Line 1706  for (;;)
1706        else        else
1707          {          {
1708          new_recursive.offset_save =          new_recursive.offset_save =
1709            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
1710          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1711          }          }
   
1712        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1713              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
       new_recursive.save_offset_top = offset_top;  
1714    
1715        /* OK, now we can do the recursion. For each top-level alternative we        /* OK, now we can do the recursion. After processing each alternative,
1716        restore the offset and recursion data. */        restore the offset data. If there were nested recursions, md->recursive
1717          might be changed, so reset it before looping. */
1718    
1719        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1720        cbegroup = (*callpat >= OP_SBRA);        cbegroup = (*callpat >= OP_SBRA);
1721        do        do
1722          {          {
1723          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1724          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
1725            md, eptrb, RM6);            md, eptrb, RM6);
1726            memcpy(md->offset_vector, new_recursive.offset_save,
1727                new_recursive.saved_max * sizeof(int));
1728            md->recursive = new_recursive.prevrec;
1729          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1730            {            {
1731            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
           md->recursive = new_recursive.prevrec;  
1732            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1733              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1734            MRRETURN(MATCH_MATCH);  
1735              /* Set where we got to in the subject, and reset the start in case
1736              it was changed by \K. This *is* propagated back out of a recursion,
1737              for Perl compatibility. */
1738    
1739              eptr = md->end_match_ptr;
1740              mstart = md->start_match_ptr;
1741              goto RECURSION_MATCHED;        /* Exit loop; end processing */
1742            }            }
1743          else if (rrc != MATCH_NOMATCH &&  
1744                  (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* PCRE does not allow THEN to escape beyond a recursion; it is treated
1745            as NOMATCH. */
1746    
1747            else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1748            {            {
1749            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1750            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1751              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1752            RRETURN(rrc);            RRETURN(rrc);
1753            }            }
1754    
1755          md->recursive = &new_recursive;          md->recursive = &new_recursive;
         memcpy(md->offset_vector, new_recursive.offset_save,  
             new_recursive.saved_max * sizeof(int));  
1756          callpat += GET(callpat, 1);          callpat += GET(callpat, 1);
1757          }          }
1758        while (*callpat == OP_ALT);        while (*callpat == OP_ALT);
# Line 1576  for (;;) Line 1760  for (;;)
1760        DPRINTF(("Recursion didn't match\n"));        DPRINTF(("Recursion didn't match\n"));
1761        md->recursive = new_recursive.prevrec;        md->recursive = new_recursive.prevrec;
1762        if (new_recursive.offset_save != stacksave)        if (new_recursive.offset_save != stacksave)
1763          (pcre_free)(new_recursive.offset_save);          (PUBL(free))(new_recursive.offset_save);
1764        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
       }  
     /* Control never reaches here */  
   
     /* "Once" brackets are like assertion brackets except that after a match,  
     the point in the subject string is not moved back. Thus there can never be  
     a move back into the brackets. Friedl calls these "atomic" subpatterns.  
     Check the alternative branches in turn - the matching won't pass the KET  
     for this kind of subpattern. If any one branch matches, we carry on as at  
     the end of a normal bracket, leaving the subject pointer, but resetting  
     the start-of-match value in case it was changed by \K. */  
   
     case OP_ONCE:  
     prev = ecode;  
     saved_eptr = eptr;  
   
     do  
       {  
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);  
       if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */  
         {  
         mstart = md->start_match_ptr;  
         break;  
         }  
       if (rrc != MATCH_NOMATCH &&  
           (rrc != MATCH_THEN || md->start_match_ptr != ecode))  
         RRETURN(rrc);  
       ecode += GET(ecode,1);  
       }  
     while (*ecode == OP_ALT);  
   
     /* If hit the end of the group (which could be repeated), fail */  
   
     if (*ecode != OP_ONCE && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);  
   
     /* Continue as from after the assertion, updating the offsets high water  
     mark, since extracts may have been taken. */  
   
     do ecode += GET(ecode, 1); while (*ecode == OP_ALT);  
   
     offset_top = md->end_offset_top;  
     eptr = md->end_match_ptr;  
   
     /* For a non-repeating ket, just continue at this level. This also  
     happens for a repeating ket if no characters were matched in the group.  
     This is the forcible breaking of infinite loops as implemented in Perl  
     5.005. If there is an options reset, it will get obeyed in the normal  
     course of events. */  
   
     if (*ecode == OP_KET || eptr == saved_eptr)  
       {  
       ecode += 1+LINK_SIZE;  
       break;  
1765        }        }
1766    
1767      /* The repeating kets try the rest of the pattern or restart from the      RECURSION_MATCHED:
1768      preceding bracket, in the appropriate order. The second "call" of match()      break;
     uses tail recursion, to avoid using another stack frame. */  
   
     if (*ecode == OP_KETRMIN)  
       {  
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM8);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode = prev;  
       goto TAIL_RECURSE;  
       }  
     else  /* OP_KETRMAX */  
       {  
       md->match_function_type = MATCH_CBEGROUP;  
       RMATCH(eptr, prev, offset_top, md, eptrb, RM9);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode += 1 + LINK_SIZE;  
       goto TAIL_RECURSE;  
       }  
     /* Control never gets here */  
1769    
1770      /* An alternation is the end of a branch; scan along to find the end of the      /* An alternation is the end of a branch; scan along to find the end of the
1771      bracketed group and go to there. */      bracketed group and go to there. */
# Line 1665  for (;;) Line 1779  for (;;)
1779      at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets      at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets
1780      with fixed upper repeat limits are compiled as a number of copies, with the      with fixed upper repeat limits are compiled as a number of copies, with the
1781      optional ones preceded by BRAZERO or BRAMINZERO. */      optional ones preceded by BRAZERO or BRAMINZERO. */
1782    
1783      case OP_BRAZERO:      case OP_BRAZERO:
1784      next = ecode + 1;      next = ecode + 1;
1785      RMATCH(eptr, next, offset_top, md, eptrb, RM10);      RMATCH(eptr, next, offset_top, md, eptrb, RM10);
# Line 1673  for (;;) Line 1787  for (;;)
1787      do next += GET(next, 1); while (*next == OP_ALT);      do next += GET(next, 1); while (*next == OP_ALT);
1788      ecode = next + 1 + LINK_SIZE;      ecode = next + 1 + LINK_SIZE;
1789      break;      break;
1790    
1791      case OP_BRAMINZERO:      case OP_BRAMINZERO:
1792      next = ecode + 1;      next = ecode + 1;
1793      do next += GET(next, 1); while (*next == OP_ALT);      do next += GET(next, 1); while (*next == OP_ALT);
# Line 1687  for (;;) Line 1801  for (;;)
1801      do next += GET(next,1); while (*next == OP_ALT);      do next += GET(next,1); while (*next == OP_ALT);
1802      ecode = next + 1 + LINK_SIZE;      ecode = next + 1 + LINK_SIZE;
1803      break;      break;
1804    
1805      /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything      /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
1806      here; just jump to the group, with allow_zero set TRUE. */      here; just jump to the group, with allow_zero set TRUE. */
1807    
1808      case OP_BRAPOSZERO:      case OP_BRAPOSZERO:
1809      op = *(++ecode);      op = *(++ecode);
1810      allow_zero = TRUE;      allow_zero = TRUE;
1811      if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;      if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
1812        goto POSSESSIVE_NON_CAPTURE;        goto POSSESSIVE_NON_CAPTURE;
# Line 1702  for (;;) Line 1816  for (;;)
1816      case OP_KET:      case OP_KET:
1817      case OP_KETRMIN:      case OP_KETRMIN:
1818      case OP_KETRMAX:      case OP_KETRMAX:
1819      case OP_KETRPOS:      case OP_KETRPOS:
1820      prev = ecode - GET(ecode, 1);      prev = ecode - GET(ecode, 1);
1821    
1822      /* If this was a group that remembered the subject start, in order to break      /* If this was a group that remembered the subject start, in order to break
1823      infinite repeats of empty string matches, retrieve the subject start from      infinite repeats of empty string matches, retrieve the subject start from
1824      the chain. Otherwise, set it NULL. */      the chain. Otherwise, set it NULL. */
1825    
1826      if (*prev >= OP_SBRA)      if (*prev >= OP_SBRA || *prev == OP_ONCE)
1827        {        {
1828        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
1829        eptrb = eptrb->epb_prev;              /* Backup to previous group */        eptrb = eptrb->epb_prev;              /* Backup to previous group */
1830        }        }
1831      else saved_eptr = NULL;      else saved_eptr = NULL;
1832    
1833      /* If we are at the end of an assertion group or an atomic group, stop      /* If we are at the end of an assertion group or a non-capturing atomic
1834      matching and return MATCH_MATCH, but record the current high water mark for      group, stop matching and return MATCH_MATCH, but record the current high
1835      use by positive assertions. We also need to record the match start in case      water mark for use by positive assertions. We also need to record the match
1836      it was changed by \K. */      start in case it was changed by \K. */
1837    
1838      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||      if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
1839          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||           *prev == OP_ONCE_NC)
         *prev == OP_ONCE)  
1840        {        {
1841        md->end_match_ptr = eptr;      /* For ONCE */        md->end_match_ptr = eptr;      /* For ONCE_NC */
1842        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1843        md->start_match_ptr = mstart;        md->start_match_ptr = mstart;
1844        MRRETURN(MATCH_MATCH);        RRETURN(MATCH_MATCH);         /* Sets md->mark */
1845        }        }
1846    
1847      /* 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
1848      and if necessary complete handling an extraction by setting the offsets and      and if necessary complete handling an extraction by setting the offsets and
1849      bumping the high water mark. Note that whole-pattern recursion is coded as      bumping the high water mark. Whole-pattern recursion is coded as a recurse
1850      a recurse into group 0, so it won't be picked up here. Instead, we catch it      into group 0, so it won't be picked up here. Instead, we catch it when the
1851      when the OP_END is reached. Other recursion is handled here. */      OP_END is reached. Other recursion is handled here. We just have to record
1852        the current subject position and start match pointer and give a MATCH
1853        return. */
1854    
1855      if (*prev == OP_CBRA || *prev == OP_SCBRA ||      if (*prev == OP_CBRA || *prev == OP_SCBRA ||
1856          *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)          *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
# Line 1748  for (;;) Line 1863  for (;;)
1863        printf("\n");        printf("\n");
1864  #endif  #endif
1865    
1866          /* Handle a recursively called group. */
1867    
1868          if (md->recursive != NULL && md->recursive->group_num == number)
1869            {
1870            md->end_match_ptr = eptr;
1871            md->start_match_ptr = mstart;
1872            RRETURN(MATCH_MATCH);
1873            }
1874    
1875          /* Deal with capturing */
1876    
1877        md->capture_last = number;        md->capture_last = number;
1878        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
1879          {          {
1880            /* If offset is greater than offset_top, it means that we are
1881            "skipping" a capturing group, and that group's offsets must be marked
1882            unset. In earlier versions of PCRE, all the offsets were unset at the
1883            start of matching, but this doesn't work because atomic groups and
1884            assertions can cause a value to be set that should later be unset.
1885            Example: matching /(?>(a))b|(a)c/ against "ac". This sets group 1 as
1886            part of the atomic group, but this is not on the final matching path,
1887            so must be unset when 2 is set. (If there is no group 2, there is no
1888            problem, because offset_top will then be 2, indicating no capture.) */
1889    
1890            if (offset > offset_top)
1891              {
1892              register int *iptr = md->offset_vector + offset_top;
1893              register int *iend = md->offset_vector + offset;
1894              while (iptr < iend) *iptr++ = -1;
1895              }
1896    
1897            /* Now make the extraction */
1898    
1899          md->offset_vector[offset] =          md->offset_vector[offset] =
1900            md->offset_vector[md->offset_end - number];            md->offset_vector[md->offset_end - number];
1901          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1902          if (offset_top <= offset) offset_top = offset + 2;          if (offset_top <= offset) offset_top = offset + 2;
1903          }          }
   
       /* Handle a recursively called group. Restore the offsets  
       appropriately and continue from after the call. */  
   
       if (md->recursive != NULL && md->recursive->group_num == number)  
         {  
         recursion_info *rec = md->recursive;  
         DPRINTF(("Recursion (%d) succeeded - continuing\n", number));  
         md->recursive = rec->prevrec;  
         memcpy(md->offset_vector, rec->offset_save,  
           rec->saved_max * sizeof(int));  
         offset_top = rec->save_offset_top;  
         ecode = rec->after_call;  
         break;  
         }  
1904        }        }
1905    
1906      /* For a non-repeating ket, just continue at this level. This also      /* For an ordinary non-repeating ket, just continue at this level. This
1907      happens for a repeating ket if no characters were matched in the group.      also happens for a repeating ket if no characters were matched in the
1908      This is the forcible breaking of infinite loops as implemented in Perl      group. This is the forcible breaking of infinite loops as implemented in
1909      5.005. If there is an options reset, it will get obeyed in the normal      Perl 5.005. For a non-repeating atomic group that includes captures,
1910      course of events. */      establish a backup point by processing the rest of the pattern at a lower
1911        level. If this results in a NOMATCH return, pass MATCH_ONCE back to the
1912        original OP_ONCE level, thereby bypassing intermediate backup points, but
1913        resetting any captures that happened along the way. */
1914    
1915      if (*ecode == OP_KET || eptr == saved_eptr)      if (*ecode == OP_KET || eptr == saved_eptr)
1916        {        {
1917        ecode += 1 + LINK_SIZE;        if (*prev == OP_ONCE)
1918            {
1919            RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
1920            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1921            md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1922            RRETURN(MATCH_ONCE);
1923            }
1924          ecode += 1 + LINK_SIZE;    /* Carry on at this level */
1925        break;        break;
1926        }        }
1927    
1928      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
1929      and return the MATCH_KETRPOS. This makes it possible to do the repeats one      and return the MATCH_KETRPOS. This makes it possible to do the repeats one
1930      at a time from the outer level, thus saving stack. */      at a time from the outer level, thus saving stack. */
1931    
1932      if (*ecode == OP_KETRPOS)      if (*ecode == OP_KETRPOS)
1933        {        {
1934        md->end_match_ptr = eptr;        md->end_match_ptr = eptr;
1935        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1936        RRETURN(MATCH_KETRPOS);        RRETURN(MATCH_KETRPOS);
1937        }        }
1938    
1939      /* The normal repeating kets try the rest of the pattern or restart from      /* The normal repeating kets try the rest of the pattern or restart from
1940      the preceding bracket, in the appropriate order. In the second case, we can      the preceding bracket, in the appropriate order. In the second case, we can
1941      use tail recursion to avoid using another stack frame, unless we have an      use tail recursion to avoid using another stack frame, unless we have an
1942      unlimited repeat of a group that can match an empty string. */      an atomic group or an unlimited repeat of a group that can match an empty
1943        string. */
1944    
1945      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1946        {        {
1947        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
1948        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1949          if (*prev == OP_ONCE)
1950            {
1951            RMATCH(eptr, prev, offset_top, md, eptrb, RM8);
1952            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1953            md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1954            RRETURN(MATCH_ONCE);
1955            }
1956        if (*prev >= OP_SBRA)    /* Could match an empty string */        if (*prev >= OP_SBRA)    /* Could match an empty string */
1957          {          {
1958          md->match_function_type = MATCH_CBEGROUP;          md->match_function_type = MATCH_CBEGROUP;
1959          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);          RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
1960          RRETURN(rrc);          RRETURN(rrc);
1961          }          }
# Line 1816  for (;;) Line 1964  for (;;)
1964        }        }
1965      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
1966        {        {
1967        if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;        if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1968        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);        RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
1969          if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
1970        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1971          if (*prev == OP_ONCE)
1972            {
1973            RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM9);
1974            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1975            md->once_target = prev;
1976            RRETURN(MATCH_ONCE);
1977            }
1978        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1979        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1980        }        }
# Line 1827  for (;;) Line 1983  for (;;)
1983      /* Not multiline mode: start of subject assertion, unless notbol. */      /* Not multiline mode: start of subject assertion, unless notbol. */
1984    
1985      case OP_CIRC:      case OP_CIRC:
1986      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
1987    
1988      /* Start of subject assertion */      /* Start of subject assertion */
1989    
1990      case OP_SOD:      case OP_SOD:
1991      if (eptr != md->start_subject) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
1992      ecode++;      ecode++;
1993      break;      break;
1994    
1995      /* Multiline mode: start of subject unless notbol, or after any newline. */      /* Multiline mode: start of subject unless notbol, or after any newline. */
1996    
1997      case OP_CIRCM:      case OP_CIRCM:
1998      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
1999      if (eptr != md->start_subject &&      if (eptr != md->start_subject &&
2000          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
2001        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2002      ecode++;      ecode++;
2003      break;      break;
2004    
2005      /* Start of match assertion */      /* Start of match assertion */
2006    
2007      case OP_SOM:      case OP_SOM:
2008      if (eptr != md->start_subject + md->start_offset) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
2009      ecode++;      ecode++;
2010      break;      break;
2011    
# Line 1865  for (;;) Line 2021  for (;;)
2021    
2022      case OP_DOLLM:      case OP_DOLLM:
2023      if (eptr < md->end_subject)      if (eptr < md->end_subject)
2024        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }        { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }
2025      else      else
2026        {        {
2027        if (md->noteol) MRRETURN(MATCH_NOMATCH);        if (md->noteol) RRETURN(MATCH_NOMATCH);
2028        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2029        }        }
2030      ecode++;      ecode++;
2031      break;      break;
2032    
2033      /* Not multiline mode: assert before a terminating newline or before end of      /* Not multiline mode: assert before a terminating newline or before end of
2034      subject unless noteol is set. */      subject unless noteol is set. */
2035    
2036      case OP_DOLL:      case OP_DOLL:
2037      if (md->noteol) MRRETURN(MATCH_NOMATCH);      if (md->noteol) RRETURN(MATCH_NOMATCH);
2038      if (!md->endonly) goto ASSERT_NL_OR_EOS;      if (!md->endonly) goto ASSERT_NL_OR_EOS;
2039    
2040      /* ... else fall through for endonly */      /* ... else fall through for endonly */
# Line 1886  for (;;) Line 2042  for (;;)
2042      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
2043    
2044      case OP_EOD:      case OP_EOD:
2045      if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
2046      SCHECK_PARTIAL();      SCHECK_PARTIAL();
2047      ecode++;      ecode++;
2048      break;      break;
# Line 1897  for (;;) Line 2053  for (;;)
2053      ASSERT_NL_OR_EOS:      ASSERT_NL_OR_EOS:
2054      if (eptr < md->end_subject &&      if (eptr < md->end_subject &&
2055          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
2056        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2057    
2058      /* Either at end of string or \n before end. */      /* Either at end of string or \n before end. */
2059    
# Line 1916  for (;;) Line 2072  for (;;)
2072        be "non-word" characters. Remember the earliest consulted character for        be "non-word" characters. Remember the earliest consulted character for
2073        partial matching. */        partial matching. */
2074    
2075  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2076        if (utf8)        if (utf)
2077          {          {
2078          /* Get status of previous character */          /* Get status of previous character */
2079    
2080          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
2081            {            {
2082            USPTR lastptr = eptr - 1;            PCRE_PUCHAR lastptr = eptr - 1;
2083            while((*lastptr & 0xc0) == 0x80) lastptr--;            BACKCHAR(lastptr);
2084            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
2085            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
2086  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 1989  for (;;) Line 2145  for (;;)
2145              }              }
2146            else            else
2147  #endif  #endif
2148            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);            prev_is_word = MAX_255(eptr[-1])
2149                && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
2150            }            }
2151    
2152          /* Get status of next character */          /* Get status of next character */
# Line 2012  for (;;) Line 2169  for (;;)
2169            }            }
2170          else          else
2171  #endif  #endif
2172          cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);          cur_is_word = MAX_255(*eptr)
2173              && ((md->ctypes[*eptr] & ctype_word) != 0);
2174          }          }
2175    
2176        /* Now see if the situation is what we want */        /* Now see if the situation is what we want */
2177    
2178        if ((*ecode++ == OP_WORD_BOUNDARY)?        if ((*ecode++ == OP_WORD_BOUNDARY)?
2179             cur_is_word == prev_is_word : cur_is_word != prev_is_word)             cur_is_word == prev_is_word : cur_is_word != prev_is_word)
2180          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2181        }        }
2182      break;      break;
2183    
2184      /* Match a single character type; inline for speed */      /* Match a single character type; inline for speed */
2185    
2186      case OP_ANY:      case OP_ANY:
2187      if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
2188      /* Fall through */      /* Fall through */
2189    
2190      case OP_ALLANY:      case OP_ALLANY:
2191      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2192        {        {                            /* not be updated before SCHECK_PARTIAL. */
2193        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2194        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2195        }        }
2196      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;      eptr++;
2197    #ifdef SUPPORT_UTF
2198        if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
2199    #endif
2200      ecode++;      ecode++;
2201      break;      break;
2202    
# Line 2043  for (;;) Line 2204  for (;;)
2204      any byte, even newline, independent of the setting of PCRE_DOTALL. */      any byte, even newline, independent of the setting of PCRE_DOTALL. */
2205    
2206      case OP_ANYBYTE:      case OP_ANYBYTE:
2207      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2208        {        {                            /* not be updated before SCHECK_PARTIAL. */
2209        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2210        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2211        }        }
2212        eptr++;
2213      ecode++;      ecode++;
2214      break;      break;
2215    
# Line 2055  for (;;) Line 2217  for (;;)
2217      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2218        {        {
2219        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2220        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2221        }        }
2222      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2223      if (      if (
2224  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2225         c < 256 &&         c < 256 &&
2226  #endif  #endif
2227         (md->ctypes[c] & ctype_digit) != 0         (md->ctypes[c] & ctype_digit) != 0
2228         )         )
2229        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2230      ecode++;      ecode++;
2231      break;      break;
2232    
# Line 2072  for (;;) Line 2234  for (;;)
2234      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2235        {        {
2236        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2237        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2238        }        }
2239      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2240      if (      if (
2241  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2242         c >= 256 ||         c > 255 ||
2243  #endif  #endif
2244         (md->ctypes[c] & ctype_digit) == 0         (md->ctypes[c] & ctype_digit) == 0
2245         )         )
2246        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2247      ecode++;      ecode++;
2248      break;      break;
2249    
# Line 2089  for (;;) Line 2251  for (;;)
2251      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2252        {        {
2253        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2254        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2255        }        }
2256      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2257      if (      if (
2258  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2259         c < 256 &&         c < 256 &&
2260  #endif  #endif
2261         (md->ctypes[c] & ctype_space) != 0         (md->ctypes[c] & ctype_space) != 0
2262         )         )
2263        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2264      ecode++;      ecode++;
2265      break;      break;
2266    
# Line 2106  for (;;) Line 2268  for (;;)
2268      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2269        {        {
2270        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2271        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2272        }        }
2273      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2274      if (      if (
2275  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2276         c >= 256 ||         c > 255 ||
2277  #endif  #endif
2278         (md->ctypes[c] & ctype_space) == 0         (md->ctypes[c] & ctype_space) == 0
2279         )         )
2280        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2281      ecode++;      ecode++;
2282      break;      break;
2283    
# Line 2123  for (;;) Line 2285  for (;;)
2285      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2286        {        {
2287        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2288        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2289        }        }
2290      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2291      if (      if (
2292  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2293         c < 256 &&         c < 256 &&
2294  #endif  #endif
2295         (md->ctypes[c] & ctype_word) != 0         (md->ctypes[c] & ctype_word) != 0
2296         )         )
2297        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2298      ecode++;      ecode++;
2299      break;      break;
2300    
# Line 2140  for (;;) Line 2302  for (;;)
2302      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2303        {        {
2304        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2305        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2306        }        }
2307      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2308      if (      if (
2309  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2310         c >= 256 ||         c > 255 ||
2311  #endif  #endif
2312         (md->ctypes[c] & ctype_word) == 0         (md->ctypes[c] & ctype_word) == 0
2313         )         )
2314        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2315      ecode++;      ecode++;
2316      break;      break;
2317    
# Line 2157  for (;;) Line 2319  for (;;)
2319      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2320        {        {
2321        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2322        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2323        }        }
2324      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2325      switch(c)      switch(c)
2326        {        {
2327        default: MRRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2328    
2329        case 0x000d:        case 0x000d:
2330        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
2331        break;        break;
# Line 2176  for (;;) Line 2338  for (;;)
2338        case 0x0085:        case 0x0085:
2339        case 0x2028:        case 0x2028:
2340        case 0x2029:        case 0x2029:
2341        if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);        if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
2342        break;        break;
2343        }        }
2344      ecode++;      ecode++;
# Line 2186  for (;;) Line 2348  for (;;)
2348      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2349        {        {
2350        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2351        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2352        }        }
2353      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2354      switch(c)      switch(c)
# Line 2211  for (;;) Line 2373  for (;;)
2373        case 0x202f:    /* NARROW NO-BREAK SPACE */        case 0x202f:    /* NARROW NO-BREAK SPACE */
2374        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
2375        case 0x3000:    /* IDEOGRAPHIC SPACE */        case 0x3000:    /* IDEOGRAPHIC SPACE */
2376        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2377        }        }
2378      ecode++;      ecode++;
2379      break;      break;
# Line 2220  for (;;) Line 2382  for (;;)
2382      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2383        {        {
2384        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2385        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2386        }        }
2387      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2388      switch(c)      switch(c)
2389        {        {
2390        default: MRRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2391        case 0x09:      /* HT */        case 0x09:      /* HT */
2392        case 0x20:      /* SPACE */        case 0x20:      /* SPACE */
2393        case 0xa0:      /* NBSP */        case 0xa0:      /* NBSP */
# Line 2254  for (;;) Line 2416  for (;;)
2416      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2417        {        {
2418        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2419        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2420        }        }
2421      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2422      switch(c)      switch(c)
# Line 2267  for (;;) Line 2429  for (;;)
2429        case 0x85:      /* NEL */        case 0x85:      /* NEL */
2430        case 0x2028:    /* LINE SEPARATOR */        case 0x2028:    /* LINE SEPARATOR */
2431        case 0x2029:    /* PARAGRAPH SEPARATOR */        case 0x2029:    /* PARAGRAPH SEPARATOR */
2432        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2433        }        }
2434      ecode++;      ecode++;
2435      break;      break;
# Line 2276  for (;;) Line 2438  for (;;)
2438      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2439        {        {
2440        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2441        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2442        }        }
2443      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2444      switch(c)      switch(c)
2445        {        {
2446        default: MRRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2447        case 0x0a:      /* LF */        case 0x0a:      /* LF */
2448        case 0x0b:      /* VT */        case 0x0b:      /* VT */
2449        case 0x0c:      /* FF */        case 0x0c:      /* FF */
# Line 2303  for (;;) Line 2465  for (;;)
2465      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2466        {        {
2467        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2468        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2469        }        }
2470      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2471        {        {
# Line 2312  for (;;) Line 2474  for (;;)
2474        switch(ecode[1])        switch(ecode[1])
2475          {          {
2476          case PT_ANY:          case PT_ANY:
2477          if (op == OP_NOTPROP) MRRETURN(MATCH_NOMATCH);          if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
2478          break;          break;
2479    
2480          case PT_LAMP:          case PT_LAMP:
2481          if ((prop->chartype == ucp_Lu ||          if ((prop->chartype == ucp_Lu ||
2482               prop->chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
2483               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
2484            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2485          break;          break;
2486    
2487          case PT_GC:          case PT_GC:
2488          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
2489            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2490          break;          break;
2491    
2492          case PT_PC:          case PT_PC:
2493          if ((ecode[2] != prop->chartype) == (op == OP_PROP))          if ((ecode[2] != prop->chartype) == (op == OP_PROP))
2494            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2495          break;          break;
2496    
2497          case PT_SC:          case PT_SC:
2498          if ((ecode[2] != prop->script) == (op == OP_PROP))          if ((ecode[2] != prop->script) == (op == OP_PROP))
2499            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2500          break;          break;
2501    
2502          /* These are specials */          /* These are specials */
2503    
2504          case PT_ALNUM:          case PT_ALNUM:
2505          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2506               _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))               PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2507            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2508          break;          break;
2509    
2510          case PT_SPACE:    /* Perl space */          case PT_SPACE:    /* Perl space */
2511          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2512               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2513                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2514            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2515          break;          break;
2516    
2517          case PT_PXSPACE:  /* POSIX space */          case PT_PXSPACE:  /* POSIX space */
2518          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2519               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2520               c == CHAR_FF || c == CHAR_CR)               c == CHAR_FF || c == CHAR_CR)
2521                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2522            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2523          break;          break;
2524    
2525          case PT_WORD:          case PT_WORD:
2526          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2527               _pcre_ucp_gentype[prop->chartype] == ucp_N ||               PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2528               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2529            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2530          break;          break;
2531    
2532          /* This should never occur */          /* This should never occur */
# Line 2384  for (;;) Line 2546  for (;;)
2546      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2547        {        {
2548        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2549        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2550        }        }
2551      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2552        if (UCD_CATEGORY(c) == ucp_M) RRETURN(MATCH_NOMATCH);
2553        while (eptr < md->end_subject)
2554        {        {
2555        int category = UCD_CATEGORY(c);        int len = 1;
2556        if (category == ucp_M) MRRETURN(MATCH_NOMATCH);        if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2557        while (eptr < md->end_subject)        if (UCD_CATEGORY(c) != ucp_M) break;
2558          {        eptr += len;
         int len = 1;  
         if (!utf8) c = *eptr; else  
           {  
           GETCHARLEN(c, eptr, len);  
           }  
         category = UCD_CATEGORY(c);  
         if (category != ucp_M) break;  
         eptr += len;  
         }  
2559        }        }
2560      ecode++;      ecode++;
2561      break;      break;
# Line 2416  for (;;) Line 2571  for (;;)
2571      loops). */      loops). */
2572    
2573      case OP_REF:      case OP_REF:
2574      case OP_REFI:      case OP_REFI:
2575      caseless = op == OP_REFI;      caseless = op == OP_REFI;
2576      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2577      ecode += 3;      ecode += 1 + IMM2_SIZE;
2578    
2579      /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2580    
# Line 2459  for (;;) Line 2614  for (;;)
2614        case OP_CRMINRANGE:        case OP_CRMINRANGE:
2615        minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2616        min = GET2(ecode, 1);        min = GET2(ecode, 1);
2617        max = GET2(ecode, 3);        max = GET2(ecode, 1 + IMM2_SIZE);
2618        if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2619        ecode += 5;        ecode += 1 + 2 * IMM2_SIZE;
2620        break;        break;
2621    
2622        default:               /* No repeat follows */        default:               /* No repeat follows */
2623        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2624          {          {
2625          CHECK_PARTIAL();          CHECK_PARTIAL();
2626          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2627          }          }
2628        eptr += length;        eptr += length;
2629        continue;              /* With the main loop */        continue;              /* With the main loop */
2630        }        }
2631    
2632      /* Handle repeated back references. If the length of the reference is      /* Handle repeated back references. If the length of the reference is
2633      zero, just continue with the main loop. */      zero, just continue with the main loop. If the length is negative, it
2634        means the reference is unset in non-Java-compatible mode. If the minimum is
2635        zero, we can continue at the same level without recursion. For any other
2636        minimum, carrying on will result in NOMATCH. */
2637    
2638      if (length == 0) continue;      if (length == 0) continue;
2639        if (length < 0 && min == 0) continue;
2640    
2641      /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2642      the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
# Line 2485  for (;;) Line 2644  for (;;)
2644    
2645      for (i = 1; i <= min; i++)      for (i = 1; i <= min; i++)
2646        {        {
2647        int slength;        int slength;
2648        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2649          {          {
2650          CHECK_PARTIAL();          CHECK_PARTIAL();
2651          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2652          }          }
2653        eptr += slength;        eptr += slength;
2654        }        }
# Line 2505  for (;;) Line 2664  for (;;)
2664        {        {
2665        for (fi = min;; fi++)        for (fi = min;; fi++)
2666          {          {
2667          int slength;          int slength;
2668          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2669          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2670          if (fi >= max) MRRETURN(MATCH_NOMATCH);          if (fi >= max) RRETURN(MATCH_NOMATCH);
2671          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2672            {            {
2673            CHECK_PARTIAL();            CHECK_PARTIAL();
2674            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2675            }            }
2676          eptr += slength;          eptr += slength;
2677          }          }
# Line 2526  for (;;) Line 2685  for (;;)
2685        pp = eptr;        pp = eptr;
2686        for (i = min; i < max; i++)        for (i = min; i < max; i++)
2687          {          {
2688          int slength;          int slength;
2689          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2690            {            {
2691            CHECK_PARTIAL();            CHECK_PARTIAL();
# Line 2540  for (;;) Line 2699  for (;;)
2699          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2700          eptr -= length;          eptr -= length;
2701          }          }
2702        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2703        }        }
2704      /* Control never gets here */      /* Control never gets here */
2705    
# Line 2558  for (;;) Line 2717  for (;;)
2717      case OP_NCLASS:      case OP_NCLASS:
2718      case OP_CLASS:      case OP_CLASS:
2719        {        {
2720          /* The data variable is saved across frames, so the byte map needs to
2721          be stored there. */
2722    #define BYTE_MAP ((pcre_uint8 *)data)
2723        data = ecode + 1;                /* Save for matching */        data = ecode + 1;                /* Save for matching */
2724        ecode += 33;                     /* Advance past the item */        ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
2725    
2726        switch (*ecode)        switch (*ecode)
2727          {          {
# Line 2580  for (;;) Line 2742  for (;;)
2742          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2743          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2744          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2745          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2746          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2747          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2748          break;          break;
2749    
2750          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2592  for (;;) Line 2754  for (;;)
2754    
2755        /* First, ensure the minimum number of matches are present. */        /* First, ensure the minimum number of matches are present. */
2756    
2757  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2758        /* UTF-8 mode */        if (utf)
       if (utf8)  
2759          {          {
2760          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2761            {            {
2762            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2763              {              {
2764              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2765              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2766              }              }
2767            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
2768            if (c > 255)            if (c > 255)
2769              {              {
2770              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2771              }              }
2772            else            else
2773              {              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
             if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
             }  
2774            }            }
2775          }          }
2776        else        else
2777  #endif  #endif
2778        /* Not UTF-8 mode */        /* Not UTF mode */
2779          {          {
2780          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2781            {            {
2782            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2783              {              {
2784              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2785              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2786              }              }
2787            c = *eptr++;            c = *eptr++;
2788            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2789              if (c > 255)
2790                {
2791                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2792                }
2793              else
2794    #endif
2795                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2796            }            }
2797          }          }
2798    
# Line 2640  for (;;) Line 2806  for (;;)
2806    
2807        if (minimize)        if (minimize)
2808          {          {
2809  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2810          /* UTF-8 mode */          if (utf)
         if (utf8)  
2811            {            {
2812            for (fi = min;; fi++)            for (fi = min;; fi++)
2813              {              {
2814              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2815              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2816              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2817              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2818                {                {
2819                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2820                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2821                }                }
2822              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
2823              if (c > 255)              if (c > 255)
2824                {                {
2825                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2826                }                }
2827              else              else
2828                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
               if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
               }  
2829              }              }
2830            }            }
2831          else          else
2832  #endif  #endif
2833          /* Not UTF-8 mode */          /* Not UTF mode */
2834            {            {
2835            for (fi = min;; fi++)            for (fi = min;; fi++)
2836              {              {
2837              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2838              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2839              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2840              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2841                {                {
2842                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2843                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2844                }                }
2845              c = *eptr++;              c = *eptr++;
2846              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2847                if (c > 255)
2848                  {
2849                  if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2850                  }
2851                else
2852    #endif
2853                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2854              }              }
2855            }            }
2856          /* Control never gets here */          /* Control never gets here */
# Line 2692  for (;;) Line 2862  for (;;)
2862          {          {
2863          pp = eptr;          pp = eptr;
2864    
2865  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2866          /* UTF-8 mode */          if (utf)
         if (utf8)  
2867            {            {
2868            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2869              {              {
# Line 2710  for (;;) Line 2879  for (;;)
2879                if (op == OP_CLASS) break;                if (op == OP_CLASS) break;
2880                }                }
2881              else              else
2882                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
               if ((data[c/8] & (1 << (c&7))) == 0) break;  
               }  
2883              eptr += len;              eptr += len;
2884              }              }
2885            for (;;)            for (;;)
# Line 2725  for (;;) Line 2892  for (;;)
2892            }            }
2893          else          else
2894  #endif  #endif
2895            /* Not UTF-8 mode */            /* Not UTF mode */
2896            {            {
2897            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2898              {              {
# Line 2735  for (;;) Line 2902  for (;;)
2902                break;                break;
2903                }                }
2904              c = *eptr;              c = *eptr;
2905              if ((data[c/8] & (1 << (c&7))) == 0) break;  #ifndef COMPILE_PCRE8
2906                if (c > 255)
2907                  {
2908                  if (op == OP_CLASS) break;
2909                  }
2910                else
2911    #endif
2912                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
2913              eptr++;              eptr++;
2914              }              }
2915            while (eptr >= pp)            while (eptr >= pp)
# Line 2746  for (;;) Line 2920  for (;;)
2920              }              }
2921            }            }
2922    
2923          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2924          }          }
2925    #undef BYTE_MAP
2926        }        }
2927      /* Control never gets here */      /* Control never gets here */
2928    
# Line 2756  for (;;) Line 2931  for (;;)
2931      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
2932      mode, because Unicode properties are supported in non-UTF-8 mode. */      mode, because Unicode properties are supported in non-UTF-8 mode. */
2933    
2934  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2935      case OP_XCLASS:      case OP_XCLASS:
2936        {        {
2937        data = ecode + 1 + LINK_SIZE;                /* Save for matching */        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
# Line 2781  for (;;) Line 2956  for (;;)
2956          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2957          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2958          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2959          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2960          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2961          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2962          break;          break;
2963    
2964          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2798  for (;;) Line 2973  for (;;)
2973          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
2974            {            {
2975            SCHECK_PARTIAL();            SCHECK_PARTIAL();
2976            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2977            }            }
2978          GETCHARINCTEST(c, eptr);          GETCHARINCTEST(c, eptr);
2979          if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);          if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
2980          }          }
2981    
2982        /* 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 2818  for (;;) Line 2993  for (;;)
2993            {            {
2994            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
2995            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2996            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
2997            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2998              {              {
2999              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3000              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3001              }              }
3002            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3003            if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);            if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3004            }            }
3005          /* Control never gets here */          /* Control never gets here */
3006          }          }
# Line 2843  for (;;) Line 3018  for (;;)
3018              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3019              break;              break;
3020              }              }
3021    #ifdef SUPPORT_UTF
3022            GETCHARLENTEST(c, eptr, len);            GETCHARLENTEST(c, eptr, len);
3023            if (!_pcre_xclass(c, data)) break;  #else
3024              c = *eptr;
3025    #endif
3026              if (!PRIV(xclass)(c, data, utf)) break;
3027            eptr += len;            eptr += len;
3028            }            }
3029          for(;;)          for(;;)
# Line 2852  for (;;) Line 3031  for (;;)
3031            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
3032            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3033            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3034            if (utf8) BACKCHAR(eptr);  #ifdef SUPPORT_UTF
3035              if (utf) BACKCHAR(eptr);
3036    #endif
3037            }            }
3038          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3039          }          }
3040    
3041        /* Control never gets here */        /* Control never gets here */
# Line 2864  for (;;) Line 3045  for (;;)
3045      /* Match a single character, casefully */      /* Match a single character, casefully */
3046    
3047      case OP_CHAR:      case OP_CHAR:
3048  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3049      if (utf8)      if (utf)
3050        {        {
3051        length = 1;        length = 1;
3052        ecode++;        ecode++;
# Line 2873  for (;;) Line 3054  for (;;)
3054        if (length > md->end_subject - eptr)        if (length > md->end_subject - eptr)
3055          {          {
3056          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
3057          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3058          }          }
3059        while (length-- > 0) if (*ecode++ != *eptr++) MRRETURN(MATCH_NOMATCH);        while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH);
3060        }        }
3061      else      else
3062  #endif  #endif
3063        /* Not UTF mode */
     /* Non-UTF-8 mode */  
3064        {        {
3065        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
3066          {          {
3067          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
3068          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3069          }          }
3070        if (ecode[1] != *eptr++) MRRETURN(MATCH_NOMATCH);        if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
3071        ecode += 2;        ecode += 2;
3072        }        }
3073      break;      break;
3074    
3075      /* Match a single character, caselessly */      /* Match a single character, caselessly. If we are at the end of the
3076        subject, give up immediately. */
3077    
3078      case OP_CHARI:      case OP_CHARI:
3079  #ifdef SUPPORT_UTF8      if (eptr >= md->end_subject)
3080      if (utf8)        {
3081          SCHECK_PARTIAL();
3082          RRETURN(MATCH_NOMATCH);
3083          }
3084    
3085    #ifdef SUPPORT_UTF
3086        if (utf)
3087        {        {
3088        length = 1;        length = 1;
3089        ecode++;        ecode++;
3090        GETCHARLEN(fc, ecode, length);        GETCHARLEN(fc, ecode, length);
3091    
       if (length > md->end_subject - eptr)  
         {  
         CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */  
         MRRETURN(MATCH_NOMATCH);  
         }  
   
3092        /* 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
3093        can use the fast lookup table. */        we know that its other case must also be one byte long, so we can use the
3094          fast lookup table. We know that there is at least one byte left in the
3095          subject. */
3096    
3097        if (fc < 128)        if (fc < 128)
3098          {          {
3099          if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          if (md->lcc[fc]
3100                != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3101            ecode++;
3102            eptr++;
3103          }          }
3104    
3105        /* Otherwise we must pick up the subject character */        /* Otherwise we must pick up the subject character. Note that we cannot
3106          use the value of "length" to check for sufficient bytes left, because the
3107          other case of the character may have more or fewer bytes.  */
3108    
3109        else        else
3110          {          {
# Line 2932  for (;;) Line 3120  for (;;)
3120  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3121            if (dc != UCD_OTHERCASE(fc))            if (dc != UCD_OTHERCASE(fc))
3122  #endif  #endif
3123              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3124            }            }
3125          }          }
3126        }        }
3127      else      else
3128  #endif   /* SUPPORT_UTF8 */  #endif   /* SUPPORT_UTF */
3129    
3130      /* Non-UTF-8 mode */      /* Not UTF mode */
3131        {        {
3132        if (md->end_subject - eptr < 1)        if (TABLE_GET(ecode[1], md->lcc, ecode[1])
3133          {            != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3134          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */        eptr++;
         MRRETURN(MATCH_NOMATCH);  
         }  
       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);  
3135        ecode += 2;        ecode += 2;
3136        }        }
3137      break;      break;
# Line 2956  for (;;) Line 3141  for (;;)
3141      case OP_EXACT:      case OP_EXACT:
3142      case OP_EXACTI:      case OP_EXACTI:
3143      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3144      ecode += 3;      ecode += 1 + IMM2_SIZE;
3145      goto REPEATCHAR;      goto REPEATCHAR;
3146    
3147      case OP_POSUPTO:      case OP_POSUPTO:
# Line 2971  for (;;) Line 3156  for (;;)
3156      min = 0;      min = 0;
3157      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3158      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
3159      ecode += 3;      ecode += 1 + IMM2_SIZE;
3160      goto REPEATCHAR;      goto REPEATCHAR;
3161    
3162      case OP_POSSTAR:      case OP_POSSTAR:
# Line 3019  for (;;) Line 3204  for (;;)
3204      /* Common code for all repeated single-character matches. */      /* Common code for all repeated single-character matches. */
3205    
3206      REPEATCHAR:      REPEATCHAR:
3207  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3208      if (utf8)      if (utf)
3209        {        {
3210        length = 1;        length = 1;
3211        charptr = ecode;        charptr = ecode;
# Line 3036  for (;;) Line 3221  for (;;)
3221          unsigned int othercase;          unsigned int othercase;
3222          if (op >= OP_STARI &&     /* Caseless */          if (op >= OP_STARI &&     /* Caseless */
3223              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3224            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = PRIV(ord2utf)(othercase, occhars);
3225          else oclength = 0;          else oclength = 0;
3226  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3227    
3228          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3229            {            {
3230            if (eptr <= md->end_subject - length &&            if (eptr <= md->end_subject - length &&
3231              memcmp(eptr, charptr, length) == 0) eptr += length;              memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3232  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3233            else if (oclength > 0 &&            else if (oclength > 0 &&
3234                     eptr <= md->end_subject - oclength &&                     eptr <= md->end_subject - oclength &&
3235                     memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3236  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3237            else            else
3238              {              {
3239              CHECK_PARTIAL();              CHECK_PARTIAL();
3240              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3241              }              }
3242            }            }
3243    
# Line 3064  for (;;) Line 3249  for (;;)
3249              {              {
3250              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3251              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3252              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3253              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3254                memcmp(eptr, charptr, length) == 0) eptr += length;                memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3255  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3256              else if (oclength > 0 &&              else if (oclength > 0 &&
3257                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3258                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3259  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3260              else              else
3261                {                {
3262                CHECK_PARTIAL();                CHECK_PARTIAL();
3263                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3264                }                }
3265              }              }
3266            /* Control never gets here */            /* Control never gets here */
# Line 3087  for (;;) Line 3272  for (;;)
3272            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3273              {              {
3274              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3275                  memcmp(eptr, charptr, length) == 0) eptr += length;                  memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3276  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3277              else if (oclength > 0 &&              else if (oclength > 0 &&
3278                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3279                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3280  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3281              else              else
3282                {                {
# Line 3106  for (;;) Line 3291  for (;;)
3291              {              {
3292              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3293              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3294              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }              if (eptr == pp) { RRETURN(MATCH_NOMATCH); }
3295  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3296              eptr--;              eptr--;
3297              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3123  for (;;) Line 3308  for (;;)
3308        value of fc will always be < 128. */        value of fc will always be < 128. */
3309        }        }
3310      else      else
3311  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3312          /* When not in UTF-8 mode, load a single-byte character. */
3313          fc = *ecode++;
3314    
3315      /* When not in UTF-8 mode, load a single-byte character. */      /* The value of fc at this point is always one character, though we may
3316        or may not be in UTF mode. The code is duplicated for the caseless and
     fc = *ecode++;  
   
     /* The value of fc at this point is always less than 256, though we may or  
     may not be in UTF-8 mode. The code is duplicated for the caseless and  
3317      caseful cases, for speed, since matching characters is likely to be quite      caseful cases, for speed, since matching characters is likely to be quite
3318      common. First, ensure the minimum number of matches are present. If min =      common. First, ensure the minimum number of matches are present. If min =
3319      max, continue at the same level without recursing. Otherwise, if      max, continue at the same level without recursing. Otherwise, if
# Line 3143  for (;;) Line 3326  for (;;)
3326    
3327      if (op >= OP_STARI)  /* Caseless */      if (op >= OP_STARI)  /* Caseless */
3328        {        {
3329        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3330          /* fc must be < 128 if UTF is enabled. */
3331          foc = md->fcc[fc];
3332    #else
3333    #ifdef SUPPORT_UTF
3334    #ifdef SUPPORT_UCP
3335          if (utf && fc > 127)
3336            foc = UCD_OTHERCASE(fc);
3337    #else
3338          if (utf && fc > 127)
3339            foc = fc;
3340    #endif /* SUPPORT_UCP */
3341          else
3342    #endif /* SUPPORT_UTF */
3343            foc = TABLE_GET(fc, md->fcc, fc);
3344    #endif /* COMPILE_PCRE8 */
3345    
3346        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3347          {          {
3348          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3349            {            {
3350            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3351            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3352            }            }
3353          if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
3354            eptr++;
3355          }          }
3356        if (min == max) continue;        if (min == max) continue;
3357        if (minimize)        if (minimize)
# Line 3160  for (;;) Line 3360  for (;;)
3360            {            {
3361            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3362            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3363            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3364            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3365              {              {
3366              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3367              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3368              }              }
3369            if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
3370              eptr++;
3371            }            }
3372          /* Control never gets here */          /* Control never gets here */
3373          }          }
# Line 3180  for (;;) Line 3381  for (;;)
3381              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3382              break;              break;
3383              }              }
3384            if (fc != md->lcc[*eptr]) break;            if (fc != *eptr && foc != *eptr) break;
3385            eptr++;            eptr++;
3386            }            }
3387    
# Line 3192  for (;;) Line 3393  for (;;)
3393            eptr--;            eptr--;
3394            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3395            }            }
3396          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3397          }          }
3398        /* Control never gets here */        /* Control never gets here */
3399        }        }
# Line 3206  for (;;) Line 3407  for (;;)
3407          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3408            {            {
3409            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3410            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3411            }            }
3412          if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);          if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
3413          }          }
3414    
3415        if (min == max) continue;        if (min == max) continue;
# Line 3219  for (;;) Line 3420  for (;;)
3420            {            {
3421            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3422            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3423            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3424            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3425              {              {
3426              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3427              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3428              }              }
3429            if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
3430            }            }
3431          /* Control never gets here */          /* Control never gets here */
3432          }          }
# Line 3250  for (;;) Line 3451  for (;;)
3451            eptr--;            eptr--;
3452            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3453            }            }
3454          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3455          }          }
3456        }        }
3457      /* Control never gets here */      /* Control never gets here */
# Line 3259  for (;;) Line 3460  for (;;)
3460      checking can be multibyte. */      checking can be multibyte. */
3461    
3462      case OP_NOT:      case OP_NOT:
3463      case OP_NOTI:      case OP_NOTI:
3464      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3465        {        {
3466        SCHECK_PARTIAL();        SCHECK_PARTIAL();
3467        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
3468        }        }
3469      ecode++;      ecode++;
3470      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
3471      if (op == OP_NOTI)         /* The caseless case */      if (op == OP_NOTI)         /* The caseless case */
3472        {        {
3473  #ifdef SUPPORT_UTF8        register int ch, och;
3474        if (c < 256)        ch = *ecode++;
3475  #endif  #ifdef COMPILE_PCRE8
3476        c = md->lcc[c];        /* ch must be < 128 if UTF is enabled. */
3477        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);        och = md->fcc[ch];
3478    #else
3479    #ifdef SUPPORT_UTF
3480    #ifdef SUPPORT_UCP
3481          if (utf && ch > 127)
3482            och = UCD_OTHERCASE(ch);
3483    #else
3484          if (utf && ch > 127)
3485            och = ch;
3486    #endif /* SUPPORT_UCP */
3487          else
3488    #endif /* SUPPORT_UTF */
3489            och = TABLE_GET(ch, md->fcc, ch);
3490    #endif /* COMPILE_PCRE8 */
3491          if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
3492        }        }
3493      else    /* Caseful */      else    /* Caseful */
3494        {        {
3495        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);        if (*ecode++ == c) RRETURN(MATCH_NOMATCH);
3496        }        }
3497      break;      break;
3498    
# Line 3291  for (;;) Line 3506  for (;;)
3506      case OP_NOTEXACT:      case OP_NOTEXACT:
3507      case OP_NOTEXACTI:      case OP_NOTEXACTI:
3508      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3509      ecode += 3;      ecode += 1 + IMM2_SIZE;
3510      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3511    
3512      case OP_NOTUPTO:      case OP_NOTUPTO:
# Line 3301  for (;;) Line 3516  for (;;)
3516      min = 0;      min = 0;
3517      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3518      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3519      ecode += 3;      ecode += 1 + IMM2_SIZE;
3520      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3521    
3522      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
# Line 3333  for (;;) Line 3548  for (;;)
3548      possessive = TRUE;      possessive = TRUE;
3549      min = 0;      min = 0;
3550      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3551      ecode += 3;      ecode += 1 + IMM2_SIZE;
3552      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3553    
3554      case OP_NOTSTAR:      case OP_NOTSTAR:
# Line 3372  for (;;) Line 3587  for (;;)
3587    
3588      if (op >= OP_NOTSTARI)     /* Caseless */      if (op >= OP_NOTSTARI)     /* Caseless */
3589        {        {
3590        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3591          /* fc must be < 128 if UTF is enabled. */
3592          foc = md->fcc[fc];
3593    #else
3594    #ifdef SUPPORT_UTF
3595    #ifdef SUPPORT_UCP
3596          if (utf && fc > 127)
3597            foc = UCD_OTHERCASE(fc);
3598    #else
3599          if (utf && fc > 127)
3600            foc = fc;
3601    #endif /* SUPPORT_UCP */
3602          else
3603    #endif /* SUPPORT_UTF */
3604            foc = TABLE_GET(fc, md->fcc, fc);
3605    #endif /* COMPILE_PCRE8 */
3606    
3607  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3608        /* UTF-8 mode */        if (utf)
       if (utf8)  
3609          {          {
3610          register unsigned int d;          register unsigned int d;
3611          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3384  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            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3619            if (d < 256) d = md->lcc[d];            if (fc == d || foc == d) RRETURN(MATCH_NOMATCH);
           if (fc == d) MRRETURN(MATCH_NOMATCH);  
3620            }            }
3621          }          }
3622        else        else
3623  #endif  #endif
3624          /* Not UTF mode */
       /* Not UTF-8 mode */  
3625          {          {
3626          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3627            {            {
3628            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3629              {              {
3630              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3631              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3632              }              }
3633            if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3634              eptr++;
3635            }            }
3636          }          }
3637    
# Line 3411  for (;;) Line 3639  for (;;)
3639    
3640        if (minimize)        if (minimize)
3641          {          {
3642  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3643          /* UTF-8 mode */          if (utf)
         if (utf8)  
3644            {            {
3645            register unsigned int d;            register unsigned int d;
3646            for (fi = min;; fi++)            for (fi = min;; fi++)
3647              {              {
3648              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3649              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3650              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3651              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3652                {                {
3653                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3654                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3655                }                }
3656              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3657              if (d < 256) d = md->lcc[d];              if (fc == d || foc == d) RRETURN(MATCH_NOMATCH);
             if (fc == d) MRRETURN(MATCH_NOMATCH);  
3658              }              }
3659            }            }
3660          else          else
3661  #endif  #endif
3662          /* Not UTF-8 mode */          /* Not UTF mode */
3663            {            {
3664            for (fi = min;; fi++)            for (fi = min;; fi++)
3665              {              {
3666              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3667              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3668              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3669              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3670                {                {
3671                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3672                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3673                }                }
3674              if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3675                eptr++;
3676              }              }
3677            }            }
3678          /* Control never gets here */          /* Control never gets here */
# Line 3457  for (;;) Line 3684  for (;;)
3684          {          {
3685          pp = eptr;          pp = eptr;
3686    
3687  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3688          /* UTF-8 mode */          if (utf)
         if (utf8)  
3689            {            {
3690            register unsigned int d;            register unsigned int d;
3691            for (i = min; i < max; i++)            for (i = min; i < max; i++)
# Line 3471  for (;;) Line 3697  for (;;)
3697                break;                break;
3698                }                }
3699              GETCHARLEN(d, eptr, len);              GETCHARLEN(d, eptr, len);
3700              if (d < 256) d = md->lcc[d];              if (fc == d || foc == d) break;
             if (fc == d) break;  
3701              eptr += len;              eptr += len;
3702              }              }
3703          if (possessive) continue;          if (possessive) continue;
# Line 3486  for (;;) Line 3711  for (;;)
3711            }            }
3712          else          else
3713  #endif  #endif
3714          /* Not UTF-8 mode */          /* Not UTF mode */
3715            {            {
3716            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3717              {              {
# Line 3495  for (;;) Line 3720  for (;;)
3720                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3721                break;                break;
3722                }                }
3723              if (fc == md->lcc[*eptr]) break;              if (fc == *eptr || foc == *eptr) break;
3724              eptr++;              eptr++;
3725              }              }
3726            if (possessive) continue;            if (possessive) continue;
# Line 3507  for (;;) Line 3732  for (;;)
3732              }              }
3733            }            }
3734    
3735          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3736          }          }
3737        /* Control never gets here */        /* Control never gets here */
3738        }        }
# Line 3516  for (;;) Line 3741  for (;;)
3741    
3742      else      else
3743        {        {
3744  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3745        /* UTF-8 mode */        if (utf)
       if (utf8)  
3746          {          {
3747          register unsigned int d;          register unsigned int d;
3748          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3526  for (;;) Line 3750  for (;;)
3750            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3751              {              {
3752              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3753              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3754              }              }
3755            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3756            if (fc == d) MRRETURN(MATCH_NOMATCH);            if (fc == d) RRETURN(MATCH_NOMATCH);
3757            }            }
3758          }          }
3759        else        else
3760  #endif  #endif
3761        /* Not UTF-8 mode */        /* Not UTF mode */
3762          {          {
3763          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3764            {            {
3765            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3766              {              {
3767              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3768              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3769              }              }
3770            if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3771            }            }
3772          }          }
3773    
# Line 3551  for (;;) Line 3775  for (;;)
3775    
3776        if (minimize)        if (minimize)
3777          {          {
3778  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3779          /* UTF-8 mode */          if (utf)
         if (utf8)  
3780            {            {
3781            register unsigned int d;            register unsigned int d;
3782            for (fi = min;; fi++)            for (fi = min;; fi++)
3783              {              {
3784              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3785              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3786              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3787              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3788                {                {
3789                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3790                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3791                }                }
3792              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3793              if (fc == d) MRRETURN(MATCH_NOMATCH);              if (fc == d) RRETURN(MATCH_NOMATCH);
3794              }              }
3795            }            }
3796          else          else
3797  #endif  #endif
3798          /* Not UTF-8 mode */          /* Not UTF mode */
3799            {            {
3800            for (fi = min;; fi++)            for (fi = min;; fi++)
3801              {              {
3802              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3803              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3804              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3805              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3806                {                {
3807                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3808                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3809                }                }
3810              if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3811              }              }
3812            }            }
3813          /* Control never gets here */          /* Control never gets here */
# Line 3596  for (;;) Line 3819  for (;;)
3819          {          {
3820          pp = eptr;          pp = eptr;
3821    
3822  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3823          /* UTF-8 mode */          if (utf)
         if (utf8)  
3824            {            {
3825            register unsigned int d;            register unsigned int d;
3826            for (i = min; i < max; i++)            for (i = min; i < max; i++)
# Line 3624  for (;;) Line 3846  for (;;)
3846            }            }
3847          else          else
3848  #endif  #endif
3849          /* Not UTF-8 mode */          /* Not UTF mode */
3850            {            {
3851            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3852              {              {
# Line 3645  for (;;) Line 3867  for (;;)
3867              }              }
3868            }            }
3869    
3870          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3871          }          }
3872        }        }
3873      /* Control never gets here */      /* Control never gets here */
# Line 3657  for (;;) Line 3879  for (;;)
3879      case OP_TYPEEXACT:      case OP_TYPEEXACT:
3880      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3881      minimize = TRUE;      minimize = TRUE;
3882      ecode += 3;      ecode += 1 + IMM2_SIZE;
3883      goto REPEATTYPE;      goto REPEATTYPE;
3884    
3885      case OP_TYPEUPTO:      case OP_TYPEUPTO:
# Line 3665  for (;;) Line 3887  for (;;)
3887      min = 0;      min = 0;
3888      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3889      minimize = *ecode == OP_TYPEMINUPTO;      minimize = *ecode == OP_TYPEMINUPTO;
3890      ecode += 3;      ecode += 1 + IMM2_SIZE;
3891      goto REPEATTYPE;      goto REPEATTYPE;
3892    
3893      case OP_TYPEPOSSTAR:      case OP_TYPEPOSSTAR:
# Line 3693  for (;;) Line 3915  for (;;)
3915      possessive = TRUE;      possessive = TRUE;
3916      min = 0;      min = 0;
3917      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3918      ecode += 3;      ecode += 1 + IMM2_SIZE;
3919      goto REPEATTYPE;      goto REPEATTYPE;
3920    
3921      case OP_TYPESTAR:      case OP_TYPESTAR:
# Line 3739  for (;;) Line 3961  for (;;)
3961          switch(prop_type)          switch(prop_type)
3962            {            {
3963            case PT_ANY:            case PT_ANY:
3964            if (prop_fail_result) MRRETURN(MATCH_NOMATCH);            if (prop_fail_result) RRETURN(MATCH_NOMATCH);
3965            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
3966              {              {
3967              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3968                {                {
3969                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3970                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3971                }                }
3972              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3973              }              }
# Line 3754  for (;;) Line 3976  for (;;)
3976            case PT_LAMP:            case PT_LAMP:
3977            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
3978              {              {
3979                int chartype;
3980              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3981                {                {
3982                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3983                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3984                }                }
3985              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3986              prop_chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
3987              if ((prop_chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
3988                   prop_chartype == ucp_Ll ||                   chartype == ucp_Ll ||
3989                   prop_chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
3990                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3991              }              }
3992            break;            break;
3993    
# Line 3774  for (;;) Line 3997  for (;;)
3997              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3998                {                {
3999                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4000                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4001                }                }
4002              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4003              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
4004              if ((prop_category == prop_value) == prop_fail_result)                RRETURN(MATCH_NOMATCH);
               MRRETURN(MATCH_NOMATCH);  
4005              }              }
4006            break;            break;
4007    
# Line 3789  for (;;) Line 4011  for (;;)
4011              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4012                {                {
4013                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4014                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4015                }                }
4016              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4017              prop_chartype = UCD_CHARTYPE(c);              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
4018              if ((prop_chartype == prop_value) == prop_fail_result)                RRETURN(MATCH_NOMATCH);
               MRRETURN(MATCH_NOMATCH);  
4019              }              }
4020            break;            break;
4021    
# Line 3804  for (;;) Line 4025  for (;;)
4025              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4026                {                {
4027                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4028                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4029                }                }
4030              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4031              prop_script = UCD_SCRIPT(c);              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
4032              if ((prop_script == prop_value) == prop_fail_result)                RRETURN(MATCH_NOMATCH);
               MRRETURN(MATCH_NOMATCH);  
4033              }              }
4034            break;            break;
4035    
4036            case PT_ALNUM:            case PT_ALNUM:
4037            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
4038              {              {
4039                int category;
4040              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4041                {                {
4042                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4043                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4044                }                }
4045              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4046              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4047              if ((prop_category == ucp_L || prop_category == ucp_N)              if ((category == ucp_L || category == ucp_N) == prop_fail_result)
4048                     == prop_fail_result)                RRETURN(MATCH_NOMATCH);
               MRRETURN(MATCH_NOMATCH);  
4049              }              }
4050            break;            break;
4051    
# Line 3835  for (;;) Line 4055  for (;;)
4055              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4056                {                {
4057                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4058                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4059                }                }
4060              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4061              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||  
4062                   c == CHAR_FF || c == CHAR_CR)                   c == CHAR_FF || c == CHAR_CR)
4063                     == prop_fail_result)                     == prop_fail_result)
4064                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4065              }              }
4066            break;            break;
4067    
# Line 3852  for (;;) Line 4071  for (;;)
4071              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4072                {                {
4073                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4074                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4075                }                }
4076              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4077              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||  
4078                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
4079                     == prop_fail_result)                     == prop_fail_result)
4080                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4081              }              }
4082            break;            break;
4083    
4084            case PT_WORD:            case PT_WORD:
4085            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
4086              {              {
4087                int category;
4088              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4089                {                {
4090                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4091                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4092                }                }
4093              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4094              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4095              if ((prop_category == ucp_L || prop_category == ucp_N ||              if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)
                  c == CHAR_UNDERSCORE)  
4096                     == prop_fail_result)                     == prop_fail_result)
4097                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4098              }              }
4099            break;            break;
4100    
# Line 3897  for (;;) Line 4115  for (;;)
4115            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4116              {              {
4117              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4118              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4119              }              }
4120            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
4121            prop_category = UCD_CATEGORY(c);            if (UCD_CATEGORY(c) == ucp_M) RRETURN(MATCH_NOMATCH);
           if (prop_category == ucp_M) MRRETURN(MATCH_NOMATCH);  
4122            while (eptr < md->end_subject)            while (eptr < md->end_subject)
4123              {              {
4124              int len = 1;              int len = 1;
4125              if (!utf8) c = *eptr;              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
4126                else { GETCHARLEN(c, eptr, len); }              if (UCD_CATEGORY(c) != ucp_M) break;
             prop_category = UCD_CATEGORY(c);  
             if (prop_category != ucp_M) break;  
4127              eptr += len;              eptr += len;
4128              }              }
4129            }            }
# Line 3919  for (;;) Line 4134  for (;;)
4134    
4135  /* Handle all other cases when the coding is UTF-8 */  /* Handle all other cases when the coding is UTF-8 */
4136    
4137  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4138        if (utf8) switch(ctype)        if (utf) switch(ctype)
4139          {          {
4140          case OP_ANY:          case OP_ANY:
4141          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3928  for (;;) Line 4143  for (;;)
4143            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4144              {              {
4145              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4146              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4147              }              }
4148            if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);            if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
4149            eptr++;            eptr++;
4150            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4151            }            }
4152          break;          break;
4153    
# Line 3942  for (;;) Line 4157  for (;;)
4157            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4158              {              {
4159