/[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 545 by ph10, Wed Jun 16 10:51:15 2010 UTC revision 702 by ph10, Tue Sep 20 15:45:06 2011 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-2010 University of Cambridge             Copyright (c) 1997-2011 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 57  possible. There are also some static sup Line 57  possible. There are also some static sup
57  #undef min  #undef min
58  #undef max  #undef max
59    
60  /* Flag bits for the match() function */  /* Values for setting in md->match_function_type to indicate two special types
61    of call to match(). We do it this way to save on using another stack variable,
62    as stack usage is to be discouraged. */
63    
64  #define match_condassert     0x01  /* Called to check a condition assertion */  #define MATCH_CONDASSERT     1  /* Called to check a condition assertion */
65  #define match_cbegroup       0x02  /* Could-be-empty unlimited repeat group */  #define MATCH_CBEGROUP       2  /* Could-be-empty unlimited repeat group */
66    
67  /* Non-error returns from the match() function. Error returns are externally  /* Non-error returns from the match() function. Error returns are externally
68  defined PCRE_ERROR_xxx codes, which are all negative. */  defined PCRE_ERROR_xxx codes, which are all negative. */
# Line 73  negative to avoid the external error cod Line 75  negative to avoid the external error cod
75    
76  #define MATCH_ACCEPT       (-999)  #define MATCH_ACCEPT       (-999)
77  #define MATCH_COMMIT       (-998)  #define MATCH_COMMIT       (-998)
78  #define MATCH_PRUNE        (-997)  #define MATCH_KETRPOS      (-997)
79  #define MATCH_SKIP         (-996)  #define MATCH_ONCE         (-996)
80  #define MATCH_SKIP_ARG     (-995)  #define MATCH_PRUNE        (-995)
81  #define MATCH_THEN         (-994)  #define MATCH_SKIP         (-994)
82    #define MATCH_SKIP_ARG     (-993)
83    #define MATCH_THEN         (-992)
84    
85  /* This is a convenience macro for code that occurs many times. */  /* This is a convenience macro for code that occurs many times. */
86    
# Line 132  while (length-- > 0) Line 136  while (length-- > 0)
136  *          Match a back-reference                *  *          Match a back-reference                *
137  *************************************************/  *************************************************/
138    
139  /* If a back reference hasn't been set, the length that is passed is greater  /* Normally, if a back reference hasn't been set, the length that is passed is
140  than the number of characters left in the string, so the match fails.  negative, so the match always fails. However, in JavaScript compatibility mode,
141    the length passed is zero. Note that in caseless UTF-8 mode, the number of
142    subject bytes matched may be different to the number of reference bytes.
143    
144  Arguments:  Arguments:
145    offset      index into the offset vector    offset      index into the offset vector
146    eptr        points into the subject    eptr        pointer into the subject
147    length      length to be matched    length      length of reference to be matched (number of bytes)
148    md          points to match data block    md          points to match data block
149    ims         the ims flags    caseless    TRUE if caseless
150    
151  Returns:      TRUE if matched  Returns:      < 0 if not matched, otherwise the number of subject bytes matched
152  */  */
153    
154  static BOOL  static int
155  match_ref(int offset, register USPTR eptr, int length, match_data *md,  match_ref(int offset, register USPTR eptr, int length, match_data *md,
156    unsigned long int ims)    BOOL caseless)
157  {  {
158  USPTR p = md->start_subject + md->offset_vector[offset];  USPTR eptr_start = eptr;
159    register USPTR p = md->start_subject + md->offset_vector[offset];
160    
161  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
162  if (eptr >= md->end_subject)  if (eptr >= md->end_subject)
# Line 164  pchars(p, length, FALSE, md); Line 171  pchars(p, length, FALSE, md);
171  printf("\n");  printf("\n");
172  #endif  #endif
173    
174  /* Always fail if not enough characters left */  /* Always fail if reference not set (and not JavaScript compatible). */
175    
176  if (length > md->end_subject - eptr) return FALSE;  if (length < 0) return -1;
177    
178  /* Separate the caseless case for speed. In UTF-8 mode we can only do this  /* Separate the caseless case for speed. In UTF-8 mode we can only do this
179  properly if Unicode properties are supported. Otherwise, we can check only  properly if Unicode properties are supported. Otherwise, we can check only
180  ASCII characters. */  ASCII characters. */
181    
182  if ((ims & PCRE_CASELESS) != 0)  if (caseless)
183    {    {
184  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
185  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
186    if (md->utf8)    if (md->utf8)
187      {      {
188      USPTR endptr = eptr + length;      /* Match characters up to the end of the reference. NOTE: the number of
189      while (eptr < endptr)      bytes matched may differ, because there are some characters whose upper and
190        lower case versions code as different numbers of bytes. For example, U+023A
191        (2 bytes in UTF-8) is the upper case version of U+2C65 (3 bytes in UTF-8);
192        a sequence of 3 of the former uses 6 bytes, as does a sequence of two of
193        the latter. It is important, therefore, to check the length along the
194        reference, not along the subject (earlier code did this wrong). */
195    
196        USPTR endptr = p + length;
197        while (p < endptr)
198        {        {
199        int c, d;        int c, d;
200          if (eptr >= md->end_subject) return -1;
201        GETCHARINC(c, eptr);        GETCHARINC(c, eptr);
202        GETCHARINC(d, p);        GETCHARINC(d, p);
203        if (c != d && c != UCD_OTHERCASE(d)) return FALSE;        if (c != d && c != UCD_OTHERCASE(d)) return -1;
204        }        }
205      }      }
206    else    else
# Line 193  if ((ims & PCRE_CASELESS) != 0) Line 209  if ((ims & PCRE_CASELESS) != 0)
209    
210    /* 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
211    is no UCP support. */    is no UCP support. */
212        {
213    while (length-- > 0)      if (eptr + length > md->end_subject) return -1;
214      { if (md->lcc[*p++] != md->lcc[*eptr++]) return FALSE; }      while (length-- > 0)
215          { if (md->lcc[*p++] != md->lcc[*eptr++]) return -1; }
216        }
217    }    }
218    
219  /* 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
220  are in UTF-8 mode. */  are in UTF-8 mode. */
221    
222  else  else
223    { while (length-- > 0) if (*p++ != *eptr++) return FALSE; }    {
224      if (eptr + length > md->end_subject) return -1;
225      while (length-- > 0) if (*p++ != *eptr++) return -1;
226      }
227    
228  return TRUE;  return eptr - eptr_start;
229  }  }
230    
231    
# Line 256  enum { RM1=1, RM2, RM3, RM4, RM5, RM Line 277  enum { RM1=1, RM2, RM3, RM4, RM5, RM
277         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
278         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
279         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
280         RM61,  RM62 };         RM61,  RM62, RM63 };
281    
282  /* 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
283  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 266  actually used in this definition. */ Line 287  actually used in this definition. */
287  #define REGISTER register  #define REGISTER register
288    
289  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
290  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
291    { \    { \
292    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
293    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rf,rg,rdepth+1); \    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1); \
294    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
295    }    }
296  #define RRETURN(ra) \  #define RRETURN(ra) \
# Line 278  actually used in this definition. */ Line 299  actually used in this definition. */
299    return ra; \    return ra; \
300    }    }
301  #else  #else
302  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
303    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rf,rg,rdepth+1)    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1)
304  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
305  #endif  #endif
306    
# Line 292  argument of match(), which never changes Line 313  argument of match(), which never changes
313    
314  #define REGISTER  #define REGISTER
315    
316  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\  #define RMATCH(ra,rb,rc,rd,re,rw)\
317    {\    {\
318    heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\
319    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
320    frame->Xwhere = rw; \    frame->Xwhere = rw; \
321    newframe->Xeptr = ra;\    newframe->Xeptr = ra;\
# Line 302  argument of match(), which never changes Line 323  argument of match(), which never changes
323    newframe->Xmstart = mstart;\    newframe->Xmstart = mstart;\
324    newframe->Xmarkptr = markptr;\    newframe->Xmarkptr = markptr;\
325    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
326    newframe->Xims = re;\    newframe->Xeptrb = re;\
   newframe->Xeptrb = rf;\  
   newframe->Xflags = rg;\  
327    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
328    newframe->Xprevframe = frame;\    newframe->Xprevframe = frame;\
329    frame = newframe;\    frame = newframe;\
# Line 340  typedef struct heapframe { Line 359  typedef struct heapframe {
359    USPTR Xmstart;    USPTR Xmstart;
360    USPTR Xmarkptr;    USPTR Xmarkptr;
361    int Xoffset_top;    int Xoffset_top;
   long int Xims;  
362    eptrblock *Xeptrb;    eptrblock *Xeptrb;
   int Xflags;  
363    unsigned int Xrdepth;    unsigned int Xrdepth;
364    
365    /* Function local variables */    /* Function local variables */
# Line 363  typedef struct heapframe { Line 380  typedef struct heapframe {
380    BOOL Xcondition;    BOOL Xcondition;
381    BOOL Xprev_is_word;    BOOL Xprev_is_word;
382    
   unsigned long int Xoriginal_ims;  
   
383  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
384    int Xprop_type;    int Xprop_type;
385    int Xprop_value;    int Xprop_value;
386    int Xprop_fail_result;    int Xprop_fail_result;
   int Xprop_category;  
   int Xprop_chartype;  
   int Xprop_script;  
387    int Xoclength;    int Xoclength;
388    uschar Xocchars[8];    uschar Xocchars[8];
389  #endif  #endif
# Line 422  immediately. The second one is used when Line 434  immediately. The second one is used when
434  the subject. */  the subject. */
435    
436  #define CHECK_PARTIAL()\  #define CHECK_PARTIAL()\
437    if (md->partial != 0 && eptr >= md->end_subject && eptr > mstart)\    if (md->partial != 0 && eptr >= md->end_subject && \
438      {\        eptr > md->start_used_ptr) \
439      md->hitend = TRUE;\      { \
440      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL);\      md->hitend = TRUE; \
441        if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \
442      }      }
443    
444  #define SCHECK_PARTIAL()\  #define SCHECK_PARTIAL()\
445    if (md->partial != 0 && eptr > mstart)\    if (md->partial != 0 && eptr > md->start_used_ptr) \
446      {\      { \
447      md->hitend = TRUE;\      md->hitend = TRUE; \
448      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL);\      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \
449      }      }
450    
451    
# Line 449  Arguments: Line 462  Arguments:
462     markptr     pointer to the most recent MARK name, or NULL     markptr     pointer to the most recent MARK name, or NULL
463     offset_top  current top pointer     offset_top  current top pointer
464     md          pointer to "static" info for the match     md          pointer to "static" info for the match
    ims         current /i, /m, and /s options  
465     eptrb       pointer to chain of blocks containing eptr at start of     eptrb       pointer to chain of blocks containing eptr at start of
466                   brackets - for testing for empty matches                   brackets - for testing for empty matches
    flags       can contain  
                  match_condassert - this is an assertion condition  
                  match_cbegroup - this is the start of an unlimited repeat  
                    group that can match an empty string  
467     rdepth      the recursion depth     rdepth      the recursion depth
468    
469  Returns:       MATCH_MATCH if matched            )  these values are >= 0  Returns:       MATCH_MATCH if matched            )  these values are >= 0
# Line 467  Returns: MATCH_MATCH if matched Line 475  Returns: MATCH_MATCH if matched
475    
476  static int  static int
477  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,
478    const uschar *markptr, int offset_top, match_data *md, unsigned long int ims,    const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,
479    eptrblock *eptrb, int flags, unsigned int rdepth)    unsigned int rdepth)
480  {  {
481  /* 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,
482  so they can be ordinary variables in all cases. Mark some of them with  so they can be ordinary variables in all cases. Mark some of them with
# Line 480  register unsigned int c; /* Character Line 488  register unsigned int c; /* Character
488  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */
489    
490  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
491    BOOL caseless;
492  int condcode;  int condcode;
493    
494  /* When recursion is not being used, all "local" variables that have to be  /* When recursion is not being used, all "local" variables that have to be
# Line 488  heap storage. Set up the top-level frame Line 497  heap storage. Set up the top-level frame
497  heap whenever RMATCH() does a "recursion". See the macro definitions above. */  heap whenever RMATCH() does a "recursion". See the macro definitions above. */
498    
499  #ifdef NO_RECURSE  #ifdef NO_RECURSE
500  heapframe *frame = (pcre_stack_malloc)(sizeof(heapframe));  heapframe *frame = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));
501  if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);  if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
502  frame->Xprevframe = NULL;            /* Marks the top level */  frame->Xprevframe = NULL;            /* Marks the top level */
503    
# Line 499  frame->Xecode = ecode; Line 508  frame->Xecode = ecode;
508  frame->Xmstart = mstart;  frame->Xmstart = mstart;
509  frame->Xmarkptr = markptr;  frame->Xmarkptr = markptr;
510  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
 frame->Xims = ims;  
511  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
 frame->Xflags = flags;  
512  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
513    
514  /* This is where control jumps back to to effect "recursion" */  /* This is where control jumps back to to effect "recursion" */
# Line 515  HEAP_RECURSE: Line 522  HEAP_RECURSE:
522  #define mstart             frame->Xmstart  #define mstart             frame->Xmstart
523  #define markptr            frame->Xmarkptr  #define markptr            frame->Xmarkptr
524  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
 #define ims                frame->Xims  
525  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
 #define flags              frame->Xflags  
526  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
527    
528  /* Ditto for the local variables */  /* Ditto for the local variables */
# Line 539  HEAP_RECURSE: Line 544  HEAP_RECURSE:
544  #define condition          frame->Xcondition  #define condition          frame->Xcondition
545  #define prev_is_word       frame->Xprev_is_word  #define prev_is_word       frame->Xprev_is_word
546    
 #define original_ims       frame->Xoriginal_ims  
   
547  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
548  #define prop_type          frame->Xprop_type  #define prop_type          frame->Xprop_type
549  #define prop_value         frame->Xprop_value  #define prop_value         frame->Xprop_value
550  #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  
551  #define oclength           frame->Xoclength  #define oclength           frame->Xoclength
552  #define occhars            frame->Xocchars  #define occhars            frame->Xocchars
553  #endif  #endif
# Line 577  i, and fc and c, can be the same variabl Line 577  i, and fc and c, can be the same variabl
577  #define fi i  #define fi i
578  #define fc c  #define fc c
579    
580    /* Many of the following variables are used only in small blocks of the code.
581    My normal style of coding would have declared them within each of those blocks.
582    However, in order to accommodate the version of this code that uses an external
583    "stack" implemented on the heap, it is easier to declare them all here, so the
584    declarations can be cut out in a block. The only declarations within blocks
585    below are for variables that do not have to be preserved over a recursive call
586    to RMATCH(). */
587    
588    #ifdef SUPPORT_UTF8
589    const uschar *charptr;
590    #endif
591    const uschar *callpat;
592    const uschar *data;
593    const uschar *next;
594    USPTR         pp;
595    const uschar *prev;
596    USPTR         saved_eptr;
597    
598  #ifdef SUPPORT_UTF8                /* Many of these variables are used only  */  recursion_info new_recursive;
599  const uschar *charptr;             /* in small blocks of the code. My normal */  
600  #endif                             /* style of coding would have declared    */  BOOL cur_is_word;
 const uschar *callpat;             /* them within each of those blocks.      */  
 const uschar *data;                /* However, in order to accommodate the   */  
 const uschar *next;                /* version of this code that uses an      */  
 USPTR         pp;                  /* external "stack" implemented on the    */  
 const uschar *prev;                /* heap, it is easier to declare them all */  
 USPTR         saved_eptr;          /* here, so the declarations can be cut   */  
                                    /* out in a block. The only declarations  */  
 recursion_info new_recursive;      /* within blocks below are for variables  */  
                                    /* that do not have to be preserved over  */  
 BOOL cur_is_word;                  /* a recursive call to RMATCH().          */  
601  BOOL condition;  BOOL condition;
602  BOOL prev_is_word;  BOOL prev_is_word;
603    
 unsigned long int original_ims;  
   
604  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
605  int prop_type;  int prop_type;
606  int prop_value;  int prop_value;
607  int prop_fail_result;  int prop_fail_result;
 int prop_category;  
 int prop_chartype;  
 int prop_script;  
608  int oclength;  int oclength;
609  uschar occhars[8];  uschar occhars[8];
610  #endif  #endif
# Line 622  int stacksave[REC_STACK_SAVE_MAX]; Line 624  int stacksave[REC_STACK_SAVE_MAX];
624  eptrblock newptrb;  eptrblock newptrb;
625  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
626    
627    /* To save space on the stack and in the heap frame, I have doubled up on some
628    of the local variables that are used only in localised parts of the code, but
629    still need to be preserved over recursive calls of match(). These macros define
630    the alternative names that are used. */
631    
632    #define allow_zero    cur_is_word
633    #define cbegroup      condition
634    #define code_offset   codelink
635    #define condassert    condition
636    #define matched_once  prev_is_word
637    
638  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
639  variables. */  variables. */
640    
# Line 658  haven't exceeded the recursive call limi Line 671  haven't exceeded the recursive call limi
671  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);
672  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
673    
 original_ims = ims;    /* Save for resetting on ')' */  
   
674  /* 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
675  string, the match_cbegroup flag is set. When this is the case, add the current  string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is
676  subject pointer to the chain of such remembered pointers, to be checked when we  done this way to save having to use another function argument, which would take
677  hit the closing ket, in order to break infinite loops that match no characters.  up space on the stack. See also MATCH_CONDASSERT below.
678  When match() is called in other circumstances, don't add to the chain. The  
679  match_cbegroup flag must NOT be used with tail recursion, because the memory  When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
680  block that is used is on the stack, so a new one may be required for each  such remembered pointers, to be checked when we hit the closing ket, in order
681  match(). */  to break infinite loops that match no characters. When match() is called in
682    other circumstances, don't add to the chain. The MATCH_CBEGROUP feature must
683    NOT be used with tail recursion, because the memory block that is used is on
684    the stack, so a new one may be required for each match(). */
685    
686  if ((flags & match_cbegroup) != 0)  if (md->match_function_type == MATCH_CBEGROUP)
687    {    {
688    newptrb.epb_saved_eptr = eptr;    newptrb.epb_saved_eptr = eptr;
689    newptrb.epb_prev = eptrb;    newptrb.epb_prev = eptrb;
690    eptrb = &newptrb;    eptrb = &newptrb;
691      md->match_function_type = 0;
692    }    }
693    
694  /* Now start processing the opcodes. */  /* Now start processing the opcodes. */
# Line 688  for (;;) Line 703  for (;;)
703      case OP_MARK:      case OP_MARK:
704      markptr = ecode + 2;      markptr = ecode + 2;
705      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
706        ims, eptrb, flags, RM55);        eptrb, RM55);
707    
708      /* 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
709      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 710  for (;;) Line 725  for (;;)
725      case OP_FAIL:      case OP_FAIL:
726      MRRETURN(MATCH_NOMATCH);      MRRETURN(MATCH_NOMATCH);
727    
728        /* COMMIT overrides PRUNE, SKIP, and THEN */
729    
730      case OP_COMMIT:      case OP_COMMIT:
731      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
732        ims, eptrb, flags, RM52);        eptrb, RM52);
733      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
734            rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
735            rrc != MATCH_THEN)
736          RRETURN(rrc);
737      MRRETURN(MATCH_COMMIT);      MRRETURN(MATCH_COMMIT);
738    
739        /* PRUNE overrides THEN */
740    
741      case OP_PRUNE:      case OP_PRUNE:
742      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
743        ims, eptrb, flags, RM51);        eptrb, RM51);
744      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
745      MRRETURN(MATCH_PRUNE);      MRRETURN(MATCH_PRUNE);
746    
747      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
748      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
749        ims, eptrb, flags, RM56);        eptrb, RM56);
750      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
751      md->mark = ecode + 2;      md->mark = ecode + 2;
752      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
753    
754        /* SKIP overrides PRUNE and THEN */
755    
756      case OP_SKIP:      case OP_SKIP:
757      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
758        ims, eptrb, flags, RM53);        eptrb, RM53);
759      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
760          RRETURN(rrc);
761      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
762      MRRETURN(MATCH_SKIP);      MRRETURN(MATCH_SKIP);
763    
764      case OP_SKIP_ARG:      case OP_SKIP_ARG:
765      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
766        ims, eptrb, flags, RM57);        eptrb, RM57);
767      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
768          RRETURN(rrc);
769    
770      /* 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
771      returning the special MATCH_SKIP_ARG return code. This will either be      returning the special MATCH_SKIP_ARG return code. This will either be
# Line 749  for (;;) Line 775  for (;;)
775      md->start_match_ptr = ecode + 2;      md->start_match_ptr = ecode + 2;
776      RRETURN(MATCH_SKIP_ARG);      RRETURN(MATCH_SKIP_ARG);
777    
778        /* For THEN (and THEN_ARG) we pass back the address of the bracket or
779        the alt that is at the start of the current branch. This makes it possible
780        to skip back past alternatives that precede the THEN within the current
781        branch. */
782    
783      case OP_THEN:      case OP_THEN:
784      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
785        ims, eptrb, flags, RM54);        eptrb, RM54);
786      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
787        md->start_match_ptr = ecode - GET(ecode, 1);
788      MRRETURN(MATCH_THEN);      MRRETURN(MATCH_THEN);
789    
790      case OP_THEN_ARG:      case OP_THEN_ARG:
791      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],
792        ims, eptrb, flags, RM58);        offset_top, md, eptrb, RM58);
793      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
794      md->mark = ecode + 2;      md->start_match_ptr = ecode - GET(ecode, 1);
795        md->mark = ecode + LINK_SIZE + 2;
796      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
797    
798      /* Handle a capturing bracket. If there is space in the offset vector, save      /* Handle a capturing bracket, other than those that are possessive with an
799      the current subject position in the working slot at the top of the vector.      unlimited repeat. If there is space in the offset vector, save the current
800      We mustn't change the current values of the data slot, because they may be      subject position in the working slot at the top of the vector. We mustn't
801      set from a previous iteration of this group, and be referred to by a      change the current values of the data slot, because they may be set from a
802      reference inside the group.      previous iteration of this group, and be referred to by a reference inside
803        the group. A failure to match might occur after the group has succeeded,
804      If the bracket fails to match, we need to restore this value and also the      if something later on doesn't match. For this reason, we need to restore
805      values of the final offsets, in case they were set by a previous iteration      the working value and also the values of the final offsets, in case they
806      of the same bracket.      were set by a previous iteration of the same bracket.
807    
808      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
809      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 799  for (;;) Line 832  for (;;)
832        md->offset_vector[md->offset_end - number] =        md->offset_vector[md->offset_end - number] =
833          (int)(eptr - md->start_subject);          (int)(eptr - md->start_subject);
834    
835        flags = (op == OP_SCBRA)? match_cbegroup : 0;        for (;;)
       do  
836          {          {
837            if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
838          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
839            ims, eptrb, flags, RM1);            eptrb, RM1);
840          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);          if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
841            if (rrc != MATCH_NOMATCH &&
842                (rrc != MATCH_THEN || md->start_match_ptr != ecode))
843              RRETURN(rrc);
844          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
845          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
846            if (*ecode != OP_ALT) break;
847          }          }
       while (*ecode == OP_ALT);  
848    
849        DPRINTF(("bracket %d failed\n", number));        DPRINTF(("bracket %d failed\n", number));
   
850        md->offset_vector[offset] = save_offset1;        md->offset_vector[offset] = save_offset1;
851        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
852        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
853    
854        if (rrc != MATCH_THEN) md->mark = markptr;        /* At this point, rrc will be one of MATCH_ONCE, MATCH_NOMATCH, or
855        RRETURN(MATCH_NOMATCH);        MATCH_THEN. */
856    
857          if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;
858          RRETURN(((rrc == MATCH_ONCE)? MATCH_ONCE:MATCH_NOMATCH));
859        }        }
860    
861      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
# Line 831  for (;;) Line 869  for (;;)
869      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
870      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
871    
872      /* Non-capturing bracket. Loop for all the alternatives. When we get to the      /* Non-capturing or atomic group, except for possessive with unlimited
873      final alternative within the brackets, we would return the result of a      repeat. Loop for all the alternatives.
874      recursive call to match() whatever happened. We can reduce stack usage by  
875      turning this into a tail recursion, except in the case when match_cbegroup      When we get to the final alternative within the brackets, we used to return
876      is set.*/      the result of a recursive call to match() whatever happened so it was
877        possible to reduce stack usage by turning this into a tail recursion,
878        except in the case of a possibly empty group. However, now that there is
879        the possiblity of (*THEN) occurring in the final alternative, this
880        optimization is no longer always possible.
881    
882        We can optimize if we know there are no (*THEN)s in the pattern; at present
883        this is the best that can be done.
884    
885        MATCH_ONCE is returned when the end of an atomic group is successfully
886        reached, but subsequent matching fails. It passes back up the tree (causing
887        captured values to be reset) until the original atomic group level is
888        reached. This is tested by comparing md->once_target with the start of the
889        group. At this point, the return is converted into MATCH_NOMATCH so that
890        previous backup points can be taken. */
891    
892        case OP_ONCE:
893      case OP_BRA:      case OP_BRA:
894      case OP_SBRA:      case OP_SBRA:
895      DPRINTF(("start non-capturing bracket\n"));      DPRINTF(("start non-capturing bracket\n"));
896      flags = (op >= OP_SBRA)? match_cbegroup : 0;  
897      for (;;)      for (;;)
898        {        {
899        if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */        if (op >= OP_SBRA || op == OP_ONCE) md->match_function_type = MATCH_CBEGROUP;
900    
901          /* If this is not a possibly empty group, and there are no (*THEN)s in
902          the pattern, and this is the final alternative, optimize as described
903          above. */
904    
905          else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
906            {
907            ecode += _pcre_OP_lengths[*ecode];
908            goto TAIL_RECURSE;
909            }
910    
911          /* In all other cases, we have to make another call to match(). */
912    
913          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,
914            RM2);
915          if (rrc != MATCH_NOMATCH &&
916              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
917          {          {
918          if (flags == 0)    /* Not a possibly empty group */          if (rrc == MATCH_ONCE)
919            {            {
920            ecode += _pcre_OP_lengths[*ecode];            const uschar *scode = ecode;
921            DPRINTF(("bracket 0 tail recursion\n"));            if (*scode != OP_ONCE)           /* If not at start, find it */
922            goto TAIL_RECURSE;              {
923                while (*scode == OP_ALT) scode += GET(scode, 1);
924                scode -= GET(scode, 1);
925                }
926              if (md->once_target == scode) rrc = MATCH_NOMATCH;
927            }            }
928            RRETURN(rrc);
929            }
930          ecode += GET(ecode, 1);
931          if (*ecode != OP_ALT) break;
932          }
933        if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;
934        RRETURN(MATCH_NOMATCH);
935    
936          /* Possibly empty group; can't use tail recursion. */      /* Handle possessive capturing brackets with an unlimited repeat. We come
937        here from BRAZERO with allow_zero set TRUE. The offset_vector values are
938        handled similarly to the normal case above. However, the matching is
939        different. The end of these brackets will always be OP_KETRPOS, which
940        returns MATCH_KETRPOS without going further in the pattern. By this means
941        we can handle the group by iteration rather than recursion, thereby
942        reducing the amount of stack needed. */
943    
944        case OP_CBRAPOS:
945        case OP_SCBRAPOS:
946        allow_zero = FALSE;
947    
948          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,      POSSESSIVE_CAPTURE:
949            eptrb, flags, RM48);      number = GET2(ecode, 1+LINK_SIZE);
950          if (rrc == MATCH_NOMATCH) md->mark = markptr;      offset = number << 1;
951          RRETURN(rrc);  
952    #ifdef PCRE_DEBUG
953        printf("start possessive bracket %d\n", number);
954        printf("subject=");
955        pchars(eptr, 16, TRUE, md);
956        printf("\n");
957    #endif
958    
959        if (offset < md->offset_max)
960          {
961          matched_once = FALSE;
962          code_offset = ecode - md->start_code;
963    
964          save_offset1 = md->offset_vector[offset];
965          save_offset2 = md->offset_vector[offset+1];
966          save_offset3 = md->offset_vector[md->offset_end - number];
967          save_capture_last = md->capture_last;
968    
969          DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
970    
971          /* Each time round the loop, save the current subject position for use
972          when the group matches. For MATCH_MATCH, the group has matched, so we
973          restart it with a new subject starting position, remembering that we had
974          at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
975          usual. If we haven't matched any alternatives in any iteration, check to
976          see if a previous iteration matched. If so, the group has matched;
977          continue from afterwards. Otherwise it has failed; restore the previous
978          capture values before returning NOMATCH. */
979    
980          for (;;)
981            {
982            md->offset_vector[md->offset_end - number] =
983              (int)(eptr - md->start_subject);
984            if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
985            RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
986              eptrb, RM63);
987            if (rrc == MATCH_KETRPOS)
988              {
989              offset_top = md->end_offset_top;
990              eptr = md->end_match_ptr;
991              ecode = md->start_code + code_offset;
992              save_capture_last = md->capture_last;
993              matched_once = TRUE;
994              continue;
995              }
996            if (rrc != MATCH_NOMATCH &&
997                (rrc != MATCH_THEN || md->start_match_ptr != ecode))
998              RRETURN(rrc);
999            md->capture_last = save_capture_last;
1000            ecode += GET(ecode, 1);
1001            if (*ecode != OP_ALT) break;
1002            }
1003    
1004          if (!matched_once)
1005            {
1006            md->offset_vector[offset] = save_offset1;
1007            md->offset_vector[offset+1] = save_offset2;
1008            md->offset_vector[md->offset_end - number] = save_offset3;
1009            }
1010    
1011          if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;
1012          if (allow_zero || matched_once)
1013            {
1014            ecode += 1 + LINK_SIZE;
1015            break;
1016          }          }
1017    
1018        /* For non-final alternatives, continue the loop for a NOMATCH result;        RRETURN(MATCH_NOMATCH);
1019        otherwise return. */        }
1020    
1021        /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
1022        as a non-capturing bracket. */
1023    
1024        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1025        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1026    
1027        DPRINTF(("insufficient capture room: treat as non-capturing\n"));
1028    
1029        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1030        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1031    
1032        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,      /* Non-capturing possessive bracket with unlimited repeat. We come here
1033          eptrb, flags, RM2);      from BRAZERO with allow_zero = TRUE. The code is similar to the above,
1034        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      without the capturing complication. It is written out separately for speed
1035        and cleanliness. */
1036    
1037        case OP_BRAPOS:
1038        case OP_SBRAPOS:
1039        allow_zero = FALSE;
1040    
1041        POSSESSIVE_NON_CAPTURE:
1042        matched_once = FALSE;
1043        code_offset = ecode - md->start_code;
1044    
1045        for (;;)
1046          {
1047          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1048          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
1049            eptrb, RM48);
1050          if (rrc == MATCH_KETRPOS)
1051            {
1052            offset_top = md->end_offset_top;
1053            eptr = md->end_match_ptr;
1054            ecode = md->start_code + code_offset;
1055            matched_once = TRUE;
1056            continue;
1057            }
1058          if (rrc != MATCH_NOMATCH &&
1059              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1060            RRETURN(rrc);
1061        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1062          if (*ecode != OP_ALT) break;
1063        }        }
1064    
1065        if (matched_once || allow_zero)
1066          {
1067          ecode += 1 + LINK_SIZE;
1068          break;
1069          }
1070        RRETURN(MATCH_NOMATCH);
1071    
1072      /* Control never reaches here. */      /* Control never reaches here. */
1073    
1074      /* Conditional group: compilation checked that there are no more than      /* Conditional group: compilation checked that there are no more than
1075      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
1076      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
1077      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. */  
1078    
1079      case OP_COND:      case OP_COND:
1080      case OP_SCOND:      case OP_SCOND:
1081      codelink= GET(ecode, 1);      codelink = GET(ecode, 1);
1082    
1083      /* Because of the way auto-callout works during compile, a callout item is      /* Because of the way auto-callout works during compile, a callout item is
1084      inserted between OP_COND and an assertion condition. */      inserted between OP_COND and an assertion condition. */
# Line 888  for (;;) Line 1088  for (;;)
1088        if (pcre_callout != NULL)        if (pcre_callout != NULL)
1089          {          {
1090          pcre_callout_block cb;          pcre_callout_block cb;
1091          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 2;   /* Version 1 of the callout block */
1092          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[LINK_SIZE+2];
1093          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1094          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
# Line 900  for (;;) Line 1100  for (;;)
1100          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1101          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last;
1102          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1103            cb.mark             = markptr;
1104          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
1105          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1106          }          }
# Line 1053  for (;;) Line 1254  for (;;)
1254        }        }
1255    
1256      /* The condition is an assertion. Call match() to evaluate it - setting      /* The condition is an assertion. Call match() to evaluate it - setting
1257      the final argument match_condassert causes it to stop at the end of an      md->match_function_type to MATCH_CONDASSERT causes it to stop at the end of
1258      assertion. */      an assertion. */
1259    
1260      else      else
1261        {        {
1262        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,        md->match_function_type = MATCH_CONDASSERT;
1263            match_condassert, RM3);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);
1264        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
1265          {          {
1266            if (md->end_offset_top > offset_top)
1267              offset_top = md->end_offset_top;  /* Captures may have happened */
1268          condition = TRUE;          condition = TRUE;
1269          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
1270          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1271          }          }
1272        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)        else if (rrc != MATCH_NOMATCH &&
1273                  (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1274          {          {
1275          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
1276          }          }
# Line 1078  for (;;) Line 1282  for (;;)
1282        }        }
1283    
1284      /* 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,
1285      we can use tail recursion to avoid using another stack frame, except when      we used always to use tail recursion to avoid using another stack frame,
1286      match_cbegroup is required for an unlimited repeat of a possibly empty      except when there was unlimited repeat of a possibly empty group. However,
1287      group. If the second alternative doesn't exist, we can just plough on. */      that strategy no longer works because of the possibilty of (*THEN) being
1288        encountered in the branch. However, we can still use tail recursion if
1289        there are no (*THEN)s in the pattern. Otherwise, a recursive call to
1290        match() is always required, unless the second alternative doesn't exist, in
1291        which case we can just plough on. */
1292    
1293      if (condition || *ecode == OP_ALT)      if (condition || *ecode == OP_ALT)
1294        {        {
1295        ecode += 1 + LINK_SIZE;        if (op == OP_SCOND) md->match_function_type = MATCH_CBEGROUP;
1296        if (op == OP_SCOND)        /* Possibly empty group */        else if (!md->hasthen)
         {  
         RMATCH(eptr, ecode, offset_top, md, ims, eptrb, match_cbegroup, RM49);  
         RRETURN(rrc);  
         }  
       else                       /* Group must match something */  
1297          {          {
1298          flags = 0;          ecode += 1 + LINK_SIZE;
1299          goto TAIL_RECURSE;          goto TAIL_RECURSE;
1300          }          }
1301        }  
1302      else                         /* Condition false & no alternative */        /* A call to match() is required. */
1303    
1304          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
1305    
1306          /* If the result is THEN from within the "true" branch of the condition,
1307          md->start_match_ptr will point to the original OP_COND, not to the start
1308          of the branch, so we have do work to see if it matches. If THEN comes
1309          from the "false" branch, md->start_match_ptr does point to OP_ALT. */
1310    
1311          if (rrc == MATCH_THEN)
1312            {
1313            if (*ecode != OP_ALT)
1314              {
1315              do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
1316              ecode -= GET(ecode, 1);
1317              }
1318            if (md->start_match_ptr == ecode) rrc = MATCH_NOMATCH;
1319            }
1320          RRETURN(rrc);
1321          }
1322    
1323         /* Condition false & no alternative; continue after the group. */
1324    
1325        else
1326        {        {
1327        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1328        }        }
# Line 1127  for (;;) Line 1353  for (;;)
1353      break;      break;
1354    
1355    
1356      /* 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. */  
1357    
     case OP_ACCEPT:  
1358      case OP_END:      case OP_END:
1359      if (md->recursive != NULL && md->recursive->group_num == 0)      case OP_ACCEPT:
1360        {      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;  
       ims = original_ims;  
       ecode = rec->after_call;  
       break;  
       }  
1361    
1362      /* 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
1363      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
1364      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,
1365      if any. */      backtracking will then try other alternatives, if any. */
1366    
1367      if (eptr == mstart &&      if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
1368          (md->notempty ||           md->recursive == NULL &&
1369            (md->notempty_atstart &&           (md->notempty ||
1370              mstart == md->start_subject + md->start_offset)))             (md->notempty_atstart &&
1371                 mstart == md->start_subject + md->start_offset)))
1372        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
1373    
1374      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
# Line 1169  for (;;) Line 1383  for (;;)
1383      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1384      MRRETURN(rrc);      MRRETURN(rrc);
1385    
     /* Change option settings */  
   
     case OP_OPT:  
     ims = ecode[1];  
     ecode += 2;  
     DPRINTF(("ims set to %02lx\n", ims));  
     break;  
   
1386      /* Assertion brackets. Check the alternative branches in turn - the      /* Assertion brackets. Check the alternative branches in turn - the
1387      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,
1388      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
1389      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
1390      this level is identical to the lookahead case. */      this level is identical to the lookahead case. When the assertion is part
1391        of a condition, we want to return immediately afterwards. The caller of
1392        this incarnation of the match() function will have set MATCH_CONDASSERT in
1393        md->match_function type, and one of these opcodes will be the first opcode
1394        that is processed. We use a local variable that is preserved over calls to
1395        match() to remember this case. */
1396    
1397      case OP_ASSERT:      case OP_ASSERT:
1398      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1399        if (md->match_function_type == MATCH_CONDASSERT)
1400          {
1401          condassert = TRUE;
1402          md->match_function_type = 0;
1403          }
1404        else condassert = FALSE;
1405    
1406      do      do
1407        {        {
1408        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
         RM4);  
1409        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1410          {          {
1411          mstart = md->start_match_ptr;   /* In case \K reset it */          mstart = md->start_match_ptr;   /* In case \K reset it */
1412            markptr = md->mark;
1413          break;          break;
1414          }          }
1415        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);        if (rrc != MATCH_NOMATCH &&
1416              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1417            RRETURN(rrc);
1418        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1419        }        }
1420      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1421    
1422      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);
1423    
1424      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1425    
1426      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);
1427    
1428      /* Continue from after the assertion, updating the offsets high water      /* Continue from after the assertion, updating the offsets high water
1429      mark, since extracts may have been taken during the assertion. */      mark, since extracts may have been taken during the assertion. */
# Line 1218  for (;;) Line 1439  for (;;)
1439    
1440      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1441      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1442        if (md->match_function_type == MATCH_CONDASSERT)
1443          {
1444          condassert = TRUE;
1445          md->match_function_type = 0;
1446          }
1447        else condassert = FALSE;
1448    
1449      do      do
1450        {        {
1451        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
         RM5);  
1452        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);
1453        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1454          {          {
1455          do ecode += GET(ecode,1); while (*ecode == OP_ALT);          do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1456          break;          break;
1457          }          }
1458        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);        if (rrc != MATCH_NOMATCH &&
1459              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1460            RRETURN(rrc);
1461        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1462        }        }
1463      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1464    
1465      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1466    
1467      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1468      continue;      continue;
# Line 1279  for (;;) Line 1508  for (;;)
1508      if (pcre_callout != NULL)      if (pcre_callout != NULL)
1509        {        {
1510        pcre_callout_block cb;        pcre_callout_block cb;
1511        cb.version          = 1;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1512        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1513        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1514        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
# Line 1291  for (;;) Line 1520  for (;;)
1520        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1521        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last;
1522        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1523          cb.mark             = markptr;
1524        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
1525        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1526        }        }
# Line 1301  for (;;) Line 1531  for (;;)
1531      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
1532      whole pattern. (This is so that it works from duplicated subpatterns.)      whole pattern. (This is so that it works from duplicated subpatterns.)
1533    
1534      If there are any capturing brackets started but not finished, we have to      The state of the capturing groups is preserved over recursion, and
1535      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
1536      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
1537      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
1538      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
1539      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
1540      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.  
1541    
1542      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
1543      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
1544      for the original version of this logic. */      for the original version of this logic. It has, however, been hacked around
1545        a lot, so he is not to blame for the current way it works. */
1546    
1547      case OP_RECURSE:      case OP_RECURSE:
1548        {        {
1549          recursion_info *ri;
1550          int recno;
1551    
1552        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1553        new_recursive.group_num = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
1554          GET2(callpat, 1 + LINK_SIZE);          GET2(callpat, 1 + LINK_SIZE);
1555    
1556          /* Check for repeating a recursion without advancing the subject pointer.
1557          This should catch convoluted mutual recursions. (Some simple cases are
1558          caught at compile time.) */
1559    
1560          for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
1561            if (recno == ri->group_num && eptr == ri->subject_position)
1562              RRETURN(PCRE_ERROR_RECURSELOOP);
1563    
1564        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1565    
1566          new_recursive.group_num = recno;
1567          new_recursive.subject_position = eptr;
1568        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1569        md->recursive = &new_recursive;        md->recursive = &new_recursive;
1570    
1571        /* Find where to continue from afterwards */        /* Where to continue from afterwards */
1572    
1573        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       new_recursive.after_call = ecode;  
1574    
1575        /* Now save the offset data. */        /* Now save the offset data */
1576    
1577        new_recursive.saved_max = md->offset_end;        new_recursive.saved_max = md->offset_end;
1578        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
# Line 1343  for (;;) Line 1583  for (;;)
1583            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));
1584          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1585          }          }
   
1586        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1587              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
       new_recursive.save_offset_top = offset_top;  
1588    
1589        /* OK, now we can do the recursion. For each top-level alternative we        /* OK, now we can do the recursion. After processing each alternative,
1590        restore the offset and recursion data. */        restore the offset data. If there were nested recursions, md->recursive
1591          might be changed, so reset it before looping. */
1592    
1593        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1594        flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;        cbegroup = (*callpat >= OP_SBRA);
1595        do        do
1596          {          {
1597            if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1598          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
1599            md, ims, eptrb, flags, RM6);            md, eptrb, RM6);
1600            memcpy(md->offset_vector, new_recursive.offset_save,
1601                new_recursive.saved_max * sizeof(int));
1602            md->recursive = new_recursive.prevrec;
1603          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1604            {            {
1605            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
           md->recursive = new_recursive.prevrec;  
1606            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1607              (pcre_free)(new_recursive.offset_save);              (pcre_free)(new_recursive.offset_save);
1608            MRRETURN(MATCH_MATCH);  
1609              /* Set where we got to in the subject, and reset the start in case
1610              it was changed by \K. This *is* propagated back out of a recursion,
1611              for Perl compatibility. */
1612    
1613              eptr = md->end_match_ptr;
1614              mstart = md->start_match_ptr;
1615              goto RECURSION_MATCHED;        /* Exit loop; end processing */
1616            }            }
1617          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)          else if (rrc != MATCH_NOMATCH &&
1618                    (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1619            {            {
1620            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1621            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
# Line 1374  for (;;) Line 1624  for (;;)
1624            }            }
1625    
1626          md->recursive = &new_recursive;          md->recursive = &new_recursive;
         memcpy(md->offset_vector, new_recursive.offset_save,  
             new_recursive.saved_max * sizeof(int));  
1627          callpat += GET(callpat, 1);          callpat += GET(callpat, 1);
1628          }          }
1629        while (*callpat == OP_ALT);        while (*callpat == OP_ALT);
# Line 1386  for (;;) Line 1634  for (;;)
1634          (pcre_free)(new_recursive.offset_save);          (pcre_free)(new_recursive.offset_save);
1635        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
1636        }        }
     /* 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, ims, eptrb, 0, RM7);  
       if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */  
         {  
         mstart = md->start_match_ptr;  
         break;  
         }  
       if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);  
       ecode += GET(ecode,1);  
       }  
     while (*ecode == OP_ALT);  
   
     /* If hit the end of the group (which could be repeated), fail */  
   
     if (*ecode != OP_ONCE && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);  
   
     /* Continue as from after the assertion, updating the offsets high water  
     mark, since extracts may have been taken. */  
   
     do ecode += GET(ecode, 1); while (*ecode == OP_ALT);  
   
     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;  
       }  
   
     /* The repeating kets try the rest of the pattern or restart from the  
     preceding bracket, in the appropriate order. The second "call" of match()  
     uses tail recursion, to avoid using another stack frame. We need to reset  
     any options that changed within the bracket before re-running it, so  
     check the next opcode. */  
1637    
1638      if (ecode[1+LINK_SIZE] == OP_OPT)      RECURSION_MATCHED:
1639        {      break;
       ims = (ims & ~PCRE_IMS) | ecode[4];  
       DPRINTF(("ims set to %02lx at group repeat\n", ims));  
       }  
   
     if (*ecode == OP_KETRMIN)  
       {  
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM8);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode = prev;  
       flags = 0;  
       goto TAIL_RECURSE;  
       }  
     else  /* OP_KETRMAX */  
       {  
       RMATCH(eptr, prev, offset_top, md, ims, eptrb, match_cbegroup, RM9);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode += 1 + LINK_SIZE;  
       flags = 0;  
       goto TAIL_RECURSE;  
       }  
     /* Control never gets here */  
1640    
1641      /* 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
1642      bracketed group and go to there. */      bracketed group and go to there. */
# Line 1481  for (;;) Line 1652  for (;;)
1652      optional ones preceded by BRAZERO or BRAMINZERO. */      optional ones preceded by BRAZERO or BRAMINZERO. */
1653    
1654      case OP_BRAZERO:      case OP_BRAZERO:
1655        {      next = ecode + 1;
1656        next = ecode+1;      RMATCH(eptr, next, offset_top, md, eptrb, RM10);
1657        RMATCH(eptr, next, offset_top, md, ims, eptrb, 0, RM10);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1658        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      do next += GET(next, 1); while (*next == OP_ALT);
1659        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1660      break;      break;
1661    
1662      case OP_BRAMINZERO:      case OP_BRAMINZERO:
1663        {      next = ecode + 1;
1664        next = ecode+1;      do next += GET(next, 1); while (*next == OP_ALT);
1665        do next += GET(next, 1); while (*next == OP_ALT);      RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, eptrb, RM11);
1666        RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0, RM11);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1667        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      ecode++;
       ecode++;  
       }  
1668      break;      break;
1669    
1670      case OP_SKIPZERO:      case OP_SKIPZERO:
1671        {      next = ecode+1;
1672        next = ecode+1;      do next += GET(next,1); while (*next == OP_ALT);
1673        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1674      break;      break;
1675    
1676        /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
1677        here; just jump to the group, with allow_zero set TRUE. */
1678    
1679        case OP_BRAPOSZERO:
1680        op = *(++ecode);
1681        allow_zero = TRUE;
1682        if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
1683          goto POSSESSIVE_NON_CAPTURE;
1684    
1685      /* End of a group, repeated or non-repeating. */      /* End of a group, repeated or non-repeating. */
1686    
1687      case OP_KET:      case OP_KET:
1688      case OP_KETRMIN:      case OP_KETRMIN:
1689      case OP_KETRMAX:      case OP_KETRMAX:
1690        case OP_KETRPOS:
1691      prev = ecode - GET(ecode, 1);      prev = ecode - GET(ecode, 1);
1692    
1693      /* 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
1694      infinite repeats of empty string matches, retrieve the subject start from      infinite repeats of empty string matches, retrieve the subject start from
1695      the chain. Otherwise, set it NULL. */      the chain. Otherwise, set it NULL. */
1696    
1697      if (*prev >= OP_SBRA)      if (*prev >= OP_SBRA || *prev == OP_ONCE)
1698        {        {
1699        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
1700        eptrb = eptrb->epb_prev;              /* Backup to previous group */        eptrb = eptrb->epb_prev;              /* Backup to previous group */
1701        }        }
1702      else saved_eptr = NULL;      else saved_eptr = NULL;
1703    
1704      /* 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, stop matching and return
1705      matching and return MATCH_MATCH, but record the current high water mark for      MATCH_MATCH, but record the current high water mark for use by positive
1706      use by positive assertions. We also need to record the match start in case      assertions. We also need to record the match start in case it was changed
1707      it was changed by \K. */      by \K. */
1708    
1709      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
1710          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT)
         *prev == OP_ONCE)  
1711        {        {
1712        md->end_match_ptr = eptr;      /* For ONCE */        md->end_match_ptr = eptr;      /* For ONCE */
1713        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1714        md->start_match_ptr = mstart;        md->start_match_ptr = mstart;
1715        MRRETURN(MATCH_MATCH);        MRRETURN(MATCH_MATCH);         /* Sets md->mark */
1716        }        }
1717    
1718      /* 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
1719      and if necessary complete handling an extraction by setting the offsets and      and if necessary complete handling an extraction by setting the offsets and
1720      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
1721      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
1722      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
1723        the current subject position and start match pointer and give a MATCH
1724        return. */
1725    
1726      if (*prev == OP_CBRA || *prev == OP_SCBRA)      if (*prev == OP_CBRA || *prev == OP_SCBRA ||
1727            *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
1728        {        {
1729        number = GET2(prev, 1+LINK_SIZE);        number = GET2(prev, 1+LINK_SIZE);
1730        offset = number << 1;        offset = number << 1;
# Line 1557  for (;;) Line 1734  for (;;)
1734        printf("\n");        printf("\n");
1735  #endif  #endif
1736    
1737          /* Handle a recursively called group. */
1738    
1739          if (md->recursive != NULL && md->recursive->group_num == number)
1740            {
1741            md->end_match_ptr = eptr;
1742            md->start_match_ptr = mstart;
1743            RRETURN(MATCH_MATCH);
1744            }
1745    
1746          /* Deal with capturing */
1747    
1748        md->capture_last = number;        md->capture_last = number;
1749        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
1750          {          {
1751            /* If offset is greater than offset_top, it means that we are
1752            "skipping" a capturing group, and that group's offsets must be marked
1753            unset. In earlier versions of PCRE, all the offsets were unset at the
1754            start of matching, but this doesn't work because atomic groups and
1755            assertions can cause a value to be set that should later be unset.
1756            Example: matching /(?>(a))b|(a)c/ against "ac". This sets group 1 as
1757            part of the atomic group, but this is not on the final matching path,
1758            so must be unset when 2 is set. (If there is no group 2, there is no
1759            problem, because offset_top will then be 2, indicating no capture.) */
1760    
1761            if (offset > offset_top)
1762              {
1763              register int *iptr = md->offset_vector + offset_top;
1764              register int *iend = md->offset_vector + offset;
1765              while (iptr < iend) *iptr++ = -1;
1766              }
1767    
1768            /* Now make the extraction */
1769    
1770          md->offset_vector[offset] =          md->offset_vector[offset] =
1771            md->offset_vector[md->offset_end - number];            md->offset_vector[md->offset_end - number];
1772          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1773          if (offset_top <= offset) offset_top = offset + 2;          if (offset_top <= offset) offset_top = offset + 2;
1774          }          }
1775          }
1776    
1777        /* Handle a recursively called group. Restore the offsets      /* For an ordinary non-repeating ket, just continue at this level. This
1778        appropriately and continue from after the call. */      also happens for a repeating ket if no characters were matched in the
1779        group. This is the forcible breaking of infinite loops as implemented in
1780        Perl 5.005. For a non-repeating atomic group, establish a backup point by
1781        processing the rest of the pattern at a lower level. If this results in a
1782        NOMATCH return, pass MATCH_ONCE back to the original OP_ONCE level, thereby
1783        bypassing intermediate backup points, but resetting any captures that
1784        happened along the way. */
1785    
1786        if (md->recursive != NULL && md->recursive->group_num == number)      if (*ecode == OP_KET || eptr == saved_eptr)
1787          {
1788          if (*prev == OP_ONCE)
1789          {          {
1790          recursion_info *rec = md->recursive;          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
1791          DPRINTF(("Recursion (%d) succeeded - continuing\n", number));          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1792          md->recursive = rec->prevrec;          md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1793          memcpy(md->offset_vector, rec->offset_save,          RRETURN(MATCH_ONCE);
           rec->saved_max * sizeof(int));  
         offset_top = rec->save_offset_top;  
         ecode = rec->after_call;  
         ims = original_ims;  
         break;  
1794          }          }
1795          ecode += 1 + LINK_SIZE;    /* Carry on at this level */
1796          break;
1797        }        }
1798    
1799      /* For both capturing and non-capturing groups, reset the value of the ims      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
1800      flags, in case they got changed during the group. */      and return the MATCH_KETRPOS. This makes it possible to do the repeats one
1801        at a time from the outer level, thus saving stack. */
1802    
1803      ims = original_ims;      if (*ecode == OP_KETRPOS)
     DPRINTF(("ims reset to %02lx\n", ims));  
   
     /* 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)  
1804        {        {
1805        ecode += 1 + LINK_SIZE;        md->end_match_ptr = eptr;
1806        break;        md->end_offset_top = offset_top;
1807          RRETURN(MATCH_KETRPOS);
1808        }        }
1809    
1810      /* The repeating kets try the rest of the pattern or restart from the      /* The normal repeating kets try the rest of the pattern or restart from
1811      preceding bracket, in the appropriate order. In the second case, we can use      the preceding bracket, in the appropriate order. In the second case, we can
1812      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
1813      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
1814        string. */
     flags = (*prev >= OP_SBRA)? match_cbegroup : 0;  
1815    
1816      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1817        {        {
1818        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM12);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
1819        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1820        if (flags != 0)    /* Could match an empty string */        if (*prev == OP_ONCE)
1821          {          {
1822          RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM50);          RMATCH(eptr, prev, offset_top, md, eptrb, RM8);
1823            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1824            md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1825            RRETURN(MATCH_ONCE);
1826            }
1827          if (*prev >= OP_SBRA)    /* Could match an empty string */
1828            {
1829            md->match_function_type = MATCH_CBEGROUP;
1830            RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
1831          RRETURN(rrc);          RRETURN(rrc);
1832          }          }
1833        ecode = prev;        ecode = prev;
# Line 1622  for (;;) Line 1835  for (;;)
1835        }        }
1836      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
1837        {        {
1838        RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM13);        if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1839          RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
1840          if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
1841        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1842          if (*prev == OP_ONCE)
1843            {
1844            RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM9);
1845            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1846            md->once_target = prev;
1847            RRETURN(MATCH_ONCE);
1848            }
1849        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       flags = 0;  
1850        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1851        }        }
1852      /* Control never gets here */      /* Control never gets here */
1853    
1854      /* Start of subject unless notbol, or after internal newline if multiline */      /* Not multiline mode: start of subject assertion, unless notbol. */
1855    
1856      case OP_CIRC:      case OP_CIRC:
1857      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);
     if ((ims & PCRE_MULTILINE) != 0)  
       {  
       if (eptr != md->start_subject &&  
           (eptr == md->end_subject || !WAS_NEWLINE(eptr)))  
         MRRETURN(MATCH_NOMATCH);  
       ecode++;  
       break;  
       }  
     /* ... else fall through */  
1858    
1859      /* Start of subject assertion */      /* Start of subject assertion */
1860    
# Line 1651  for (;;) Line 1863  for (;;)
1863      ecode++;      ecode++;
1864      break;      break;
1865    
1866        /* Multiline mode: start of subject unless notbol, or after any newline. */
1867    
1868        case OP_CIRCM:
1869        if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);
1870        if (eptr != md->start_subject &&
1871            (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
1872          MRRETURN(MATCH_NOMATCH);
1873        ecode++;
1874        break;
1875    
1876      /* Start of match assertion */      /* Start of match assertion */
1877    
1878      case OP_SOM:      case OP_SOM:
# Line 1665  for (;;) Line 1887  for (;;)
1887      ecode++;      ecode++;
1888      break;      break;
1889    
1890      /* Assert before internal newline if multiline, or before a terminating      /* Multiline mode: assert before any newline, or before end of subject
1891      newline unless endonly is set, else end of subject unless noteol is set. */      unless noteol is set. */
1892    
1893      case OP_DOLL:      case OP_DOLLM:
1894      if ((ims & PCRE_MULTILINE) != 0)      if (eptr < md->end_subject)
1895        {        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }
       if (eptr < md->end_subject)  
         { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }  
       else  
         { if (md->noteol) MRRETURN(MATCH_NOMATCH); }  
       ecode++;  
       break;  
       }  
1896      else      else
1897        {        {
1898        if (md->noteol) MRRETURN(MATCH_NOMATCH);        if (md->noteol) MRRETURN(MATCH_NOMATCH);
1899        if (!md->endonly)        SCHECK_PARTIAL();
         {  
         if (eptr != md->end_subject &&  
             (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))  
           MRRETURN(MATCH_NOMATCH);  
         ecode++;  
         break;  
         }  
1900        }        }
1901        ecode++;
1902        break;
1903    
1904        /* Not multiline mode: assert before a terminating newline or before end of
1905        subject unless noteol is set. */
1906    
1907        case OP_DOLL:
1908        if (md->noteol) MRRETURN(MATCH_NOMATCH);
1909        if (!md->endonly) goto ASSERT_NL_OR_EOS;
1910    
1911      /* ... else fall through for endonly */      /* ... else fall through for endonly */
1912    
1913      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
1914    
1915      case OP_EOD:      case OP_EOD:
1916      if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);
1917        SCHECK_PARTIAL();
1918      ecode++;      ecode++;
1919      break;      break;
1920    
1921      /* End of subject or ending \n assertion (\Z) */      /* End of subject or ending \n assertion (\Z) */
1922    
1923      case OP_EODN:      case OP_EODN:
1924      if (eptr != md->end_subject &&      ASSERT_NL_OR_EOS:
1925        if (eptr < md->end_subject &&
1926          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
1927        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
1928    
1929        /* Either at end of string or \n before end. */
1930    
1931        SCHECK_PARTIAL();
1932      ecode++;      ecode++;
1933      break;      break;
1934    
# Line 1833  for (;;) Line 2057  for (;;)
2057      /* Fall through */      /* Fall through */
2058    
2059      case OP_ALLANY:      case OP_ALLANY:
2060      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2061        {        {                            /* not be updated before SCHECK_PARTIAL. */
2062        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2063        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2064        }        }
2065        eptr++;
2066      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
2067      ecode++;      ecode++;
2068      break;      break;
# Line 1846  for (;;) Line 2071  for (;;)
2071      any byte, even newline, independent of the setting of PCRE_DOTALL. */      any byte, even newline, independent of the setting of PCRE_DOTALL. */
2072    
2073      case OP_ANYBYTE:      case OP_ANYBYTE:
2074      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2075        {        {                            /* not be updated before SCHECK_PARTIAL. */
2076        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2077        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2078        }        }
2079        eptr++;
2080      ecode++;      ecode++;
2081      break;      break;
2082    
# Line 1966  for (;;) Line 2192  for (;;)
2192      switch(c)      switch(c)
2193        {        {
2194        default: MRRETURN(MATCH_NOMATCH);        default: MRRETURN(MATCH_NOMATCH);
2195    
2196        case 0x000d:        case 0x000d:
2197        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
2198        break;        break;
# Line 2189  for (;;) Line 2416  for (;;)
2416        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2417        }        }
2418      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2419        if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);
2420        while (eptr < md->end_subject)
2421        {        {
2422        int category = UCD_CATEGORY(c);        int len = 1;
2423        if (category == ucp_M) MRRETURN(MATCH_NOMATCH);        if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2424        while (eptr < md->end_subject)        if (UCD_CATEGORY(c) != ucp_M) break;
2425          {        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;  
         }  
2426        }        }
2427      ecode++;      ecode++;
2428      break;      break;
# Line 2218  for (;;) Line 2438  for (;;)
2438      loops). */      loops). */
2439    
2440      case OP_REF:      case OP_REF:
2441        {      case OP_REFI:
2442        offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      caseless = op == OP_REFI;
2443        ecode += 3;      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2444        ecode += 3;
2445    
2446        /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2447    
2448        (a) In the default, Perl-compatible state, set the length to be longer      (a) In the default, Perl-compatible state, set the length negative;
2449        than the amount of subject left; this ensures that every attempt at a      this ensures that every attempt at a match fails. We can't just fail
2450        match fails. We can't just fail here, because of the possibility of      here, because of the possibility of quantifiers with zero minima.
       quantifiers with zero minima.  
2451    
2452        (b) If the JavaScript compatibility flag is set, set the length to zero      (b) If the JavaScript compatibility flag is set, set the length to zero
2453        so that the back reference matches an empty string.      so that the back reference matches an empty string.
2454    
2455        Otherwise, set the length to the length of what was matched by the      Otherwise, set the length to the length of what was matched by the
2456        referenced subpattern. */      referenced subpattern. */
2457    
2458        if (offset >= offset_top || md->offset_vector[offset] < 0)      if (offset >= offset_top || md->offset_vector[offset] < 0)
2459          length = (md->jscript_compat)? 0 : (int)(md->end_subject - eptr + 1);        length = (md->jscript_compat)? 0 : -1;
2460        else      else
2461          length = md->offset_vector[offset+1] - md->offset_vector[offset];        length = md->offset_vector[offset+1] - md->offset_vector[offset];
2462    
2463        /* Set up for repetition, or handle the non-repeated case */      /* Set up for repetition, or handle the non-repeated case */
2464    
2465        switch (*ecode)      switch (*ecode)
2466          {        {
2467          case OP_CRSTAR:        case OP_CRSTAR:
2468          case OP_CRMINSTAR:        case OP_CRMINSTAR:
2469          case OP_CRPLUS:        case OP_CRPLUS:
2470          case OP_CRMINPLUS:        case OP_CRMINPLUS:
2471          case OP_CRQUERY:        case OP_CRQUERY:
2472          case OP_CRMINQUERY:        case OP_CRMINQUERY:
2473          c = *ecode++ - OP_CRSTAR;        c = *ecode++ - OP_CRSTAR;
2474          minimize = (c & 1) != 0;        minimize = (c & 1) != 0;
2475          min = rep_min[c];                 /* Pick up values from tables; */        min = rep_min[c];                 /* Pick up values from tables; */
2476          max = rep_max[c];                 /* zero for max => infinity */        max = rep_max[c];                 /* zero for max => infinity */
2477          if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2478          break;        break;
2479    
2480          case OP_CRRANGE:        case OP_CRRANGE:
2481          case OP_CRMINRANGE:        case OP_CRMINRANGE:
2482          minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2483          min = GET2(ecode, 1);        min = GET2(ecode, 1);
2484          max = GET2(ecode, 3);        max = GET2(ecode, 3);
2485          if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2486          ecode += 5;        ecode += 5;
2487          break;        break;
2488    
2489          default:               /* No repeat follows */        default:               /* No repeat follows */
2490          if (!match_ref(offset, eptr, length, md, ims))        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2491            {          {
2492            CHECK_PARTIAL();          CHECK_PARTIAL();
2493            MRRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
           }  
         eptr += length;  
         continue;              /* With the main loop */  
2494          }          }
2495          eptr += length;
2496          continue;              /* With the main loop */
2497          }
2498    
2499        /* If the length of the reference is zero, just continue with the      /* Handle repeated back references. If the length of the reference is
2500        main loop. */      zero, just continue with the main loop. */
2501    
2502        if (length == 0) continue;      if (length == 0) continue;
2503    
2504        /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2505        the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
2506        address of eptr, so that eptr can be a register variable. */      address of eptr, so that eptr can be a register variable. */
2507    
2508        for (i = 1; i <= min; i++)      for (i = 1; i <= min; i++)
2509          {
2510          int slength;
2511          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2512          {          {
2513          if (!match_ref(offset, eptr, length, md, ims))          CHECK_PARTIAL();
2514            {          MRRETURN(MATCH_NOMATCH);
           CHECK_PARTIAL();  
           MRRETURN(MATCH_NOMATCH);  
           }  
         eptr += length;  
2515          }          }
2516          eptr += slength;
2517          }
2518    
2519        /* If min = max, continue at the same level without recursion.      /* If min = max, continue at the same level without recursion.
2520        They are not both allowed to be zero. */      They are not both allowed to be zero. */
2521    
2522        if (min == max) continue;      if (min == max) continue;
2523    
2524        /* If minimizing, keep trying and advancing the pointer */      /* If minimizing, keep trying and advancing the pointer */
2525    
2526        if (minimize)      if (minimize)
2527          {
2528          for (fi = min;; fi++)
2529          {          {
2530          for (fi = min;; fi++)          int slength;
2531            RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2532            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2533            if (fi >= max) MRRETURN(MATCH_NOMATCH);
2534            if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2535            {            {
2536            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM14);            CHECK_PARTIAL();
2537            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            MRRETURN(MATCH_NOMATCH);
           if (fi >= max) MRRETURN(MATCH_NOMATCH);  
           if (!match_ref(offset, eptr, length, md, ims))  
             {  
             CHECK_PARTIAL();  
             MRRETURN(MATCH_NOMATCH);  
             }  
           eptr += length;  
2538            }            }
2539          /* Control never gets here */          eptr += slength;
2540          }          }
2541          /* Control never gets here */
2542          }
2543    
2544        /* If maximizing, find the longest string and work backwards */      /* If maximizing, find the longest string and work backwards */
2545    
2546        else      else
2547          {
2548          pp = eptr;
2549          for (i = min; i < max; i++)
2550          {          {
2551          pp = eptr;          int slength;
2552          for (i = min; i < max; i++)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
           {  
           if (!match_ref(offset, eptr, length, md, ims))  
             {  
             CHECK_PARTIAL();  
             break;  
             }  
           eptr += length;  
           }  
         while (eptr >= pp)  
2553            {            {
2554            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM15);            CHECK_PARTIAL();
2555            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            break;
           eptr -= length;  
2556            }            }
2557          MRRETURN(MATCH_NOMATCH);          eptr += slength;
2558          }          }
2559          while (eptr >= pp)
2560            {
2561            RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2562            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2563            eptr -= length;
2564            }
2565          MRRETURN(MATCH_NOMATCH);
2566        }        }
2567      /* Control never gets here */      /* Control never gets here */
2568    
# Line 2446  for (;;) Line 2668  for (;;)
2668            {            {
2669            for (fi = min;; fi++)            for (fi = min;; fi++)
2670              {              {
2671              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2672              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2673              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
2674              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 2471  for (;;) Line 2693  for (;;)
2693            {            {
2694            for (fi = min;; fi++)            for (fi = min;; fi++)
2695              {              {
2696              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2697              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2698              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
2699              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 2517  for (;;) Line 2739  for (;;)
2739              }              }
2740            for (;;)            for (;;)
2741              {              {
2742              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM18);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
2743              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2744              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
2745              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2540  for (;;) Line 2762  for (;;)
2762              }              }
2763            while (eptr >= pp)            while (eptr >= pp)
2764              {              {
2765              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM19);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
2766              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2767              eptr--;              eptr--;
2768              }              }
# Line 2616  for (;;) Line 2838  for (;;)
2838          {          {
2839          for (fi = min;; fi++)          for (fi = min;; fi++)
2840            {            {
2841            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
2842            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2843            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
2844            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 2649  for (;;) Line 2871  for (;;)
2871            }            }
2872          for(;;)          for(;;)
2873            {            {
2874            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
2875            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2876            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
2877            if (utf8) BACKCHAR(eptr);            if (utf8) BACKCHAR(eptr);
# Line 2694  for (;;) Line 2916  for (;;)
2916    
2917      /* Match a single character, caselessly */      /* Match a single character, caselessly */
2918    
2919      case OP_CHARNC:      case OP_CHARI:
2920  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2921      if (utf8)      if (utf8)
2922        {        {
# Line 2754  for (;;) Line 2976  for (;;)
2976      /* Match a single character repeatedly. */      /* Match a single character repeatedly. */
2977    
2978      case OP_EXACT:      case OP_EXACT:
2979        case OP_EXACTI:
2980      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
2981      ecode += 3;      ecode += 3;
2982      goto REPEATCHAR;      goto REPEATCHAR;
2983    
2984      case OP_POSUPTO:      case OP_POSUPTO:
2985        case OP_POSUPTOI:
2986      possessive = TRUE;      possessive = TRUE;
2987      /* Fall through */      /* Fall through */
2988    
2989      case OP_UPTO:      case OP_UPTO:
2990        case OP_UPTOI:
2991      case OP_MINUPTO:      case OP_MINUPTO:
2992        case OP_MINUPTOI:
2993      min = 0;      min = 0;
2994      max = GET2(ecode, 1);      max = GET2(ecode, 1);
2995      minimize = *ecode == OP_MINUPTO;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
2996      ecode += 3;      ecode += 3;
2997      goto REPEATCHAR;      goto REPEATCHAR;
2998    
2999      case OP_POSSTAR:      case OP_POSSTAR:
3000        case OP_POSSTARI:
3001      possessive = TRUE;      possessive = TRUE;
3002      min = 0;      min = 0;
3003      max = INT_MAX;      max = INT_MAX;
# Line 2778  for (;;) Line 3005  for (;;)
3005      goto REPEATCHAR;      goto REPEATCHAR;
3006    
3007      case OP_POSPLUS:      case OP_POSPLUS:
3008        case OP_POSPLUSI:
3009      possessive = TRUE;      possessive = TRUE;
3010      min = 1;      min = 1;
3011      max = INT_MAX;      max = INT_MAX;
# Line 2785  for (;;) Line 3013  for (;;)
3013      goto REPEATCHAR;      goto REPEATCHAR;
3014    
3015      case OP_POSQUERY:      case OP_POSQUERY:
3016        case OP_POSQUERYI:
3017      possessive = TRUE;      possessive = TRUE;
3018      min = 0;      min = 0;
3019      max = 1;      max = 1;
# Line 2792  for (;;) Line 3021  for (;;)
3021      goto REPEATCHAR;      goto REPEATCHAR;
3022    
3023      case OP_STAR:      case OP_STAR:
3024        case OP_STARI:
3025      case OP_MINSTAR:      case OP_MINSTAR:
3026        case OP_MINSTARI:
3027      case OP_PLUS:      case OP_PLUS:
3028        case OP_PLUSI:
3029      case OP_MINPLUS:      case OP_MINPLUS:
3030        case OP_MINPLUSI:
3031      case OP_QUERY:      case OP_QUERY:
3032        case OP_QUERYI:
3033      case OP_MINQUERY:      case OP_MINQUERY:
3034      c = *ecode++ - OP_STAR;      case OP_MINQUERYI:
3035        c = *ecode++ - ((op < OP_STARI)? OP_STAR : OP_STARI);
3036      minimize = (c & 1) != 0;      minimize = (c & 1) != 0;
   
3037      min = rep_min[c];                 /* Pick up values from tables; */      min = rep_min[c];                 /* Pick up values from tables; */
3038      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
3039      if (max == 0) max = INT_MAX;      if (max == 0) max = INT_MAX;
# Line 2822  for (;;) Line 3056  for (;;)
3056          {          {
3057  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3058          unsigned int othercase;          unsigned int othercase;
3059          if ((ims & PCRE_CASELESS) != 0 &&          if (op >= OP_STARI &&     /* Caseless */
3060              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3061            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = _pcre_ord2utf8(othercase, occhars);
3062          else oclength = 0;          else oclength = 0;
# Line 2850  for (;;) Line 3084  for (;;)
3084            {            {
3085            for (fi = min;; fi++)            for (fi = min;; fi++)
3086              {              {
3087              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3088              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3089              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3090              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
# Line 2892  for (;;) Line 3126  for (;;)
3126    
3127            for(;;)            for(;;)
3128              {              {
3129              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3130              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3131              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }
3132  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 2929  for (;;) Line 3163  for (;;)
3163      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3164        max, eptr));        max, eptr));
3165    
3166      if ((ims & PCRE_CASELESS) != 0)      if (op >= OP_STARI)  /* Caseless */
3167        {        {
3168        fc = md->lcc[fc];        fc = md->lcc[fc];
3169        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
# Line 2946  for (;;) Line 3180  for (;;)
3180          {          {
3181          for (fi = min;; fi++)          for (fi = min;; fi++)
3182            {            {
3183            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3184            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3185            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
3186            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 2976  for (;;) Line 3210  for (;;)
3210    
3211          while (eptr >= pp)          while (eptr >= pp)
3212            {            {
3213            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM25);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
3214            eptr--;            eptr--;
3215            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3216            }            }
# Line 3005  for (;;) Line 3239  for (;;)
3239          {          {
3240          for (fi = min;; fi++)          for (fi = min;; fi++)
3241            {            {
3242            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3243            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3244            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
3245            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 3034  for (;;) Line 3268  for (;;)
3268    
3269          while (eptr >= pp)          while (eptr >= pp)
3270            {            {
3271            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM27);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
3272            eptr--;            eptr--;
3273            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3274            }            }
# Line 3047  for (;;) Line 3281  for (;;)
3281      checking can be multibyte. */      checking can be multibyte. */
3282    
3283      case OP_NOT:      case OP_NOT:
3284        case OP_NOTI:
3285      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3286        {        {
3287        SCHECK_PARTIAL();        SCHECK_PARTIAL();
# Line 3054  for (;;) Line 3289  for (;;)
3289        }        }
3290      ecode++;      ecode++;
3291      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
3292      if ((ims & PCRE_CASELESS) != 0)      if (op == OP_NOTI)         /* The caseless case */
3293        {        {
3294  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3295        if (c < 256)        if (c < 256)
# Line 3062  for (;;) Line 3297  for (;;)
3297        c = md->lcc[c];        c = md->lcc[c];
3298        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);
3299        }        }
3300      else      else    /* Caseful */
3301        {        {
3302        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);
3303        }        }
# Line 3076  for (;;) Line 3311  for (;;)
3311      about... */      about... */
3312    
3313      case OP_NOTEXACT:      case OP_NOTEXACT:
3314        case OP_NOTEXACTI:
3315      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3316      ecode += 3;      ecode += 3;
3317      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3318    
3319      case OP_NOTUPTO:      case OP_NOTUPTO:
3320        case OP_NOTUPTOI:
3321      case OP_NOTMINUPTO:      case OP_NOTMINUPTO:
3322        case OP_NOTMINUPTOI:
3323      min = 0;      min = 0;
3324      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3325      minimize = *ecode == OP_NOTMINUPTO;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3326      ecode += 3;      ecode += 3;
3327      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3328    
3329      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
3330        case OP_NOTPOSSTARI:
3331      possessive = TRUE;      possessive = TRUE;
3332      min = 0;      min = 0;
3333      max = INT_MAX;      max = INT_MAX;
# Line 3096  for (;;) Line 3335  for (;;)
3335      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3336    
3337      case OP_NOTPOSPLUS:      case OP_NOTPOSPLUS:
3338        case OP_NOTPOSPLUSI:
3339      possessive = TRUE;      possessive = TRUE;
3340      min = 1;      min = 1;
3341      max = INT_MAX;      max = INT_MAX;
# Line 3103  for (;;) Line 3343  for (;;)
3343      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3344    
3345      case OP_NOTPOSQUERY:      case OP_NOTPOSQUERY:
3346        case OP_NOTPOSQUERYI:
3347      possessive = TRUE;      possessive = TRUE;
3348      min = 0;      min = 0;
3349      max = 1;      max = 1;
# Line 3110  for (;;) Line 3351  for (;;)
3351      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3352    
3353      case OP_NOTPOSUPTO:      case OP_NOTPOSUPTO:
3354        case OP_NOTPOSUPTOI:
3355      possessive = TRUE;      possessive = TRUE;
3356      min = 0;      min = 0;
3357      max = GET2(ecode, 1);      max = GET2(ecode, 1);
# Line 3117  for (;;) Line 3359  for (;;)
3359      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3360    
3361      case OP_NOTSTAR:      case OP_NOTSTAR:
3362        case OP_NOTSTARI:
3363      case OP_NOTMINSTAR:      case OP_NOTMINSTAR:
3364        case OP_NOTMINSTARI:
3365      case OP_NOTPLUS:      case OP_NOTPLUS:
3366        case OP_NOTPLUSI:
3367      case OP_NOTMINPLUS:      case OP_NOTMINPLUS:
3368        case OP_NOTMINPLUSI:
3369      case OP_NOTQUERY:      case OP_NOTQUERY:
3370        case OP_NOTQUERYI:
3371      case OP_NOTMINQUERY:      case OP_NOTMINQUERY:
3372      c = *ecode++ - OP_NOTSTAR;      case OP_NOTMINQUERYI:
3373        c = *ecode++ - ((op >= OP_NOTSTARI)? OP_NOTSTARI: OP_NOTSTAR);
3374      minimize = (c & 1) != 0;      minimize = (c & 1) != 0;
3375      min = rep_min[c];                 /* Pick up values from tables; */      min = rep_min[c];                 /* Pick up values from tables; */
3376      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
# Line 3144  for (;;) Line 3392  for (;;)
3392      DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3393        max, eptr));        max, eptr));
3394    
3395      if ((ims & PCRE_CASELESS) != 0)      if (op >= OP_NOTSTARI)     /* Caseless */
3396        {        {
3397        fc = md->lcc[fc];        fc = md->lcc[fc];
3398    
# Line 3192  for (;;) Line 3440  for (;;)
3440            register unsigned int d;            register unsigned int d;
3441            for (fi = min;; fi++)            for (fi = min;; fi++)
3442              {              {
3443              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3444              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3445              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3446              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3211  for (;;) Line 3459  for (;;)
3459            {            {
3460            for (fi = min;; fi++)            for (fi = min;; fi++)
3461              {              {
3462              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3463              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3464              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3465              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3252  for (;;) Line 3500  for (;;)
3500          if (possessive) continue;          if (possessive) continue;
3501          for(;;)          for(;;)
3502              {              {
3503              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3504              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3505              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3506              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3275  for (;;) Line 3523  for (;;)
3523            if (possessive) continue;            if (possessive) continue;
3524            while (eptr >= pp)            while (eptr >= pp)
3525              {              {
3526              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM31);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
3527              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3528              eptr--;              eptr--;
3529              }              }
# Line 3332  for (;;) Line 3580  for (;;)
3580            register unsigned int d;            register unsigned int d;
3581            for (fi = min;; fi++)            for (fi = min;; fi++)
3582              {              {
3583              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3584              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3585              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3586              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3350  for (;;) Line 3598  for (;;)
3598            {            {
3599            for (fi = min;; fi++)            for (fi = min;; fi++)
3600              {              {
3601              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3602              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3603              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3604              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3390  for (;;) Line 3638  for (;;)
3638            if (possessive) continue;            if (possessive) continue;
3639            for(;;)            for(;;)
3640              {              {
3641              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM34);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);
3642              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3643              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3644              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3413  for (;;) Line 3661  for (;;)
3661            if (possessive) continue;            if (possessive) continue;
3662            while (eptr >= pp)            while (eptr >= pp)
3663              {              {
3664              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM35);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);
3665              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3666              eptr--;              eptr--;
3667              }              }
# Line 3528  for (;;) Line 3776  for (;;)
3776            case PT_LAMP:            case PT_LAMP:
3777            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
3778              {              {
3779                int chartype;
3780              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3781                {                {
3782                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3783                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3784                }                }
3785              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3786              prop_chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
3787              if ((prop_chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
3788                   prop_chartype == ucp_Ll ||                   chartype == ucp_Ll ||
3789                   prop_chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
3790                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3791              }              }
3792            break;            break;
# Line 3551  for (;;) Line 3800  for (;;)
3800                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3801                }                }
3802              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3803              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
             if ((prop_category == prop_value) == prop_fail_result)  
3804                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3805              }              }
3806            break;            break;
# Line 3566  for (;;) Line 3814  for (;;)
3814                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3815                }                }
3816              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3817              prop_chartype = UCD_CHARTYPE(c);              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
             if ((prop_chartype == prop_value) == prop_fail_result)  
3818                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3819              }              }
3820            break;            break;
# Line 3581  for (;;) Line 3828  for (;;)
3828                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3829                }                }
3830              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3831              prop_script = UCD_SCRIPT(c);              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
             if ((prop_script == prop_value) == prop_fail_result)  
3832                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3833              }              }
3834            break;            break;
# Line 3590  for (;;) Line 3836  for (;;)
3836            case PT_ALNUM:            case PT_ALNUM:
3837            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
3838              {              {
3839                int category;
3840              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3841                {                {
3842                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3843                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3844                }                }
3845              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3846              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
3847              if ((prop_category == ucp_L || prop_category == ucp_N)              if ((category == ucp_L || category == ucp_N) == prop_fail_result)
                    == prop_fail_result)  
3848                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3849              }              }
3850            break;            break;
# Line 3612  for (;;) Line 3858  for (;;)
3858                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3859                }                }
3860              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3861              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 ||  
3862                   c == CHAR_FF || c == CHAR_CR)                   c == CHAR_FF || c == CHAR_CR)
3863                     == prop_fail_result)                     == prop_fail_result)
3864                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
# Line 3629  for (;;) Line 3874  for (;;)
3874                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3875                }                }
3876              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3877              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 ||  
3878                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
3879                     == prop_fail_result)                     == prop_fail_result)
3880                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
# Line 3640  for (;;) Line 3884  for (;;)
3884            case PT_WORD:            case PT_WORD:
3885            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
3886              {              {
3887                int category;
3888              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3889                {                {
3890                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3891                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3892                }                }
3893              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3894              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
3895              if ((prop_category == ucp_L || prop_category == ucp_N ||              if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)
                  c == CHAR_UNDERSCORE)  
3896                     == prop_fail_result)                     == prop_fail_result)
3897                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3898              }              }
# Line 3674  for (;;) Line 3918  for (;;)
3918              MRRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3919              }              }
3920            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3921            prop_category = UCD_CATEGORY(c);            if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);
           if (prop_category == ucp_M) MRRETURN(MATCH_NOMATCH);  
3922            while (eptr < md->end_subject)            while (eptr < md->end_subject)
3923              {              {
3924              int len = 1;              int len = 1;
3925              if (!utf8) c = *eptr;              if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }
3926                else { GETCHARLEN(c, eptr, len); }              if (UCD_CATEGORY(c) != ucp_M) break;
             prop_category = UCD_CATEGORY(c);  
             if (prop_category != ucp_M) break;  
3927              eptr += len;              eptr += len;
3928              }              }
3929            }            }
# Line 3740  for (;;) Line 3981  for (;;)
3981            switch(c)            switch(c)
3982              {              {
3983              default: MRRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
3984    
3985              case 0x000d:              case 0x000d:
3986              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
3987              break;              break;
# Line 4016  for (;;) Line 4258  for (;;)
4258            switch(*eptr++)            switch(*eptr++)
4259              {              {
4260              default: MRRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
4261    
4262              case 0x000d:              case 0x000d:
4263              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
4264              break;              break;
4265    
4266              case 0x000a:              case 0x000a:
4267              break;              break;
4268    
# Line 4208  for (;;) Line 4452  for (;;)
4452            case PT_ANY:            case PT_ANY:
4453            for (fi = min;; fi++)            for (fi = min;; fi++)
4454              {              {
4455              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM36);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM36);
4456              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4457              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4458              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4224  for (;;) Line 4468  for (;;)
4468            case PT_LAMP:            case PT_LAMP:
4469            for (fi = min;; fi++)            for (fi = min;; fi++)
4470              {              {
4471              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM37);              int chartype;
4472                RMATCH(eptr, ecode, offset_top, md, eptrb, RM37);
4473              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4474              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4475              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4233  for (;;) Line 4478  for (;;)
4478                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4479                }                }
4480              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4481              prop_chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
4482              if ((prop_chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
4483                   prop_chartype == ucp_Ll ||                   chartype == ucp_Ll ||
4484                   prop_chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
4485                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4486              }              }
4487            /* Control never gets here */            /* Control never gets here */
# Line 4244  for (;;) Line 4489  for (;;)
4489            case PT_GC:            case PT_GC:
4490            for (fi = min;; fi++)            for (fi = min;; fi++)
4491              {              {
4492              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM38);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM38);
4493              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4494              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4495              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4253  for (;;) Line 4498  for (;;)
4498                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4499                }                }
4500              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4501              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
             if ((prop_category == prop_value) == prop_fail_result)  
4502                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4503              }              }
4504            /* Control never gets here */            /* Control never gets here */
# Line 4262  for (;;) Line 4506  for (;;)
4506            case PT_PC:            case PT_PC:
4507            for (fi = min;; fi++)            for (fi = min;; fi++)
4508              {              {
4509              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM39);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM39);
4510              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4511              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4512              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4271  for (;;) Line 4515  for (;;)
4515                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4516                }                }
4517              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4518              prop_chartype = UCD_CHARTYPE(c);              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
             if ((prop_chartype == prop_value) == prop_fail_result)  
4519                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4520              }              }
4521            /* Control never gets here */            /* Control never gets here */
# Line 4280  for (;;) Line 4523  for (;;)
4523            case PT_SC:            case PT_SC:
4524            for (fi = min;; fi++)            for (fi = min;; fi++)
4525              {              {
4526              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM40);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM40);
4527              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4528              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4529              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4289  for (;;) Line 4532  for (;;)
4532                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4533                }                }
4534              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4535              prop_script = UCD_SCRIPT(c);              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
             if ((prop_script == prop_value) == prop_fail_result)  
4536                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4537              }              }
4538            /* Control never gets here */            /* Control never gets here */
# Line 4298  for (;;) Line 4540  for (;;)
4540            case PT_ALNUM:            case PT_ALNUM:
4541            for (fi = min;; fi++)            for (fi = min;; fi++)
4542              {              {
4543              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM59);              int category;
4544                RMATCH(eptr, ecode, offset_top, md, eptrb, RM59);
4545              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4546              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4547              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4307  for (;;) Line 4550  for (;;)
4550                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4551                }                }
4552              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4553              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4554              if ((prop_category == ucp_L || prop_category == ucp_N)              if ((category == ucp_L || category == ucp_N) == prop_fail_result)
                    == prop_fail_result)  
4555                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4556              }              }
4557            /* Control never gets here */            /* Control never gets here */
# Line 4317  for (;;) Line 4559  for (;;)
4559            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
4560            for (fi = min;; fi++)            for (fi = min;; fi++)
4561              {              {
4562              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM60);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM60);
4563              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4564              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4565              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4326  for (;;) Line 4568  for (;;)
4568                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4569                }                }
4570              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4571              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 ||  
4572                   c == CHAR_FF || c == CHAR_CR)                   c == CHAR_FF || c == CHAR_CR)
4573                     == prop_fail_result)                     == prop_fail_result)
4574                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
# Line 4337  for (;;) Line 4578  for (;;)
4578            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
4579            for (fi = min;; fi++)            for (fi = min;; fi++)
4580              {              {
4581              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM61);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM61);
4582              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4583              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4584              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4346  for (;;) Line 4587  for (;;)
4587                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4588                }                }
4589              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4590              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 ||  
4591                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
4592                     == prop_fail_result)                     == prop_fail_result)
4593                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
# Line 4357  for (;;) Line 4597  for (;;)
4597            case PT_WORD:            case PT_WORD:
4598            for (fi = min;; fi++)            for (fi = min;; fi++)
4599              {              {
4600              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM62);              int category;
4601                RMATCH(eptr, ecode, offset_top, md, eptrb, RM62);
4602              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4603              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4604              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4366  for (;;) Line 4607  for (;;)
4607                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4608                }                }
4609              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4610              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4611              if ((prop_category == ucp_L ||              if ((category == ucp_L ||
4612                   prop_category == ucp_N ||                   category == ucp_N ||
4613                   c == CHAR_UNDERSCORE)                   c == CHAR_UNDERSCORE)
4614                     == prop_fail_result)                     == prop_fail_result)
4615                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
# Line 4389  for (;;) Line 4630  for (;;)
4630          {          {
4631          for (fi = min;; fi++)          for (fi = min;; fi++)
4632            {            {
4633            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM41);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM41);
4634            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4635            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
4636            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 4398  for (;;) Line 4639  for (;;)
4639              MRRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4640              }              }
4641            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
4642            prop_category = UCD_CATEGORY(c);            if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);
           if (prop_category == ucp_M) MRRETURN(MATCH_NOMATCH);  
4643            while (eptr < md->end_subject)            while (eptr < md->end_subject)
4644              {              {
4645              int len = 1;              int len = 1;
4646              if (!utf8) c = *eptr;              if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }
4647                else { GETCHARLEN(c, eptr, len); }              if (UCD_CATEGORY(c) != ucp_M) break;
             prop_category = UCD_CATEGORY(c);  
             if (prop_category != ucp_M) break;  
4648              eptr += len;              eptr += len;
4649              }              }
4650            }            }
4651          }          }
   
4652        else        else
4653  #endif     /* SUPPORT_UCP */  #endif     /* SUPPORT_UCP */
4654    
# Line 4421  for (;;) Line 4658  for (;;)
4658          {          {
4659          for (fi = min;; fi++)          for (fi = min;; fi++)
4660            {            {
4661            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM42);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM42);
4662            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4663            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
4664            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 4584  for (;;) Line 4821  for (;;)
4821          {          {
4822          for (fi = min;; fi++)          for (fi = min;; fi++)
4823            {            {
4824            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM43);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM43);
4825            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4826            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
4827            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 4732  for (;;) Line 4969  for (;;)
4969            case PT_LAMP:            case PT_LAMP:
4970            for (i = min; i < max; i++)            for (i = min; i < max; i++)
4971              {              {
4972                int chartype;
4973              int len = 1;              int len = 1;
4974              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4975                {                {
# Line 4739  for (;;) Line 4977  for (;;)
4977                break;                break;
4978                }                }
4979              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
4980              prop_chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
4981              if ((prop_chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
4982                   prop_chartype == ucp_Ll ||                   chartype == ucp_Ll ||
4983                   prop_chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
4984                break;                break;
4985              eptr+= len;              eptr+= len;
4986              }              }
# Line 4758  for (;;) Line 4996  for (;;)
4996                break;                break;
4997                }                }
4998              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
4999              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result) break;
             if ((prop_category == prop_value) == prop_fail_result)  
               break;  
5000              eptr+= len;              eptr+= len;
5001              }              }
5002            break;            break;
# Line 4775  for (;;) Line 5011  for (;;)
5011                break;                break;
5012                }                }
5013              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5014              prop_chartype = UCD_CHARTYPE(c);              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result) break;
             if ((prop_chartype == prop_value) == prop_fail_result)  
               break;  
5015              eptr+= len;              eptr+= len;
5016              }              }
5017            break;            break;
# Line 4792  for (;;) Line 5026  for (;;)
5026                break;                break;
5027                }                }
5028              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5029              prop_script = UCD_SCRIPT(c);              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result) break;
             if ((prop_script == prop_value) == prop_fail_result)  
               break;  
5030              eptr+= len;              eptr+= len;
5031              }              }
5032            break;            break;
# Line 4802  for (;;) Line 5034  for (;;)
5034            case PT_ALNUM:            case PT_ALNUM:
5035            for (i = min; i < max; i++)            for (i = min; i < max; i++)
5036              {              {
5037                int category;
5038              int len = 1;              int len = 1;
5039              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
5040                {                {
# Line 4809  for (;;) Line 5042  for (;;)
5042                break;                break;
5043                }                }
5044              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5045              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
5046              if ((prop_category == ucp_L || prop_category == ucp_N)              if ((category == ucp_L || category == ucp_N) == prop_fail_result)
                  == prop_fail_result)  
5047                break;                break;
5048              eptr+= len;              eptr+= len;
5049              }              }
# Line 4827  for (;;) Line 5059  for (;;)
5059                break;                break;
5060                }                }
5061              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5062              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 ||  
5063                   c == CHAR_FF || c == CHAR_CR)                   c == CHAR_FF || c == CHAR_CR)
5064                   == prop_fail_result)                   == prop_fail_result)
5065                break;                break;
# Line 4846  for (;;) Line 5077  for (;;)
5077                break;                break;
5078                }                }
5079              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5080              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 ||  
5081                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
5082                   == prop_fail_result)                   == prop_fail_result)
5083                break;                break;
# Line 4858  for (;;) Line 5088  for (;;)
5088            case PT_WORD:            case PT_WORD:
5089            for (i = min; i < max; i++)            for (i = min; i < max; i++)
5090              {              {
5091                int category;
5092              int len = 1;              int len = 1;
5093              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
5094                {                {
# Line 4865  for (;;) Line 5096  for (;;)
5096                break;                break;
5097                }                }
5098              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5099              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
5100              if ((prop_category == ucp_L || prop_category == ucp_N ||              if ((category == ucp_L || category == ucp_N ||
5101                   c == CHAR_UNDERSCORE) == prop_fail_result)                   c == CHAR_UNDERSCORE) == prop_fail_result)
5102                break;                break;
5103              eptr+= len;              eptr+= len;
# Line 4882  for (;;) Line 5113  for (;;)
5113          if (possessive) continue;          if (possessive) continue;
5114          for(;;)          for(;;)
5115            {            {
5116            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM44);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM44);
5117            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5118            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
5119            if (utf8) BACKCHAR(eptr);            if (utf8) BACKCHAR(eptr);
# Line 4896  for (;;) Line 5127  for (;;)
5127          {          {
5128          for (i = min; i < max; i++)          for (i = min; i < max; i++)
5129            {            {
5130              int len = 1;
5131            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
5132              {              {
5133              SCHECK_PARTIAL();              SCHECK_PARTIAL();
5134              break;              break;
5135              }              }
5136            GETCHARINCTEST(c, eptr);            if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }
5137            prop_category = UCD_CATEGORY(c);            if (UCD_CATEGORY(c) == ucp_M) break;
5138            if (prop_category == ucp_M) break;            eptr += len;
5139            while (eptr < md->end_subject)            while (eptr < md->end_subject)
5140              {              {
5141              int len = 1;              len = 1;
5142              if (!utf8) c = *eptr; else              if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }
5143                {              if (UCD_CATEGORY(c) != ucp_M) break;
               GETCHARLEN(c, eptr, len);  
               }  
             prop_category = UCD_CATEGORY(c);  
             if (prop_category != ucp_M) break;  
5144              eptr += len;              eptr += len;
5145              }              }
5146            }            }
# Line 4923  for (;;) Line 5151  for (;;)
5151    
5152          for(;;)          for(;;)
5153            {            {
5154            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM45);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM45);
5155            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5156            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
5157            for (;;)                        /* Move back over one extended */            for (;;)                        /* Move back over one extended */
5158              {              {
             int len = 1;  
5159              if (!utf8) c = *eptr; else              if (!utf8) c = *eptr; else
5160                {                {
5161                BACKCHAR(eptr);                BACKCHAR(eptr);
5162                GETCHARLEN(c, eptr, len);                GETCHAR(c, eptr);
5163                }                }
5164              prop_category = UCD_CATEGORY(c);              if (UCD_CATEGORY(c) != ucp_M) break;
             if (prop_category != ucp_M) break;  
5165              eptr--;              eptr--;
5166              }              }
5167            }            }
# Line 4999  for (;;) Line 5225  for (;;)
5225                while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;                while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
5226                }                }
5227              }              }
5228            else eptr = md->end_subject;   /* Unlimited UTF-8 repeat */            else
5229                {
5230                eptr = md->end_subject;   /* Unlimited UTF-8 repeat */
5231                SCHECK_PARTIAL();
5232                }
5233            break;            break;
5234    
5235            /* The byte case is the same as non-UTF8 */            /* The byte case is the same as non-UTF8 */
# Line 5207  for (;;) Line 5437  for (;;)
5437            RRETURN(PCRE_ERROR_INTERNAL);            RRETURN(PCRE_ERROR_INTERNAL);
5438            }            }
5439    
5440          /* eptr is now past the end of the maximum run */          /* eptr is now past the end of the maximum run. If possessive, we are
5441            done (no backing up). Otherwise, match at this position; anything other
5442            than no match is immediately returned. For nomatch, back up one
5443            character, unless we are matching \R and the last thing matched was
5444            \r\n, in which case, back up two bytes. */
5445    
5446          if (possessive) continue;          if (possessive) continue;
5447          for(;;)          for(;;)
5448            {            {
5449            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM46);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM46);
5450            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5451            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
5452            BACKCHAR(eptr);            BACKCHAR(eptr);
5453              if (ctype == OP_ANYNL && eptr > pp  && *eptr == '\n' &&
5454                  eptr[-1] == '\r') eptr--;
5455            }            }
5456          }          }
5457        else        else
# Line 5414  for (;;) Line 5650  for (;;)
5650            RRETURN(PCRE_ERROR_INTERNAL);            RRETURN(PCRE_ERROR_INTERNAL);
5651            }            }
5652    
5653          /* eptr is now past the end of the maximum run */          /* eptr is now past the end of the maximum run. If possessive, we are
5654            done (no backing up). Otherwise, match at this position; anything other
5655            than no match is immediately returned. For nomatch, back up one
5656            character (byte), unless we are matching \R and the last thing matched
5657            was \r\n, in which case, back up two bytes. */
5658    
5659          if (possessive) continue;          if (possessive) continue;
5660          while (eptr >= pp)          while (eptr >= pp)
5661            {            {
5662            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM47);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM47);
           eptr--;  
5663            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5664              eptr--;
5665              if (ctype == OP_ANYNL && eptr > pp  && *eptr == '\n' &&
5666                  eptr[-1] == '\r') eptr--;
5667            }            }
5668          }          }
5669    
# Line 5460  switch (frame->Xwhere) Line 5702  switch (frame->Xwhere)
5702    LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(17)    LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(17)
5703    LBL(19) LBL(24) LBL(25) LBL(26) LBL(27) LBL(29) LBL(31) LBL(33)    LBL(19) LBL(24) LBL(25) LBL(26) LBL(27) LBL(29) LBL(31) LBL(33)
5704    LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)    LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)
5705    LBL(53) LBL(54) LBL(55) LBL(56) LBL(57) LBL(58)    LBL(53) LBL(54) LBL(55) LBL(56) LBL(57) LBL(58) LBL(63)
5706  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
5707    LBL(16) LBL(18) LBL(20) LBL(21) LBL(22) LBL(23) LBL(28) LBL(30)    LBL(16) LBL(18) LBL(20) LBL(21) LBL(22) LBL(23) LBL(28) LBL(30)
5708    LBL(32) LBL(34) LBL(42) LBL(46)    LBL(32) LBL(34) LBL(42) LBL(46)
# Line 5489  Undefine all the macros that were define Line 5731  Undefine all the macros that were define
5731  #undef ecode  #undef ecode
5732  #undef mstart  #undef mstart
5733  #undef offset_top  #undef offset_top
 #undef ims  
5734  #undef eptrb  #undef eptrb
5735  #undef flags  #undef flags
5736    
# Line 5507  Undefine all the macros that were define Line 5748  Undefine all the macros that were define
5748  #undef condition  #undef condition
5749  #undef prev_is_word  #undef prev_is_word
5750    
 #undef original_ims  
   
5751  #undef ctype  #undef ctype
5752  #undef length  #undef length
5753  #undef max  #undef max
# Line 5565  pcre_exec(const pcre *argument_re, const Line 5804  pcre_exec(const pcre *argument_re, const
5804    PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,    PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,
5805    int offsetcount)    int offsetcount)
5806  {  {
5807  int rc, resetcount, ocount;  int rc, ocount, arg_offset_max;
5808  int first_byte = -1;  int first_byte = -1;
5809  int req_byte = -1;  int req_byte = -1;
5810  int req_byte2 = -1;  int req_byte2 = -1;
5811  int newline;  int newline;
 unsigned long int ims;  
5812  BOOL using_temporary_offsets = FALSE;  BOOL using_temporary_offsets = FALSE;
5813  BOOL anchored;  BOOL anchored;
5814  BOOL startline;  BOOL startline;
# Line 5600  if ((options & ~PUBLIC_EXEC_OPTIONS) != Line 5838  if ((options & ~PUBLIC_EXEC_OPTIONS) !=
5838  if (re == NULL || subject == NULL ||  if (re == NULL || subject == NULL ||
5839     (offsets == NULL && offsetcount > 0)) return PCRE_ERROR_NULL;     (offsets == NULL && offsetcount > 0)) return PCRE_ERROR_NULL;
5840  if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;  if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;
5841    if (start_offset < 0 || start_offset > length) return PCRE_ERROR_BADOFFSET;
5842    
5843    /* These two settings are used in the code for checking a UTF-8 string that
5844    follows immediately afterwards. Other values in the md block are used only
5845    during "normal" pcre_exec() processing, not when the JIT support is in use,
5846    so they are set up later. */
5847    
5848    utf8 = md->utf8 = (re->options & PCRE_UTF8) != 0;
5849    md->partial = ((options & PCRE_PARTIAL_HARD) != 0)? 2 :
5850                  ((options & PCRE_PARTIAL_SOFT) != 0)? 1 : 0;
5851    
5852    /* Check a UTF-8 string if required. Pass back the character offset and error
5853    code for an invalid string if a results vector is available. */
5854    
5855    #ifdef SUPPORT_UTF8
5856    if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)
5857      {
5858      int erroroffset;
5859      int errorcode = _pcre_valid_utf8((USPTR)subject, length, &erroroffset);
5860      if (errorcode != 0)
5861        {
5862        if (offsetcount >= 2)
5863          {
5864          offsets[0] = erroroffset;
5865          offsets[1] = errorcode;
5866          }
5867        return (errorcode <= PCRE_UTF8_ERR5 && md->partial > 1)?
5868          PCRE_ERROR_SHORTUTF8 : PCRE_ERROR_BADUTF8;
5869        }
5870    
5871      /* Check that a start_offset points to the start of a UTF-8 character. */
5872      if (start_offset > 0 && start_offset < length &&
5873          (((USPTR)subject)[start_offset] & 0xc0) == 0x80)
5874        return PCRE_ERROR_BADUTF8_OFFSET;
5875      }
5876    #endif
5877    
5878    /* If the pattern was successfully studied with JIT support, run the JIT
5879    executable instead of the rest of this function. Most options must be set at
5880    compile time for the JIT code to be usable. Fallback to the normal code path if
5881    an unsupported flag is set. In particular, JIT does not support partial
5882    matching. */
5883    
5884    #ifdef SUPPORT_JIT
5885    if (extra_data != NULL
5886        && (extra_data->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0
5887        && extra_data->executable_jit != NULL
5888        && (options & ~(PCRE_NO_UTF8_CHECK | PCRE_NOTBOL | PCRE_NOTEOL |
5889                        PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART)) == 0)
5890      return _pcre_jit_exec(re, extra_data->executable_jit, subject, length,
5891        start_offset, options, ((extra_data->flags & PCRE_EXTRA_MATCH_LIMIT) == 0)
5892        ? MATCH_LIMIT : extra_data->match_limit, offsets, offsetcount);
5893    #endif
5894    
5895  /* This information is for finding all the numbers associated with a given  /* Carry on with non-JIT matching. This information is for finding all the
5896  name, for condition testing. */  numbers associated with a given name, for condition testing. */
5897    
5898  md->name_table = (uschar *)re + re->name_table_offset;  md->name_table = (uschar *)re + re->name_table_offset;
5899  md->name_count = re->name_count;  md->name_count = re->name_count;
# Line 5669  md->end_subject = md->start_subject + le Line 5960  md->end_subject = md->start_subject + le
5960  end_subject = md->end_subject;  end_subject = md->end_subject;
5961    
5962  md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;  md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
 utf8 = md->utf8 = (re->options & PCRE_UTF8) != 0;  
5963  md->use_ucp = (re->options & PCRE_UCP) != 0;  md->use_ucp = (re->options & PCRE_UCP) != 0;
5964  md->jscript_compat = (re->options & PCRE_JAVASCRIPT_COMPAT) != 0;  md->jscript_compat = (re->options & PCRE_JAVASCRIPT_COMPAT) != 0;
5965    
5966    /* Some options are unpacked into BOOL variables in the hope that testing
5967    them will be faster than individual option bits. */
5968    
5969  md->notbol = (options & PCRE_NOTBOL) != 0;  md->notbol = (options & PCRE_NOTBOL) != 0;
5970  md->noteol = (options & PCRE_NOTEOL) != 0;  md->noteol = (options & PCRE_NOTEOL) != 0;
5971  md->notempty = (options & PCRE_NOTEMPTY) != 0;  md->notempty = (options & PCRE_NOTEMPTY) != 0;
5972  md->notempty_atstart = (options & PCRE_NOTEMPTY_ATSTART) != 0;  md->notempty_atstart = (options & PCRE_NOTEMPTY_ATSTART) != 0;
5973  md->partial = ((options & PCRE_PARTIAL_HARD) != 0)? 2 :  
               ((options & PCRE_PARTIAL_SOFT) != 0)? 1 : 0;  
5974  md->hitend = FALSE;  md->hitend = FALSE;
5975  md->mark = NULL;                        /* In case never set */  md->mark = NULL;                        /* In case never set */
5976    
5977  md->recursive = NULL;                   /* No recursion at top level */  md->recursive = NULL;                   /* No recursion at top level */
5978    md->hasthen = (re->flags & PCRE_HASTHEN) != 0;
5979    
5980  md->lcc = tables + lcc_offset;  md->lcc = tables + lcc_offset;
5981  md->ctypes = tables + ctypes_offset;  md->ctypes = tables + ctypes_offset;
# Line 5760  defined (though never set). So there's n Line 6053  defined (though never set). So there's n
6053  if (md->partial && (re->flags & PCRE_NOPARTIAL) != 0)  if (md->partial && (re->flags & PCRE_NOPARTIAL) != 0)
6054    return PCRE_ERROR_BADPARTIAL;    return PCRE_ERROR_BADPARTIAL;
6055    
 /* Check a UTF-8 string if required. Unfortunately there's no way of passing  
 back the character offset. */  
   
 #ifdef SUPPORT_UTF8  
 if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)  
   {  
   if (_pcre_valid_utf8((USPTR)subject, length) >= 0)  
     return PCRE_ERROR_BADUTF8;  
   if (start_offset > 0 && start_offset < length)  
     {  
     int tb = ((USPTR)subject)[start_offset];  
     if (tb > 127)  
       {  
       tb &= 0xc0;  
       if (tb != 0 && tb != 0xc0) return PCRE_ERROR_BADUTF8_OFFSET;  
       }  
     }  
   }  
 #endif  
   
 /* The ims options can vary during the matching as a result of the presence  
 of (?ims) items in the pattern. They are kept in a local variable so that  
 restoring at the exit of a group is easy. */  
   
 ims = re->options & (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL);  
   
6056  /* If the expression has got more back references than the offsets supplied can  /* If the expression has got more back references than the offsets supplied can
6057  hold, we get a temporary chunk of working store to use during the matching.  hold, we get a temporary chunk of working store to use during the matching.
6058  Otherwise, we can use the vector supplied, rounding down its size to a multiple  Otherwise, we can use the vector supplied, rounding down its size to a multiple
6059  of 3. */  of 3. */
6060    
6061  ocount = offsetcount - (offsetcount % 3);  ocount = offsetcount - (offsetcount % 3);
6062    arg_offset_max = (2*ocount)/3;
6063    
6064  if (re->top_backref > 0 && re->top_backref >= ocount/3)  if (re->top_backref > 0 && re->top_backref >= ocount/3)
6065    {    {
# Line 5808  md->offset_max = (2*ocount)/3; Line 6076  md->offset_max = (2*ocount)/3;
6076  md->offset_overflow = FALSE;  md->offset_overflow = FALSE;
6077  md->capture_last = -1;  md->capture_last = -1;
6078    
 /* Compute the minimum number of offsets that we need to reset each time. Doing  
 this makes a huge difference to execution time when there aren't many brackets  
 in the pattern. */  
   
 resetcount = 2 + re->top_bracket * 2;  
 if (resetcount > offsetcount) resetcount = ocount;  
   
6079  /* Reset the working variable associated with each extraction. These should  /* Reset the working variable associated with each extraction. These should
6080  never be used unless previously set, but they get saved and restored, and so we  never be used unless previously set, but they get saved and restored, and so we
6081  initialize them to avoid reading uninitialized locations. */  initialize them to avoid reading uninitialized locations. Also, unset the
6082    offsets for the matched string. This is really just for tidiness with callouts,
6083    in case they inspect these fields. */
6084    
6085  if (md->offset_vector != NULL)  if (md->offset_vector != NULL)
6086    {    {
6087    register int *iptr = md->offset_vector + ocount;    register int *iptr = md->offset_vector + ocount;
6088    register int *iend = iptr - resetcount/2 + 1;    register int *iend = iptr - re->top_bracket;
6089      if (iend < md->offset_vector + 2) iend = md->offset_vector + 2;
6090    while (--iptr >= iend) *iptr = -1;    while (--iptr >= iend) *iptr = -1;
6091      md->offset_vector[0] = md->offset_vector[1] = -1;
6092    }    }
6093    
6094  /* Set up the first character to match, if available. The first_byte value is  /* Set up the first character to match, if available. The first_byte value is
# Line 5857  if ((re->flags & PCRE_REQCHSET) != 0) Line 6122  if ((re->flags & PCRE_REQCHSET) != 0)
6122    }    }
6123    
6124    
6125    
6126    
6127  /* ==========================================================================*/  /* ==========================================================================*/
6128    
6129  /* Loop for handling unanchored repeated matching attempts; for anchored regexs  /* Loop for handling unanchored repeated matching attempts; for anchored regexs
# Line 5867  for(;;) Line 6134  for(;;)
6134    USPTR save_end_subject = end_subject;    USPTR save_end_subject = end_subject;
6135    USPTR new_start_match;    USPTR new_start_match;
6136    
   /* Reset the maximum number of extractions we might see. */  
   
   if (md->offset_vector != NULL)  
     {  
     register int *iptr = md->offset_vector;  
     register int *iend = iptr + resetcount;  
     while (iptr < iend) *iptr++ = -1;  
     }  
   
6137    /* If firstline is TRUE, the start of the match is constrained to the first    /* If firstline is TRUE, the start of the match is constrained to the first
6138    line of a multiline string. That is, the match must be before or at the first    line of a multiline string. That is, the match must be before or at the first
6139    newline. Implement this by temporarily adjusting end_subject so that we stop    newline. Implement this by temporarily adjusting end_subject so that we stop
# Line 5903  for(;;) Line 6161  for(;;)
6161    /* There are some optimizations that avoid running the match if a known    /* There are some optimizations that avoid running the match if a known
6162    starting point is not found, or if a known later character is not present.    starting point is not found, or if a known later character is not present.
6163    However, there is an option that disables these, for testing and for ensuring    However, there is an option that disables these, for testing and for ensuring
6164    that all callouts do actually occur. */    that all callouts do actually occur. The option can be set in the regex by
6165      (*NO_START_OPT) or passed in match-time options. */
6166    
6167    if ((options & PCRE_NO_START_OPTIMIZE) == 0)    if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0)
6168      {      {
6169      /* Advance to a unique first byte if there is one. */      /* Advance to a unique first byte if there is one. */
6170    
# Line 6063  for(;;) Line 6322  for(;;)
6322    md->start_match_ptr = start_match;    md->start_match_ptr = start_match;
6323    md->start_used_ptr = start_match;    md->start_used_ptr = start_match;
6324    md->match_call_count = 0;    md->match_call_count = 0;
6325    rc = match(start_match, md->start_code, start_match, NULL, 2, md, ims, NULL,    md->match_function_type = 0;
6326      0, 0);    md->end_offset_top = 0;
6327      rc = match(start_match, md->start_code, start_match, NULL, 2, md, NULL, 0);
6328    if (md->hitend && start_partial == NULL) start_partial = md->start_used_ptr;    if (md->hitend && start_partial == NULL) start_partial = md->start_used_ptr;
6329    
6330    switch(rc)    switch(rc)
# Line 6174  if (rc == MATCH_MATCH || rc == MATCH_ACC Line 6434  if (rc == MATCH_MATCH || rc == MATCH_ACC
6434    {    {
6435    if (using_temporary_offsets)    if (using_temporary_offsets)
6436      {      {
6437      if (offsetcount >= 4)      if (arg_offset_max >= 4)
6438        {        {
6439        memcpy(offsets + 2, md->offset_vector + 2,        memcpy(offsets + 2, md->offset_vector + 2,
6440          (offsetcount - 2) * sizeof(int));          (arg_offset_max - 2) * sizeof(int));
6441        DPRINTF(("Copied offsets from temporary memory\n"));        DPRINTF(("Copied offsets from temporary memory\n"));
6442        }        }
6443      if (md->end_offset_top > offsetcount) md->offset_overflow = TRUE;      if (md->end_offset_top > arg_offset_max) md->offset_overflow = TRUE;
6444      DPRINTF(("Freeing temporary memory\n"));      DPRINTF(("Freeing temporary memory\n"));
6445      (pcre_free)(md->offset_vector);      (pcre_free)(md->offset_vector);
6446      }      }
6447    
6448    /* Set the return code to the number of captured strings, or 0 if there are    /* Set the return code to the number of captured strings, or 0 if there were
6449    too many to fit into the vector. */    too many to fit into the vector. */
6450    
6451    rc = md->offset_overflow? 0 : md->end_offset_top/2;    rc = (md->offset_overflow && md->end_offset_top >= arg_offset_max)?
6452        0 : md->end_offset_top/2;
6453    
6454      /* If there is space in the offset vector, set any unused pairs at the end of
6455      the pattern to -1 for backwards compatibility. It is documented that this
6456      happens. In earlier versions, the whole set of potential capturing offsets
6457      was set to -1 each time round the loop, but this is handled differently now.
6458      "Gaps" are set to -1 dynamically instead (this fixes a bug). Thus, it is only
6459      those at the end that need unsetting here. We can't just unset them all at
6460      the start of the whole thing because they may get set in one branch that is
6461      not the final matching branch. */
6462    
6463      if (md->end_offset_top/2 <= re->top_bracket && offsets != NULL)
6464        {
6465        register int *iptr, *iend;
6466        int resetcount = 2 + re->top_bracket * 2;
6467        if (resetcount > offsetcount) resetcount = ocount;
6468        iptr = offsets + md->end_offset_top;
6469        iend = offsets + resetcount;
6470        while (iptr < iend) *iptr++ = -1;
6471        }
6472    
6473    /* If there is space, set up the whole thing as substring 0. The value of    /* If there is space, set up the whole thing as substring 0. The value of
6474    md->start_match_ptr might be modified if \K was encountered on the success    md->start_match_ptr might be modified if \K was encountered on the success

Legend:
Removed from v.545  
changed lines
  Added in v.702

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12