/[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 91 by nigel, Sat Feb 24 21:41:34 2007 UTC revision 178 by ph10, Wed Jun 13 08:44:34 2007 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-2006 University of Cambridge             Copyright (c) 1997-2007 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 42  POSSIBILITY OF SUCH DAMAGE. Line 42  POSSIBILITY OF SUCH DAMAGE.
42  pattern matching using an NFA algorithm, trying to mimic Perl as closely as  pattern matching using an NFA algorithm, trying to mimic Perl as closely as
43  possible. There are also some static supporting functions. */  possible. There are also some static supporting functions. */
44    
45  #define NLBLOCK md           /* The block containing newline information */  #define NLBLOCK md             /* Block containing newline information */
46    #define PSSTART start_subject  /* Field containing processed string start */
47    #define PSEND   end_subject    /* Field containing processed string end */
48    
49  #include "pcre_internal.h"  #include "pcre_internal.h"
50    
51    /* Undefine some potentially clashing cpp symbols */
52    
53    #undef min
54    #undef max
55    
56    /* The chain of eptrblocks for tail recursions uses memory in stack workspace,
57    obtained at top level, the size of which is defined by EPTR_WORK_SIZE. */
58    
59  /* Structure for building a chain of data that actually lives on the  #define EPTR_WORK_SIZE (1000)
 stack, for holding the values of the subject pointer at the start of each  
 subpattern, so as to detect when an empty string has been matched by a  
 subpattern - to break infinite loops. When NO_RECURSE is set, these blocks  
 are on the heap, not on the stack. */  
   
 typedef struct eptrblock {  
   struct eptrblock *epb_prev;  
   USPTR epb_saved_eptr;  
 } eptrblock;  
60    
61  /* Flag bits for the match() function */  /* Flag bits for the match() function */
62    
63  #define match_condassert   0x01    /* Called to check a condition assertion */  #define match_condassert     0x01  /* Called to check a condition assertion */
64  #define match_isgroup      0x02    /* Set if start of bracketed group */  #define match_cbegroup       0x02  /* Could-be-empty unlimited repeat group */
65    #define match_tail_recursed  0x04  /* Tail recursive call */
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 101  Returns: nothing Line 103  Returns: nothing
103  static void  static void
104  pchars(const uschar *p, int length, BOOL is_subject, match_data *md)  pchars(const uschar *p, int length, BOOL is_subject, match_data *md)
105  {  {
106  int c;  unsigned int c;
107  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
108  while (length-- > 0)  while (length-- > 0)
109    if (isprint(c = *(p++))) printf("%c", c); else printf("\\x%02x", c);    if (isprint(c = *(p++))) printf("%c", c); else printf("\\x%02x", c);
# Line 186  calls by keeping local variables that ne Line 188  calls by keeping local variables that ne
188  obtained from malloc() instead instead of on the stack. Macros are used to  obtained from malloc() instead instead of on the stack. Macros are used to
189  achieve this so that the actual code doesn't look very different to what it  achieve this so that the actual code doesn't look very different to what it
190  always used to.  always used to.
191    
192    The original heap-recursive code used longjmp(). However, it seems that this
193    can be very slow on some operating systems. Following a suggestion from Stan
194    Switzer, the use of longjmp() has been abolished, at the cost of having to
195    provide a unique number for each call to RMATCH. There is no way of generating
196    a sequence of numbers at compile time in C. I have given them names, to make
197    them stand out more clearly.
198    
199    Crude tests on x86 Linux show a small speedup of around 5-8%. However, on
200    FreeBSD, avoiding longjmp() more than halves the time taken to run the standard
201    tests. Furthermore, not using longjmp() means that local dynamic variables
202    don't have indeterminate values; this has meant that the frame size can be
203    reduced because the result can be "passed back" by straight setting of the
204    variable instead of being passed in the frame.
205  ****************************************************************************  ****************************************************************************
206  ***************************************************************************/  ***************************************************************************/
207    
208    
209    /* Numbers for RMATCH calls */
210    
211    enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM6,  RM7,  RM8,  RM9,  RM10,
212           RM11,  RM12, RM13, RM14, RM15, RM16, RM17, RM18, RM19, RM20,
213           RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
214           RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
215           RM41,  RM42, RM43, RM44, RM45, RM46, RM47 };
216    
217    
218  /* 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
219  versions and production versions. */  versions and production versions. Note that the "rw" argument of RMATCH isn't
220    actuall used in this definition. */
221    
222  #ifndef NO_RECURSE  #ifndef NO_RECURSE
223  #define REGISTER register  #define REGISTER register
224    
225  #ifdef DEBUG  #ifdef DEBUG
226  #define RMATCH(rx,ra,rb,rc,rd,re,rf,rg) \  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \
227    { \    { \
228    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
229    rx = match(ra,rb,rc,rd,re,rf,rg,rdepth+1); \    rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1); \
230    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
231    }    }
232  #define RRETURN(ra) \  #define RRETURN(ra) \
# Line 208  versions and production versions. */ Line 235  versions and production versions. */
235    return ra; \    return ra; \
236    }    }
237  #else  #else
238  #define RMATCH(rx,ra,rb,rc,rd,re,rf,rg) \  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \
239    rx = match(ra,rb,rc,rd,re,rf,rg,rdepth+1)    rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1)
240  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
241  #endif  #endif
242    
243  #else  #else
244    
245    
246  /* These versions of the macros manage a private stack on the heap. Note  /* These versions of the macros manage a private stack on the heap. Note that
247  that the rd argument of RMATCH isn't actually used. It's the md argument of  the "rd" argument of RMATCH isn't actually used in this definition. It's the md
248  match(), which never changes. */  argument of match(), which never changes. */
249    
250  #define REGISTER  #define REGISTER
251    
252  #define RMATCH(rx,ra,rb,rc,rd,re,rf,rg)\  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\
253    {\    {\
254    heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\
255    if (setjmp(frame->Xwhere) == 0)\    frame->Xwhere = rw; \
256      {\    newframe->Xeptr = ra;\
257      newframe->Xeptr = ra;\    newframe->Xecode = rb;\
258      newframe->Xecode = rb;\    newframe->Xmstart = mstart;\
259      newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
260      newframe->Xims = re;\    newframe->Xims = re;\
261      newframe->Xeptrb = rf;\    newframe->Xeptrb = rf;\
262      newframe->Xflags = rg;\    newframe->Xflags = rg;\
263      newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
264      newframe->Xprevframe = frame;\    newframe->Xprevframe = frame;\
265      frame = newframe;\    frame = newframe;\
266      DPRINTF(("restarting from line %d\n", __LINE__));\    DPRINTF(("restarting from line %d\n", __LINE__));\
267      goto HEAP_RECURSE;\    goto HEAP_RECURSE;\
268      }\    L_##rw:\
269    else\    DPRINTF(("jumped back to line %d\n", __LINE__));\
     {\  
     DPRINTF(("longjumped back to line %d\n", __LINE__));\  
     frame = md->thisframe;\  
     rx = frame->Xresult;\  
     }\  
270    }    }
271    
272  #define RRETURN(ra)\  #define RRETURN(ra)\
# Line 254  match(), which never changes. */ Line 276  match(), which never changes. */
276    (pcre_stack_free)(newframe);\    (pcre_stack_free)(newframe);\
277    if (frame != NULL)\    if (frame != NULL)\
278      {\      {\
279      frame->Xresult = ra;\      rrc = ra;\
280      md->thisframe = frame;\      goto HEAP_RETURN;\
     longjmp(frame->Xwhere, 1);\  
281      }\      }\
282    return ra;\    return ra;\
283    }    }
# Line 271  typedef struct heapframe { Line 292  typedef struct heapframe {
292    
293    const uschar *Xeptr;    const uschar *Xeptr;
294    const uschar *Xecode;    const uschar *Xecode;
295      const uschar *Xmstart;
296    int Xoffset_top;    int Xoffset_top;
297    long int Xims;    long int Xims;
298    eptrblock *Xeptrb;    eptrblock *Xeptrb;
# Line 291  typedef struct heapframe { Line 313  typedef struct heapframe {
313    
314    BOOL Xcur_is_word;    BOOL Xcur_is_word;
315    BOOL Xcondition;    BOOL Xcondition;
   BOOL Xminimize;  
316    BOOL Xprev_is_word;    BOOL Xprev_is_word;
317    
318    unsigned long int Xoriginal_ims;    unsigned long int Xoriginal_ims;
# Line 303  typedef struct heapframe { Line 324  typedef struct heapframe {
324    int Xprop_category;    int Xprop_category;
325    int Xprop_chartype;    int Xprop_chartype;
326    int Xprop_script;    int Xprop_script;
327    int *Xprop_test_variable;    int Xoclength;
328      uschar Xocchars[8];
329  #endif  #endif
330    
331    int Xctype;    int Xctype;
332    int Xfc;    unsigned int Xfc;
333    int Xfi;    int Xfi;
334    int Xlength;    int Xlength;
335    int Xmax;    int Xmax;
# Line 321  typedef struct heapframe { Line 343  typedef struct heapframe {
343    
344    eptrblock Xnewptrb;    eptrblock Xnewptrb;
345    
346    /* Place to pass back result, and where to jump back to */    /* Where to jump back to */
347    
348    int  Xresult;    int Xwhere;
   jmp_buf Xwhere;  
349    
350  } heapframe;  } heapframe;
351    
# Line 340  typedef struct heapframe { Line 361  typedef struct heapframe {
361  *         Match from current position            *  *         Match from current position            *
362  *************************************************/  *************************************************/
363    
364  /* On entry ecode points to the first opcode, and eptr to the first character  /* This function is called recursively in many circumstances. Whenever it
 in the subject string, while eptrb holds the value of eptr at the start of the  
 last bracketed group - used for breaking infinite loops matching zero-length  
 strings. This function is called recursively in many circumstances. Whenever it  
365  returns a negative (error) response, the outer incarnation must also return the  returns a negative (error) response, the outer incarnation must also return the
366  same response.  same response.
367    
# Line 353  performance. Tests using gcc on a SPARC Line 371  performance. Tests using gcc on a SPARC
371  made performance worse.  made performance worse.
372    
373  Arguments:  Arguments:
374     eptr        pointer in subject     eptr        pointer to current character in subject
375     ecode       position in code     ecode       pointer to current position in compiled code
376       mstart      pointer to the current match start position (can be modified
377                     by encountering \K)
378     offset_top  current top pointer     offset_top  current top pointer
379     md          pointer to "static" info for the match     md          pointer to "static" info for the match
380     ims         current /i, /m, and /s options     ims         current /i, /m, and /s options
# Line 362  Arguments: Line 382  Arguments:
382                   brackets - for testing for empty matches                   brackets - for testing for empty matches
383     flags       can contain     flags       can contain
384                   match_condassert - this is an assertion condition                   match_condassert - this is an assertion condition
385                   match_isgroup - this is the start of a bracketed group                   match_cbegroup - this is the start of an unlimited repeat
386                       group that can match an empty string
387                     match_tail_recursed - this is a tail_recursed group
388     rdepth      the recursion depth     rdepth      the recursion depth
389    
390  Returns:       MATCH_MATCH if matched            )  these values are >= 0  Returns:       MATCH_MATCH if matched            )  these values are >= 0
# Line 372  Returns: MATCH_MATCH if matched Line 394  Returns: MATCH_MATCH if matched
394  */  */
395    
396  static int  static int
397  match(REGISTER USPTR eptr, REGISTER const uschar *ecode,  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, const uschar *mstart,
398    int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,    int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,
399    int flags, unsigned int rdepth)    int flags, unsigned int rdepth)
400  {  {
401  /* 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,
402  so they can be ordinary variables in all cases. Mark them with "register"  so they can be ordinary variables in all cases. Mark some of them with
403  because they are used a lot in loops. */  "register" because they are used a lot in loops. */
404    
405  register int  rrc;         /* Returns from recursive calls */  register int  rrc;         /* Returns from recursive calls */
406  register int  i;           /* Used for loops not involving calls to RMATCH() */  register int  i;           /* Used for loops not involving calls to RMATCH() */
407  register unsigned int  c;  /* Character values not kept over RMATCH() calls */  register unsigned int c;   /* Character values not kept over RMATCH() calls */
408  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */
409    
410    BOOL minimize, possessive; /* Quantifier options */
411    
412  /* 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
413  preserved over calls to RMATCH() are part of a "frame" which is obtained from  preserved over calls to RMATCH() are part of a "frame" which is obtained from
414  heap storage. Set up the top-level frame here; others are obtained from the  heap storage. Set up the top-level frame here; others are obtained from the
# Line 398  frame->Xprevframe = NULL; /* Line 422  frame->Xprevframe = NULL; /*
422    
423  frame->Xeptr = eptr;  frame->Xeptr = eptr;
424  frame->Xecode = ecode;  frame->Xecode = ecode;
425    frame->Xmstart = mstart;
426  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
427  frame->Xims = ims;  frame->Xims = ims;
428  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
# Line 412  HEAP_RECURSE: Line 437  HEAP_RECURSE:
437    
438  #define eptr               frame->Xeptr  #define eptr               frame->Xeptr
439  #define ecode              frame->Xecode  #define ecode              frame->Xecode
440    #define mstart             frame->Xmstart
441  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
442  #define ims                frame->Xims  #define ims                frame->Xims
443  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
# Line 434  HEAP_RECURSE: Line 460  HEAP_RECURSE:
460    
461  #define cur_is_word        frame->Xcur_is_word  #define cur_is_word        frame->Xcur_is_word
462  #define condition          frame->Xcondition  #define condition          frame->Xcondition
 #define minimize           frame->Xminimize  
463  #define prev_is_word       frame->Xprev_is_word  #define prev_is_word       frame->Xprev_is_word
464    
465  #define original_ims       frame->Xoriginal_ims  #define original_ims       frame->Xoriginal_ims
# Line 446  HEAP_RECURSE: Line 471  HEAP_RECURSE:
471  #define prop_category      frame->Xprop_category  #define prop_category      frame->Xprop_category
472  #define prop_chartype      frame->Xprop_chartype  #define prop_chartype      frame->Xprop_chartype
473  #define prop_script        frame->Xprop_script  #define prop_script        frame->Xprop_script
474  #define prop_test_variable frame->Xprop_test_variable  #define oclength           frame->Xoclength
475    #define occhars            frame->Xocchars
476  #endif  #endif
477    
478  #define ctype              frame->Xctype  #define ctype              frame->Xctype
# Line 470  HEAP_RECURSE: Line 496  HEAP_RECURSE:
496  get preserved during recursion in the normal way. In this environment, fi and  get preserved during recursion in the normal way. In this environment, fi and
497  i, and fc and c, can be the same variables. */  i, and fc and c, can be the same variables. */
498    
499  #else  #else         /* NO_RECURSE not defined */
500  #define fi i  #define fi i
501  #define fc c  #define fc c
502    
# Line 489  recursion_info new_recursive; /* wi Line 515  recursion_info new_recursive; /* wi
515                                     /* that do not have to be preserved over  */                                     /* that do not have to be preserved over  */
516  BOOL cur_is_word;                  /* a recursive call to RMATCH().          */  BOOL cur_is_word;                  /* a recursive call to RMATCH().          */
517  BOOL condition;  BOOL condition;
 BOOL minimize;  
518  BOOL prev_is_word;  BOOL prev_is_word;
519    
520  unsigned long int original_ims;  unsigned long int original_ims;
# Line 501  int prop_fail_result; Line 526  int prop_fail_result;
526  int prop_category;  int prop_category;
527  int prop_chartype;  int prop_chartype;
528  int prop_script;  int prop_script;
529  int *prop_test_variable;  int oclength;
530    uschar occhars[8];
531  #endif  #endif
532    
533  int ctype;  int ctype;
# Line 516  int save_offset1, save_offset2, save_off Line 542  int save_offset1, save_offset2, save_off
542  int stacksave[REC_STACK_SAVE_MAX];  int stacksave[REC_STACK_SAVE_MAX];
543    
544  eptrblock newptrb;  eptrblock newptrb;
545  #endif  #endif     /* NO_RECURSE */
546    
547  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
548  variables. */  variables. */
# Line 524  variables. */ Line 550  variables. */
550  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
551  prop_value = 0;  prop_value = 0;
552  prop_fail_result = 0;  prop_fail_result = 0;
 prop_test_variable = NULL;  
553  #endif  #endif
554    
555    
556  /* This label is used for tail recursion, which is used in a few cases even  /* This label is used for tail recursion, which is used in a few cases even
557  when NO_RECURSE is not defined, in order to reduce the amount of stack that is  when NO_RECURSE is not defined, in order to reduce the amount of stack that is
558  used. Thanks to Ian Taylor for noticing this possibility and sending the  used. Thanks to Ian Taylor for noticing this possibility and sending the
# Line 542  defined). However, RMATCH isn't like a f Line 568  defined). However, RMATCH isn't like a f
568  complicated macro. It has to be used in one particular way. This shouldn't,  complicated macro. It has to be used in one particular way. This shouldn't,
569  however, impact performance when true recursion is being used. */  however, impact performance when true recursion is being used. */
570    
571    #ifdef SUPPORT_UTF8
572    utf8 = md->utf8;       /* Local copy of the flag */
573    #else
574    utf8 = FALSE;
575    #endif
576    
577  /* First check that we haven't called match() too many times, or that we  /* First check that we haven't called match() too many times, or that we
578  haven't exceeded the recursive call limit. */  haven't exceeded the recursive call limit. */
579    
# Line 550  if (rdepth >= md->match_limit_recursion) Line 582  if (rdepth >= md->match_limit_recursion)
582    
583  original_ims = ims;    /* Save for resetting on ')' */  original_ims = ims;    /* Save for resetting on ')' */
584    
585  #ifdef SUPPORT_UTF8  /* At the start of a group with an unlimited repeat that may match an empty
586  utf8 = md->utf8;       /* Local copy of the flag */  string, the match_cbegroup flag is set. When this is the case, add the current
587  #else  subject pointer to the chain of such remembered pointers, to be checked when we
588  utf8 = FALSE;  hit the closing ket, in order to break infinite loops that match no characters.
589  #endif  When match() is called in other circumstances, don't add to the chain. If this
590    is a tail recursion, use a block from the workspace, as the one on the stack is
591  /* At the start of a bracketed group, add the current subject pointer to the  already used. */
 stack of such pointers, to be re-instated at the end of the group when we hit  
 the closing ket. When match() is called in other circumstances, we don't add to  
 this stack. */  
592    
593  if ((flags & match_isgroup) != 0)  if ((flags & match_cbegroup) != 0)
594    {    {
595    newptrb.epb_prev = eptrb;    eptrblock *p;
596    newptrb.epb_saved_eptr = eptr;    if ((flags & match_tail_recursed) != 0)
597    eptrb = &newptrb;      {
598        if (md->eptrn >= EPTR_WORK_SIZE) RRETURN(PCRE_ERROR_NULLWSLIMIT);
599        p = md->eptrchain + md->eptrn++;
600        }
601      else p = &newptrb;
602      p->epb_saved_eptr = eptr;
603      p->epb_prev = eptrb;
604      eptrb = p;
605    }    }
606    
607  /* Now start processing the operations. */  /* Now start processing the opcodes. */
608    
609  for (;;)  for (;;)
610    {    {
611      minimize = possessive = FALSE;
612    op = *ecode;    op = *ecode;
   minimize = FALSE;  
613    
614    /* For partial matching, remember if we ever hit the end of the subject after    /* For partial matching, remember if we ever hit the end of the subject after
615    matching at least one subject character. */    matching at least one subject character. */
616    
617    if (md->partial &&    if (md->partial &&
618        eptr >= md->end_subject &&        eptr >= md->end_subject &&
619        eptr > md->start_match)        eptr > mstart)
620      md->hitend = TRUE;      md->hitend = TRUE;
621    
622    /* Opening capturing bracket. If there is space in the offset vector, save    switch(op)
   the current subject position in the working slot at the top of the vector. We  
   mustn't change the current values of the data slot, because they may be set  
   from a previous iteration of this group, and be referred to by a reference  
   inside the group.  
   
   If the bracket fails to match, we need to restore this value and also the  
   values of the final offsets, in case they were set by a previous iteration of  
   the same bracket.  
   
   If there isn't enough space in the offset vector, treat this as if it were a  
   non-capturing bracket. Don't worry about setting the flag for the error case  
   here; that is handled in the code for KET. */  
   
   if (op > OP_BRA)  
623      {      {
624      number = op - OP_BRA;      /* Handle a capturing bracket. If there is space in the offset vector, save
625        the current subject position in the working slot at the top of the vector.
626      /* For extended extraction brackets (large number), we have to fish out the      We mustn't change the current values of the data slot, because they may be
627      number from a dummy opcode at the start. */      set from a previous iteration of this group, and be referred to by a
628        reference inside the group.
629      if (number > EXTRACT_BASIC_MAX)  
630        number = GET2(ecode, 2+LINK_SIZE);      If the bracket fails to match, we need to restore this value and also the
631        values of the final offsets, in case they were set by a previous iteration
632        of the same bracket.
633    
634        If there isn't enough space in the offset vector, treat this as if it were
635        a non-capturing bracket. Don't worry about setting the flag for the error
636        case here; that is handled in the code for KET. */
637    
638        case OP_CBRA:
639        case OP_SCBRA:
640        number = GET2(ecode, 1+LINK_SIZE);
641      offset = number << 1;      offset = number << 1;
642    
643  #ifdef DEBUG  #ifdef DEBUG
644      printf("start bracket %d subject=", number);      printf("start bracket %d\n", number);
645        printf("subject=");
646      pchars(eptr, 16, TRUE, md);      pchars(eptr, 16, TRUE, md);
647      printf("\n");      printf("\n");
648  #endif  #endif
# Line 624  for (;;) Line 657  for (;;)
657        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
658        md->offset_vector[md->offset_end - number] = eptr - md->start_subject;        md->offset_vector[md->offset_end - number] = eptr - md->start_subject;
659    
660          flags = (op == OP_SCBRA)? match_cbegroup : 0;
661        do        do
662          {          {
663          RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb,          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
664            match_isgroup);            ims, eptrb, flags, RM1);
665          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
666          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
667          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
# Line 643  for (;;) Line 677  for (;;)
677        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
678        }        }
679    
680      /* Insufficient room for saving captured contents */      /* Insufficient room for saving captured contents. Treat as a non-capturing
681        bracket. */
     else op = OP_BRA;  
     }  
682    
683    /* Other types of node can be handled by a switch */      DPRINTF(("insufficient capture room: treat as non-capturing\n"));
   
   switch(op)  
     {  
     case OP_BRA:     /* Non-capturing bracket: optimized */  
     DPRINTF(("start bracket 0\n"));  
   
     /* Loop for all the alternatives */  
684    
685        /* Non-capturing bracket. Loop for all the alternatives. When we get to the
686        final alternative within the brackets, we would return the result of a
687        recursive call to match() whatever happened. We can reduce stack usage by
688        turning this into a tail recursion. */
689    
690        case OP_BRA:
691        case OP_SBRA:
692        DPRINTF(("start non-capturing bracket\n"));
693        flags = (op >= OP_SBRA)? match_cbegroup : 0;
694      for (;;)      for (;;)
695        {        {
       /* When we get to the final alternative within the brackets, we would  
       return the result of a recursive call to match() whatever happened. We  
       can reduce stack usage by turning this into a tail recursion. */  
   
696        if (ecode[GET(ecode, 1)] != OP_ALT)        if (ecode[GET(ecode, 1)] != OP_ALT)
697         {          {
698         ecode += 1 + LINK_SIZE;          ecode += _pcre_OP_lengths[*ecode];
699         flags = match_isgroup;          flags |= match_tail_recursed;
700         DPRINTF(("bracket 0 tail recursion\n"));          DPRINTF(("bracket 0 tail recursion\n"));
701         goto TAIL_RECURSE;          goto TAIL_RECURSE;
702         }          }
703    
704        /* For non-final alternatives, continue the loop for a NOMATCH result;        /* For non-final alternatives, continue the loop for a NOMATCH result;
705        otherwise return. */        otherwise return. */
706    
707        RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb,        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,
708          match_isgroup);          eptrb, flags, RM2);
709        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
710        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
711        }        }
# Line 688  for (;;) Line 718  for (;;)
718      obeyed, we can use tail recursion to avoid using another stack frame. */      obeyed, we can use tail recursion to avoid using another stack frame. */
719    
720      case OP_COND:      case OP_COND:
721      if (ecode[LINK_SIZE+1] == OP_CREF) /* Condition extract or recurse test */      case OP_SCOND:
722        if (ecode[LINK_SIZE+1] == OP_RREF)         /* Recursion test */
723          {
724          offset = GET2(ecode, LINK_SIZE + 2);     /* Recursion group number*/
725          condition = md->recursive != NULL &&
726            (offset == RREF_ANY || offset == md->recursive->group_num);
727          ecode += condition? 3 : GET(ecode, 1);
728          }
729    
730        else if (ecode[LINK_SIZE+1] == OP_CREF)    /* Group used test */
731        {        {
732        offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */        offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */
733        condition = (offset == CREF_RECURSE * 2)?        condition = offset < offset_top && md->offset_vector[offset] >= 0;
734          (md->recursive != NULL) :        ecode += condition? 3 : GET(ecode, 1);
735          (offset < offset_top && md->offset_vector[offset] >= 0);        }
736        ecode += condition? (LINK_SIZE + 4) : (LINK_SIZE + 1 + GET(ecode, 1));  
737        flags = match_isgroup;      else if (ecode[LINK_SIZE+1] == OP_DEF)     /* DEFINE - always false */
738        goto TAIL_RECURSE;        {
739          condition = FALSE;
740          ecode += GET(ecode, 1);
741        }        }
742    
743      /* The condition is an assertion. Call match() to evaluate it - setting      /* The condition is an assertion. Call match() to evaluate it - setting
744      the final argument TRUE causes it to stop at the end of an assertion. */      the final argument match_condassert causes it to stop at the end of an
745        assertion. */
746    
747      else      else
748        {        {
749        RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,
750            match_condassert | match_isgroup);            match_condassert, RM3);
751        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
752          {          {
753          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE+2);          condition = TRUE;
754            ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
755          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
756          }          }
757        else if (rrc != MATCH_NOMATCH)        else if (rrc != MATCH_NOMATCH)
758          {          {
759          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
760          }          }
761        else ecode += GET(ecode, 1);        else
762            {
763            condition = FALSE;
764            ecode += GET(ecode, 1);
765            }
766          }
767    
768        /* 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,
769        we can use tail recursion to avoid using another stack frame. */      we can use tail recursion to avoid using another stack frame. If the second
770        alternative doesn't exist, we can just plough on. */
771    
772        if (condition || *ecode == OP_ALT)
773          {
774        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
775        flags = match_isgroup;        flags = match_tail_recursed | ((op == OP_SCOND)? match_cbegroup : 0);
776        goto TAIL_RECURSE;        goto TAIL_RECURSE;
777        }        }
778      /* Control never reaches here */      else
779          {
780      /* Skip over conditional reference or large extraction number data if        ecode += 1 + LINK_SIZE;
781      encountered. */        }
   
     case OP_CREF:  
     case OP_BRANUMBER:  
     ecode += 3;  
782      break;      break;
783    
784      /* End of the pattern. If we are in a recursion, we should restore the  
785      offsets appropriately and continue from after the call. */      /* End of the pattern. If we are in a top-level recursion, we should
786        restore the offsets appropriately and continue from after the call. */
787    
788      case OP_END:      case OP_END:
789      if (md->recursive != NULL && md->recursive->group_num == 0)      if (md->recursive != NULL && md->recursive->group_num == 0)
# Line 745  for (;;) Line 793  for (;;)
793        md->recursive = rec->prevrec;        md->recursive = rec->prevrec;
794        memmove(md->offset_vector, rec->offset_save,        memmove(md->offset_vector, rec->offset_save,
795          rec->saved_max * sizeof(int));          rec->saved_max * sizeof(int));
796        md->start_match = rec->save_start;        mstart = rec->save_start;
797        ims = original_ims;        ims = original_ims;
798        ecode = rec->after_call;        ecode = rec->after_call;
799        break;        break;
# Line 754  for (;;) Line 802  for (;;)
802      /* Otherwise, if PCRE_NOTEMPTY is set, fail if we have matched an empty      /* Otherwise, if PCRE_NOTEMPTY is set, fail if we have matched an empty
803      string - backtracking will then try other alternatives, if any. */      string - backtracking will then try other alternatives, if any. */
804    
805      if (md->notempty && eptr == md->start_match) RRETURN(MATCH_NOMATCH);      if (md->notempty && eptr == mstart) RRETURN(MATCH_NOMATCH);
806      md->end_match_ptr = eptr;          /* Record where we ended */      md->end_match_ptr = eptr;           /* Record where we ended */
807      md->end_offset_top = offset_top;   /* and how many extracts were taken */      md->end_offset_top = offset_top;    /* and how many extracts were taken */
808        md->start_match_ptr = mstart;  /* and the start (\K can modify) */
809      RRETURN(MATCH_MATCH);      RRETURN(MATCH_MATCH);
810    
811      /* Change option settings */      /* Change option settings */
# Line 777  for (;;) Line 826  for (;;)
826      case OP_ASSERTBACK:      case OP_ASSERTBACK:
827      do      do
828        {        {
829        RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,
830          match_isgroup);          RM4);
831        if (rrc == MATCH_MATCH) break;        if (rrc == MATCH_MATCH) break;
832        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
833        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
# Line 804  for (;;) Line 853  for (;;)
853      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
854      do      do
855        {        {
856        RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,
857          match_isgroup);          RM5);
858        if (rrc == MATCH_MATCH) RRETURN(MATCH_NOMATCH);        if (rrc == MATCH_MATCH) RRETURN(MATCH_NOMATCH);
859        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
860        ecode += GET(ecode,1);        ecode += GET(ecode,1);
# Line 826  for (;;) Line 875  for (;;)
875  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
876      if (utf8)      if (utf8)
877        {        {
878        c = GET(ecode,1);        i = GET(ecode, 1);
879        for (i = 0; i < c; i++)        while (i-- > 0)
880          {          {
881          eptr--;          eptr--;
882          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
# Line 840  for (;;) Line 889  for (;;)
889      /* No UTF-8 support, or not in UTF-8 mode: count is byte count */      /* No UTF-8 support, or not in UTF-8 mode: count is byte count */
890    
891        {        {
892        eptr -= GET(ecode,1);        eptr -= GET(ecode, 1);
893        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
894        }        }
895    
# Line 862  for (;;) Line 911  for (;;)
911        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
912        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
913        cb.subject_length   = md->end_subject - md->start_subject;        cb.subject_length   = md->end_subject - md->start_subject;
914        cb.start_match      = md->start_match - md->start_subject;        cb.start_match      = mstart - md->start_subject;
915        cb.current_position = eptr - md->start_subject;        cb.current_position = eptr - md->start_subject;
916        cb.pattern_position = GET(ecode, 2);        cb.pattern_position = GET(ecode, 2);
917        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
# Line 897  for (;;) Line 946  for (;;)
946      case OP_RECURSE:      case OP_RECURSE:
947        {        {
948        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
949        new_recursive.group_num = *callpat - OP_BRA;        new_recursive.group_num = (callpat == md->start_code)? 0 :
950            GET2(callpat, 1 + LINK_SIZE);
       /* For extended extraction brackets (large number), we have to fish out  
       the number from a dummy opcode at the start. */  
   
       if (new_recursive.group_num > EXTRACT_BASIC_MAX)  
         new_recursive.group_num = GET2(callpat, 2+LINK_SIZE);  
951    
952        /* Add to "recursing stack" */        /* Add to "recursing stack" */
953    
# Line 929  for (;;) Line 973  for (;;)
973    
974        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
975              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
976        new_recursive.save_start = md->start_match;        new_recursive.save_start = mstart;
977        md->start_match = eptr;        mstart = eptr;
978    
979        /* OK, now we can do the recursion. For each top-level alternative we        /* OK, now we can do the recursion. For each top-level alternative we
980        restore the offset and recursion data. */        restore the offset and recursion data. */
981    
982        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
983          flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;
984        do        do
985          {          {
986          RMATCH(rrc, eptr, callpat + 1 + LINK_SIZE, offset_top, md, ims,          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
987              eptrb, match_isgroup);            md, ims, eptrb, flags, RM6);
988          if (rrc == MATCH_MATCH)          if (rrc == MATCH_MATCH)
989            {            {
990            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
# Line 982  for (;;) Line 1027  for (;;)
1027    
1028      do      do
1029        {        {
1030        RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims,
1031          eptrb, match_isgroup);          eptrb, 0, RM7);
1032        if (rrc == MATCH_MATCH) break;        if (rrc == MATCH_MATCH) break;
1033        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1034        ecode += GET(ecode,1);        ecode += GET(ecode,1);
# Line 997  for (;;) Line 1042  for (;;)
1042      /* Continue as from after the assertion, updating the offsets high water      /* Continue as from after the assertion, updating the offsets high water
1043      mark, since extracts may have been taken. */      mark, since extracts may have been taken. */
1044    
1045      do ecode += GET(ecode,1); while (*ecode == OP_ALT);      do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
1046    
1047      offset_top = md->end_offset_top;      offset_top = md->end_offset_top;
1048      eptr = md->end_match_ptr;      eptr = md->end_match_ptr;
# Line 1028  for (;;) Line 1073  for (;;)
1073    
1074      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1075        {        {
1076        RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0,
1077            RM8);
1078        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1079        ecode = prev;        ecode = prev;
1080        flags = match_isgroup;        flags = match_tail_recursed;
1081        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1082        }        }
1083      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
1084        {        {
1085        RMATCH(rrc, eptr, prev, offset_top, md, ims, eptrb, match_isgroup);        RMATCH(eptr, prev, offset_top, md, ims, eptrb, match_cbegroup, RM9);
1086        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1087        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1088        flags = 0;        flags = match_tail_recursed;
1089        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1090        }        }
1091      /* Control never gets here */      /* Control never gets here */
# Line 1060  for (;;) Line 1106  for (;;)
1106      case OP_BRAZERO:      case OP_BRAZERO:
1107        {        {
1108        next = ecode+1;        next = ecode+1;
1109        RMATCH(rrc, eptr, next, offset_top, md, ims, eptrb, match_isgroup);        RMATCH(eptr, next, offset_top, md, ims, eptrb, 0, RM10);
1110        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1111        do next += GET(next,1); while (*next == OP_ALT);        do next += GET(next,1); while (*next == OP_ALT);
1112        ecode = next + 1+LINK_SIZE;        ecode = next + 1 + LINK_SIZE;
1113        }        }
1114      break;      break;
1115    
1116      case OP_BRAMINZERO:      case OP_BRAMINZERO:
1117        {        {
1118        next = ecode+1;        next = ecode+1;
1119        do next += GET(next,1); while (*next == OP_ALT);        do next += GET(next, 1); while (*next == OP_ALT);
1120        RMATCH(rrc, eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb,        RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0, RM11);
         match_isgroup);  
1121        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1122        ecode++;        ecode++;
1123        }        }
1124      break;      break;
1125    
1126      /* End of a group, repeated or non-repeating. If we are at the end of      /* End of a group, repeated or non-repeating. */
     an assertion "group", stop matching and return MATCH_MATCH, but record the  
     current high water mark for use by positive assertions. Do this also  
     for the "once" (not-backup up) groups. */  
1127    
1128      case OP_KET:      case OP_KET:
1129      case OP_KETRMIN:      case OP_KETRMIN:
1130      case OP_KETRMAX:      case OP_KETRMAX:
1131      prev = ecode - GET(ecode, 1);      prev = ecode - GET(ecode, 1);
     saved_eptr = eptrb->epb_saved_eptr;  
1132    
1133      /* Back up the stack of bracket start pointers. */      /* If this was a group that remembered the subject start, in order to break
1134        infinite repeats of empty string matches, retrieve the subject start from
1135        the chain. Otherwise, set it NULL. */
1136    
1137      eptrb = eptrb->epb_prev;      if (*prev >= OP_SBRA)
1138          {
1139          saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
1140          eptrb = eptrb->epb_prev;              /* Backup to previous group */
1141          }
1142        else saved_eptr = NULL;
1143    
1144        /* If we are at the end of an assertion group, stop matching and return
1145        MATCH_MATCH, but record the current high water mark for use by positive
1146        assertions. Do this also for the "once" (atomic) groups. */
1147    
1148      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
1149          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||
# Line 1102  for (;;) Line 1154  for (;;)
1154        RRETURN(MATCH_MATCH);        RRETURN(MATCH_MATCH);
1155        }        }
1156    
1157      /* In all other cases except a conditional group we have to check the      /* For capturing groups we have to check the group number back at the start
1158      group number back at the start and if necessary complete handling an      and if necessary complete handling an extraction by setting the offsets and
1159      extraction by setting the offsets and bumping the high water mark. */      bumping the high water mark. Note that whole-pattern recursion is coded as
1160        a recurse into group 0, so it won't be picked up here. Instead, we catch it
1161        when the OP_END is reached. Other recursion is handled here. */
1162    
1163      if (*prev != OP_COND)      if (*prev == OP_CBRA || *prev == OP_SCBRA)
1164        {        {
1165        number = *prev - OP_BRA;        number = GET2(prev, 1+LINK_SIZE);
   
       /* For extended extraction brackets (large number), we have to fish out  
       the number from a dummy opcode at the start. */  
   
       if (number > EXTRACT_BASIC_MAX) number = GET2(prev, 2+LINK_SIZE);  
1166        offset = number << 1;        offset = number << 1;
1167    
1168  #ifdef DEBUG  #ifdef DEBUG
# Line 1121  for (;;) Line 1170  for (;;)
1170        printf("\n");        printf("\n");
1171  #endif  #endif
1172    
1173        /* Test for a numbered group. This includes groups called as a result        md->capture_last = number;
1174        of recursion. Note that whole-pattern recursion is coded as a recurse        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
       into group 0, so it won't be picked up here. Instead, we catch it when  
       the OP_END is reached. */  
   
       if (number > 0)  
1175          {          {
1176          md->capture_last = number;          md->offset_vector[offset] =
1177          if (offset >= md->offset_max) md->offset_overflow = TRUE; else            md->offset_vector[md->offset_end - number];
1178            {          md->offset_vector[offset+1] = eptr - md->start_subject;
1179            md->offset_vector[offset] =          if (offset_top <= offset) offset_top = offset + 2;
1180              md->offset_vector[md->offset_end - number];          }
1181            md->offset_vector[offset+1] = eptr - md->start_subject;  
1182            if (offset_top <= offset) offset_top = offset + 2;        /* Handle a recursively called group. Restore the offsets
1183            }        appropriately and continue from after the call. */
1184    
1185          /* Handle a recursively called group. Restore the offsets        if (md->recursive != NULL && md->recursive->group_num == number)
1186          appropriately and continue from after the call. */          {
1187            recursion_info *rec = md->recursive;
1188          if (md->recursive != NULL && md->recursive->group_num == number)          DPRINTF(("Recursion (%d) succeeded - continuing\n", number));
1189            {          md->recursive = rec->prevrec;
1190            recursion_info *rec = md->recursive;          mstart = rec->save_start;
1191            DPRINTF(("Recursion (%d) succeeded - continuing\n", number));          memcpy(md->offset_vector, rec->offset_save,
1192            md->recursive = rec->prevrec;            rec->saved_max * sizeof(int));
1193            md->start_match = rec->save_start;          ecode = rec->after_call;
1194            memcpy(md->offset_vector, rec->offset_save,          ims = original_ims;
1195              rec->saved_max * sizeof(int));          break;
           ecode = rec->after_call;  
           ims = original_ims;  
           break;  
           }  
1196          }          }
1197        }        }
1198    
1199      /* Reset the value of the ims flags, in case they got changed during      /* For both capturing and non-capturing groups, reset the value of the ims
1200      the group. */      flags, in case they got changed during the group. */
1201    
1202      ims = original_ims;      ims = original_ims;
1203      DPRINTF(("ims reset to %02lx\n", ims));      DPRINTF(("ims reset to %02lx\n", ims));
# Line 1177  for (;;) Line 1218  for (;;)
1218      preceding bracket, in the appropriate order. In the second case, we can use      preceding bracket, in the appropriate order. In the second case, we can use
1219      tail recursion to avoid using another stack frame. */      tail recursion to avoid using another stack frame. */
1220    
1221        flags = (*prev >= OP_SBRA)? match_cbegroup : 0;
1222    
1223      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1224        {        {
1225        RMATCH(rrc, eptr, ecode + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0);        RMATCH(eptr, ecode + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0,
1226            RM12);
1227        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1228        ecode = prev;        ecode = prev;
1229        flags = match_isgroup;        flags |= match_tail_recursed;
1230        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1231        }        }
1232      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
1233        {        {
1234        RMATCH(rrc, eptr, prev, offset_top, md, ims, eptrb, match_isgroup);        RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM13);
1235        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1236        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1237        flags = 0;        flags = match_tail_recursed;
1238        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1239        }        }
1240      /* Control never gets here */      /* Control never gets here */
# Line 1202  for (;;) Line 1246  for (;;)
1246      if ((ims & PCRE_MULTILINE) != 0)      if ((ims & PCRE_MULTILINE) != 0)
1247        {        {
1248        if (eptr != md->start_subject &&        if (eptr != md->start_subject &&
1249            (eptr == md->end_subject ||            (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
            eptr < md->start_subject + md->nllen ||  
            !IS_NEWLINE(eptr - md->nllen)))  
1250          RRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
1251        ecode++;        ecode++;
1252        break;        break;
# Line 1225  for (;;) Line 1267  for (;;)
1267      ecode++;      ecode++;
1268      break;      break;
1269    
1270        /* Reset the start of match point */
1271    
1272        case OP_SET_SOM:
1273        mstart = eptr;
1274        ecode++;
1275        break;
1276    
1277      /* Assert before internal newline if multiline, or before a terminating      /* Assert before internal newline if multiline, or before a terminating
1278      newline unless endonly is set, else end of subject unless noteol is set. */      newline unless endonly is set, else end of subject unless noteol is set. */
1279    
# Line 1244  for (;;) Line 1293  for (;;)
1293        if (!md->endonly)        if (!md->endonly)
1294          {          {
1295          if (eptr != md->end_subject &&          if (eptr != md->end_subject &&
1296              (eptr != md->end_subject - md->nllen || !IS_NEWLINE(eptr)))              (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
1297            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
1298          ecode++;          ecode++;
1299          break;          break;
# Line 1263  for (;;) Line 1312  for (;;)
1312    
1313      case OP_EODN:      case OP_EODN:
1314      if (eptr != md->end_subject &&      if (eptr != md->end_subject &&
1315          (eptr != md->end_subject - md->nllen || !IS_NEWLINE(eptr)))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
1316        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1317      ecode++;      ecode++;
1318      break;      break;
# Line 1319  for (;;) Line 1368  for (;;)
1368      case OP_ANY:      case OP_ANY:
1369      if ((ims & PCRE_DOTALL) == 0)      if ((ims & PCRE_DOTALL) == 0)
1370        {        {
1371        if (eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr))        if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
         RRETURN(MATCH_NOMATCH);  
1372        }        }
1373      if (eptr++ >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr++ >= md->end_subject) RRETURN(MATCH_NOMATCH);
1374      if (utf8)      if (utf8)
# Line 1414  for (;;) Line 1462  for (;;)
1462      ecode++;      ecode++;
1463      break;      break;
1464    
1465        case OP_ANYNL:
1466        if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
1467        GETCHARINCTEST(c, eptr);
1468        switch(c)
1469          {
1470          default: RRETURN(MATCH_NOMATCH);
1471          case 0x000d:
1472          if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
1473          break;
1474          case 0x000a:
1475          case 0x000b:
1476          case 0x000c:
1477          case 0x0085:
1478          case 0x2028:
1479          case 0x2029:
1480          break;
1481          }
1482        ecode++;
1483        break;
1484    
1485        case OP_NOT_HSPACE:
1486        if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
1487        GETCHARINCTEST(c, eptr);
1488        switch(c)
1489          {
1490          default: break;
1491          case 0x09:      /* HT */
1492          case 0x20:      /* SPACE */
1493          case 0xa0:      /* NBSP */
1494          case 0x1680:    /* OGHAM SPACE MARK */
1495          case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1496          case 0x2000:    /* EN QUAD */
1497          case 0x2001:    /* EM QUAD */
1498          case 0x2002:    /* EN SPACE */
1499          case 0x2003:    /* EM SPACE */
1500          case 0x2004:    /* THREE-PER-EM SPACE */
1501          case 0x2005:    /* FOUR-PER-EM SPACE */
1502          case 0x2006:    /* SIX-PER-EM SPACE */
1503          case 0x2007:    /* FIGURE SPACE */
1504          case 0x2008:    /* PUNCTUATION SPACE */
1505          case 0x2009:    /* THIN SPACE */
1506          case 0x200A:    /* HAIR SPACE */
1507          case 0x202f:    /* NARROW NO-BREAK SPACE */
1508          case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1509          case 0x3000:    /* IDEOGRAPHIC SPACE */
1510          RRETURN(MATCH_NOMATCH);
1511          }
1512        ecode++;
1513        break;
1514    
1515        case OP_HSPACE:
1516        if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
1517        GETCHARINCTEST(c, eptr);
1518        switch(c)
1519          {
1520          default: RRETURN(MATCH_NOMATCH);
1521          case 0x09:      /* HT */
1522          case 0x20:      /* SPACE */
1523          case 0xa0:      /* NBSP */
1524          case 0x1680:    /* OGHAM SPACE MARK */
1525          case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1526          case 0x2000:    /* EN QUAD */
1527          case 0x2001:    /* EM QUAD */
1528          case 0x2002:    /* EN SPACE */
1529          case 0x2003:    /* EM SPACE */
1530          case 0x2004:    /* THREE-PER-EM SPACE */
1531          case 0x2005:    /* FOUR-PER-EM SPACE */
1532          case 0x2006:    /* SIX-PER-EM SPACE */
1533          case 0x2007:    /* FIGURE SPACE */
1534          case 0x2008:    /* PUNCTUATION SPACE */
1535          case 0x2009:    /* THIN SPACE */
1536          case 0x200A:    /* HAIR SPACE */
1537          case 0x202f:    /* NARROW NO-BREAK SPACE */
1538          case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1539          case 0x3000:    /* IDEOGRAPHIC SPACE */
1540          break;
1541          }
1542        ecode++;
1543        break;
1544    
1545        case OP_NOT_VSPACE:
1546        if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
1547        GETCHARINCTEST(c, eptr);
1548        switch(c)
1549          {
1550          default: break;
1551          case 0x0a:      /* LF */
1552          case 0x0b:      /* VT */
1553          case 0x0c:      /* FF */
1554          case 0x0d:      /* CR */
1555          case 0x85:      /* NEL */
1556          case 0x2028:    /* LINE SEPARATOR */
1557          case 0x2029:    /* PARAGRAPH SEPARATOR */
1558          RRETURN(MATCH_NOMATCH);
1559          }
1560        ecode++;
1561        break;
1562    
1563        case OP_VSPACE:
1564        if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
1565        GETCHARINCTEST(c, eptr);
1566        switch(c)
1567          {
1568          default: RRETURN(MATCH_NOMATCH);
1569          case 0x0a:      /* LF */
1570          case 0x0b:      /* VT */
1571          case 0x0c:      /* FF */
1572          case 0x0d:      /* CR */
1573          case 0x85:      /* NEL */
1574          case 0x2028:    /* LINE SEPARATOR */
1575          case 0x2029:    /* PARAGRAPH SEPARATOR */
1576          break;
1577          }
1578        ecode++;
1579        break;
1580    
1581  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
1582      /* Check the next character by Unicode property. We will get here only      /* Check the next character by Unicode property. We will get here only
1583      if the support is in the binary; otherwise a compile-time error occurs. */      if the support is in the binary; otherwise a compile-time error occurs. */
# Line 1456  for (;;) Line 1620  for (;;)
1620    
1621          default:          default:
1622          RRETURN(PCRE_ERROR_INTERNAL);          RRETURN(PCRE_ERROR_INTERNAL);
         break;  
1623          }          }
1624    
1625        ecode += 3;        ecode += 3;
# Line 1570  for (;;) Line 1733  for (;;)
1733          {          {
1734          for (fi = min;; fi++)          for (fi = min;; fi++)
1735            {            {
1736            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM14);
1737            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1738            if (fi >= max || !match_ref(offset, eptr, length, md, ims))            if (fi >= max || !match_ref(offset, eptr, length, md, ims))
1739              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
# Line 1591  for (;;) Line 1754  for (;;)
1754            }            }
1755          while (eptr >= pp)          while (eptr >= pp)
1756            {            {
1757            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM15);
1758            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1759            eptr -= length;            eptr -= length;
1760            }            }
# Line 1696  for (;;) Line 1859  for (;;)
1859            {            {
1860            for (fi = min;; fi++)            for (fi = min;; fi++)
1861              {              {
1862              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM16);
1863              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1864              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
1865              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
# Line 1716  for (;;) Line 1879  for (;;)
1879            {            {
1880            for (fi = min;; fi++)            for (fi = min;; fi++)
1881              {              {
1882              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM17);
1883              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1884              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
1885              c = *eptr++;              c = *eptr++;
# Line 1753  for (;;) Line 1916  for (;;)
1916              }              }
1917            for (;;)            for (;;)
1918              {              {
1919              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM18);
1920              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1921              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
1922              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 1772  for (;;) Line 1935  for (;;)
1935              }              }
1936            while (eptr >= pp)            while (eptr >= pp)
1937              {              {
1938              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM19);
1939              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1940              eptr--;              eptr--;
1941              }              }
# Line 1843  for (;;) Line 2006  for (;;)
2006          {          {
2007          for (fi = min;; fi++)          for (fi = min;; fi++)
2008            {            {
2009            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);
2010            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2011            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2012            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
# Line 1867  for (;;) Line 2030  for (;;)
2030            }            }
2031          for(;;)          for(;;)
2032            {            {
2033            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM21);
2034            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2035            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
2036            BACKCHAR(eptr)            BACKCHAR(eptr)
# Line 1926  for (;;) Line 2089  for (;;)
2089    
2090        else        else
2091          {          {
2092          int dc;          unsigned int dc;
2093          GETCHARINC(dc, eptr);          GETCHARINC(dc, eptr);
2094          ecode += length;          ecode += length;
2095    
# Line 1953  for (;;) Line 2116  for (;;)
2116        }        }
2117      break;      break;
2118    
2119      /* Match a single character repeatedly; different opcodes share code. */      /* Match a single character repeatedly. */
2120    
2121      case OP_EXACT:      case OP_EXACT:
2122      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
2123      ecode += 3;      ecode += 3;
2124      goto REPEATCHAR;      goto REPEATCHAR;
2125    
2126        case OP_POSUPTO:
2127        possessive = TRUE;
2128        /* Fall through */
2129    
2130      case OP_UPTO:      case OP_UPTO:
2131      case OP_MINUPTO:      case OP_MINUPTO:
2132      min = 0;      min = 0;
# Line 1968  for (;;) Line 2135  for (;;)
2135      ecode += 3;      ecode += 3;
2136      goto REPEATCHAR;      goto REPEATCHAR;
2137    
2138        case OP_POSSTAR:
2139        possessive = TRUE;
2140        min = 0;
2141        max = INT_MAX;
2142        ecode++;
2143        goto REPEATCHAR;
2144    
2145        case OP_POSPLUS:
2146        possessive = TRUE;
2147        min = 1;
2148        max = INT_MAX;
2149        ecode++;
2150        goto REPEATCHAR;
2151    
2152        case OP_POSQUERY:
2153        possessive = TRUE;
2154        min = 0;
2155        max = 1;
2156        ecode++;
2157        goto REPEATCHAR;
2158    
2159      case OP_STAR:      case OP_STAR:
2160      case OP_MINSTAR:      case OP_MINSTAR:
2161      case OP_PLUS:      case OP_PLUS:
# Line 1999  for (;;) Line 2187  for (;;)
2187    
2188        if (length > 1)        if (length > 1)
2189          {          {
         int oclength = 0;  
         uschar occhars[8];  
   
2190  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2191          int othercase;          unsigned int othercase;
2192          if ((ims & PCRE_CASELESS) != 0 &&          if ((ims & PCRE_CASELESS) != 0 &&
2193              (othercase = _pcre_ucp_othercase(fc)) >= 0 &&              (othercase = _pcre_ucp_othercase(fc)) != NOTACHAR)
              othercase >= 0)  
2194            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = _pcre_ord2utf8(othercase, occhars);
2195            else oclength = 0;
2196  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2197    
2198          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2199            {            {
2200            if (memcmp(eptr, charptr, length) == 0) eptr += length;            if (memcmp(eptr, charptr, length) == 0) eptr += length;
2201    #ifdef SUPPORT_UCP
2202            /* Need braces because of following else */            /* Need braces because of following else */
2203            else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }            else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }
2204            else            else
# Line 2020  for (;;) Line 2206  for (;;)
2206              if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);              if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);
2207              eptr += oclength;              eptr += oclength;
2208              }              }
2209    #else   /* without SUPPORT_UCP */
2210              else { RRETURN(MATCH_NOMATCH); }
2211    #endif  /* SUPPORT_UCP */
2212            }            }
2213    
2214          if (min == max) continue;          if (min == max) continue;
# Line 2028  for (;;) Line 2217  for (;;)
2217            {            {
2218            for (fi = min;; fi++)            for (fi = min;; fi++)
2219              {              {
2220              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM22);
2221              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2222              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2223              if (memcmp(eptr, charptr, length) == 0) eptr += length;              if (memcmp(eptr, charptr, length) == 0) eptr += length;
2224    #ifdef SUPPORT_UCP
2225              /* Need braces because of following else */              /* Need braces because of following else */
2226              else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }              else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }
2227              else              else
# Line 2039  for (;;) Line 2229  for (;;)
2229                if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);                if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);
2230                eptr += oclength;                eptr += oclength;
2231                }                }
2232    #else   /* without SUPPORT_UCP */
2233                else { RRETURN (MATCH_NOMATCH); }
2234    #endif  /* SUPPORT_UCP */
2235              }              }
2236            /* Control never gets here */            /* Control never gets here */
2237            }            }
2238          else  
2239            else  /* Maximize */
2240            {            {
2241            pp = eptr;            pp = eptr;
2242            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2243              {              {
2244              if (eptr > md->end_subject - length) break;              if (eptr > md->end_subject - length) break;
2245              if (memcmp(eptr, charptr, length) == 0) eptr += length;              if (memcmp(eptr, charptr, length) == 0) eptr += length;
2246    #ifdef SUPPORT_UCP
2247              else if (oclength == 0) break;              else if (oclength == 0) break;
2248              else              else
2249                {                {
2250                if (memcmp(eptr, occhars, oclength) != 0) break;                if (memcmp(eptr, occhars, oclength) != 0) break;
2251                eptr += oclength;                eptr += oclength;
2252                }                }
2253    #else   /* without SUPPORT_UCP */
2254                else break;
2255    #endif  /* SUPPORT_UCP */
2256              }              }
2257            while (eptr >= pp)  
2258              if (possessive) continue;
2259              for(;;)
2260             {             {
2261             RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM23);
2262             if (rrc != MATCH_NOMATCH) RRETURN(rrc);             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2263               if (eptr == pp) RRETURN(MATCH_NOMATCH);
2264    #ifdef SUPPORT_UCP
2265               eptr--;
2266               BACKCHAR(eptr);
2267    #else   /* without SUPPORT_UCP */
2268             eptr -= length;             eptr -= length;
2269    #endif  /* SUPPORT_UCP */
2270             }             }
           RRETURN(MATCH_NOMATCH);  
2271            }            }
2272          /* Control never gets here */          /* Control never gets here */
2273          }          }
# Line 2102  for (;;) Line 2307  for (;;)
2307          {          {
2308          for (fi = min;; fi++)          for (fi = min;; fi++)
2309            {            {
2310            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM24);
2311            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2312            if (fi >= max || eptr >= md->end_subject ||            if (fi >= max || eptr >= md->end_subject ||
2313                fc != md->lcc[*eptr++])                fc != md->lcc[*eptr++])
# Line 2110  for (;;) Line 2315  for (;;)
2315            }            }
2316          /* Control never gets here */          /* Control never gets here */
2317          }          }
2318        else        else  /* Maximize */
2319          {          {
2320          pp = eptr;          pp = eptr;
2321          for (i = min; i < max; i++)          for (i = min; i < max; i++)
# Line 2118  for (;;) Line 2323  for (;;)
2323            if (eptr >= md->end_subject || fc != md->lcc[*eptr]) break;            if (eptr >= md->end_subject || fc != md->lcc[*eptr]) break;
2324            eptr++;            eptr++;
2325            }            }
2326            if (possessive) continue;
2327          while (eptr >= pp)          while (eptr >= pp)
2328            {            {
2329            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM25);
2330            eptr--;            eptr--;
2331            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2332            }            }
# Line 2139  for (;;) Line 2345  for (;;)
2345          {          {
2346          for (fi = min;; fi++)          for (fi = min;; fi++)
2347            {            {
2348            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM26);
2349            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2350            if (fi >= max || eptr >= md->end_subject || fc != *eptr++)            if (fi >= max || eptr >= md->end_subject || fc != *eptr++)
2351              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2352            }            }
2353          /* Control never gets here */          /* Control never gets here */
2354          }          }
2355        else        else  /* Maximize */
2356          {          {
2357          pp = eptr;          pp = eptr;
2358          for (i = min; i < max; i++)          for (i = min; i < max; i++)
# Line 2154  for (;;) Line 2360  for (;;)
2360            if (eptr >= md->end_subject || fc != *eptr) break;            if (eptr >= md->end_subject || fc != *eptr) break;
2361            eptr++;            eptr++;
2362            }            }
2363            if (possessive) continue;
2364          while (eptr >= pp)          while (eptr >= pp)
2365            {            {
2366            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM27);
2367            eptr--;            eptr--;
2368            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2369            }            }
# Line 2206  for (;;) Line 2413  for (;;)
2413      ecode += 3;      ecode += 3;
2414      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
2415    
2416        case OP_NOTPOSSTAR:
2417        possessive = TRUE;
2418        min = 0;
2419        max = INT_MAX;
2420        ecode++;
2421        goto REPEATNOTCHAR;
2422    
2423        case OP_NOTPOSPLUS:
2424        possessive = TRUE;
2425        min = 1;
2426        max = INT_MAX;
2427        ecode++;
2428        goto REPEATNOTCHAR;
2429    
2430        case OP_NOTPOSQUERY:
2431        possessive = TRUE;
2432        min = 0;
2433        max = 1;
2434        ecode++;
2435        goto REPEATNOTCHAR;
2436    
2437        case OP_NOTPOSUPTO:
2438        possessive = TRUE;
2439        min = 0;
2440        max = GET2(ecode, 1);
2441        ecode += 3;
2442        goto REPEATNOTCHAR;
2443    
2444      case OP_NOTSTAR:      case OP_NOTSTAR:
2445      case OP_NOTMINSTAR:      case OP_NOTMINSTAR:
2446      case OP_NOTPLUS:      case OP_NOTPLUS:
# Line 2245  for (;;) Line 2480  for (;;)
2480        /* UTF-8 mode */        /* UTF-8 mode */
2481        if (utf8)        if (utf8)
2482          {          {
2483          register int d;          register unsigned int d;
2484          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2485            {            {
2486            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
# Line 2270  for (;;) Line 2505  for (;;)
2505          /* UTF-8 mode */          /* UTF-8 mode */
2506          if (utf8)          if (utf8)
2507            {            {
2508            register int d;            register unsigned int d;
2509            for (fi = min;; fi++)            for (fi = min;; fi++)
2510              {              {
2511              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);
2512              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2513              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
2514              if (d < 256) d = md->lcc[d];              if (d < 256) d = md->lcc[d];
# Line 2287  for (;;) Line 2522  for (;;)
2522            {            {
2523            for (fi = min;; fi++)            for (fi = min;; fi++)
2524              {              {
2525              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM29);
2526              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2527              if (fi >= max || eptr >= md->end_subject || fc == md->lcc[*eptr++])              if (fi >= max || eptr >= md->end_subject || fc == md->lcc[*eptr++])
2528                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
# Line 2306  for (;;) Line 2541  for (;;)
2541          /* UTF-8 mode */          /* UTF-8 mode */
2542          if (utf8)          if (utf8)
2543            {            {
2544            register int d;            register unsigned int d;
2545            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2546              {              {
2547              int len = 1;              int len = 1;
# Line 2316  for (;;) Line 2551  for (;;)
2551              if (fc == d) break;              if (fc == d) break;
2552              eptr += len;              eptr += len;
2553              }              }
2554            for(;;)          if (possessive) continue;
2555            for(;;)
2556              {              {
2557              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM30);
2558              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2559              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
2560              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2333  for (;;) Line 2569  for (;;)
2569              if (eptr >= md->end_subject || fc == md->lcc[*eptr]) break;              if (eptr >= md->end_subject || fc == md->lcc[*eptr]) break;
2570              eptr++;              eptr++;
2571              }              }
2572              if (possessive) continue;
2573            while (eptr >= pp)            while (eptr >= pp)
2574              {              {
2575              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM31);
2576              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2577              eptr--;              eptr--;
2578              }              }
# Line 2354  for (;;) Line 2591  for (;;)
2591        /* UTF-8 mode */        /* UTF-8 mode */
2592        if (utf8)        if (utf8)
2593          {          {
2594          register int d;          register unsigned int d;
2595          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2596            {            {
2597            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
# Line 2377  for (;;) Line 2614  for (;;)
2614          /* UTF-8 mode */          /* UTF-8 mode */
2615          if (utf8)          if (utf8)
2616            {            {
2617            register int d;            register unsigned int d;
2618            for (fi = min;; fi++)            for (fi = min;; fi++)
2619              {              {
2620              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);
2621              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2622              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
2623              if (fi >= max || eptr >= md->end_subject || fc == d)              if (fi >= max || eptr >= md->end_subject || fc == d)
# Line 2393  for (;;) Line 2630  for (;;)
2630            {            {
2631            for (fi = min;; fi++)            for (fi = min;; fi++)
2632              {              {
2633              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM33);
2634              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2635              if (fi >= max || eptr >= md->end_subject || fc == *eptr++)              if (fi >= max || eptr >= md->end_subject || fc == *eptr++)
2636                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
# Line 2412  for (;;) Line 2649  for (;;)
2649          /* UTF-8 mode */          /* UTF-8 mode */
2650          if (utf8)          if (utf8)
2651            {            {
2652            register int d;            register unsigned int d;
2653            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2654              {              {
2655              int len = 1;              int len = 1;
# Line 2421  for (;;) Line 2658  for (;;)
2658              if (fc == d) break;              if (fc == d) break;
2659              eptr += len;              eptr += len;
2660              }              }
2661              if (possessive) continue;
2662            for(;;)            for(;;)
2663              {              {
2664              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM34);
2665              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2666              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
2667              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2438  for (;;) Line 2676  for (;;)
2676              if (eptr >= md->end_subject || fc == *eptr) break;              if (eptr >= md->end_subject || fc == *eptr) break;
2677              eptr++;              eptr++;
2678              }              }
2679              if (possessive) continue;
2680            while (eptr >= pp)            while (eptr >= pp)
2681              {              {
2682              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM35);
2683              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2684              eptr--;              eptr--;
2685              }              }
# Line 2469  for (;;) Line 2708  for (;;)
2708      ecode += 3;      ecode += 3;
2709      goto REPEATTYPE;      goto REPEATTYPE;
2710    
2711        case OP_TYPEPOSSTAR:
2712        possessive = TRUE;
2713        min = 0;
2714        max = INT_MAX;
2715        ecode++;
2716        goto REPEATTYPE;
2717    
2718        case OP_TYPEPOSPLUS:
2719        possessive = TRUE;
2720        min = 1;
2721        max = INT_MAX;
2722        ecode++;
2723        goto REPEATTYPE;
2724    
2725        case OP_TYPEPOSQUERY:
2726        possessive = TRUE;
2727        min = 0;
2728        max = 1;
2729        ecode++;
2730        goto REPEATTYPE;
2731    
2732        case OP_TYPEPOSUPTO:
2733        possessive = TRUE;
2734        min = 0;
2735        max = GET2(ecode, 1);
2736        ecode += 3;
2737        goto REPEATTYPE;
2738    
2739      case OP_TYPESTAR:      case OP_TYPESTAR:
2740      case OP_TYPEMINSTAR:      case OP_TYPEMINSTAR:
2741      case OP_TYPEPLUS:      case OP_TYPEPLUS:
# Line 2571  for (;;) Line 2838  for (;;)
2838    
2839            default:            default:
2840            RRETURN(PCRE_ERROR_INTERNAL);            RRETURN(PCRE_ERROR_INTERNAL);
           break;  
2841            }            }
2842          }          }
2843    
# Line 2611  for (;;) Line 2877  for (;;)
2877          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2878            {            {
2879            if (eptr >= md->end_subject ||            if (eptr >= md->end_subject ||
2880                 ((ims & PCRE_DOTALL) == 0 &&                 ((ims & PCRE_DOTALL) == 0 && IS_NEWLINE(eptr)))
                  eptr <= md->end_subject - md->nllen &&  
                  IS_NEWLINE(eptr)))  
2881              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2882            eptr++;            eptr++;
2883            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
# Line 2624  for (;;) Line 2888  for (;;)
2888          eptr += min;          eptr += min;
2889          break;          break;
2890    
2891            case OP_ANYNL:
2892            for (i = 1; i <= min; i++)
2893              {
2894              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2895              GETCHARINC(c, eptr);
2896              switch(c)
2897                {
2898                default: RRETURN(MATCH_NOMATCH);
2899                case 0x000d:
2900                if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
2901                break;
2902                case 0x000a:
2903                case 0x000b:
2904                case 0x000c:
2905                case 0x0085:
2906                case 0x2028:
2907                case 0x2029:
2908                break;
2909                }
2910              }
2911            break;
2912    
2913            case OP_NOT_HSPACE:
2914            for (i = 1; i <= min; i++)
2915              {
2916              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2917              GETCHARINC(c, eptr);
2918              switch(c)
2919                {
2920                default: break;
2921                case 0x09:      /* HT */
2922                case 0x20:      /* SPACE */
2923                case 0xa0:      /* NBSP */
2924                case 0x1680:    /* OGHAM SPACE MARK */
2925                case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
2926                case 0x2000:    /* EN QUAD */
2927                case 0x2001:    /* EM QUAD */
2928                case 0x2002:    /* EN SPACE */
2929                case 0x2003:    /* EM SPACE */
2930                case 0x2004:    /* THREE-PER-EM SPACE */
2931                case 0x2005:    /* FOUR-PER-EM SPACE */
2932                case 0x2006:    /* SIX-PER-EM SPACE */
2933                case 0x2007:    /* FIGURE SPACE */
2934                case 0x2008:    /* PUNCTUATION SPACE */
2935                case 0x2009:    /* THIN SPACE */
2936                case 0x200A:    /* HAIR SPACE */
2937                case 0x202f:    /* NARROW NO-BREAK SPACE */
2938                case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
2939                case 0x3000:    /* IDEOGRAPHIC SPACE */
2940                RRETURN(MATCH_NOMATCH);
2941                }
2942              }
2943            break;
2944    
2945            case OP_HSPACE:
2946            for (i = 1; i <= min; i++)
2947              {
2948              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2949              GETCHARINC(c, eptr);
2950              switch(c)
2951                {
2952                default: RRETURN(MATCH_NOMATCH);
2953                case 0x09:      /* HT */
2954                case 0x20:      /* SPACE */
2955                case 0xa0:      /* NBSP */
2956                case 0x1680:    /* OGHAM SPACE MARK */
2957                case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
2958                case 0x2000:    /* EN QUAD */
2959                case 0x2001:    /* EM QUAD */
2960                case 0x2002:    /* EN SPACE */
2961                case 0x2003:    /* EM SPACE */
2962                case 0x2004:    /* THREE-PER-EM SPACE */
2963                case 0x2005:    /* FOUR-PER-EM SPACE */
2964                case 0x2006:    /* SIX-PER-EM SPACE */
2965                case 0x2007:    /* FIGURE SPACE */
2966                case 0x2008:    /* PUNCTUATION SPACE */
2967                case 0x2009:    /* THIN SPACE */
2968                case 0x200A:    /* HAIR SPACE */
2969                case 0x202f:    /* NARROW NO-BREAK SPACE */
2970                case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
2971                case 0x3000:    /* IDEOGRAPHIC SPACE */
2972                break;
2973                }
2974              }
2975            break;
2976    
2977            case OP_NOT_VSPACE:
2978            for (i = 1; i <= min; i++)
2979              {
2980              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2981              GETCHARINC(c, eptr);
2982              switch(c)
2983                {
2984                default: break;
2985                case 0x0a:      /* LF */
2986                case 0x0b:      /* VT */
2987                case 0x0c:      /* FF */
2988                case 0x0d:      /* CR */
2989                case 0x85:      /* NEL */
2990                case 0x2028:    /* LINE SEPARATOR */
2991                case 0x2029:    /* PARAGRAPH SEPARATOR */
2992                RRETURN(MATCH_NOMATCH);
2993                }
2994              }
2995            break;
2996    
2997            case OP_VSPACE:
2998            for (i = 1; i <= min; i++)
2999              {
3000              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3001              GETCHARINC(c, eptr);
3002              switch(c)
3003                {
3004                default: RRETURN(MATCH_NOMATCH);
3005                case 0x0a:      /* LF */
3006                case 0x0b:      /* VT */
3007                case 0x0c:      /* FF */
3008                case 0x0d:      /* CR */
3009                case 0x85:      /* NEL */
3010                case 0x2028:    /* LINE SEPARATOR */
3011                case 0x2029:    /* PARAGRAPH SEPARATOR */
3012                break;
3013                }
3014              }
3015            break;
3016    
3017          case OP_NOT_DIGIT:          case OP_NOT_DIGIT:
3018          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3019            {            {
# Line 2692  for (;;) Line 3082  for (;;)
3082  #endif     /* SUPPORT_UTF8 */  #endif     /* SUPPORT_UTF8 */
3083    
3084        /* Code for the non-UTF-8 case for minimum matching of operators other        /* Code for the non-UTF-8 case for minimum matching of operators other
3085        than OP_PROP and OP_NOTPROP. */        than OP_PROP and OP_NOTPROP. We can assume that there are the minimum
3086          number of bytes present, as this was tested above. */
3087    
3088        switch(ctype)        switch(ctype)
3089          {          {
# Line 2701  for (;;) Line 3092  for (;;)
3092            {            {
3093            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
3094              {              {
3095              if (eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr))              if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
               RRETURN(MATCH_NOMATCH);  
3096              eptr++;              eptr++;
3097              }              }
3098            }            }
# Line 2713  for (;;) Line 3103  for (;;)
3103          eptr += min;          eptr += min;
3104          break;          break;
3105    
3106            /* Because of the CRLF case, we can't assume the minimum number of
3107            bytes are present in this case. */
3108    
3109            case OP_ANYNL:
3110            for (i = 1; i <= min; i++)
3111              {
3112              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3113              switch(*eptr++)
3114                {
3115                default: RRETURN(MATCH_NOMATCH);
3116                case 0x000d:
3117                if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
3118                break;
3119                case 0x000a:
3120                case 0x000b:
3121                case 0x000c:
3122                case 0x0085:
3123                break;
3124                }
3125              }
3126            break;
3127    
3128            case OP_NOT_HSPACE:
3129            for (i = 1; i <= min; i++)
3130              {
3131              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3132              switch(*eptr++)
3133                {
3134                default: break;
3135                case 0x09:      /* HT */
3136                case 0x20:      /* SPACE */
3137                case 0xa0:      /* NBSP */
3138                RRETURN(MATCH_NOMATCH);
3139                }
3140              }
3141            break;
3142    
3143            case OP_HSPACE:
3144            for (i = 1; i <= min; i++)
3145              {
3146              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3147              switch(*eptr++)
3148                {
3149                default: RRETURN(MATCH_NOMATCH);
3150                case 0x09:      /* HT */
3151                case 0x20:      /* SPACE */
3152                case 0xa0:      /* NBSP */
3153                break;
3154                }
3155              }
3156            break;
3157    
3158            case OP_NOT_VSPACE:
3159            for (i = 1; i <= min; i++)
3160              {
3161              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3162              switch(*eptr++)
3163                {
3164                default: break;
3165                case 0x0a:      /* LF */
3166                case 0x0b:      /* VT */
3167                case 0x0c:      /* FF */
3168                case 0x0d:      /* CR */
3169                case 0x85:      /* NEL */
3170                RRETURN(MATCH_NOMATCH);
3171                }
3172              }
3173            break;
3174    
3175            case OP_VSPACE:
3176            for (i = 1; i <= min; i++)
3177              {
3178              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3179              switch(*eptr++)
3180                {
3181                default: RRETURN(MATCH_NOMATCH);
3182                case 0x0a:      /* LF */
3183                case 0x0b:      /* VT */
3184                case 0x0c:      /* FF */
3185                case 0x0d:      /* CR */
3186                case 0x85:      /* NEL */
3187                break;
3188                }
3189              }
3190            break;
3191    
3192          case OP_NOT_DIGIT:          case OP_NOT_DIGIT:
3193          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3194            if ((md->ctypes[*eptr++] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);            if ((md->ctypes[*eptr++] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
# Line 2768  for (;;) Line 3244  for (;;)
3244            case PT_ANY:            case PT_ANY:
3245            for (fi = min;; fi++)            for (fi = min;; fi++)
3246              {              {
3247              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM36);
3248              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3249              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3250              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
3251              if (prop_fail_result) RRETURN(MATCH_NOMATCH);              if (prop_fail_result) RRETURN(MATCH_NOMATCH);
3252              }              }
3253            break;            /* Control never gets here */
3254    
3255            case PT_LAMP:            case PT_LAMP:
3256            for (fi = min;; fi++)            for (fi = min;; fi++)
3257              {              {
3258              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM37);
3259              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3260              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3261              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
# Line 2789  for (;;) Line 3265  for (;;)
3265                   prop_chartype == ucp_Lt) == prop_fail_result)                   prop_chartype == ucp_Lt) == prop_fail_result)
3266                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3267              }              }
3268            break;            /* Control never gets here */
3269    
3270            case PT_GC:            case PT_GC:
3271            for (fi = min;; fi++)            for (fi = min;; fi++)
3272              {              {
3273              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM38);
3274              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3275              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3276              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
# Line 2802  for (;;) Line 3278  for (;;)
3278              if ((prop_category == prop_value) == prop_fail_result)              if ((prop_category == prop_value) == prop_fail_result)
3279                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3280              }              }
3281            break;            /* Control never gets here */
3282    
3283            case PT_PC:            case PT_PC:
3284            for (fi = min;; fi++)            for (fi = min;; fi++)
3285              {              {
3286              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM39);
3287              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3288              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3289              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
# Line 2815  for (;;) Line 3291  for (;;)
3291              if ((prop_chartype == prop_value) == prop_fail_result)              if ((prop_chartype == prop_value) == prop_fail_result)
3292                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3293              }              }
3294            break;            /* Control never gets here */
3295    
3296            case PT_SC:            case PT_SC:
3297            for (fi = min;; fi++)            for (fi = min;; fi++)
3298              {              {
3299              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM40);
3300              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3301              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3302              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
# Line 2828  for (;;) Line 3304  for (;;)
3304              if ((prop_script == prop_value) == prop_fail_result)              if ((prop_script == prop_value) == prop_fail_result)
3305                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3306              }              }
3307            break;            /* Control never gets here */
3308    
3309            default:            default:
3310            RRETURN(PCRE_ERROR_INTERNAL);            RRETURN(PCRE_ERROR_INTERNAL);
           break;  
3311            }            }
3312          }          }
3313    
# Line 2843  for (;;) Line 3318  for (;;)
3318          {          {
3319          for (fi = min;; fi++)          for (fi = min;; fi++)
3320            {            {
3321            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM41);
3322            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3323            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3324            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
# Line 2872  for (;;) Line 3347  for (;;)
3347          {          {
3348          for (fi = min;; fi++)          for (fi = min;; fi++)
3349            {            {
3350            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM42);
3351            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3352            if (fi >= max || eptr >= md->end_subject ||            if (fi >= max || eptr >= md->end_subject ||
3353                 (ctype == OP_ANY && (ims & PCRE_DOTALL) == 0 &&                 (ctype == OP_ANY && (ims & PCRE_DOTALL) == 0 &&
3354                  eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr)))                  IS_NEWLINE(eptr)))
3355              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3356    
3357            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
# Line 2888  for (;;) Line 3363  for (;;)
3363              case OP_ANYBYTE:              case OP_ANYBYTE:
3364              break;              break;
3365    
3366                case OP_ANYNL:
3367                switch(c)
3368                  {
3369                  default: RRETURN(MATCH_NOMATCH);
3370                  case 0x000d:
3371                  if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
3372                  break;
3373                  case 0x000a:
3374                  case 0x000b:
3375                  case 0x000c:
3376                  case 0x0085:
3377                  case 0x2028:
3378                  case 0x2029:
3379                  break;
3380                  }
3381                break;
3382    
3383                case OP_NOT_HSPACE:
3384                switch(c)
3385                  {
3386                  default: break;
3387                  case 0x09:      /* HT */
3388                  case 0x20:      /* SPACE */
3389                  case 0xa0:      /* NBSP */
3390                  case 0x1680:    /* OGHAM SPACE MARK */
3391                  case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
3392                  case 0x2000:    /* EN QUAD */
3393                  case 0x2001:    /* EM QUAD */
3394                  case 0x2002:    /* EN SPACE */
3395                  case 0x2003:    /* EM SPACE */
3396                  case 0x2004:    /* THREE-PER-EM SPACE */
3397                  case 0x2005:    /* FOUR-PER-EM SPACE */
3398                  case 0x2006:    /* SIX-PER-EM SPACE */
3399                  case 0x2007:    /* FIGURE SPACE */
3400                  case 0x2008:    /* PUNCTUATION SPACE */
3401                  case 0x2009:    /* THIN SPACE */
3402                  case 0x200A:    /* HAIR SPACE */
3403                  case 0x202f:    /* NARROW NO-BREAK SPACE */
3404                  case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
3405                  case 0x3000:    /* IDEOGRAPHIC SPACE */
3406                  RRETURN(MATCH_NOMATCH);
3407                  }
3408                break;
3409    
3410                case OP_HSPACE:
3411                switch(c)
3412                  {
3413                  default: RRETURN(MATCH_NOMATCH);
3414                  case 0x09:      /* HT */
3415                  case 0x20:      /* SPACE */
3416                  case 0xa0:      /* NBSP */
3417                  case 0x1680:    /* OGHAM SPACE MARK */
3418                  case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
3419                  case 0x2000:    /* EN QUAD */
3420                  case 0x2001:    /* EM QUAD */
3421                  case 0x2002:    /* EN SPACE */
3422                  case 0x2003:    /* EM SPACE */
3423                  case 0x2004:    /* THREE-PER-EM SPACE */
3424                  case 0x2005:    /* FOUR-PER-EM SPACE */
3425                  case 0x2006:    /* SIX-PER-EM SPACE */
3426                  case 0x2007:    /* FIGURE SPACE */
3427                  case 0x2008:    /* PUNCTUATION SPACE */
3428                  case 0x2009:    /* THIN SPACE */
3429                  case 0x200A:    /* HAIR SPACE */
3430                  case 0x202f:    /* NARROW NO-BREAK SPACE */
3431                  case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
3432                  case 0x3000:    /* IDEOGRAPHIC SPACE */
3433                  break;
3434                  }
3435                break;
3436    
3437                case OP_NOT_VSPACE:
3438                switch(c)
3439                  {
3440                  default: break;
3441                  case 0x0a:      /* LF */
3442                  case 0x0b:      /* VT */
3443                  case 0x0c:      /* FF */
3444                  case 0x0d:      /* CR */
3445                  case 0x85:      /* NEL */
3446                  case 0x2028:    /* LINE SEPARATOR */
3447                  case 0x2029:    /* PARAGRAPH SEPARATOR */
3448                  RRETURN(MATCH_NOMATCH);
3449                  }
3450                break;
3451    
3452                case OP_VSPACE:
3453                switch(c)
3454                  {
3455                  default: RRETURN(MATCH_NOMATCH);
3456                  case 0x0a:      /* LF */
3457                  case 0x0b:      /* VT */
3458                  case 0x0c:      /* FF */
3459                  case 0x0d:      /* CR */
3460                  case 0x85:      /* NEL */
3461                  case 0x2028:    /* LINE SEPARATOR */
3462                  case 0x2029:    /* PARAGRAPH SEPARATOR */
3463                  break;
3464                  }
3465                break;
3466    
3467              case OP_NOT_DIGIT:              case OP_NOT_DIGIT:
3468              if (c < 256 && (md->ctypes[c] & ctype_digit) != 0)              if (c < 256 && (md->ctypes[c] & ctype_digit) != 0)
3469                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
# Line 2929  for (;;) Line 3505  for (;;)
3505          {          {
3506          for (fi = min;; fi++)          for (fi = min;; fi++)
3507            {            {
3508            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM43);
3509            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3510            if (fi >= max || eptr >= md->end_subject ||            if (fi >= max || eptr >= md->end_subject ||
3511                 ((ims & PCRE_DOTALL) == 0 &&                 ((ims & PCRE_DOTALL) == 0 && IS_NEWLINE(eptr)))
                  eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr)))  
3512              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3513    
3514            c = *eptr++;            c = *eptr++;
# Line 2945  for (;;) Line 3520  for (;;)
3520              case OP_ANYBYTE:              case OP_ANYBYTE:
3521              break;              break;
3522    
3523                case OP_ANYNL:
3524                switch(c)
3525                  {
3526                  default: RRETURN(MATCH_NOMATCH);
3527                  case 0x000d:
3528                  if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
3529                  break;
3530                  case 0x000a:
3531                  case 0x000b:
3532                  case 0x000c:
3533                  case 0x0085:
3534                  break;
3535                  }
3536                break;
3537    
3538                case OP_NOT_HSPACE:
3539                switch(c)
3540                  {
3541                  default: break;
3542                  case 0x09:      /* HT */
3543                  case 0x20:      /* SPACE */
3544                  case 0xa0:      /* NBSP */
3545                  RRETURN(MATCH_NOMATCH);
3546                  }
3547                break;
3548    
3549                case OP_HSPACE:
3550                switch(c)
3551                  {
3552                  default: RRETURN(MATCH_NOMATCH);
3553                  case 0x09:      /* HT */
3554                  case 0x20:      /* SPACE */
3555                  case 0xa0:      /* NBSP */
3556                  break;
3557                  }
3558                break;
3559    
3560                case OP_NOT_VSPACE:
3561                switch(c)
3562                  {
3563                  default: break;
3564                  case 0x0a:      /* LF */
3565                  case 0x0b:      /* VT */
3566                  case 0x0c:      /* FF */
3567                  case 0x0d:      /* CR */
3568                  case 0x85:      /* NEL */
3569                  RRETURN(MATCH_NOMATCH);
3570                  }
3571                break;
3572    
3573                case OP_VSPACE:
3574                switch(c)
3575                  {
3576                  default: RRETURN(MATCH_NOMATCH);
3577                  case 0x0a:      /* LF */
3578                  case 0x0b:      /* VT */
3579                  case 0x0c:      /* FF */
3580                  case 0x0d:      /* CR */
3581                  case 0x85:      /* NEL */
3582                  break;
3583                  }
3584                break;
3585    
3586              case OP_NOT_DIGIT:              case OP_NOT_DIGIT:
3587              if ((md->ctypes[c] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);              if ((md->ctypes[c] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
3588              break;              break;
# Line 2977  for (;;) Line 3615  for (;;)
3615        /* Control never gets here */        /* Control never gets here */
3616        }        }
3617    
3618      /* If maximizing it is worth using inline code for speed, doing the type      /* If maximizing, it is worth using inline code for speed, doing the type
3619      test once at the start (i.e. keep it out of the loop). Again, keep the      test once at the start (i.e. keep it out of the loop). Again, keep the
3620      UTF-8 and UCP stuff separate. */      UTF-8 and UCP stuff separate. */
3621    
# Line 3058  for (;;) Line 3696  for (;;)
3696    
3697          /* eptr is now past the end of the maximum run */          /* eptr is now past the end of the maximum run */
3698    
3699            if (possessive) continue;
3700          for(;;)          for(;;)
3701            {            {
3702            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM44);
3703            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3704            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3705            BACKCHAR(eptr);            BACKCHAR(eptr);
# Line 3093  for (;;) Line 3732  for (;;)
3732    
3733          /* eptr is now past the end of the maximum run */          /* eptr is now past the end of the maximum run */
3734    
3735            if (possessive) continue;
3736          for(;;)          for(;;)
3737            {            {
3738            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM45);
3739            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3740            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3741            for (;;)                        /* Move back over one extended */            for (;;)                        /* Move back over one extended */
# Line 3135  for (;;) Line 3775  for (;;)
3775                {                {
3776                for (i = min; i < max; i++)                for (i = min; i < max; i++)
3777                  {                  {
3778                  if (eptr >= md->end_subject ||                  if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
                     (eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr)))  
                   break;  
3779                  eptr++;                  eptr++;
3780                  while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;                  while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
3781                  }                  }
# Line 3161  for (;;) Line 3799  for (;;)
3799                {                {
3800                for (i = min; i < max; i++)                for (i = min; i < max; i++)
3801                  {                  {
3802                  if (eptr >= md->end_subject ||                  if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
                     (eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr)))  
                   break;  
3803                  eptr++;                  eptr++;
3804                  }                  }
3805                break;                break;
# Line 3171  for (;;) Line 3807  for (;;)
3807              else              else
3808                {                {
3809                c = max - min;                c = max - min;
3810                if (c > md->end_subject - eptr) c = md->end_subject - eptr;                if (c > (unsigned int)(md->end_subject - eptr))
3811                    c = md->end_subject - eptr;
3812                eptr += c;                eptr += c;
3813                }                }
3814              }              }
# Line 3181  for (;;) Line 3818  for (;;)
3818    
3819            case OP_ANYBYTE:            case OP_ANYBYTE:
3820            c = max - min;            c = max - min;
3821            if (c > md->end_subject - eptr) c = md->end_subject - eptr;            if (c > (unsigned int)(md->end_subject - eptr))
3822                c = md->end_subject - eptr;
3823            eptr += c;            eptr += c;
3824            break;            break;
3825    
3826              case OP_ANYNL:
3827              for (i = min; i < max; i++)
3828                {
3829                int len = 1;
3830                if (eptr >= md->end_subject) break;
3831                GETCHARLEN(c, eptr, len);
3832                if (c == 0x000d)
3833                  {
3834                  if (++eptr >= md->end_subject) break;
3835                  if (*eptr == 0x000a) eptr++;
3836                  }
3837                else
3838                  {
3839                  if (c != 0x000a && c != 0x000b && c != 0x000c &&
3840                      c != 0x0085 && c != 0x2028 && c != 0x2029)
3841                    break;
3842                  eptr += len;
3843                  }
3844                }
3845              break;
3846    
3847              case OP_NOT_HSPACE:
3848              case OP_HSPACE:
3849              for (i = min; i < max; i++)
3850                {
3851                BOOL gotspace;
3852                int len = 1;
3853                if (eptr >= md->end_subject) break;
3854                GETCHARLEN(c, eptr, len);
3855                switch(c)
3856                  {
3857                  default: gotspace = FALSE; break;
3858                  case 0x09:      /* HT */
3859                  case 0x20:      /* SPACE */
3860                  case 0xa0:      /* NBSP */
3861                  case 0x1680:    /* OGHAM SPACE MARK */
3862                  case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
3863                  case 0x2000:    /* EN QUAD */
3864                  case 0x2001:    /* EM QUAD */
3865                  case 0x2002:    /* EN SPACE */
3866                  case 0x2003:    /* EM SPACE */
3867                  case 0x2004:    /* THREE-PER-EM SPACE */
3868                  case 0x2005:    /* FOUR-PER-EM SPACE */
3869                  case 0x2006:    /* SIX-PER-EM SPACE */
3870                  case 0x2007:    /* FIGURE SPACE */
3871                  case 0x2008:    /* PUNCTUATION SPACE */
3872                  case 0x2009:    /* THIN SPACE */
3873                  case 0x200A:    /* HAIR SPACE */
3874                  case 0x202f:    /* NARROW NO-BREAK SPACE */
3875                  case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
3876                  case 0x3000:    /* IDEOGRAPHIC SPACE */
3877                  gotspace = TRUE;
3878                  break;
3879                  }
3880                if (gotspace == (ctype == OP_NOT_HSPACE)) break;
3881                eptr += len;
3882                }
3883              break;
3884    
3885              case OP_NOT_VSPACE:
3886              case OP_VSPACE:
3887              for (i = min; i < max; i++)
3888                {
3889                BOOL gotspace;
3890                int len = 1;
3891                if (eptr >= md->end_subject) break;
3892                GETCHARLEN(c, eptr, len);
3893                switch(c)
3894                  {
3895                  default: gotspace = FALSE; break;
3896                  case 0x0a:      /* LF */
3897                  case 0x0b:      /* VT */
3898                  case 0x0c:      /* FF */
3899                  case 0x0d:      /* CR */
3900                  case 0x85:      /* NEL */
3901                  case 0x2028:    /* LINE SEPARATOR */
3902                  case 0x2029:    /* PARAGRAPH SEPARATOR */
3903                  gotspace = TRUE;
3904                  break;
3905                  }
3906                if (gotspace == (ctype == OP_NOT_VSPACE)) break;
3907                eptr += len;
3908                }
3909              break;
3910    
3911            case OP_NOT_DIGIT:            case OP_NOT_DIGIT:
3912            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3913              {              {
# Line 3257  for (;;) Line 3980  for (;;)
3980    
3981          /* eptr is now past the end of the maximum run */          /* eptr is now past the end of the maximum run */
3982    
3983            if (possessive) continue;
3984          for(;;)          for(;;)
3985            {            {
3986            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM46);
3987            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3988            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3989            BACKCHAR(eptr);            BACKCHAR(eptr);
# Line 3277  for (;;) Line 4001  for (;;)
4001              {              {
4002              for (i = min; i < max; i++)              for (i = min; i < max; i++)
4003                {                {
4004                if (eptr >= md->end_subject ||                if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
                   (eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr)))  
                 break;  
4005                eptr++;                eptr++;
4006                }                }
4007              break;              break;
# Line 3288  for (;;) Line 4010  for (;;)
4010    
4011            case OP_ANYBYTE:            case OP_ANYBYTE:
4012            c = max - min;            c = max - min;
4013            if (c > md->end_subject - eptr) c = md->end_subject - eptr;            if (c > (unsigned int)(md->end_subject - eptr))
4014                c = md->end_subject - eptr;
4015            eptr += c;            eptr += c;
4016            break;            break;
4017    
4018              case OP_ANYNL:
4019              for (i = min; i < max; i++)
4020                {
4021                if (eptr >= md->end_subject) break;
4022                c = *eptr;
4023                if (c == 0x000d)
4024                  {
4025                  if (++eptr >= md->end_subject) break;
4026                  if (*eptr == 0x000a) eptr++;
4027                  }
4028                else
4029                  {
4030                  if (c != 0x000a && c != 0x000b && c != 0x000c && c != 0x0085)
4031                    break;
4032                  eptr++;
4033                  }
4034                }
4035              break;
4036    
4037              case OP_NOT_HSPACE:
4038              for (i = min; i < max; i++)
4039                {
4040                if (eptr >= md->end_subject) break;
4041                c = *eptr;
4042                if (c == 0x09 || c == 0x20 || c == 0xa0) break;
4043                eptr++;
4044                }
4045              break;
4046    
4047              case OP_HSPACE:
4048              for (i = min; i < max; i++)
4049                {
4050                if (eptr >= md->end_subject) break;
4051                c = *eptr;
4052                if (c != 0x09 && c != 0x20 && c != 0xa0) break;
4053                eptr++;
4054                }
4055              break;
4056    
4057              case OP_NOT_VSPACE:
4058              for (i = min; i < max; i++)
4059                {
4060                if (eptr >= md->end_subject) break;
4061                c = *eptr;
4062                if (c == 0x0a || c == 0x0b || c == 0x0c || c == 0x0d || c == 0x85)
4063                  break;
4064                eptr++;
4065                }
4066              break;
4067    
4068              case OP_VSPACE:
4069              for (i = min; i < max; i++)
4070                {
4071                if (eptr >= md->end_subject) break;
4072                c = *eptr;
4073                if (c != 0x0a && c != 0x0b && c != 0x0c && c != 0x0d && c != 0x85)
4074                  break;
4075                eptr++;
4076                }
4077              break;
4078    
4079            case OP_NOT_DIGIT:            case OP_NOT_DIGIT:
4080            for (i = min; i < max; i++)            for (i = min; i < max; i++)
4081              {              {
# Line 3352  for (;;) Line 4136  for (;;)
4136    
4137          /* eptr is now past the end of the maximum run */          /* eptr is now past the end of the maximum run */
4138    
4139            if (possessive) continue;
4140          while (eptr >= pp)          while (eptr >= pp)
4141            {            {
4142            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM47);
4143            eptr--;            eptr--;
4144            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4145            }            }
# Line 3366  for (;;) Line 4151  for (;;)
4151        }        }
4152      /* Control never gets here */      /* Control never gets here */
4153    
4154      /* There's been some horrible disaster. Since all codes > OP_BRA are      /* There's been some horrible disaster. Arrival here can only mean there is
4155      for capturing brackets, and there shouldn't be any gaps between 0 and      something seriously wrong in the code above or the OP_xxx definitions. */
     OP_BRA, arrival here can only mean there is something seriously wrong  
     in the code above or the OP_xxx definitions. */  
4156    
4157      default:      default:
4158      DPRINTF(("Unknown opcode %d\n", *ecode));      DPRINTF(("Unknown opcode %d\n", *ecode));
4159      RRETURN(PCRE_ERROR_UNKNOWN_NODE);      RRETURN(PCRE_ERROR_UNKNOWN_OPCODE);
4160      }      }
4161    
4162    /* Do not stick any code in here without much thought; it is assumed    /* Do not stick any code in here without much thought; it is assumed
# Line 3382  for (;;) Line 4165  for (;;)
4165    
4166    }             /* End of main loop */    }             /* End of main loop */
4167  /* Control never reaches here */  /* Control never reaches here */
4168    
4169    
4170    /* When compiling to use the heap rather than the stack for recursive calls to
4171    match(), the RRETURN() macro jumps here. The number that is saved in
4172    frame->Xwhere indicates which label we actually want to return to. */
4173    
4174    #ifdef NO_RECURSE
4175    #define LBL(val) case val: goto L_RM##val;
4176    HEAP_RETURN:
4177    switch (frame->Xwhere)
4178      {
4179      LBL( 1) LBL( 2) LBL( 3) LBL( 4) LBL( 5) LBL( 6) LBL( 7) LBL( 8)
4180      LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(16)
4181      LBL(17) LBL(18) LBL(19) LBL(20) LBL(21) LBL(22) LBL(23) LBL(24)
4182      LBL(25) LBL(26) LBL(27) LBL(28) LBL(29) LBL(30) LBL(31) LBL(32)
4183      LBL(33) LBL(34) LBL(35) LBL(36) LBL(37) LBL(38) LBL(39) LBL(40)
4184      LBL(41) LBL(42) LBL(43) LBL(44) LBL(45) LBL(46) LBL(47)
4185      default:
4186      DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));
4187      return PCRE_ERROR_INTERNAL;
4188      }
4189    #undef LBL
4190    #endif  /* NO_RECURSE */
4191  }  }
4192    
4193    
# Line 3394  Undefine all the macros that were define Line 4200  Undefine all the macros that were define
4200  #ifdef NO_RECURSE  #ifdef NO_RECURSE
4201  #undef eptr  #undef eptr
4202  #undef ecode  #undef ecode
4203    #undef mstart
4204  #undef offset_top  #undef offset_top
4205  #undef ims  #undef ims
4206  #undef eptrb  #undef eptrb
# Line 3411  Undefine all the macros that were define Line 4218  Undefine all the macros that were define
4218    
4219  #undef cur_is_word  #undef cur_is_word
4220  #undef condition  #undef condition
 #undef minimize  
4221  #undef prev_is_word  #undef prev_is_word
4222    
4223  #undef original_ims  #undef original_ims
# Line 3467  Returns: > 0 => success; value Line 4273  Returns: > 0 => success; value
4273                   < -1 => some kind of unexpected problem                   < -1 => some kind of unexpected problem
4274  */  */
4275    
4276  PCRE_DATA_SCOPE int  PCRE_EXP_DEFN int
4277  pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,  pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,
4278    PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,    PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,
4279    int offsetcount)    int offsetcount)
# Line 3484  BOOL startline; Line 4290  BOOL startline;
4290  BOOL firstline;  BOOL firstline;
4291  BOOL first_byte_caseless = FALSE;  BOOL first_byte_caseless = FALSE;
4292  BOOL req_byte_caseless = FALSE;  BOOL req_byte_caseless = FALSE;
4293    BOOL utf8;
4294  match_data match_block;  match_data match_block;
4295  match_data *md = &match_block;  match_data *md = &match_block;
4296  const uschar *tables;  const uschar *tables;
# Line 3491  const uschar *start_bits = NULL; Line 4298  const uschar *start_bits = NULL;
4298  USPTR start_match = (USPTR)subject + start_offset;  USPTR start_match = (USPTR)subject + start_offset;
4299  USPTR end_subject;  USPTR end_subject;
4300  USPTR req_byte_ptr = start_match - 1;  USPTR req_byte_ptr = start_match - 1;
4301    eptrblock eptrchain[EPTR_WORK_SIZE];
4302    
4303  pcre_study_data internal_study;  pcre_study_data internal_study;
4304  const pcre_study_data *study;  const pcre_study_data *study;
# Line 3567  md->end_subject = md->start_subject + le Line 4375  md->end_subject = md->start_subject + le
4375  end_subject = md->end_subject;  end_subject = md->end_subject;
4376    
4377  md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;  md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
4378  md->utf8 = (re->options & PCRE_UTF8) != 0;  utf8 = md->utf8 = (re->options & PCRE_UTF8) != 0;
4379    
4380  md->notbol = (options & PCRE_NOTBOL) != 0;  md->notbol = (options & PCRE_NOTBOL) != 0;
4381  md->noteol = (options & PCRE_NOTEOL) != 0;  md->noteol = (options & PCRE_NOTEOL) != 0;
# Line 3576  md->partial = (options & PCRE_PARTIAL) ! Line 4384  md->partial = (options & PCRE_PARTIAL) !
4384  md->hitend = FALSE;  md->hitend = FALSE;
4385    
4386  md->recursive = NULL;                   /* No recursion at top level */  md->recursive = NULL;                   /* No recursion at top level */
4387    md->eptrchain = eptrchain;              /* Make workspace generally available */
4388    
4389  md->lcc = tables + lcc_offset;  md->lcc = tables + lcc_offset;
4390  md->ctypes = tables + ctypes_offset;  md->ctypes = tables + ctypes_offset;
4391    
4392  /* Handle different types of newline. The two bits give four cases. If nothing  /* Handle different types of newline. The three bits give eight cases. If
4393  is set at run time, whatever was used at compile time applies. */  nothing is set at run time, whatever was used at compile time applies. */
4394    
4395  switch ((((options & PCRE_NEWLINE_CRLF) == 0)? re->options : options) &  switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options : (pcre_uint32)options) &
4396           PCRE_NEWLINE_CRLF)         PCRE_NEWLINE_BITS)
4397    {    {
4398    default:              newline = NEWLINE; break;   /* Compile-time default */    case 0: newline = NEWLINE; break;   /* Compile-time default */
4399    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = '\r'; break;
4400    case PCRE_NEWLINE_LF: newline = '\n'; break;    case PCRE_NEWLINE_LF: newline = '\n'; break;
4401    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
4402         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;
4403      case PCRE_NEWLINE_ANY: newline = -1; break;
4404      case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
4405      default: return PCRE_ERROR_BADNEWLINE;
4406    }    }
4407    
4408  if (newline > 255)  if (newline == -2)
4409    {    {
4410    md->nllen = 2;    md->nltype = NLTYPE_ANYCRLF;
4411    md->nl[0] = (newline >> 8) & 255;    }
4412    md->nl[1] = newline & 255;  else if (newline < 0)
4413      {
4414      md->nltype = NLTYPE_ANY;
4415    }    }
4416  else  else
4417    {    {
4418    md->nllen = 1;    md->nltype = NLTYPE_FIXED;
4419    md->nl[0] = newline;    if (newline > 255)
4420        {
4421        md->nllen = 2;
4422        md->nl[0] = (newline >> 8) & 255;
4423        md->nl[1] = newline & 255;
4424        }
4425      else
4426        {
4427        md->nllen = 1;
4428        md->nl[0] = newline;
4429        }
4430    }    }
4431    
4432  /* Partial matching is supported only for a restricted set of regexes at the  /* Partial matching is supported only for a restricted set of regexes at the
# Line 3615  if (md->partial && (re->options & PCRE_N Line 4439  if (md->partial && (re->options & PCRE_N
4439  back the character offset. */  back the character offset. */
4440    
4441  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4442  if (md->utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)
4443    {    {
4444    if (_pcre_valid_utf8((uschar *)subject, length) >= 0)    if (_pcre_valid_utf8((uschar *)subject, length) >= 0)
4445      return PCRE_ERROR_BADUTF8;      return PCRE_ERROR_BADUTF8;
# Line 3707  if ((re->options & PCRE_REQCHSET) != 0) Line 4531  if ((re->options & PCRE_REQCHSET) != 0)
4531    req_byte2 = (tables + fcc_offset)[req_byte];  /* case flipped */    req_byte2 = (tables + fcc_offset)[req_byte];  /* case flipped */
4532    }    }
4533    
4534    
4535    /* ==========================================================================*/
4536    
4537  /* Loop for handling unanchored repeated matching attempts; for anchored regexs  /* Loop for handling unanchored repeated matching attempts; for anchored regexs
4538  the loop runs just once. */  the loop runs just once. */
4539    
4540  do  for(;;)
4541    {    {
4542    USPTR save_end_subject = end_subject;    USPTR save_end_subject = end_subject;
4543    
# Line 3725  do Line 4552  do
4552    
4553    /* Advance to a unique first char if possible. If firstline is TRUE, the    /* Advance to a unique first char if possible. If firstline is TRUE, the
4554    start of the match is constrained to the first line of a multiline string.    start of the match is constrained to the first line of a multiline string.
4555    Implement this by temporarily adjusting end_subject so that we stop scanning    That is, the match must be before or at the first newline. Implement this by
4556    at a newline. If the match fails at the newline, later code breaks this loop.    temporarily adjusting end_subject so that we stop scanning at a newline. If
4557    */    the match fails at the newline, later code breaks this loop. */
4558    
4559    if (firstline)    if (firstline)
4560      {      {
4561      USPTR t = start_match;      USPTR t = start_match;
4562      while (t <= save_end_subject - md->nllen && !IS_NEWLINE(t)) t++;      while (t < md->end_subject && !IS_NEWLINE(t)) t++;
4563      end_subject = t;      end_subject = t;
4564      }      }
4565    
# Line 3753  do Line 4580  do
4580    
4581    else if (startline)    else if (startline)
4582      {      {
4583      if (start_match >= md->start_subject + md->nllen +      if (start_match > md->start_subject + start_offset)
           start_offset)  
4584        {        {
4585        while (start_match <= end_subject &&        while (start_match <= end_subject && !WAS_NEWLINE(start_match))
4586               !IS_NEWLINE(start_match - md->nllen))          start_match++;
4587    
4588          /* If we have just passed a CR and the newline option is ANY or ANYCRLF,
4589          and we are now at a LF, advance the match position by one more character.
4590          */
4591    
4592          if (start_match[-1] == '\r' &&
4593               (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
4594               start_match < end_subject &&
4595               *start_match == '\n')
4596          start_match++;          start_match++;
4597        }        }
4598      }      }
# Line 3793  do Line 4628  do
4628    
4629    HOWEVER: when the subject string is very, very long, searching to its end can    HOWEVER: when the subject string is very, very long, searching to its end can
4630    take a long time, and give bad performance on quite ordinary patterns. This    take a long time, and give bad performance on quite ordinary patterns. This
4631    showed up when somebody was matching /^C/ on a 32-megabyte string... so we    showed up when somebody was matching something like /^\d+C/ on a 32-megabyte
4632    don't do this when the string is sufficiently long.    string... so we don't do this when the string is sufficiently long.
4633    
4634    ALSO: this processing is disabled when partial matching is requested.    ALSO: this processing is disabled when partial matching is requested.
4635    */    */
# Line 3826  do Line 4661  do
4661            }            }
4662          }          }
4663    
4664        /* If we can't find the required character, break the matching loop */        /* If we can't find the required character, break the matching loop,
4665          forcing a match failure. */
4666    
4667        if (p >= end_subject) break;        if (p >= end_subject)
4668            {
4669            rc = MATCH_NOMATCH;
4670            break;
4671            }
4672    
4673        /* If we have found the required character, save the point where we        /* If we have found the required character, save the point where we
4674        found it, so that we don't search again next time round the loop if        found it, so that we don't search again next time round the loop if
# Line 3838  do Line 4678  do
4678        }        }
4679      }      }
4680    
4681    /* When a match occurs, substrings will be set for all internal extractions;    /* OK, we can now run the match. */
   we just need to set up the whole thing as substring 0 before returning. If  
   there were too many extractions, set the return code to zero. In the case  
   where we had to get some local store to hold offsets for backreferences, copy  
   those back references that we can. In this case there need not be overflow  
   if certain parts of the pattern were not used. */  
4682    
4683    md->start_match = start_match;    md->start_match_ptr = start_match;      /* Insurance */
4684    md->match_call_count = 0;    md->match_call_count = 0;
4685      md->eptrn = 0;                          /* Next free eptrchain slot */
4686      rc = match(start_match, md->start_code, start_match, 2, md,
4687        ims, NULL, 0, 0);
4688    
4689    rc = match(start_match, md->start_code, 2, md, ims, NULL, match_isgroup, 0);    /* Any return other than MATCH_NOMATCH breaks the loop. */
4690    
4691    /* When the result is no match, if the subject's first character was a    if (rc != MATCH_NOMATCH) break;
   newline and the PCRE_FIRSTLINE option is set, break (which will return  
   PCRE_ERROR_NOMATCH). The option requests that a match occur before the first  
   newline in the subject. Otherwise, advance the pointer to the next character  
   and continue - but the continuation will actually happen only when the  
   pattern is not anchored. */  
4692    
4693    if (rc == MATCH_NOMATCH)    /* If PCRE_FIRSTLINE is set, the match must happen before or at the first
4694      {    newline in the subject (though it may continue over the newline). Therefore,
4695      if (firstline &&    if we have just failed to match, starting at a newline, do not continue. */
4696          start_match <= md->end_subject - md->nllen &&  
4697          IS_NEWLINE(start_match))    if (firstline && IS_NEWLINE(start_match)) break;
4698        break;  
4699      start_match++;    /* Advance the match position by one character. */
4700    
4701      start_match++;
4702  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4703      if (md->utf8)    if (utf8)
4704        while(start_match < end_subject && (*start_match & 0xc0) == 0x80)      while(start_match < end_subject && (*start_match & 0xc0) == 0x80)
4705          start_match++;        start_match++;
4706  #endif  #endif
4707      continue;  
4708      }    /* Break the loop if the pattern is anchored or if we have passed the end of
4709      the subject. */
4710    
4711      if (anchored || start_match > end_subject) break;
4712    
4713      /* If we have just passed a CR and the newline option is CRLF or ANY or
4714      ANYCRLF, and we are now at a LF, advance the match position by one more
4715      character. */
4716    
4717      if (start_match[-1] == '\r' &&
4718           (md->nltype == NLTYPE_ANY ||
4719            md->nltype == NLTYPE_ANYCRLF ||
4720            md->nllen == 2) &&
4721           start_match < end_subject &&
4722           *start_match == '\n')
4723        start_match++;
4724    
4725    if (rc != MATCH_MATCH)    }   /* End of for(;;) "bumpalong" loop */
4726      {  
4727      DPRINTF((">>>> error: returning %d\n", rc));  /* ==========================================================================*/
4728      return rc;  
4729      }  /* We reach here when rc is not MATCH_NOMATCH, or if one of the stopping
4730    conditions is true:
4731    
4732    /* We have a match! Copy the offset information from temporary store if  (1) The pattern is anchored;
   necessary */  
4733    
4734    (2) We are past the end of the subject;
4735    
4736    (3) PCRE_FIRSTLINE is set and we have failed to match at a newline, because
4737        this option requests that a match occur at or before the first newline in
4738        the subject.
4739    
4740    When we have a match and the offset vector is big enough to deal with any
4741    backreferences, captured substring offsets will already be set up. In the case
4742    where we had to get some local store to hold offsets for backreference
4743    processing, copy those that we can. In this case there need not be overflow if
4744    certain parts of the pattern were not used, even though there are more
4745    capturing parentheses than vector slots. */
4746    
4747    if (rc == MATCH_MATCH)
4748      {
4749    if (using_temporary_offsets)    if (using_temporary_offsets)
4750      {      {
4751      if (offsetcount >= 4)      if (offsetcount >= 4)
# Line 3889  do Line 4754  do
4754          (offsetcount - 2) * sizeof(int));          (offsetcount - 2) * sizeof(int));
4755        DPRINTF(("Copied offsets from temporary memory\n"));        DPRINTF(("Copied offsets from temporary memory\n"));
4756        }        }
4757      if (md->end_offset_top > offsetcount)      if (md->end_offset_top > offsetcount) md->offset_overflow = TRUE;
       md->offset_overflow = TRUE;  
   
4758      DPRINTF(("Freeing temporary memory\n"));      DPRINTF(("Freeing temporary memory\n"));
4759      (pcre_free)(md->offset_vector);      (pcre_free)(md->offset_vector);
4760      }      }
4761    
4762      /* Set the return code to the number of captured strings, or 0 if there are
4763      too many to fit into the vector. */
4764    
4765    rc = md->offset_overflow? 0 : md->end_offset_top/2;    rc = md->offset_overflow? 0 : md->end_offset_top/2;
4766    
4767      /* If there is space, set up the whole thing as substring 0. The value of
4768      md->start_match_ptr might be modified if \K was encountered on the success
4769      matching path. */
4770    
4771    if (offsetcount < 2) rc = 0; else    if (offsetcount < 2) rc = 0; else
4772      {      {
4773      offsets[0] = start_match - md->start_subject;      offsets[0] = md->start_match_ptr - md->start_subject;
4774      offsets[1] = md->end_match_ptr - md->start_subject;      offsets[1] = md->end_match_ptr - md->start_subject;
4775      }      }
4776    
# Line 3908  do Line 4778  do
4778    return rc;    return rc;
4779    }    }
4780    
4781  /* This "while" is the end of the "do" above */  /* Control gets here if there has been an error, or if the overall match
4782    attempt has failed at all permitted starting positions. */
 while (!anchored && start_match <= end_subject);  
4783    
4784  if (using_temporary_offsets)  if (using_temporary_offsets)
4785    {    {
# Line 3918  if (using_temporary_offsets) Line 4787  if (using_temporary_offsets)
4787    (pcre_free)(md->offset_vector);    (pcre_free)(md->offset_vector);
4788    }    }
4789    
4790  if (md->partial && md->hitend)  if (rc != MATCH_NOMATCH)
4791      {
4792      DPRINTF((">>>> error: returning %d\n", rc));
4793      return rc;
4794      }
4795    else if (md->partial && md->hitend)
4796    {    {
4797    DPRINTF((">>>> returning PCRE_ERROR_PARTIAL\n"));    DPRINTF((">>>> returning PCRE_ERROR_PARTIAL\n"));
4798    return PCRE_ERROR_PARTIAL;    return PCRE_ERROR_PARTIAL;
Legend:
Removed from v.91  
changed lines
  Added in v.178
webmaster@exim.org
 ViewVC Help
Powered by ViewVC 1.1.12