/[pcre]/code/trunk/pcre_compile.c
ViewVC logotype

Diff of /code/trunk/pcre_compile.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 391 by ph10, Tue Mar 17 21:16:01 2009 UTC revision 758 by ph10, Mon Nov 21 12:05:36 2011 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2009 University of Cambridge             Copyright (c) 1997-2011 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 53  supporting internal functions that are n Line 53  supporting internal functions that are n
53  #include "pcre_internal.h"  #include "pcre_internal.h"
54    
55    
56  /* When DEBUG is defined, we need the pcre_printint() function, which is also  /* When PCRE_DEBUG is defined, we need the pcre_printint() function, which is
57  used by pcretest. DEBUG is not defined when building a production library. */  also used by pcretest. PCRE_DEBUG is not defined when building a production
58    library. */
59    
60  #ifdef DEBUG  #ifdef PCRE_DEBUG
61  #include "pcre_printint.src"  #include "pcre_printint.src"
62  #endif  #endif
63    
# Line 91  is 4 there is plenty of room. */ Line 92  is 4 there is plenty of room. */
92    
93  #define COMPILE_WORK_SIZE (4096)  #define COMPILE_WORK_SIZE (4096)
94    
95    /* The overrun tests check for a slightly smaller size so that they detect the
96    overrun before it actually does run off the end of the data block. */
97    
98    #define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100)
99    
100    
101  /* Table for handling escaped characters in the range '0'-'z'. Positive returns  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
102  are simple data values; negative values are for special things like \d and so  are simple data values; negative values are for special things like \d and so
# Line 100  is invalid. */ Line 106  is invalid. */
106  #ifndef EBCDIC  #ifndef EBCDIC
107    
108  /* This is the "normal" table for ASCII systems or for EBCDIC systems running  /* This is the "normal" table for ASCII systems or for EBCDIC systems running
109  in UTF-8 mode. */  in UTF-8 mode. */
110    
111  static const short int escapes[] = {  static const short int escapes[] = {
112       0,                       0,       0,                       0,
113         0,                       0,
114         0,                       0,
115       0,                       0,       0,                       0,
      0,                       0,  
116       0,                       0,       0,                       0,
      0,                       0,  
117       CHAR_COLON,              CHAR_SEMICOLON,       CHAR_COLON,              CHAR_SEMICOLON,
118       CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,       CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
119       CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,       CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
120       CHAR_COMMERCIAL_AT,      -ESC_A,       CHAR_COMMERCIAL_AT,      -ESC_A,
121       -ESC_B,                  -ESC_C,       -ESC_B,                  -ESC_C,
122       -ESC_D,                  -ESC_E,       -ESC_D,                  -ESC_E,
123       0,                       -ESC_G,       0,                       -ESC_G,
124       -ESC_H,                  0,       -ESC_H,                  0,
125       0,                       -ESC_K,       0,                       -ESC_K,
      0,                       0,  
126       0,                       0,       0,                       0,
127         -ESC_N,                  0,
128       -ESC_P,                  -ESC_Q,       -ESC_P,                  -ESC_Q,
129       -ESC_R,                  -ESC_S,       -ESC_R,                  -ESC_S,
130       0,                       0,       0,                       0,
131       -ESC_V,                  -ESC_W,       -ESC_V,                  -ESC_W,
132       -ESC_X,                  0,       -ESC_X,                  0,
133       -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,       -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
134       CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,       CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
135       CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,       CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
136       CHAR_GRAVE_ACCENT,       7,       CHAR_GRAVE_ACCENT,       7,
137       -ESC_b,                  0,       -ESC_b,                  0,
138       -ESC_d,                  ESC_e,       -ESC_d,                  ESC_e,
139       ESC_f,                   0,       ESC_f,                   0,
140       -ESC_h,                  0,       -ESC_h,                  0,
141       0,                       -ESC_k,       0,                       -ESC_k,
142       0,                       0,       0,                       0,
143       ESC_n,                   0,       ESC_n,                   0,
144       -ESC_p,                  0,       -ESC_p,                  0,
145       ESC_r,                   -ESC_s,       ESC_r,                   -ESC_s,
146       ESC_tee,                 0,       ESC_tee,                 0,
147       -ESC_v,                  -ESC_w,       -ESC_v,                  -ESC_w,
148       0,                       0,       0,                       0,
149       -ESC_z       -ESC_z
150  };  };
151    
152  #else  #else
153    
154  /* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */  /* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
155    
# Line 165  static const short int escapes[] = { Line 171  static const short int escapes[] = {
171  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
172  /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,  /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,
173  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
174  /*  D0 */   '}',     0, -ESC_K,       0,      0,     0,      0, -ESC_P,  /*  D0 */   '}',     0, -ESC_K,       0,      0,-ESC_N,      0, -ESC_P,
175  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
176  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
177  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
# Line 177  static const short int escapes[] = { Line 183  static const short int escapes[] = {
183    
184  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is
185  searched linearly. Put all the names into a single string, in order to reduce  searched linearly. Put all the names into a single string, in order to reduce
186  the number of relocations when a shared library is dynamically linked. The  the number of relocations when a shared library is dynamically linked. The
187  string is built from string macros so that it works in UTF-8 mode on EBCDIC  string is built from string macros so that it works in UTF-8 mode on EBCDIC
188  platforms. */  platforms. */
189    
190  typedef struct verbitem {  typedef struct verbitem {
191    int   len;    int   len;                 /* Length of verb name */
192    int   op;    int   op;                  /* Op when no arg, or -1 if arg mandatory */
193      int   op_arg;              /* Op when arg present, or -1 if not allowed */
194  } verbitem;  } verbitem;
195    
196  static const char verbnames[] =  static const char verbnames[] =
197      "\0"                       /* Empty name is a shorthand for MARK */
198      STRING_MARK0
199    STRING_ACCEPT0    STRING_ACCEPT0
200    STRING_COMMIT0    STRING_COMMIT0
201    STRING_F0    STRING_F0
# Line 196  static const char verbnames[] = Line 205  static const char verbnames[] =
205    STRING_THEN;    STRING_THEN;
206    
207  static const verbitem verbs[] = {  static const verbitem verbs[] = {
208    { 6, OP_ACCEPT },    { 0, -1,        OP_MARK },
209    { 6, OP_COMMIT },    { 4, -1,        OP_MARK },
210    { 1, OP_FAIL },    { 6, OP_ACCEPT, -1 },
211    { 4, OP_FAIL },    { 6, OP_COMMIT, -1 },
212    { 5, OP_PRUNE },    { 1, OP_FAIL,   -1 },
213    { 4, OP_SKIP  },    { 4, OP_FAIL,   -1 },
214    { 4, OP_THEN  }    { 5, OP_PRUNE,  OP_PRUNE_ARG },
215      { 4, OP_SKIP,   OP_SKIP_ARG  },
216      { 4, OP_THEN,   OP_THEN_ARG  }
217  };  };
218    
219  static const int verbcount = sizeof(verbs)/sizeof(verbitem);  static const int verbcount = sizeof(verbs)/sizeof(verbitem);
# Line 215  length entry. The first three must be al Line 226  length entry. The first three must be al
226  for handling case independence. */  for handling case independence. */
227    
228  static const char posix_names[] =  static const char posix_names[] =
229    STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0    STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
230    STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0    STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
231    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
232    STRING_word0  STRING_xdigit;    STRING_word0  STRING_xdigit;
233    
# Line 250  static const int posix_class_maps[] = { Line 261  static const int posix_class_maps[] = {
261    cbit_xdigit,-1,          0              /* xdigit */    cbit_xdigit,-1,          0              /* xdigit */
262  };  };
263    
264    /* Table of substitutes for \d etc when PCRE_UCP is set. The POSIX class
265    substitutes must be in the order of the names, defined above, and there are
266    both positive and negative cases. NULL means no substitute. */
267    
268    #ifdef SUPPORT_UCP
269    static const uschar *substitutes[] = {
270      (uschar *)"\\P{Nd}",    /* \D */
271      (uschar *)"\\p{Nd}",    /* \d */
272      (uschar *)"\\P{Xsp}",   /* \S */       /* NOTE: Xsp is Perl space */
273      (uschar *)"\\p{Xsp}",   /* \s */
274      (uschar *)"\\P{Xwd}",   /* \W */
275      (uschar *)"\\p{Xwd}"    /* \w */
276    };
277    
278    static const uschar *posix_substitutes[] = {
279      (uschar *)"\\p{L}",     /* alpha */
280      (uschar *)"\\p{Ll}",    /* lower */
281      (uschar *)"\\p{Lu}",    /* upper */
282      (uschar *)"\\p{Xan}",   /* alnum */
283      NULL,                   /* ascii */
284      (uschar *)"\\h",        /* blank */
285      NULL,                   /* cntrl */
286      (uschar *)"\\p{Nd}",    /* digit */
287      NULL,                   /* graph */
288      NULL,                   /* print */
289      NULL,                   /* punct */
290      (uschar *)"\\p{Xps}",   /* space */    /* NOTE: Xps is POSIX space */
291      (uschar *)"\\p{Xwd}",   /* word */
292      NULL,                   /* xdigit */
293      /* Negated cases */
294      (uschar *)"\\P{L}",     /* ^alpha */
295      (uschar *)"\\P{Ll}",    /* ^lower */
296      (uschar *)"\\P{Lu}",    /* ^upper */
297      (uschar *)"\\P{Xan}",   /* ^alnum */
298      NULL,                   /* ^ascii */
299      (uschar *)"\\H",        /* ^blank */
300      NULL,                   /* ^cntrl */
301      (uschar *)"\\P{Nd}",    /* ^digit */
302      NULL,                   /* ^graph */
303      NULL,                   /* ^print */
304      NULL,                   /* ^punct */
305      (uschar *)"\\P{Xps}",   /* ^space */   /* NOTE: Xps is POSIX space */
306      (uschar *)"\\P{Xwd}",   /* ^word */
307      NULL                    /* ^xdigit */
308    };
309    #define POSIX_SUBSIZE (sizeof(posix_substitutes)/sizeof(uschar *))
310    #endif
311    
312  #define STRING(a)  # a  #define STRING(a)  # a
313  #define XSTRING(s) STRING(s)  #define XSTRING(s) STRING(s)
# Line 262  the number of relocations needed when a Line 320  the number of relocations needed when a
320  it is now one long string. We cannot use a table of offsets, because the  it is now one long string. We cannot use a table of offsets, because the
321  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
322  simply count through to the one we want - this isn't a performance issue  simply count through to the one we want - this isn't a performance issue
323  because these strings are used only when there is a compilation error. */  because these strings are used only when there is a compilation error.
324    
325    Each substring ends with \0 to insert a null character. This includes the final
326    substring, so that the whole string ends with \0\0, which can be detected when
327    counting through. */
328    
329  static const char error_texts[] =  static const char error_texts[] =
330    "no error\0"    "no error\0"
# Line 309  static const char error_texts[] = Line 371  static const char error_texts[] =
371    /* 35 */    /* 35 */
372    "invalid condition (?(0)\0"    "invalid condition (?(0)\0"
373    "\\C not allowed in lookbehind assertion\0"    "\\C not allowed in lookbehind assertion\0"
374    "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"    "PCRE does not support \\L, \\l, \\N{name}, \\U, or \\u\0"
375    "number after (?C is > 255\0"    "number after (?C is > 255\0"
376    "closing ) for (?C expected\0"    "closing ) for (?C expected\0"
377    /* 40 */    /* 40 */
# Line 331  static const char error_texts[] = Line 393  static const char error_texts[] =
393    "internal error: previously-checked referenced subpattern not found\0"    "internal error: previously-checked referenced subpattern not found\0"
394    "DEFINE group contains more than one branch\0"    "DEFINE group contains more than one branch\0"
395    /* 55 */    /* 55 */
396    "repeating a DEFINE group is not allowed\0"    "repeating a DEFINE group is not allowed\0"  /** DEAD **/
397    "inconsistent NEWLINE options\0"    "inconsistent NEWLINE options\0"
398    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
399    "a numbered reference must not be zero\0"    "a numbered reference must not be zero\0"
400    "(*VERB) with an argument is not supported\0"    "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
401    /* 60 */    /* 60 */
402    "(*VERB) not recognized\0"    "(*VERB) not recognized\0"
403    "number is too big\0"    "number is too big\0"
404    "subpattern name expected\0"    "subpattern name expected\0"
405    "digit expected after (?+\0"    "digit expected after (?+\0"
406    "] is an invalid data character in JavaScript compatibility mode";    "] is an invalid data character in JavaScript compatibility mode\0"
407      /* 65 */
408      "different names for subpatterns of the same number are not allowed\0"
409      "(*MARK) must have an argument\0"
410      "this version of PCRE is not compiled with PCRE_UCP support\0"
411      "\\c must be followed by an ASCII character\0"
412      "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
413      /* 70 */
414      "internal error: unknown opcode in find_fixedlength()\0"
415      "\\N is not supported in a class\0"
416      ;
417    
418  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
419  patterns. Note that the tables in chartables are dependent on the locale, and  patterns. Note that the tables in chartables are dependent on the locale, and
# Line 360  For convenience, we use the same bit def Line 431  For convenience, we use the same bit def
431    
432  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
433    
434  #ifndef EBCDIC  #ifndef EBCDIC
435    
436  /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in  /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
437  UTF-8 mode. */  UTF-8 mode. */
438    
439  static const unsigned char digitab[] =  static const unsigned char digitab[] =
# Line 400  static const unsigned char digitab[] = Line 471  static const unsigned char digitab[] =
471    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
472    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
473    
474  #else  #else
475    
476  /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */  /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
477    
# Line 478  static const unsigned char ebcdic_charta Line 549  static const unsigned char ebcdic_charta
549  /* Definition to allow mutual recursion */  /* Definition to allow mutual recursion */
550    
551  static BOOL  static BOOL
552    compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,    compile_regex(int, uschar **, const uschar **, int *, BOOL, BOOL, int, int,
553      int *, int *, branch_chain *, compile_data *, int *);      int *, int *, branch_chain *, compile_data *, int *);
554    
555    
# Line 500  static const char * Line 571  static const char *
571  find_error_text(int n)  find_error_text(int n)
572  {  {
573  const char *s = error_texts;  const char *s = error_texts;
574  for (; n > 0; n--) while (*s++ != 0) {};  for (; n > 0; n--)
575      {
576      while (*s++ != 0) {};
577      if (*s == 0) return "Error text not found (please report)";
578      }
579  return s;  return s;
580  }  }
581    
582    
583  /*************************************************  /*************************************************
584    *            Check for counted repeat            *
585    *************************************************/
586    
587    /* This function is called when a '{' is encountered in a place where it might
588    start a quantifier. It looks ahead to see if it really is a quantifier or not.
589    It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
590    where the ddds are digits.
591    
592    Arguments:
593      p         pointer to the first char after '{'
594    
595    Returns:    TRUE or FALSE
596    */
597    
598    static BOOL
599    is_counted_repeat(const uschar *p)
600    {
601    if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
602    while ((digitab[*p] & ctype_digit) != 0) p++;
603    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
604    
605    if (*p++ != CHAR_COMMA) return FALSE;
606    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
607    
608    if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
609    while ((digitab[*p] & ctype_digit) != 0) p++;
610    
611    return (*p == CHAR_RIGHT_CURLY_BRACKET);
612    }
613    
614    
615    
616    /*************************************************
617  *            Handle escapes                      *  *            Handle escapes                      *
618  *************************************************/  *************************************************/
619    
# Line 571  else Line 679  else
679    
680      case CHAR_l:      case CHAR_l:
681      case CHAR_L:      case CHAR_L:
682      case CHAR_N:      *errorcodeptr = ERR37;
683        break;
684    
685      case CHAR_u:      case CHAR_u:
686        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
687          {
688          /* In JavaScript, \u must be followed by four hexadecimal numbers.
689          Otherwise it is a lowercase u letter. */
690          if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0
691               && (digitab[ptr[3]] & ctype_xdigit) != 0 && (digitab[ptr[4]] & ctype_xdigit) != 0)
692            {
693            c = 0;
694            for (i = 0; i < 4; ++i)
695              {
696              register int cc = *(++ptr);
697    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
698              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
699              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
700    #else           /* EBCDIC coding */
701              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
702              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
703    #endif
704              }
705            }
706          }
707        else
708          *errorcodeptr = ERR37;
709        break;
710    
711      case CHAR_U:      case CHAR_U:
712      *errorcodeptr = ERR37;      /* In JavaScript, \U is an uppercase U letter. */
713        if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
714      break;      break;
715    
716      /* \g must be followed by one of a number of specific things:      /* In a character class, \g is just a literal "g". Outside a character
717        class, \g must be followed by one of a number of specific things:
718    
719      (1) A number, either plain or braced. If positive, it is an absolute      (1) A number, either plain or braced. If positive, it is an absolute
720      backreference. If negative, it is a relative backreference. This is a Perl      backreference. If negative, it is a relative backreference. This is a Perl
# Line 594  else Line 731  else
731      the -ESC_g code (cf \k). */      the -ESC_g code (cf \k). */
732    
733      case CHAR_g:      case CHAR_g:
734        if (isclass) break;
735      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
736        {        {
737        c = -ESC_g;        c = -ESC_g;
# Line 722  else Line 860  else
860      treated as a data character. */      treated as a data character. */
861    
862      case CHAR_x:      case CHAR_x:
863        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
864          {
865          /* In JavaScript, \x must be followed by two hexadecimal numbers.
866          Otherwise it is a lowercase x letter. */
867          if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0)
868            {
869            c = 0;
870            for (i = 0; i < 2; ++i)
871              {
872              register int cc = *(++ptr);
873    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
874              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
875              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
876    #else           /* EBCDIC coding */
877              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
878              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
879    #endif
880              }
881            }
882          break;
883          }
884    
885      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
886        {        {
887        const uschar *pt = ptr + 2;        const uschar *pt = ptr + 2;
# Line 772  else Line 932  else
932      break;      break;
933    
934      /* For \c, a following letter is upper-cased; then the 0x40 bit is flipped.      /* For \c, a following letter is upper-cased; then the 0x40 bit is flipped.
935      This coding is ASCII-specific, but then the whole concept of \cx is      An error is given if the byte following \c is not an ASCII character. This
936        coding is ASCII-specific, but then the whole concept of \cx is
937      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
938    
939      case CHAR_c:      case CHAR_c:
# Line 782  else Line 943  else
943        *errorcodeptr = ERR2;        *errorcodeptr = ERR2;
944        break;        break;
945        }        }
946    #ifndef EBCDIC    /* ASCII/UTF-8 coding */
947  #ifndef EBCDIC  /* ASCII/UTF-8 coding */      if (c > 127)  /* Excludes all non-ASCII in either mode */
948          {
949          *errorcodeptr = ERR68;
950          break;
951          }
952      if (c >= CHAR_a && c <= CHAR_z) c -= 32;      if (c >= CHAR_a && c <= CHAR_z) c -= 32;
953      c ^= 0x40;      c ^= 0x40;
954  #else           /* EBCDIC coding */  #else             /* EBCDIC coding */
955      if (c >= CHAR_a && c <= CHAR_z) c += 64;      if (c >= CHAR_a && c <= CHAR_z) c += 64;
956      c ^= 0xC0;      c ^= 0xC0;
957  #endif  #endif
# Line 809  else Line 974  else
974      }      }
975    }    }
976    
977    /* Perl supports \N{name} for character names, as well as plain \N for "not
978    newline". PCRE does not support \N{name}. However, it does support
979    quantification such as \N{2,3}. */
980    
981    if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
982         !is_counted_repeat(ptr+2))
983      *errorcodeptr = ERR37;
984    
985    /* If PCRE_UCP is set, we change the values for \d etc. */
986    
987    if ((options & PCRE_UCP) != 0 && c <= -ESC_D && c >= -ESC_w)
988      c -= (ESC_DU - ESC_D);
989    
990    /* Set the pointer to the final character before returning. */
991    
992  *ptrptr = ptr;  *ptrptr = ptr;
993  return c;  return c;
994  }  }
# Line 909  return -1; Line 1089  return -1;
1089    
1090    
1091  /*************************************************  /*************************************************
 *            Check for counted repeat            *  
 *************************************************/  
   
 /* This function is called when a '{' is encountered in a place where it might  
 start a quantifier. It looks ahead to see if it really is a quantifier or not.  
 It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}  
 where the ddds are digits.  
   
 Arguments:  
   p         pointer to the first char after '{'  
   
 Returns:    TRUE or FALSE  
 */  
   
 static BOOL  
 is_counted_repeat(const uschar *p)  
 {  
 if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  
 while ((digitab[*p] & ctype_digit) != 0) p++;  
 if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  
   
 if (*p++ != CHAR_COMMA) return FALSE;  
 if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  
   
 if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  
 while ((digitab[*p] & ctype_digit) != 0) p++;  
   
 return (*p == CHAR_RIGHT_CURLY_BRACKET);  
 }  
   
   
   
 /*************************************************  
1092  *         Read repeat counts                     *  *         Read repeat counts                     *
1093  *************************************************/  *************************************************/
1094    
# Line 1009  return p; Line 1156  return p;
1156    
1157    
1158  /*************************************************  /*************************************************
1159  *       Find forward referenced subpattern       *  *  Subroutine for finding forward reference      *
1160  *************************************************/  *************************************************/
1161    
1162  /* This function scans along a pattern's text looking for capturing  /* This recursive function is called only from find_parens() below. The
1163    top-level call starts at the beginning of the pattern. All other calls must
1164    start at a parenthesis. It scans along a pattern's text looking for capturing
1165  subpatterns, and counting them. If it finds a named pattern that matches the  subpatterns, and counting them. If it finds a named pattern that matches the
1166  name it is given, it returns its number. Alternatively, if the name is NULL, it  name it is given, it returns its number. Alternatively, if the name is NULL, it
1167  returns when it reaches a given numbered subpattern. This is used for forward  returns when it reaches a given numbered subpattern. Recursion is used to keep
1168  references to subpatterns. We know that if (?P< is encountered, the name will  track of subpatterns that reset the capturing group numbers - the (?| feature.
1169  be terminated by '>' because that is checked in the first pass.  
1170    This function was originally called only from the second pass, in which we know
1171    that if (?< or (?' or (?P< is encountered, the name will be correctly
1172    terminated because that is checked in the first pass. There is now one call to
1173    this function in the first pass, to check for a recursive back reference by
1174    name (so that we can make the whole group atomic). In this case, we need check
1175    only up to the current position in the pattern, and that is still OK because
1176    and previous occurrences will have been checked. To make this work, the test
1177    for "end of pattern" is a check against cd->end_pattern in the main loop,
1178    instead of looking for a binary zero. This means that the special first-pass
1179    call can adjust cd->end_pattern temporarily. (Checks for binary zero while
1180    processing items within the loop are OK, because afterwards the main loop will
1181    terminate.)
1182    
1183  Arguments:  Arguments:
1184    ptr          current position in the pattern    ptrptr       address of the current character pointer (updated)
1185    cd           compile background data    cd           compile background data
1186    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1187    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1188    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1189      utf8         TRUE if we are in UTF-8 mode
1190      count        pointer to the current capturing subpattern number (updated)
1191    
1192  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1193  */  */
1194    
1195  static int  static int
1196  find_parens(const uschar *ptr, compile_data *cd, const uschar *name, int lorn,  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,
1197    BOOL xmode)    BOOL xmode, BOOL utf8, int *count)
1198  {  {
1199  const uschar *thisname;  uschar *ptr = *ptrptr;
1200  int count = cd->bracount;  int start_count = *count;
1201    int hwm_count = start_count;
1202    BOOL dup_parens = FALSE;
1203    
1204    /* If the first character is a parenthesis, check on the type of group we are
1205    dealing with. The very first call may not start with a parenthesis. */
1206    
1207  for (; *ptr != 0; ptr++)  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1208    {    {
1209    int term;    /* Handle specials such as (*SKIP) or (*UTF8) etc. */
1210    
1211      if (ptr[1] == CHAR_ASTERISK) ptr += 2;
1212    
1213      /* Handle a normal, unnamed capturing parenthesis. */
1214    
1215      else if (ptr[1] != CHAR_QUESTION_MARK)
1216        {
1217        *count += 1;
1218        if (name == NULL && *count == lorn) return *count;
1219        ptr++;
1220        }
1221    
1222      /* All cases now have (? at the start. Remember when we are in a group
1223      where the parenthesis numbers are duplicated. */
1224    
1225      else if (ptr[2] == CHAR_VERTICAL_LINE)
1226        {
1227        ptr += 3;
1228        dup_parens = TRUE;
1229        }
1230    
1231      /* Handle comments; all characters are allowed until a ket is reached. */
1232    
1233      else if (ptr[2] == CHAR_NUMBER_SIGN)
1234        {
1235        for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
1236        goto FAIL_EXIT;
1237        }
1238    
1239      /* Handle a condition. If it is an assertion, just carry on so that it
1240      is processed as normal. If not, skip to the closing parenthesis of the
1241      condition (there can't be any nested parens). */
1242    
1243      else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
1244        {
1245        ptr += 2;
1246        if (ptr[1] != CHAR_QUESTION_MARK)
1247          {
1248          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
1249          if (*ptr != 0) ptr++;
1250          }
1251        }
1252    
1253      /* Start with (? but not a condition. */
1254    
1255      else
1256        {
1257        ptr += 2;
1258        if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */
1259    
1260        /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */
1261    
1262        if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&
1263            ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1264          {
1265          int term;
1266          const uschar *thisname;
1267          *count += 1;
1268          if (name == NULL && *count == lorn) return *count;
1269          term = *ptr++;
1270          if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;
1271          thisname = ptr;
1272          while (*ptr != term) ptr++;
1273          if (name != NULL && lorn == ptr - thisname &&
1274              strncmp((const char *)name, (const char *)thisname, lorn) == 0)
1275            return *count;
1276          term++;
1277          }
1278        }
1279      }
1280    
1281    /* Past any initial parenthesis handling, scan for parentheses or vertical
1282    bars. Stop if we get to cd->end_pattern. Note that this is important for the
1283    first-pass call when this value is temporarily adjusted to stop at the current
1284    position. So DO NOT change this to a test for binary zero. */
1285    
1286    for (; ptr < cd->end_pattern; ptr++)
1287      {
1288    /* Skip over backslashed characters and also entire \Q...\E */    /* Skip over backslashed characters and also entire \Q...\E */
1289    
1290    if (*ptr == CHAR_BACKSLASH)    if (*ptr == CHAR_BACKSLASH)
1291      {      {
1292      if (*(++ptr) == 0) return -1;      if (*(++ptr) == 0) goto FAIL_EXIT;
1293      if (*ptr == CHAR_Q) for (;;)      if (*ptr == CHAR_Q) for (;;)
1294        {        {
1295        while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};        while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1296        if (*ptr == 0) return -1;        if (*ptr == 0) goto FAIL_EXIT;
1297        if (*(++ptr) == CHAR_E) break;        if (*(++ptr) == CHAR_E) break;
1298        }        }
1299      continue;      continue;
# Line 1057  for (; *ptr != 0; ptr++) Line 1302  for (; *ptr != 0; ptr++)
1302    /* Skip over character classes; this logic must be similar to the way they    /* Skip over character classes; this logic must be similar to the way they
1303    are handled for real. If the first character is '^', skip it. Also, if the    are handled for real. If the first character is '^', skip it. Also, if the
1304    first few characters (either before or after ^) are \Q\E or \E we skip them    first few characters (either before or after ^) are \Q\E or \E we skip them
1305    too. This makes for compatibility with Perl. Note the use of STR macros to    too. This makes for compatibility with Perl. Note the use of STR macros to
1306    encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */    encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */
1307    
1308    if (*ptr == CHAR_LEFT_SQUARE_BRACKET)    if (*ptr == CHAR_LEFT_SQUARE_BRACKET)
# Line 1065  for (; *ptr != 0; ptr++) Line 1310  for (; *ptr != 0; ptr++)
1310      BOOL negate_class = FALSE;      BOOL negate_class = FALSE;
1311      for (;;)      for (;;)
1312        {        {
1313        int c = *(++ptr);        if (ptr[1] == CHAR_BACKSLASH)
       if (c == CHAR_BACKSLASH)  
1314          {          {
1315          if (ptr[1] == CHAR_E)          if (ptr[2] == CHAR_E)
1316            ptr++;            ptr+= 2;
1317          else if (strncmp((const char *)ptr+1,          else if (strncmp((const char *)ptr+2,
1318                   STR_Q STR_BACKSLASH STR_E, 3) == 0)                   STR_Q STR_BACKSLASH STR_E, 3) == 0)
1319            ptr += 3;            ptr += 4;
1320          else          else
1321            break;            break;
1322          }          }
1323        else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)        else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
1324            {
1325          negate_class = TRUE;          negate_class = TRUE;
1326            ptr++;
1327            }
1328        else break;        else break;
1329        }        }
1330    
1331      /* If the next character is ']', it is a data character that must be      /* If the next character is ']', it is a data character that must be
1332      skipped, except in JavaScript compatibility mode. */      skipped, except in JavaScript compatibility mode. */
1333    
1334      if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&      if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&
1335          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
1336        ptr++;        ptr++;
1337    
# Line 1093  for (; *ptr != 0; ptr++) Line 1340  for (; *ptr != 0; ptr++)
1340        if (*ptr == 0) return -1;        if (*ptr == 0) return -1;
1341        if (*ptr == CHAR_BACKSLASH)        if (*ptr == CHAR_BACKSLASH)
1342          {          {
1343          if (*(++ptr) == 0) return -1;          if (*(++ptr) == 0) goto FAIL_EXIT;
1344          if (*ptr == CHAR_Q) for (;;)          if (*ptr == CHAR_Q) for (;;)
1345            {            {
1346            while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};            while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1347            if (*ptr == 0) return -1;            if (*ptr == 0) goto FAIL_EXIT;
1348            if (*(++ptr) == CHAR_E) break;            if (*(++ptr) == CHAR_E) break;
1349            }            }
1350          continue;          continue;
# Line 1110  for (; *ptr != 0; ptr++) Line 1357  for (; *ptr != 0; ptr++)
1357    
1358    if (xmode && *ptr == CHAR_NUMBER_SIGN)    if (xmode && *ptr == CHAR_NUMBER_SIGN)
1359      {      {
1360      while (*(++ptr) != 0 && *ptr != CHAR_NL) {};      ptr++;
1361      if (*ptr == 0) return -1;      while (*ptr != 0)
1362          {
1363          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
1364          ptr++;
1365    #ifdef SUPPORT_UTF8
1366          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
1367    #endif
1368          }
1369        if (*ptr == 0) goto FAIL_EXIT;
1370      continue;      continue;
1371      }      }
1372    
1373    /* An opening parens must now be a real metacharacter */    /* Check for the special metacharacters */
1374    
1375    if (*ptr != CHAR_LEFT_PARENTHESIS) continue;    if (*ptr == CHAR_LEFT_PARENTHESIS)
   if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)  
1376      {      {
1377      count++;      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, count);
1378      if (name == NULL && count == lorn) return count;      if (rc > 0) return rc;
1379      continue;      if (*ptr == 0) goto FAIL_EXIT;
1380      }      }
1381    
1382    ptr += 2;    else if (*ptr == CHAR_RIGHT_PARENTHESIS)
1383    if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */      {
1384        if (dup_parens && *count < hwm_count) *count = hwm_count;
1385        goto FAIL_EXIT;
1386        }
1387    
1388    /* We have to disambiguate (?<! and (?<= from (?<name> */    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
1389        {
1390        if (*count > hwm_count) hwm_count = *count;
1391        *count = start_count;
1392        }
1393      }
1394    
1395    if ((*ptr != CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_EXCLAMATION_MARK ||  FAIL_EXIT:
1396        ptr[1] == CHAR_EQUALS_SIGN) && *ptr != CHAR_APOSTROPHE)  *ptrptr = ptr;
1397      continue;  return -1;
1398    }
1399    
1400    
1401    
1402    
1403    /*************************************************
1404    *       Find forward referenced subpattern       *
1405    *************************************************/
1406    
1407    /* This function scans along a pattern's text looking for capturing
1408    subpatterns, and counting them. If it finds a named pattern that matches the
1409    name it is given, it returns its number. Alternatively, if the name is NULL, it
1410    returns when it reaches a given numbered subpattern. This is used for forward
1411    references to subpatterns. We used to be able to start this scan from the
1412    current compiling point, using the current count value from cd->bracount, and
1413    do it all in a single loop, but the addition of the possibility of duplicate
1414    subpattern numbers means that we have to scan from the very start, in order to
1415    take account of such duplicates, and to use a recursive function to keep track
1416    of the different types of group.
1417    
1418    Arguments:
1419      cd           compile background data
1420      name         name to seek, or NULL if seeking a numbered subpattern
1421      lorn         name length, or subpattern number if name is NULL
1422      xmode        TRUE if we are in /x mode
1423      utf8         TRUE if we are in UTF-8 mode
1424    
1425    count++;  Returns:       the number of the found subpattern, or -1 if not found
1426    */
1427    
1428    if (name == NULL && count == lorn) return count;  static int
1429    term = *ptr++;  find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode,
1430    if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;    BOOL utf8)
1431    thisname = ptr;  {
1432    while (*ptr != term) ptr++;  uschar *ptr = (uschar *)cd->start_pattern;
1433    if (name != NULL && lorn == ptr - thisname &&  int count = 0;
1434        strncmp((const char *)name, (const char *)thisname, lorn) == 0)  int rc;
1435      return count;  
1436    /* If the pattern does not start with an opening parenthesis, the first call
1437    to find_parens_sub() will scan right to the end (if necessary). However, if it
1438    does start with a parenthesis, find_parens_sub() will return when it hits the
1439    matching closing parens. That is why we have to have a loop. */
1440    
1441    for (;;)
1442      {
1443      rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, &count);
1444      if (rc > 0 || *ptr++ == 0) break;
1445    }    }
1446    
1447  return -1;  return rc;
1448  }  }
1449    
1450    
1451    
1452    
1453  /*************************************************  /*************************************************
1454  *      Find first significant op code            *  *      Find first significant op code            *
1455  *************************************************/  *************************************************/
1456    
1457  /* This is called by several functions that scan a compiled expression looking  /* This is called by several functions that scan a compiled expression looking
1458  for a fixed first character, or an anchoring op code etc. It skips over things  for a fixed first character, or an anchoring op code etc. It skips over things
1459  that do not influence this. For some calls, a change of option is important.  that do not influence this. For some calls, it makes sense to skip negative
1460  For some calls, it makes sense to skip negative forward and all backward  forward and all backward assertions, and also the \b assertion; for others it
1461  assertions, and also the \b assertion; for others it does not.  does not.
1462    
1463  Arguments:  Arguments:
1464    code         pointer to the start of the group    code         pointer to the start of the group
   options      pointer to external options  
   optbit       the option bit whose changing is significant, or  
                  zero if none are  
1465    skipassert   TRUE if certain assertions are to be skipped    skipassert   TRUE if certain assertions are to be skipped
1466    
1467  Returns:       pointer to the first significant opcode  Returns:       pointer to the first significant opcode
1468  */  */
1469    
1470  static const uschar*  static const uschar*
1471  first_significant_code(const uschar *code, int *options, int optbit,  first_significant_code(const uschar *code, BOOL skipassert)
   BOOL skipassert)  
1472  {  {
1473  for (;;)  for (;;)
1474    {    {
1475    switch ((int)*code)    switch ((int)*code)
1476      {      {
     case OP_OPT:  
     if (optbit > 0 && ((int)code[1] & optbit) != (*options & optbit))  
       *options = (int)code[1];  
     code += 2;  
     break;  
   
1477      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1478      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1479      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
# Line 1200  for (;;) Line 1489  for (;;)
1489    
1490      case OP_CALLOUT:      case OP_CALLOUT:
1491      case OP_CREF:      case OP_CREF:
1492        case OP_NCREF:
1493      case OP_RREF:      case OP_RREF:
1494        case OP_NRREF:
1495      case OP_DEF:      case OP_DEF:
1496      code += _pcre_OP_lengths[*code];      code += _pcre_OP_lengths[*code];
1497      break;      break;
# Line 1216  for (;;) Line 1507  for (;;)
1507    
1508    
1509  /*************************************************  /*************************************************
1510  *        Find the fixed length of a pattern      *  *        Find the fixed length of a branch       *
1511  *************************************************/  *************************************************/
1512    
1513  /* Scan a pattern and compute the fixed length of subject that will match it,  /* Scan a branch and compute the fixed length of subject that will match it,
1514  if the length is fixed. This is needed for dealing with backward assertions.  if the length is fixed. This is needed for dealing with backward assertions.
1515  In UTF8 mode, the result is in characters rather than bytes.  In UTF8 mode, the result is in characters rather than bytes. The branch is
1516    temporarily terminated with OP_END when this function is called.
1517    
1518    This function is called when a backward assertion is encountered, so that if it
1519    fails, the error message can point to the correct place in the pattern.
1520    However, we cannot do this when the assertion contains subroutine calls,
1521    because they can be forward references. We solve this by remembering this case
1522    and doing the check at the end; a flag specifies which mode we are running in.
1523    
1524  Arguments:  Arguments:
1525    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1526    options  the compiling options    utf8     TRUE in UTF-8 mode
1527      atend    TRUE if called when the pattern is complete
1528  Returns:   the fixed length, or -1 if there is no fixed length,    cd       the "compile data" structure
1529               or -2 if \C was encountered  
1530    Returns:   the fixed length,
1531                 or -1 if there is no fixed length,
1532                 or -2 if \C was encountered (in UTF-8 mode only)
1533                 or -3 if an OP_RECURSE item was encountered and atend is FALSE
1534                 or -4 if an unknown opcode was encountered (internal error)
1535  */  */
1536    
1537  static int  static int
1538  find_fixedlength(uschar *code, int options)  find_fixedlength(uschar *code, BOOL utf8, BOOL atend, compile_data *cd)
1539  {  {
1540  int length = -1;  int length = -1;
1541    
# Line 1245  branch, check the length against that of Line 1548  branch, check the length against that of
1548  for (;;)  for (;;)
1549    {    {
1550    int d;    int d;
1551      uschar *ce, *cs;
1552    register int op = *cc;    register int op = *cc;
1553    switch (op)    switch (op)
1554      {      {
1555        /* We only need to continue for OP_CBRA (normal capturing bracket) and
1556        OP_BRA (normal non-capturing bracket) because the other variants of these
1557        opcodes are all concerned with unlimited repeated groups, which of course
1558        are not of fixed length. */
1559    
1560      case OP_CBRA:      case OP_CBRA:
1561      case OP_BRA:      case OP_BRA:
1562      case OP_ONCE:      case OP_ONCE:
1563        case OP_ONCE_NC:
1564      case OP_COND:      case OP_COND:
1565      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), utf8, atend, cd);
1566      if (d < 0) return d;      if (d < 0) return d;
1567      branchlength += d;      branchlength += d;
1568      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1569      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1570      break;      break;
1571    
1572      /* Reached end of a branch; if it's a ket it is the end of a nested      /* Reached end of a branch; if it's a ket it is the end of a nested call.
1573      call. If it's ALT it is an alternation in a nested call. If it is      If it's ALT it is an alternation in a nested call. An ACCEPT is effectively
1574      END it's the end of the outer call. All can be handled by the same code. */      an ALT. If it is END it's the end of the outer call. All can be handled by
1575        the same code. Note that we must not include the OP_KETRxxx opcodes here,
1576        because they all imply an unlimited repeat. */
1577    
1578      case OP_ALT:      case OP_ALT:
1579      case OP_KET:      case OP_KET:
     case OP_KETRMAX:  
     case OP_KETRMIN:  
1580      case OP_END:      case OP_END:
1581        case OP_ACCEPT:
1582        case OP_ASSERT_ACCEPT:
1583      if (length < 0) length = branchlength;      if (length < 0) length = branchlength;
1584        else if (length != branchlength) return -1;        else if (length != branchlength) return -1;
1585      if (*cc != OP_ALT) return length;      if (*cc != OP_ALT) return length;
# Line 1275  for (;;) Line 1587  for (;;)
1587      branchlength = 0;      branchlength = 0;
1588      break;      break;
1589    
1590        /* A true recursion implies not fixed length, but a subroutine call may
1591        be OK. If the subroutine is a forward reference, we can't deal with
1592        it until the end of the pattern, so return -3. */
1593    
1594        case OP_RECURSE:
1595        if (!atend) return -3;
1596        cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1597        do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */
1598        if (cc > cs && cc < ce) return -1;                /* Recursion */
1599        d = find_fixedlength(cs + 2, utf8, atend, cd);
1600        if (d < 0) return d;
1601        branchlength += d;
1602        cc += 1 + LINK_SIZE;
1603        break;
1604    
1605      /* Skip over assertive subpatterns */      /* Skip over assertive subpatterns */
1606    
1607      case OP_ASSERT:      case OP_ASSERT:
# Line 1286  for (;;) Line 1613  for (;;)
1613    
1614      /* Skip over things that don't match chars */      /* Skip over things that don't match chars */
1615    
1616      case OP_REVERSE:      case OP_MARK:
1617        case OP_PRUNE_ARG:
1618        case OP_SKIP_ARG:
1619        case OP_THEN_ARG:
1620        cc += cc[1] + _pcre_OP_lengths[*cc];
1621        break;
1622    
1623        case OP_CALLOUT:
1624        case OP_CIRC:
1625        case OP_CIRCM:
1626        case OP_CLOSE:
1627        case OP_COMMIT:
1628      case OP_CREF:      case OP_CREF:
     case OP_RREF:  
1629      case OP_DEF:      case OP_DEF:
1630      case OP_OPT:      case OP_DOLL:
1631      case OP_CALLOUT:      case OP_DOLLM:
     case OP_SOD:  
     case OP_SOM:  
1632      case OP_EOD:      case OP_EOD:
1633      case OP_EODN:      case OP_EODN:
1634      case OP_CIRC:      case OP_FAIL:
1635      case OP_DOLL:      case OP_NCREF:
1636        case OP_NRREF:
1637      case OP_NOT_WORD_BOUNDARY:      case OP_NOT_WORD_BOUNDARY:
1638        case OP_PRUNE:
1639        case OP_REVERSE:
1640        case OP_RREF:
1641        case OP_SET_SOM:
1642        case OP_SKIP:
1643        case OP_SOD:
1644        case OP_SOM:
1645        case OP_THEN:
1646      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
1647      cc += _pcre_OP_lengths[*cc];      cc += _pcre_OP_lengths[*cc];
1648      break;      break;
# Line 1306  for (;;) Line 1650  for (;;)
1650      /* Handle literal characters */      /* Handle literal characters */
1651    
1652      case OP_CHAR:      case OP_CHAR:
1653      case OP_CHARNC:      case OP_CHARI:
1654      case OP_NOT:      case OP_NOT:
1655        case OP_NOTI:
1656      branchlength++;      branchlength++;
1657      cc += 2;      cc += 2;
1658  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1659      if ((options & PCRE_UTF8) != 0)      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       {  
       while ((*cc & 0xc0) == 0x80) cc++;  
       }  
1660  #endif  #endif
1661      break;      break;
1662    
# Line 1322  for (;;) Line 1664  for (;;)
1664      need to skip over a multibyte character in UTF8 mode.  */      need to skip over a multibyte character in UTF8 mode.  */
1665    
1666      case OP_EXACT:      case OP_EXACT:
1667        case OP_EXACTI:
1668        case OP_NOTEXACT:
1669        case OP_NOTEXACTI:
1670      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1671      cc += 4;      cc += 4;
1672  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1673      if ((options & PCRE_UTF8) != 0)      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       {  
       while((*cc & 0x80) == 0x80) cc++;  
       }  
1674  #endif  #endif
1675      break;      break;
1676    
# Line 1345  for (;;) Line 1687  for (;;)
1687      cc += 2;      cc += 2;
1688      /* Fall through */      /* Fall through */
1689    
1690        case OP_HSPACE:
1691        case OP_VSPACE:
1692        case OP_NOT_HSPACE:
1693        case OP_NOT_VSPACE:
1694      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
1695      case OP_DIGIT:      case OP_DIGIT:
1696      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
# Line 1357  for (;;) Line 1703  for (;;)
1703      cc++;      cc++;
1704      break;      break;
1705    
1706      /* The single-byte matcher isn't allowed */      /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
1707        otherwise \C is coded as OP_ALLANY. */
1708    
1709      case OP_ANYBYTE:      case OP_ANYBYTE:
1710      return -2;      return -2;
# Line 1376  for (;;) Line 1723  for (;;)
1723    
1724      switch (*cc)      switch (*cc)
1725        {        {
1726          case OP_CRPLUS:
1727          case OP_CRMINPLUS:
1728        case OP_CRSTAR:        case OP_CRSTAR:
1729        case OP_CRMINSTAR:        case OP_CRMINSTAR:
1730        case OP_CRQUERY:        case OP_CRQUERY:
# Line 1396  for (;;) Line 1745  for (;;)
1745    
1746      /* Anything else is variable length */      /* Anything else is variable length */
1747    
1748      default:      case OP_ANYNL:
1749        case OP_BRAMINZERO:
1750        case OP_BRAPOS:
1751        case OP_BRAPOSZERO:
1752        case OP_BRAZERO:
1753        case OP_CBRAPOS:
1754        case OP_EXTUNI:
1755        case OP_KETRMAX:
1756        case OP_KETRMIN:
1757        case OP_KETRPOS:
1758        case OP_MINPLUS:
1759        case OP_MINPLUSI:
1760        case OP_MINQUERY:
1761        case OP_MINQUERYI:
1762        case OP_MINSTAR:
1763        case OP_MINSTARI:
1764        case OP_MINUPTO:
1765        case OP_MINUPTOI:
1766        case OP_NOTMINPLUS:
1767        case OP_NOTMINPLUSI:
1768        case OP_NOTMINQUERY:
1769        case OP_NOTMINQUERYI:
1770        case OP_NOTMINSTAR:
1771        case OP_NOTMINSTARI:
1772        case OP_NOTMINUPTO:
1773        case OP_NOTMINUPTOI:
1774        case OP_NOTPLUS:
1775        case OP_NOTPLUSI:
1776        case OP_NOTPOSPLUS:
1777        case OP_NOTPOSPLUSI:
1778        case OP_NOTPOSQUERY:
1779        case OP_NOTPOSQUERYI:
1780        case OP_NOTPOSSTAR:
1781        case OP_NOTPOSSTARI:
1782        case OP_NOTPOSUPTO:
1783        case OP_NOTPOSUPTOI:
1784        case OP_NOTQUERY:
1785        case OP_NOTQUERYI:
1786        case OP_NOTSTAR:
1787        case OP_NOTSTARI:
1788        case OP_NOTUPTO:
1789        case OP_NOTUPTOI:
1790        case OP_PLUS:
1791        case OP_PLUSI:
1792        case OP_POSPLUS:
1793        case OP_POSPLUSI:
1794        case OP_POSQUERY:
1795        case OP_POSQUERYI:
1796        case OP_POSSTAR:
1797        case OP_POSSTARI:
1798        case OP_POSUPTO:
1799        case OP_POSUPTOI:
1800        case OP_QUERY:
1801        case OP_QUERYI:
1802        case OP_REF:
1803        case OP_REFI:
1804        case OP_SBRA:
1805        case OP_SBRAPOS:
1806        case OP_SCBRA:
1807        case OP_SCBRAPOS:
1808        case OP_SCOND:
1809        case OP_SKIPZERO:
1810        case OP_STAR:
1811        case OP_STARI:
1812        case OP_TYPEMINPLUS:
1813        case OP_TYPEMINQUERY:
1814        case OP_TYPEMINSTAR:
1815        case OP_TYPEMINUPTO:
1816        case OP_TYPEPLUS:
1817        case OP_TYPEPOSPLUS:
1818        case OP_TYPEPOSQUERY:
1819        case OP_TYPEPOSSTAR:
1820        case OP_TYPEPOSUPTO:
1821        case OP_TYPEQUERY:
1822        case OP_TYPESTAR:
1823        case OP_TYPEUPTO:
1824        case OP_UPTO:
1825        case OP_UPTOI:
1826      return -1;      return -1;
1827    
1828        /* Catch unrecognized opcodes so that when new ones are added they
1829        are not forgotten, as has happened in the past. */
1830    
1831        default:
1832        return -4;
1833      }      }
1834    }    }
1835  /* Control never gets here */  /* Control never gets here */
# Line 1407  for (;;) Line 1839  for (;;)
1839    
1840    
1841  /*************************************************  /*************************************************
1842  *    Scan compiled regex for numbered bracket    *  *    Scan compiled regex for specific bracket    *
1843  *************************************************/  *************************************************/
1844    
1845  /* This little function scans through a compiled pattern until it finds a  /* This little function scans through a compiled pattern until it finds a
1846  capturing bracket with the given number.  capturing bracket with the given number, or, if the number is negative, an
1847    instance of OP_REVERSE for a lookbehind. The function is global in the C sense
1848    so that it can be called from pcre_study() when finding the minimum matching
1849    length.
1850    
1851  Arguments:  Arguments:
1852    code        points to start of expression    code        points to start of expression
1853    utf8        TRUE in UTF-8 mode    utf8        TRUE in UTF-8 mode
1854    number      the required bracket number    number      the required bracket number or negative to find a lookbehind
1855    
1856  Returns:      pointer to the opcode for the bracket, or NULL if not found  Returns:      pointer to the opcode for the bracket, or NULL if not found
1857  */  */
1858    
1859  static const uschar *  const uschar *
1860  find_bracket(const uschar *code, BOOL utf8, int number)  _pcre_find_bracket(const uschar *code, BOOL utf8, int number)
1861  {  {
1862  for (;;)  for (;;)
1863    {    {
1864    register int c = *code;    register int c = *code;
1865    
1866    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
1867    
1868    /* XCLASS is used for classes that cannot be represented just by a bit    /* XCLASS is used for classes that cannot be represented just by a bit
# Line 1435  for (;;) Line 1871  for (;;)
1871    
1872    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
1873    
1874      /* Handle recursion */
1875    
1876      else if (c == OP_REVERSE)
1877        {
1878        if (number < 0) return (uschar *)code;
1879        code += _pcre_OP_lengths[c];
1880        }
1881    
1882    /* Handle capturing bracket */    /* Handle capturing bracket */
1883    
1884    else if (c == OP_CBRA)    else if (c == OP_CBRA || c == OP_SCBRA ||
1885               c == OP_CBRAPOS || c == OP_SCBRAPOS)
1886      {      {
1887      int n = GET2(code, 1+LINK_SIZE);      int n = GET2(code, 1+LINK_SIZE);
1888      if (n == number) return (uschar *)code;      if (n == number) return (uschar *)code;
# Line 1446  for (;;) Line 1891  for (;;)
1891    
1892    /* Otherwise, we can get the item's length from the table, except that for    /* Otherwise, we can get the item's length from the table, except that for
1893    repeated character types, we have to test for \p and \P, which have an extra    repeated character types, we have to test for \p and \P, which have an extra
1894    two bytes of parameters. */    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
1895      must add in its length. */
1896    
1897    else    else
1898      {      {
# Line 1470  for (;;) Line 1916  for (;;)
1916        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
1917        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1918        break;        break;
1919    
1920          case OP_MARK:
1921          case OP_PRUNE_ARG:
1922          case OP_SKIP_ARG:
1923          code += code[1];
1924          break;
1925    
1926          case OP_THEN_ARG:
1927          code += code[1];
1928          break;
1929        }        }
1930    
1931      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
# Line 1484  for (;;) Line 1940  for (;;)
1940      if (utf8) switch(c)      if (utf8) switch(c)
1941        {        {
1942        case OP_CHAR:        case OP_CHAR:
1943        case OP_CHARNC:        case OP_CHARI:
1944        case OP_EXACT:        case OP_EXACT:
1945          case OP_EXACTI:
1946        case OP_UPTO:        case OP_UPTO:
1947          case OP_UPTOI:
1948        case OP_MINUPTO:        case OP_MINUPTO:
1949          case OP_MINUPTOI:
1950        case OP_POSUPTO:        case OP_POSUPTO:
1951          case OP_POSUPTOI:
1952        case OP_STAR:        case OP_STAR:
1953          case OP_STARI:
1954        case OP_MINSTAR:        case OP_MINSTAR:
1955          case OP_MINSTARI:
1956        case OP_POSSTAR:        case OP_POSSTAR:
1957          case OP_POSSTARI:
1958        case OP_PLUS:        case OP_PLUS:
1959          case OP_PLUSI:
1960        case OP_MINPLUS:        case OP_MINPLUS:
1961          case OP_MINPLUSI:
1962        case OP_POSPLUS:        case OP_POSPLUS:
1963          case OP_POSPLUSI:
1964        case OP_QUERY:        case OP_QUERY:
1965          case OP_QUERYI:
1966        case OP_MINQUERY:        case OP_MINQUERY:
1967          case OP_MINQUERYI:
1968        case OP_POSQUERY:        case OP_POSQUERY:
1969          case OP_POSQUERYI:
1970        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1971        break;        break;
1972        }        }
# Line 1541  for (;;) Line 2010  for (;;)
2010    
2011    /* Otherwise, we can get the item's length from the table, except that for    /* Otherwise, we can get the item's length from the table, except that for
2012    repeated character types, we have to test for \p and \P, which have an extra    repeated character types, we have to test for \p and \P, which have an extra
2013    two bytes of parameters. */    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
2014      must add in its length. */
2015    
2016    else    else
2017      {      {
# Line 1565  for (;;) Line 2035  for (;;)
2035        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2036        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
2037        break;        break;
2038    
2039          case OP_MARK:
2040          case OP_PRUNE_ARG:
2041          case OP_SKIP_ARG:
2042          code += code[1];
2043          break;
2044    
2045          case OP_THEN_ARG:
2046          code += code[1];
2047          break;
2048        }        }
2049    
2050      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
# Line 1579  for (;;) Line 2059  for (;;)
2059      if (utf8) switch(c)      if (utf8) switch(c)
2060        {        {
2061        case OP_CHAR:        case OP_CHAR:
2062        case OP_CHARNC:        case OP_CHARI:
2063        case OP_EXACT:        case OP_EXACT:
2064          case OP_EXACTI:
2065        case OP_UPTO:        case OP_UPTO:
2066          case OP_UPTOI:
2067        case OP_MINUPTO:        case OP_MINUPTO:
2068          case OP_MINUPTOI:
2069        case OP_POSUPTO:        case OP_POSUPTO:
2070          case OP_POSUPTOI:
2071        case OP_STAR:        case OP_STAR:
2072          case OP_STARI:
2073        case OP_MINSTAR:        case OP_MINSTAR:
2074          case OP_MINSTARI:
2075        case OP_POSSTAR:        case OP_POSSTAR:
2076          case OP_POSSTARI:
2077        case OP_PLUS:        case OP_PLUS:
2078          case OP_PLUSI:
2079        case OP_MINPLUS:        case OP_MINPLUS:
2080          case OP_MINPLUSI:
2081        case OP_POSPLUS:        case OP_POSPLUS:
2082          case OP_POSPLUSI:
2083        case OP_QUERY:        case OP_QUERY:
2084          case OP_QUERYI:
2085        case OP_MINQUERY:        case OP_MINQUERY:
2086          case OP_MINQUERYI:
2087        case OP_POSQUERY:        case OP_POSQUERY:
2088          case OP_POSQUERYI:
2089        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
2090        break;        break;
2091        }        }
# Line 1621  Arguments: Line 2114  Arguments:
2114    code        points to start of search    code        points to start of search
2115    endcode     points to where to stop    endcode     points to where to stop
2116    utf8        TRUE if in UTF8 mode    utf8        TRUE if in UTF8 mode
2117      cd          contains pointers to tables etc.
2118    
2119  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2120  */  */
2121    
2122  static BOOL  static BOOL
2123  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8)  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8,
2124      compile_data *cd)
2125  {  {
2126  register int c;  register int c;
2127  for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);  for (code = first_significant_code(code + _pcre_OP_lengths[*code], TRUE);
2128       code < endcode;       code < endcode;
2129       code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))       code = first_significant_code(code + _pcre_OP_lengths[c], TRUE))
2130    {    {
2131    const uschar *ccode;    const uschar *ccode;
2132    
# Line 1647  for (code = first_significant_code(code Line 2142  for (code = first_significant_code(code
2142      continue;      continue;
2143      }      }
2144    
2145      /* For a recursion/subroutine call, if its end has been reached, which
2146      implies a backward reference subroutine call, we can scan it. If it's a
2147      forward reference subroutine call, we can't. To detect forward reference
2148      we have to scan up the list that is kept in the workspace. This function is
2149      called only when doing the real compile, not during the pre-compile that
2150      measures the size of the compiled pattern. */
2151    
2152      if (c == OP_RECURSE)
2153        {
2154        const uschar *scode;
2155        BOOL empty_branch;
2156    
2157        /* Test for forward reference */
2158    
2159        for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE)
2160          if (GET(scode, 0) == code + 1 - cd->start_code) return TRUE;
2161    
2162        /* Not a forward reference, test for completed backward reference */
2163    
2164        empty_branch = FALSE;
2165        scode = cd->start_code + GET(code, 1);
2166        if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
2167    
2168        /* Completed backwards reference */
2169    
2170        do
2171          {
2172          if (could_be_empty_branch(scode, endcode, utf8, cd))
2173            {
2174            empty_branch = TRUE;
2175            break;
2176            }
2177          scode += GET(scode, 1);
2178          }
2179        while (*scode == OP_ALT);
2180    
2181        if (!empty_branch) return FALSE;  /* All branches are non-empty */
2182        continue;
2183        }
2184    
2185    /* Groups with zero repeats can of course be empty; skip them. */    /* Groups with zero repeats can of course be empty; skip them. */
2186    
2187    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2188          c == OP_BRAPOSZERO)
2189      {      {
2190      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
2191      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
# Line 1657  for (code = first_significant_code(code Line 2193  for (code = first_significant_code(code
2193      continue;      continue;
2194      }      }
2195    
2196      /* A nested group that is already marked as "could be empty" can just be
2197      skipped. */
2198    
2199      if (c == OP_SBRA  || c == OP_SBRAPOS ||
2200          c == OP_SCBRA || c == OP_SCBRAPOS)
2201        {
2202        do code += GET(code, 1); while (*code == OP_ALT);
2203        c = *code;
2204        continue;
2205        }
2206    
2207    /* For other groups, scan the branches. */    /* For other groups, scan the branches. */
2208    
2209    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)    if (c == OP_BRA  || c == OP_BRAPOS ||
2210          c == OP_CBRA || c == OP_CBRAPOS ||
2211          c == OP_ONCE || c == OP_ONCE_NC ||
2212          c == OP_COND)
2213      {      {
2214      BOOL empty_branch;      BOOL empty_branch;
2215      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
2216    
2217      /* Scan a closed bracket */      /* If a conditional group has only one branch, there is a second, implied,
2218        empty branch, so just skip over the conditional, because it could be empty.
2219        Otherwise, scan the individual branches of the group. */
2220    
2221      empty_branch = FALSE;      if (c == OP_COND && code[GET(code, 1)] != OP_ALT)
     do  
       {  
       if (!empty_branch && could_be_empty_branch(code, endcode, utf8))  
         empty_branch = TRUE;  
2222        code += GET(code, 1);        code += GET(code, 1);
2223        else
2224          {
2225          empty_branch = FALSE;
2226          do
2227            {
2228            if (!empty_branch && could_be_empty_branch(code, endcode, utf8, cd))
2229              empty_branch = TRUE;
2230            code += GET(code, 1);
2231            }
2232          while (*code == OP_ALT);
2233          if (!empty_branch) return FALSE;   /* All branches are non-empty */
2234        }        }
2235      while (*code == OP_ALT);  
     if (!empty_branch) return FALSE;   /* All branches are non-empty */  
2236      c = *code;      c = *code;
2237      continue;      continue;
2238      }      }
# Line 1738  for (code = first_significant_code(code Line 2296  for (code = first_significant_code(code
2296      case OP_ALLANY:      case OP_ALLANY:
2297      case OP_ANYBYTE:      case OP_ANYBYTE:
2298      case OP_CHAR:      case OP_CHAR:
2299      case OP_CHARNC:      case OP_CHARI:
2300      case OP_NOT:      case OP_NOT:
2301        case OP_NOTI:
2302      case OP_PLUS:      case OP_PLUS:
2303      case OP_MINPLUS:      case OP_MINPLUS:
2304      case OP_POSPLUS:      case OP_POSPLUS:
# Line 1779  for (code = first_significant_code(code Line 2338  for (code = first_significant_code(code
2338      case OP_KET:      case OP_KET:
2339      case OP_KETRMAX:      case OP_KETRMAX:
2340      case OP_KETRMIN:      case OP_KETRMIN:
2341        case OP_KETRPOS:
2342      case OP_ALT:      case OP_ALT:
2343      return TRUE;      return TRUE;
2344    
# Line 1787  for (code = first_significant_code(code Line 2347  for (code = first_significant_code(code
2347    
2348  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2349      case OP_STAR:      case OP_STAR:
2350        case OP_STARI:
2351      case OP_MINSTAR:      case OP_MINSTAR:
2352        case OP_MINSTARI:
2353      case OP_POSSTAR:      case OP_POSSTAR:
2354        case OP_POSSTARI:
2355      case OP_QUERY:      case OP_QUERY:
2356        case OP_QUERYI:
2357      case OP_MINQUERY:      case OP_MINQUERY:
2358        case OP_MINQUERYI:
2359      case OP_POSQUERY:      case OP_POSQUERY:
2360        case OP_POSQUERYI:
2361        if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];
2362        break;
2363    
2364      case OP_UPTO:      case OP_UPTO:
2365        case OP_UPTOI:
2366      case OP_MINUPTO:      case OP_MINUPTO:
2367        case OP_MINUPTOI:
2368      case OP_POSUPTO:      case OP_POSUPTO:
2369      if (utf8) while ((code[2] & 0xc0) == 0x80) code++;      case OP_POSUPTOI:
2370        if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];
2371      break;      break;
2372  #endif  #endif
2373    
2374        /* MARK, and PRUNE/SKIP/THEN with an argument must skip over the argument
2375        string. */
2376    
2377        case OP_MARK:
2378        case OP_PRUNE_ARG:
2379        case OP_SKIP_ARG:
2380        code += code[1];
2381        break;
2382    
2383        case OP_THEN_ARG:
2384        code += code[1];
2385        break;
2386    
2387        /* None of the remaining opcodes are required to match a character. */
2388    
2389        default:
2390        break;
2391      }      }
2392    }    }
2393    
# Line 1814  return TRUE; Line 2404  return TRUE;
2404  the current branch of the current pattern to see if it could match the empty  the current branch of the current pattern to see if it could match the empty
2405  string. If it could, we must look outwards for branches at other levels,  string. If it could, we must look outwards for branches at other levels,
2406  stopping when we pass beyond the bracket which is the subject of the recursion.  stopping when we pass beyond the bracket which is the subject of the recursion.
2407    This function is called only during the real compile, not during the
2408    pre-compile.
2409    
2410  Arguments:  Arguments:
2411    code        points to start of the recursion    code        points to start of the recursion
2412    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2413    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2414    utf8        TRUE if in UTF-8 mode    utf8        TRUE if in UTF-8 mode
2415      cd          pointers to tables etc
2416    
2417  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2418  */  */
2419    
2420  static BOOL  static BOOL
2421  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,
2422    BOOL utf8)    BOOL utf8, compile_data *cd)
2423  {  {
2424  while (bcptr != NULL && bcptr->current >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2425    {    {
2426    if (!could_be_empty_branch(bcptr->current, endcode, utf8)) return FALSE;    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8, cd))
2427        return FALSE;
2428    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2429    }    }
2430  return TRUE;  return TRUE;
# Line 1862  where Perl recognizes it as the POSIX cl Line 2456  where Perl recognizes it as the POSIX cl
2456  "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,  "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
2457  I think.  I think.
2458    
2459    A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
2460    It seems that the appearance of a nested POSIX class supersedes an apparent
2461    external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
2462    a digit.
2463    
2464    In Perl, unescaped square brackets may also appear as part of class names. For
2465    example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
2466    [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
2467    seem right at all. PCRE does not allow closing square brackets in POSIX class
2468    names.
2469    
2470  Arguments:  Arguments:
2471    ptr      pointer to the initial [    ptr      pointer to the initial [
2472    endptr   where to return the end pointer    endptr   where to return the end pointer
# Line 1876  int terminator;          /* Don't combin Line 2481  int terminator;          /* Don't combin
2481  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2482  for (++ptr; *ptr != 0; ptr++)  for (++ptr; *ptr != 0; ptr++)
2483    {    {
2484    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2485        ptr++;
2486      else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2487      else
2488      {      {
     if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;  
2489      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2490        {        {
2491        *endptr = ptr;        *endptr = ptr;
2492        return TRUE;        return TRUE;
2493        }        }
2494        if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&
2495             (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
2496              ptr[1] == CHAR_EQUALS_SIGN) &&
2497            check_posix_syntax(ptr, endptr))
2498          return FALSE;
2499      }      }
2500    }    }
2501  return FALSE;  return FALSE;
# Line 2012  auto_callout(uschar *code, const uschar Line 2624  auto_callout(uschar *code, const uschar
2624  {  {
2625  *code++ = OP_CALLOUT;  *code++ = OP_CALLOUT;
2626  *code++ = 255;  *code++ = 255;
2627  PUT(code, 0, ptr - cd->start_pattern);  /* Pattern offset */  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
2628  PUT(code, LINK_SIZE, 0);                /* Default length */  PUT(code, LINK_SIZE, 0);                       /* Default length */
2629  return code + 2*LINK_SIZE;  return code + 2*LINK_SIZE;
2630  }  }
2631    
# Line 2038  Returns:             nothing Line 2650  Returns:             nothing
2650  static void  static void
2651  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)
2652  {  {
2653  int length = ptr - cd->start_pattern - GET(previous_callout, 2);  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
2654  PUT(previous_callout, 2 + LINK_SIZE, length);  PUT(previous_callout, 2 + LINK_SIZE, length);
2655  }  }
2656    
# Line 2088  for (++c; c <= d; c++) Line 2700  for (++c; c <= d; c++)
2700    
2701  return TRUE;  return TRUE;
2702  }  }
2703    
2704    
2705    
2706    /*************************************************
2707    *        Check a character and a property        *
2708    *************************************************/
2709    
2710    /* This function is called by check_auto_possessive() when a property item
2711    is adjacent to a fixed character.
2712    
2713    Arguments:
2714      c            the character
2715      ptype        the property type
2716      pdata        the data for the type
2717      negated      TRUE if it's a negated property (\P or \p{^)
2718    
2719    Returns:       TRUE if auto-possessifying is OK
2720    */
2721    
2722    static BOOL
2723    check_char_prop(int c, int ptype, int pdata, BOOL negated)
2724    {
2725    const ucd_record *prop = GET_UCD(c);
2726    switch(ptype)
2727      {
2728      case PT_LAMP:
2729      return (prop->chartype == ucp_Lu ||
2730              prop->chartype == ucp_Ll ||
2731              prop->chartype == ucp_Lt) == negated;
2732    
2733      case PT_GC:
2734      return (pdata == _pcre_ucp_gentype[prop->chartype]) == negated;
2735    
2736      case PT_PC:
2737      return (pdata == prop->chartype) == negated;
2738    
2739      case PT_SC:
2740      return (pdata == prop->script) == negated;
2741    
2742      /* These are specials */
2743    
2744      case PT_ALNUM:
2745      return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
2746              _pcre_ucp_gentype[prop->chartype] == ucp_N) == negated;
2747    
2748      case PT_SPACE:    /* Perl space */
2749      return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
2750              c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2751              == negated;
2752    
2753      case PT_PXSPACE:  /* POSIX space */
2754      return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
2755              c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2756              c == CHAR_FF || c == CHAR_CR)
2757              == negated;
2758    
2759      case PT_WORD:
2760      return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
2761              _pcre_ucp_gentype[prop->chartype] == ucp_N ||
2762              c == CHAR_UNDERSCORE) == negated;
2763      }
2764    return FALSE;
2765    }
2766  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2767    
2768    
# Line 2101  whether the next thing could possibly ma Line 2776  whether the next thing could possibly ma
2776  sense to automatically possessify the repeated item.  sense to automatically possessify the repeated item.
2777    
2778  Arguments:  Arguments:
2779    op_code       the repeated op code    previous      pointer to the repeated opcode
   this          data for this item, depends on the opcode  
2780    utf8          TRUE in UTF-8 mode    utf8          TRUE in UTF-8 mode
   utf8_char     used for utf8 character bytes, NULL if not relevant  
2781    ptr           next character in pattern    ptr           next character in pattern
2782    options       options bits    options       options bits
2783    cd            contains pointers to tables etc.    cd            contains pointers to tables etc.
# Line 2113  Returns:        TRUE if possessifying is Line 2786  Returns:        TRUE if possessifying is
2786  */  */
2787    
2788  static BOOL  static BOOL
2789  check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,  check_auto_possessive(const uschar *previous, BOOL utf8, const uschar *ptr,
2790    const uschar *ptr, int options, compile_data *cd)    int options, compile_data *cd)
2791  {  {
2792  int next;  int c, next;
2793    int op_code = *previous++;
2794    
2795  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
2796    
# Line 2127  if ((options & PCRE_EXTENDED) != 0) Line 2801  if ((options & PCRE_EXTENDED) != 0)
2801      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2802      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
2803        {        {
2804        while (*(++ptr) != 0)        ptr++;
2805          while (*ptr != 0)
2806            {
2807          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
2808            ptr++;
2809    #ifdef SUPPORT_UTF8
2810            if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
2811    #endif
2812            }
2813        }        }
2814      else break;      else break;
2815      }      }
# Line 2164  if ((options & PCRE_EXTENDED) != 0) Line 2845  if ((options & PCRE_EXTENDED) != 0)
2845      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2846      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
2847        {        {
2848        while (*(++ptr) != 0)        ptr++;
2849          while (*ptr != 0)
2850            {
2851          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
2852            ptr++;
2853    #ifdef SUPPORT_UTF8
2854            if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
2855    #endif
2856            }
2857        }        }
2858      else break;      else break;
2859      }      }
# Line 2173  if ((options & PCRE_EXTENDED) != 0) Line 2861  if ((options & PCRE_EXTENDED) != 0)
2861    
2862  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
2863    
2864  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
2865    strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)    strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
2866      return FALSE;      return FALSE;
2867    
2868  /* Now compare the next item with the previous opcode. If the previous is a  /* Now compare the next item with the previous opcode. First, handle cases when
2869  positive single character match, "item" either contains the character or, if  the next item is a character. */
 "item" is greater than 127 in utf8 mode, the character's bytes are in  
 utf8_char. */  
   
   
 /* Handle cases when the next item is a character. */  
2870    
2871  if (next >= 0) switch(op_code)  if (next >= 0) switch(op_code)
2872    {    {
2873    case OP_CHAR:    case OP_CHAR:
2874  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2875    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
2876  #else  #else
2877    (void)(utf8_char);  /* Keep compiler happy by referencing function argument */    c = *previous;
2878  #endif  #endif
2879    return item != next;    return c != next;
2880    
2881    /* For CHARNC (caseless character) we must check the other case. If we have    /* For CHARI (caseless character) we must check the other case. If we have
2882    Unicode property support, we can use it to test the other case of    Unicode property support, we can use it to test the other case of
2883    high-valued characters. */    high-valued characters. */
2884    
2885    case OP_CHARNC:    case OP_CHARI:
2886  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2887    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
2888    #else
2889      c = *previous;
2890  #endif  #endif
2891    if (item == next) return FALSE;    if (c == next) return FALSE;
2892  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2893    if (utf8)    if (utf8)
2894      {      {
# Line 2214  if (next >= 0) switch(op_code) Line 2899  if (next >= 0) switch(op_code)
2899  #else  #else
2900      othercase = NOTACHAR;      othercase = NOTACHAR;
2901  #endif  #endif
2902      return (unsigned int)item != othercase;      return (unsigned int)c != othercase;
2903      }      }
2904    else    else
2905  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF8 */
2906    return (item != cd->fcc[next]);  /* Non-UTF-8 mode */    return (c != cd->fcc[next]);  /* Non-UTF-8 mode */
2907    
2908    /* For OP_NOT, "item" must be a single-byte character. */    /* For OP_NOT and OP_NOTI, the data is always a single-byte character. These
2909      opcodes are not used for multi-byte characters, because they are coded using
2910      an XCLASS instead. */
2911    
2912    case OP_NOT:    case OP_NOT:
2913    if (item == next) return TRUE;    return (c = *previous) == next;
2914    if ((options & PCRE_CASELESS) == 0) return FALSE;  
2915      case OP_NOTI:
2916      if ((c = *previous) == next) return TRUE;
2917  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2918    if (utf8)    if (utf8)
2919      {      {
# Line 2235  if (next >= 0) switch(op_code) Line 2924  if (next >= 0) switch(op_code)
2924  #else  #else
2925      othercase = NOTACHAR;      othercase = NOTACHAR;
2926  #endif  #endif
2927      return (unsigned int)item == othercase;      return (unsigned int)c == othercase;
2928      }      }
2929    else    else
2930  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF8 */
2931    return (item == cd->fcc[next]);  /* Non-UTF-8 mode */    return (c == cd->fcc[next]);  /* Non-UTF-8 mode */
2932    
2933      /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.
2934      When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
2935    
2936    case OP_DIGIT:    case OP_DIGIT:
2937    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;
# Line 2282  if (next >= 0) switch(op_code) Line 2974  if (next >= 0) switch(op_code)
2974      case 0x202f:      case 0x202f:
2975      case 0x205f:      case 0x205f:
2976      case 0x3000:      case 0x3000:
2977      return op_code != OP_HSPACE;      return op_code == OP_NOT_HSPACE;
2978      default:      default:
2979      return op_code == OP_HSPACE;      return op_code != OP_NOT_HSPACE;
2980      }      }
2981    
2982      case OP_ANYNL:
2983    case OP_VSPACE:    case OP_VSPACE:
2984    case OP_NOT_VSPACE:    case OP_NOT_VSPACE:
2985    switch(next)    switch(next)
# Line 2298  if (next >= 0) switch(op_code) Line 2991  if (next >= 0) switch(op_code)
2991      case 0x85:      case 0x85:
2992      case 0x2028:      case 0x2028:
2993      case 0x2029:      case 0x2029:
2994      return op_code != OP_VSPACE;      return op_code == OP_NOT_VSPACE;
2995      default:      default:
2996      return op_code == OP_VSPACE;      return op_code != OP_NOT_VSPACE;
2997      }      }
2998    
2999    #ifdef SUPPORT_UCP
3000      case OP_PROP:
3001      return check_char_prop(next, previous[0], previous[1], FALSE);
3002    
3003      case OP_NOTPROP:
3004      return check_char_prop(next, previous[0], previous[1], TRUE);
3005    #endif
3006    
3007    default:    default:
3008    return FALSE;    return FALSE;
3009    }    }
3010    
3011    
3012  /* Handle the case when the next item is \d, \s, etc. */  /* Handle the case when the next item is \d, \s, etc. Note that when PCRE_UCP
3013    is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are
3014    generated only when PCRE_UCP is *not* set, that is, when only ASCII
3015    characteristics are recognized. Similarly, the opcodes OP_DIGIT etc. are
3016    replaced by OP_PROP codes when PCRE_UCP is set. */
3017    
3018  switch(op_code)  switch(op_code)
3019    {    {
3020    case OP_CHAR:    case OP_CHAR:
3021    case OP_CHARNC:    case OP_CHARI:
3022  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3023    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
3024    #else
3025      c = *previous;
3026  #endif  #endif
3027    switch(-next)    switch(-next)
3028      {      {
3029      case ESC_d:      case ESC_d:
3030      return item > 127 || (cd->ctypes[item] & ctype_digit) == 0;      return c > 127 || (cd->ctypes[c] & ctype_digit) == 0;
3031    
3032      case ESC_D:      case ESC_D:
3033      return item <= 127 && (cd->ctypes[item] & ctype_digit) != 0;      return c <= 127 && (cd->ctypes[c] & ctype_digit) != 0;
3034    
3035      case ESC_s:      case ESC_s:
3036      return item > 127 || (cd->ctypes[item] & ctype_space) == 0;      return c > 127 || (cd->ctypes[c] & ctype_space) == 0;
3037    
3038      case ESC_S:      case ESC_S:
3039      return item <= 127 && (cd->ctypes[item] & ctype_space) != 0;      return c <= 127 && (cd->ctypes[c] & ctype_space) != 0;
3040    
3041      case ESC_w:      case ESC_w:
3042      return item > 127 || (cd->ctypes[item] & ctype_word) == 0;      return c > 127 || (cd->ctypes[c] & ctype_word) == 0;
3043    
3044      case ESC_W:      case ESC_W:
3045      return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;      return c <= 127 && (cd->ctypes[c] & ctype_word) != 0;
3046    
3047      case ESC_h:      case ESC_h:
3048      case ESC_H:      case ESC_H:
3049      switch(item)      switch(c)
3050        {        {
3051        case 0x09:        case 0x09:
3052        case 0x20:        case 0x20:
# Line 2367  switch(op_code) Line 3074  switch(op_code)
3074    
3075      case ESC_v:      case ESC_v:
3076      case ESC_V:      case ESC_V:
3077      switch(item)      switch(c)
3078        {        {
3079        case 0x0a:        case 0x0a:
3080        case 0x0b:        case 0x0b:
# Line 2381  switch(op_code) Line 3088  switch(op_code)
3088        return -next == ESC_v;        return -next == ESC_v;
3089        }        }
3090    
3091        /* When PCRE_UCP is set, these values get generated for \d etc. Find
3092        their substitutions and process them. The result will always be either
3093        -ESC_p or -ESC_P. Then fall through to process those values. */
3094    
3095    #ifdef SUPPORT_UCP
3096        case ESC_du:
3097        case ESC_DU:
3098        case ESC_wu:
3099        case ESC_WU:
3100        case ESC_su:
3101        case ESC_SU:
3102          {
3103          int temperrorcode = 0;
3104          ptr = substitutes[-next - ESC_DU];
3105          next = check_escape(&ptr, &temperrorcode, 0, options, FALSE);
3106          if (temperrorcode != 0) return FALSE;
3107          ptr++;    /* For compatibility */
3108          }
3109        /* Fall through */
3110    
3111        case ESC_p:
3112        case ESC_P:
3113          {
3114          int ptype, pdata, errorcodeptr;
3115          BOOL negated;
3116    
3117          ptr--;      /* Make ptr point at the p or P */
3118          ptype = get_ucp(&ptr, &negated, &pdata, &errorcodeptr);
3119          if (ptype < 0) return FALSE;
3120          ptr++;      /* Point past the final curly ket */
3121    
3122          /* If the property item is optional, we have to give up. (When generated
3123          from \d etc by PCRE_UCP, this test will have been applied much earlier,
3124          to the original \d etc. At this point, ptr will point to a zero byte. */
3125    
3126          if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3127            strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
3128              return FALSE;
3129    
3130          /* Do the property check. */
3131    
3132          return check_char_prop(c, ptype, pdata, (next == -ESC_P) != negated);
3133          }
3134    #endif
3135    
3136      default:      default:
3137      return FALSE;      return FALSE;
3138      }      }
3139    
3140      /* In principle, support for Unicode properties should be integrated here as
3141      well. It means re-organizing the above code so as to get hold of the property
3142      values before switching on the op-code. However, I wonder how many patterns
3143      combine ASCII \d etc with Unicode properties? (Note that if PCRE_UCP is set,
3144      these op-codes are never generated.) */
3145    
3146    case OP_DIGIT:    case OP_DIGIT:
3147    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
3148           next == -ESC_h || next == -ESC_v;           next == -ESC_h || next == -ESC_v || next == -ESC_R;
3149    
3150    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
3151    return next == -ESC_d;    return next == -ESC_d;
3152    
3153    case OP_WHITESPACE:    case OP_WHITESPACE:
3154    return next == -ESC_S || next == -ESC_d || next == -ESC_w;    return next == -ESC_S || next == -ESC_d || next == -ESC_w || next == -ESC_R;
3155    
3156    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
3157    return next == -ESC_s || next == -ESC_h || next == -ESC_v;    return next == -ESC_s || next == -ESC_h || next == -ESC_v;
3158    
3159    case OP_HSPACE:    case OP_HSPACE:
3160    return next == -ESC_S || next == -ESC_H || next == -ESC_d || next == -ESC_w;    return next == -ESC_S || next == -ESC_H || next == -ESC_d ||
3161             next == -ESC_w || next == -ESC_v || next == -ESC_R;
3162    
3163    case OP_NOT_HSPACE:    case OP_NOT_HSPACE:
3164    return next == -ESC_h;    return next == -ESC_h;
3165    
3166    /* Can't have \S in here because VT matches \S (Perl anomaly) */    /* Can't have \S in here because VT matches \S (Perl anomaly) */
3167      case OP_ANYNL:
3168    case OP_VSPACE:    case OP_VSPACE:
3169    return next == -ESC_V || next == -ESC_d || next == -ESC_w;    return next == -ESC_V || next == -ESC_d || next == -ESC_w;
3170    
3171    case OP_NOT_VSPACE:    case OP_NOT_VSPACE:
3172    return next == -ESC_v;    return next == -ESC_v || next == -ESC_R;
3173    
3174    case OP_WORDCHAR:    case OP_WORDCHAR:
3175    return next == -ESC_W || next == -ESC_s || next == -ESC_h || next == -ESC_v;    return next == -ESC_W || next == -ESC_s || next == -ESC_h ||
3176             next == -ESC_v || next == -ESC_R;
3177    
3178    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
3179    return next == -ESC_w || next == -ESC_d;    return next == -ESC_w || next == -ESC_d;
# Line 2444  Arguments: Line 3205  Arguments:
3205    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)
3206    reqbyteptr     set to the last literal character required, else < 0    reqbyteptr     set to the last literal character required, else < 0
3207    bcptr          points to current branch chain    bcptr          points to current branch chain
3208      cond_depth     conditional nesting depth
3209    cd             contains pointers to tables etc.    cd             contains pointers to tables etc.
3210    lengthptr      NULL during the real compile phase    lengthptr      NULL during the real compile phase
3211                   points to length accumulator during pre-compile phase                   points to length accumulator during pre-compile phase
# Line 2455  Returns:         TRUE on success Line 3217  Returns:         TRUE on success
3217  static BOOL  static BOOL
3218  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,
3219    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
3220    compile_data *cd, int *lengthptr)    int cond_depth, compile_data *cd, int *lengthptr)
3221  {  {
3222  int repeat_type, op_type;  int repeat_type, op_type;
3223  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
# Line 2464  int greedy_default, greedy_non_default; Line 3226  int greedy_default, greedy_non_default;
3226  int firstbyte, reqbyte;  int firstbyte, reqbyte;
3227  int zeroreqbyte, zerofirstbyte;  int zeroreqbyte, zerofirstbyte;
3228  int req_caseopt, reqvary, tempreqvary;  int req_caseopt, reqvary, tempreqvary;
3229  int options = *optionsptr;  int options = *optionsptr;               /* May change dynamically */
3230  int after_manual_callout = 0;  int after_manual_callout = 0;
3231  int length_prevgroup = 0;  int length_prevgroup = 0;
3232  register int c;  register int c;
# Line 2476  BOOL inescq = FALSE; Line 3238  BOOL inescq = FALSE;
3238  BOOL groupsetfirstbyte = FALSE;  BOOL groupsetfirstbyte = FALSE;
3239  const uschar *ptr = *ptrptr;  const uschar *ptr = *ptrptr;
3240  const uschar *tempptr;  const uschar *tempptr;
3241    const uschar *nestptr = NULL;
3242  uschar *previous = NULL;  uschar *previous = NULL;
3243  uschar *previous_callout = NULL;  uschar *previous_callout = NULL;
3244  uschar *save_hwm = NULL;  uschar *save_hwm = NULL;
3245  uschar classbits[32];  uschar classbits[32];
3246    
3247    /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
3248    must not do this for other options (e.g. PCRE_EXTENDED) because they may change
3249    dynamically as we process the pattern. */
3250    
3251  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3252  BOOL class_utf8;  BOOL class_utf8;
3253  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf8 = (options & PCRE_UTF8) != 0;
# Line 2489  uschar *class_utf8data_base; Line 3256  uschar *class_utf8data_base;
3256  uschar utf8_char[6];  uschar utf8_char[6];
3257  #else  #else
3258  BOOL utf8 = FALSE;  BOOL utf8 = FALSE;
 uschar *utf8_char = NULL;  
3259  #endif  #endif
3260    
3261  #ifdef DEBUG  #ifdef PCRE_DEBUG
3262  if (lengthptr != NULL) DPRINTF((">> start branch\n"));  if (lengthptr != NULL) DPRINTF((">> start branch\n"));
3263  #endif  #endif
3264    
# Line 2540  for (;; ptr++) Line 3306  for (;; ptr++)
3306    int subfirstbyte;    int subfirstbyte;
3307    int terminator;    int terminator;
3308    int mclength;    int mclength;
3309      int tempbracount;
3310    uschar mcbuffer[8];    uschar mcbuffer[8];
3311    
3312    /* Get next byte in the pattern */    /* Get next byte in the pattern */
3313    
3314    c = *ptr;    c = *ptr;
3315    
3316      /* If we are at the end of a nested substitution, revert to the outer level
3317      string. Nesting only happens one level deep. */
3318    
3319      if (c == 0 && nestptr != NULL)
3320        {
3321        ptr = nestptr;
3322        nestptr = NULL;
3323        c = *ptr;
3324        }
3325    
3326    /* If we are in the pre-compile phase, accumulate the length used for the    /* If we are in the pre-compile phase, accumulate the length used for the
3327    previous cycle of this loop. */    previous cycle of this loop. */
3328    
3329    if (lengthptr != NULL)    if (lengthptr != NULL)
3330      {      {
3331  #ifdef DEBUG  #ifdef PCRE_DEBUG
3332      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
3333  #endif  #endif
3334      if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */      if (code > cd->start_workspace + WORK_SIZE_CHECK)   /* Check for overrun */
3335        {        {
3336        *errorcodeptr = ERR52;        *errorcodeptr = ERR52;
3337        goto FAILED;        goto FAILED;
# Line 2576  for (;; ptr++) Line 3353  for (;; ptr++)
3353        goto FAILED;        goto FAILED;
3354        }        }
3355    
3356      *lengthptr += code - last_code;      *lengthptr += (int)(code - last_code);
3357      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, (int)(code - last_code),
3358          c));
3359    
3360      /* If "previous" is set and it is not at the start of the work space, move      /* If "previous" is set and it is not at the start of the work space, move
3361      it back to there, in order to avoid filling up the work space. Otherwise,      it back to there, in order to avoid filling up the work space. Otherwise,
# Line 2603  for (;; ptr++) Line 3381  for (;; ptr++)
3381    /* In the real compile phase, just check the workspace used by the forward    /* In the real compile phase, just check the workspace used by the forward
3382    reference list. */    reference list. */
3383    
3384    else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)    else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK)
3385      {      {
3386      *errorcodeptr = ERR52;      *errorcodeptr = ERR52;
3387      goto FAILED;      goto FAILED;
# Line 2639  for (;; ptr++) Line 3417  for (;; ptr++)
3417    /* Fill in length of a previous callout, except when the next thing is    /* Fill in length of a previous callout, except when the next thing is
3418    a quantifier. */    a quantifier. */
3419    
3420    is_quantifier =    is_quantifier =
3421      c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||      c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
3422      (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));      (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
3423    
# Line 2651  for (;; ptr++) Line 3429  for (;; ptr++)
3429      previous_callout = NULL;      previous_callout = NULL;
3430      }      }
3431    
3432    /* In extended mode, skip white space and comments */    /* In extended mode, skip white space and comments. */
3433    
3434    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
3435      {      {
3436      if ((cd->ctypes[c] & ctype_space) != 0) continue;      if ((cd->ctypes[c] & ctype_space) != 0) continue;
3437      if (c == CHAR_NUMBER_SIGN)      if (c == CHAR_NUMBER_SIGN)
3438        {        {
3439        while (*(++ptr) != 0)        ptr++;
3440          while (*ptr != 0)
3441          {          {
3442          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
3443            ptr++;
3444    #ifdef SUPPORT_UTF8
3445            if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
3446    #endif
3447          }          }
3448        if (*ptr != 0) continue;        if (*ptr != 0) continue;
3449    
# Line 2694  for (;; ptr++) Line 3477  for (;; ptr++)
3477          *errorcodeptr = ERR20;          *errorcodeptr = ERR20;
3478          goto FAILED;          goto FAILED;
3479          }          }
3480        *lengthptr += code - last_code;   /* To include callout length */        *lengthptr += (int)(code - last_code);   /* To include callout length */
3481        DPRINTF((">> end branch\n"));        DPRINTF((">> end branch\n"));
3482        }        }
3483      return TRUE;      return TRUE;
# Line 2705  for (;; ptr++) Line 3488  for (;; ptr++)
3488      the setting of any following char as a first character. */      the setting of any following char as a first character. */
3489    
3490      case CHAR_CIRCUMFLEX_ACCENT:      case CHAR_CIRCUMFLEX_ACCENT:
3491        previous = NULL;
3492      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
3493        {        {
3494        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
3495          *code++ = OP_CIRCM;
3496        }        }
3497      previous = NULL;      else *code++ = OP_CIRC;
     *code++ = OP_CIRC;  
3498      break;      break;
3499    
3500      case CHAR_DOLLAR_SIGN:      case CHAR_DOLLAR_SIGN:
3501      previous = NULL;      previous = NULL;
3502      *code++ = OP_DOLL;      *code++ = ((options & PCRE_MULTILINE) != 0)? OP_DOLLM : OP_DOLL;
3503      break;      break;
3504    
3505      /* There can never be a first char if '.' is first, whatever happens about      /* There can never be a first char if '.' is first, whatever happens about
# Line 2759  for (;; ptr++) Line 3543  for (;; ptr++)
3543      /* PCRE supports POSIX class stuff inside a class. Perl gives an error if      /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
3544      they are encountered at the top level, so we'll do that too. */      they are encountered at the top level, so we'll do that too. */
3545    
3546      if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||      if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
3547           ptr[1] == CHAR_EQUALS_SIGN) &&           ptr[1] == CHAR_EQUALS_SIGN) &&
3548          check_posix_syntax(ptr, &tempptr))          check_posix_syntax(ptr, &tempptr))
3549        {        {
# Line 2777  for (;; ptr++) Line 3561  for (;; ptr++)
3561        c = *(++ptr);        c = *(++ptr);
3562        if (c == CHAR_BACKSLASH)        if (c == CHAR_BACKSLASH)
3563          {          {
3564          if (ptr[1] == CHAR_E)          if (ptr[1] == CHAR_E)
3565            ptr++;            ptr++;
3566          else if (strncmp((const char *)ptr+1,          else if (strncmp((const char *)ptr+1,
3567                            STR_Q STR_BACKSLASH STR_E, 3) == 0)                            STR_Q STR_BACKSLASH STR_E, 3) == 0)
3568            ptr += 3;            ptr += 3;
3569          else          else
3570            break;            break;
3571          }          }
3572        else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)        else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
# Line 2795  for (;; ptr++) Line 3579  for (;; ptr++)
3579      that. In JS mode, [] must always fail, so generate OP_FAIL, whereas      that. In JS mode, [] must always fail, so generate OP_FAIL, whereas
3580      [^] must match any character, so generate OP_ALLANY. */      [^] must match any character, so generate OP_ALLANY. */
3581    
3582      if (c == CHAR_RIGHT_SQUARE_BRACKET &&      if (c == CHAR_RIGHT_SQUARE_BRACKET &&
3583          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
3584        {        {
3585        *code++ = negate_class? OP_ALLANY : OP_FAIL;        *code++ = negate_class? OP_ALLANY : OP_FAIL;
# Line 2877  for (;; ptr++) Line 3661  for (;; ptr++)
3661        5.6 and 5.8 do. */        5.6 and 5.8 do. */
3662    
3663        if (c == CHAR_LEFT_SQUARE_BRACKET &&        if (c == CHAR_LEFT_SQUARE_BRACKET &&
3664            (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||            (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
3665             ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))             ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))
3666          {          {
3667          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
# Line 2899  for (;; ptr++) Line 3683  for (;; ptr++)
3683            ptr++;            ptr++;
3684            }            }
3685    
3686          posix_class = check_posix_name(ptr, tempptr - ptr);          posix_class = check_posix_name(ptr, (int)(tempptr - ptr));
3687          if (posix_class < 0)          if (posix_class < 0)
3688            {            {
3689            *errorcodeptr = ERR30;            *errorcodeptr = ERR30;
# Line 2913  for (;; ptr++) Line 3697  for (;; ptr++)
3697          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)
3698            posix_class = 0;            posix_class = 0;
3699    
3700          /* We build the bit map for the POSIX class in a chunk of local store          /* When PCRE_UCP is set, some of the POSIX classes are converted to
3701          because we may be adding and subtracting from it, and we don't want to          different escape sequences that use Unicode properties. */
3702          subtract bits that may be in the main map already. At the end we or the  
3703          result into the bit map that is being built. */  #ifdef SUPPORT_UCP
3704            if ((options & PCRE_UCP) != 0)
3705              {
3706              int pc = posix_class + ((local_negate)? POSIX_SUBSIZE/2 : 0);
3707              if (posix_substitutes[pc] != NULL)
3708                {
3709                nestptr = tempptr + 1;
3710                ptr = posix_substitutes[pc] - 1;
3711                continue;
3712                }
3713              }
3714    #endif
3715            /* In the non-UCP case, we build the bit map for the POSIX class in a
3716            chunk of local store because we may be adding and subtracting from it,
3717            and we don't want to subtract bits that may be in the main map already.
3718            At the end we or the result into the bit map that is being built. */
3719    
3720          posix_class *= 3;          posix_class *= 3;
3721    
# Line 2960  for (;; ptr++) Line 3759  for (;; ptr++)
3759    
3760        /* Backslash may introduce a single character, or it may introduce one        /* Backslash may introduce a single character, or it may introduce one
3761        of the specials, which just set a flag. The sequence \b is a special        of the specials, which just set a flag. The sequence \b is a special
3762        case. Inside a class (and only there) it is treated as backspace.        case. Inside a class (and only there) it is treated as backspace. We
3763        Elsewhere it marks a word boundary. Other escapes have preset maps ready        assume that other escapes have more than one character in them, so set
3764        to 'or' into the one we are building. We assume they have more than one        class_charcount bigger than one. Unrecognized escapes fall through and
3765        character in them, so set class_charcount bigger than one. */        are either treated as literal characters (by default), or are faulted if
3766          PCRE_EXTRA is set. */
3767    
3768        if (c == CHAR_BACKSLASH)        if (c == CHAR_BACKSLASH)
3769          {          {
3770          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3771          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
3772    
3773          if (-c == ESC_b) c = CHAR_BS;       /* \b is backspace in a class */          if (-c == ESC_b) c = CHAR_BS;    /* \b is backspace in a class */
3774          else if (-c == ESC_X) c = CHAR_X;   /* \X is literal X in a class */          else if (-c == ESC_N)            /* \N is not supported in a class */
3775          else if (-c == ESC_R) c = CHAR_R;   /* \R is literal R in a class */            {
3776              *errorcodeptr = ERR71;
3777              goto FAILED;
3778              }
3779          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
3780            {            {
3781            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
# Line 2989  for (;; ptr++) Line 3792  for (;; ptr++)
3792            register const uschar *cbits = cd->cbits;            register const uschar *cbits = cd->cbits;
3793            class_charcount += 2;     /* Greater than 1 is what matters */            class_charcount += 2;     /* Greater than 1 is what matters */
3794    
3795            /* Save time by not doing this in the pre-compile phase. */            switch (-c)
   
           if (lengthptr == NULL) switch (-c)  
3796              {              {
3797    #ifdef SUPPORT_UCP
3798                case ESC_du:     /* These are the values given for \d etc */
3799                case ESC_DU:     /* when PCRE_UCP is set. We replace the */
3800                case ESC_wu:     /* escape sequence with an appropriate \p */
3801                case ESC_WU:     /* or \P to test Unicode properties instead */
3802                case ESC_su:     /* of the default ASCII testing. */
3803                case ESC_SU:
3804                nestptr = ptr;
3805                ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
3806                class_charcount -= 2;                /* Undo! */
3807                continue;
3808    #endif
3809              case ESC_d:              case ESC_d:
3810              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];
3811              continue;              continue;
# Line 3011  for (;; ptr++) Line 3824  for (;; ptr++)
3824              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
3825              continue;              continue;
3826    
3827                /* Perl 5.004 onwards omits VT from \s, but we must preserve it
3828                if it was previously set by something earlier in the character
3829                class. */
3830    
3831              case ESC_s:              case ESC_s:
3832              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_space];              classbits[0] |= cbits[cbit_space];
3833              classbits[1] &= ~0x08;   /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= cbits[cbit_space+1] & ~0x08;
3834                for (c = 2; c < 32; c++) classbits[c] |= cbits[c+cbit_space];
3835              continue;              continue;
3836    
3837              case ESC_S:              case ESC_S:
# Line 3022  for (;; ptr++) Line 3840  for (;; ptr++)
3840              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
3841              continue;              continue;
3842    
3843              default:    /* Not recognized; fall through */              case ESC_h:
             break;      /* Need "default" setting to stop compiler warning. */  
             }  
   
           /* In the pre-compile phase, just do the recognition. */  
   
           else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||  
                    c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;  
   
           /* We need to deal with \H, \h, \V, and \v in both phases because  
           they use extra memory. */  
   
           if (-c == ESC_h)  
             {  
3844              SETBIT(classbits, 0x09); /* VT */              SETBIT(classbits, 0x09); /* VT */
3845              SETBIT(classbits, 0x20); /* SPACE */              SETBIT(classbits, 0x20); /* SPACE */
3846              SETBIT(classbits, 0xa0); /* NSBP */              SETBIT(classbits, 0xa0); /* NSBP */
# Line 3059  for (;; ptr++) Line 3864  for (;; ptr++)
3864                }                }
3865  #endif  #endif
3866              continue;              continue;
             }  
3867    
3868            if (-c == ESC_H)              case ESC_H:
             {  
3869              for (c = 0; c < 32; c++)              for (c = 0; c < 32; c++)
3870                {                {
3871                int x = 0xff;                int x = 0xff;
# Line 3104  for (;; ptr++) Line 3907  for (;; ptr++)
3907                }                }
3908  #endif  #endif
3909              continue;              continue;
             }  
3910    
3911            if (-c == ESC_v)              case ESC_v:
             {  
3912              SETBIT(classbits, 0x0a); /* LF */              SETBIT(classbits, 0x0a); /* LF */
3913              SETBIT(classbits, 0x0b); /* VT */              SETBIT(classbits, 0x0b); /* VT */
3914              SETBIT(classbits, 0x0c); /* FF */              SETBIT(classbits, 0x0c); /* FF */
# Line 3123  for (;; ptr++) Line 3924  for (;; ptr++)
3924                }                }
3925  #endif  #endif
3926              continue;              continue;
             }  
3927    
3928            if (-c == ESC_V)              case ESC_V:
             {  
3929              for (c = 0; c < 32; c++)              for (c = 0; c < 32; c++)
3930                {                {
3931                int x = 0xff;                int x = 0xff;
# Line 3156  for (;; ptr++) Line 3955  for (;; ptr++)
3955                }                }
3956  #endif  #endif
3957              continue;              continue;
             }  
   
           /* We need to deal with \P and \p in both phases. */  
3958    
3959  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3960            if (-c == ESC_p || -c == ESC_P)              case ESC_p:
3961              {              case ESC_P:
3962              BOOL negated;                {
3963              int pdata;                BOOL negated;
3964              int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);                int pdata;
3965              if (ptype < 0) goto FAILED;                int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
3966              class_utf8 = TRUE;                if (ptype < 0) goto FAILED;
3967              *class_utf8data++ = ((-c == ESC_p) != negated)?                class_utf8 = TRUE;
3968                XCL_PROP : XCL_NOTPROP;                *class_utf8data++ = ((-c == ESC_p) != negated)?
3969              *class_utf8data++ = ptype;                  XCL_PROP : XCL_NOTPROP;
3970              *class_utf8data++ = pdata;                *class_utf8data++ = ptype;
3971              class_charcount -= 2;   /* Not a < 256 character */                *class_utf8data++ = pdata;
3972              continue;                class_charcount -= 2;   /* Not a < 256 character */
3973              }                continue;
3974                  }
3975  #endif  #endif
3976            /* Unrecognized escapes are faulted if PCRE is running in its              /* Unrecognized escapes are faulted if PCRE is running in its
3977            strict mode. By default, for compatibility with Perl, they are              strict mode. By default, for compatibility with Perl, they are
3978            treated as literals. */              treated as literals. */
3979    
3980            if ((options & PCRE_EXTRA) != 0)              default:
3981              {              if ((options & PCRE_EXTRA) != 0)
3982              *errorcodeptr = ERR7;                {
3983              goto FAILED;                *errorcodeptr = ERR7;
3984                  goto FAILED;
3985                  }
3986                class_charcount -= 2;  /* Undo the default count from above */
3987                c = *ptr;              /* Get the final character and fall through */
3988                break;
3989              }              }
   
           class_charcount -= 2;  /* Undo the default count from above */  
           c = *ptr;              /* Get the final character and fall through */  
3990            }            }
3991    
3992          /* Fall through if we have a single character (c >= 0). This may be          /* Fall through if we have a single character (c >= 0). This may be
# Line 3227  for (;; ptr++) Line 4026  for (;; ptr++)
4026          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
4027            {            {
4028            ptr += 2;            ptr += 2;
4029            if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)            if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)
4030              { ptr += 2; continue; }              { ptr += 2; continue; }
4031            inescq = TRUE;            inescq = TRUE;
4032            break;            break;
# Line 3257  for (;; ptr++) Line 4056  for (;; ptr++)
4056            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
4057            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
4058    
4059            /* \b is backspace; \X is literal X; \R is literal R; any other            /* \b is backspace; any other special means the '-' was literal */
           special means the '-' was literal */  
4060    
4061            if (d < 0)            if (d < 0)
4062              {              {
4063              if (d == -ESC_b) d = CHAR_BS;              if (d == -ESC_b) d = CHAR_BS; else
             else if (d == -ESC_X) d = CHAR_X;  
             else if (d == -ESC_R) d = CHAR_R; else  
4064                {                {
4065                ptr = oldptr;                ptr = oldptr;
4066                goto LONE_SINGLE_CHARACTER;  /* A few lines below */                goto LONE_SINGLE_CHARACTER;  /* A few lines below */
# Line 3430  for (;; ptr++) Line 4226  for (;; ptr++)
4226          }          }
4227        }        }
4228    
4229      /* Loop until ']' reached. This "while" is the end of the "do" above. */      /* Loop until ']' reached. This "while" is the end of the "do" far above.
4230        If we are at the end of an internal nested string, revert to the outer
4231        string. */
4232    
4233        while (((c = *(++ptr)) != 0 ||
4234               (nestptr != NULL &&
4235                 (ptr = nestptr, nestptr = NULL, c = *(++ptr)) != 0)) &&
4236               (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
4237    
4238      while ((c = *(++ptr)) != 0 && (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));      /* Check for missing terminating ']' */
4239    
4240      if (c == 0)                          /* Missing terminating ']' */      if (c == 0)
4241        {        {
4242        *errorcodeptr = ERR6;        *errorcodeptr = ERR6;
4243        goto FAILED;        goto FAILED;
4244        }        }
4245    
   
 /* This code has been disabled because it would mean that \s counts as  
 an explicit \r or \n reference, and that's not really what is wanted. Now  
 we set the flag only if there is a literal "\r" or "\n" in the class. */  
   
 #if 0  
     /* Remember whether \r or \n are in this class */  
   
     if (negate_class)  
       {  
       if ((classbits[1] & 0x24) != 0x24) cd->external_flags |= PCRE_HASCRORLF;  
       }  
     else  
       {  
       if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;  
       }  
 #endif  
   
   
4246      /* If class_charcount is 1, we saw precisely one character whose value is      /* If class_charcount is 1, we saw precisely one character whose value is
4247      less than 256. As long as there were no characters >= 128 and there was no      less than 256. As long as there were no characters >= 128 and there was no
4248      use of \p or \P, in other words, no use of any XCLASS features, we can      use of \p or \P, in other words, no use of any XCLASS features, we can
# Line 3466  we set the flag only if there is a liter Line 4250  we set the flag only if there is a liter
4250    
4251      In UTF-8 mode, we can optimize the negative case only if there were no      In UTF-8 mode, we can optimize the negative case only if there were no
4252      characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR      characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
4253      operate on single-bytes only. This is an historical hangover. Maybe one day      operate on single-bytes characters only. This is an historical hangover.
4254      we can tidy these opcodes to handle multi-byte characters.      Maybe one day we can tidy these opcodes to handle multi-byte characters.
4255    
4256      The optimization throws away the bit map. We turn the item into a      The optimization throws away the bit map. We turn the item into a
4257      1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note      1-character OP_CHAR[I] if it's positive, or OP_NOT[I] if it's negative.
4258      that OP_NOT does not support multibyte characters. In the positive case, it      Note that OP_NOT[I] does not support multibyte characters. In the positive
4259      can cause firstbyte to be set. Otherwise, there can be no first char if      case, it can cause firstbyte to be set. Otherwise, there can be no first
4260      this item is first, whatever repeat count may follow. In the case of      char if this item is first, whatever repeat count may follow. In the case
4261      reqbyte, save the previous value for reinstating. */      of reqbyte, save the previous value for reinstating. */
4262    
4263  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4264      if (class_charcount == 1 && !class_utf8 &&      if (class_charcount == 1 && !class_utf8 &&
# Line 3485  we set the flag only if there is a liter Line 4269  we set the flag only if there is a liter
4269        {        {
4270        zeroreqbyte = reqbyte;        zeroreqbyte = reqbyte;
4271    
4272        /* The OP_NOT opcode works on one-byte characters only. */        /* The OP_NOT[I] opcodes work on one-byte characters only. */
4273    
4274        if (negate_class)        if (negate_class)
4275          {          {
4276          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
4277          zerofirstbyte = firstbyte;          zerofirstbyte = firstbyte;
4278          *code++ = OP_NOT;          *code++ = ((options & PCRE_CASELESS) != 0)? OP_NOTI: OP_NOT;
4279          *code++ = class_lastchar;          *code++ = class_lastchar;
4280          break;          break;
4281          }          }
# Line 3522  we set the flag only if there is a liter Line 4306  we set the flag only if there is a liter
4306    
4307      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
4308      extended class, with its own opcode, unless there was a negated special      extended class, with its own opcode, unless there was a negated special
4309      such as \S in the class, because in that case all characters > 255 are in      such as \S in the class, and PCRE_UCP is not set, because in that case all
4310      the class, so any that were explicitly given as well can be ignored. If      characters > 255 are in the class, so any that were explicitly given as
4311      (when there are explicit characters > 255 that must be listed) there are no      well can be ignored. If (when there are explicit characters > 255 that must
4312      characters < 256, we can omit the bitmap in the actual compiled code. */      be listed) there are no characters < 256, we can omit the bitmap in the
4313        actual compiled code. */
4314    
4315  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4316      if (class_utf8 && !should_flip_negation)      if (class_utf8 && (!should_flip_negation || (options & PCRE_UCP) != 0))
4317        {        {
4318        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
4319        *code++ = OP_XCLASS;        *code++ = OP_XCLASS;
# Line 3554  we set the flag only if there is a liter Line 4339  we set the flag only if there is a liter
4339        }        }
4340  #endif  #endif
4341    
4342      /* If there are no characters > 255, set the opcode to OP_CLASS or      /* If there are no characters > 255, or they are all to be included or
4343      OP_NCLASS, depending on whether the whole class was negated and whether      excluded, set the opcode to OP_CLASS or OP_NCLASS, depending on whether the
4344      there were negative specials such as \S in the class. Then copy the 32-byte      whole class was negated and whether there were negative specials such as \S
4345      map into the code vector, negating it if necessary. */      (non-UCP) in the class. Then copy the 32-byte map into the code vector,
4346        negating it if necessary. */
4347    
4348      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
4349      if (negate_class)      if (negate_class)
# Line 3617  we set the flag only if there is a liter Line 4403  we set the flag only if there is a liter
4403      op_type = 0;                    /* Default single-char op codes */      op_type = 0;                    /* Default single-char op codes */
4404      possessive_quantifier = FALSE;  /* Default not possessive quantifier */      possessive_quantifier = FALSE;  /* Default not possessive quantifier */
4405    
4406      /* Save start of previous item, in case we have to move it up to make space      /* Save start of previous item, in case we have to move it up in order to
4407      for an inserted OP_ONCE for the additional '+' extension. */      insert something before it. */
4408    
4409      tempcode = previous;      tempcode = previous;
4410    
# Line 3641  we set the flag only if there is a liter Line 4427  we set the flag only if there is a liter
4427        }        }
4428      else repeat_type = greedy_default;      else repeat_type = greedy_default;
4429    
4430        /* If previous was a recursion call, wrap it in atomic brackets so that
4431        previous becomes the atomic group. All recursions were so wrapped in the
4432        past, but it no longer happens for non-repeated recursions. In fact, the
4433        repeated ones could be re-implemented independently so as not to need this,
4434        but for the moment we rely on the code for repeating groups. */
4435    
4436        if (*previous == OP_RECURSE)
4437          {
4438          memmove(previous + 1 + LINK_SIZE, previous, 1 + LINK_SIZE);
4439          *previous = OP_ONCE;
4440          PUT(previous, 1, 2 + 2*LINK_SIZE);
4441          previous[2 + 2*LINK_SIZE] = OP_KET;
4442          PUT(previous, 3 + 2*LINK_SIZE, 2 + 2*LINK_SIZE);
4443          code += 2 + 2 * LINK_SIZE;
4444          length_prevgroup = 3 + 3*LINK_SIZE;
4445    
4446          /* When actually compiling, we need to check whether this was a forward
4447          reference, and if so, adjust the offset. */
4448    
4449          if (lengthptr == NULL && cd->hwm >= cd->start_workspace + LINK_SIZE)
4450            {
4451            int offset = GET(cd->hwm, -LINK_SIZE);
4452            if (offset == previous + 1 - cd->start_code)
4453              PUT(cd->hwm, -LINK_SIZE, offset + 1 + LINK_SIZE);
4454            }
4455          }
4456    
4457        /* Now handle repetition for the different types of item. */
4458    
4459      /* If previous was a character match, abolish the item and generate a      /* If previous was a character match, abolish the item and generate a
4460      repeat item instead. If a char item has a minumum of more than one, ensure      repeat item instead. If a char item has a minumum of more than one, ensure
4461      that it is set in reqbyte - it might not be if a sequence such as x{3} is      that it is set in reqbyte - it might not be if a sequence such as x{3} is
4462      the first thing in a branch because the x will have gone into firstbyte      the first thing in a branch because the x will have gone into firstbyte
4463      instead.  */      instead.  */
4464    
4465      if (*previous == OP_CHAR || *previous == OP_CHARNC)      if (*previous == OP_CHAR || *previous == OP_CHARI)
4466        {        {
4467          op_type = (*previous == OP_CHAR)? 0 : OP_STARI - OP_STAR;
4468    
4469        /* Deal with UTF-8 characters that take up more than one byte. It's        /* Deal with UTF-8 characters that take up more than one byte. It's
4470        easier to write this out separately than try to macrify it. Use c to        easier to write this out separately than try to macrify it. Use c to
4471        hold the length of the character in bytes, plus 0x80 to flag that it's a        hold the length of the character in bytes, plus 0x80 to flag that it's a
# Line 3681  we set the flag only if there is a liter Line 4498  we set the flag only if there is a liter
4498    
4499        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4500            repeat_max < 0 &&            repeat_max < 0 &&
4501            check_auto_possessive(*previous, c, utf8, utf8_char, ptr + 1,            check_auto_possessive(previous, utf8, ptr + 1, options, cd))
             options, cd))  
4502          {          {
4503          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4504          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 3694  we set the flag only if there is a liter Line 4510  we set the flag only if there is a liter
4510      /* If previous was a single negated character ([^a] or similar), we use      /* If previous was a single negated character ([^a] or similar), we use
4511      one of the special opcodes, replacing it. The code is shared with single-      one of the special opcodes, replacing it. The code is shared with single-
4512      character repeats by setting opt_type to add a suitable offset into      character repeats by setting opt_type to add a suitable offset into
4513      repeat_type. We can also test for auto-possessification. OP_NOT is      repeat_type. We can also test for auto-possessification. OP_NOT and OP_NOTI
4514      currently used only for single-byte chars. */      are currently used only for single-byte chars. */
4515    
4516      else if (*previous == OP_NOT)      else if (*previous == OP_NOT || *previous == OP_NOTI)
4517        {        {
4518        op_type = OP_NOTSTAR - OP_STAR;  /* Use "not" opcodes */        op_type = ((*previous == OP_NOT)? OP_NOTSTAR : OP_NOTSTARI) - OP_STAR;
4519        c = previous[1];        c = previous[1];
4520        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4521            repeat_max < 0 &&            repeat_max < 0 &&
4522            check_auto_possessive(OP_NOT, c, utf8, NULL, ptr + 1, options, cd))            check_auto_possessive(previous, utf8, ptr + 1, options, cd))
4523          {          {
4524          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4525          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 3727  we set the flag only if there is a liter Line 4543  we set the flag only if there is a liter
4543    
4544        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4545            repeat_max < 0 &&            repeat_max < 0 &&
4546            check_auto_possessive(c, 0, utf8, NULL, ptr + 1, options, cd))            check_auto_possessive(previous, utf8, ptr + 1, options, cd))
4547          {          {
4548          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4549          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 3749  we set the flag only if there is a liter Line 4565  we set the flag only if there is a liter
4565    
4566        if (repeat_max == 0) goto END_REPEAT;        if (repeat_max == 0) goto END_REPEAT;
4567    
4568          /*--------------------------------------------------------------------*/
4569          /* This code is obsolete from release 8.00; the restriction was finally
4570          removed: */
4571    
4572        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
4573        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
4574    
4575        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
4576          /*--------------------------------------------------------------------*/
4577    
4578        /* Combine the op_type with the repeat_type */        /* Combine the op_type with the repeat_type */
4579    
# Line 3891  we set the flag only if there is a liter Line 4712  we set the flag only if there is a liter
4712  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4713               *previous == OP_XCLASS ||               *previous == OP_XCLASS ||
4714  #endif  #endif
4715               *previous == OP_REF)               *previous == OP_REF ||
4716                 *previous == OP_REFI)
4717        {        {
4718        if (repeat_max == 0)        if (repeat_max == 0)
4719          {          {
# Line 3899  we set the flag only if there is a liter Line 4721  we set the flag only if there is a liter
4721          goto END_REPEAT;          goto END_REPEAT;
4722          }          }
4723    
4724          /*--------------------------------------------------------------------*/
4725          /* This code is obsolete from release 8.00; the restriction was finally
4726          removed: */
4727    
4728        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
4729        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
4730    
4731        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
4732          /*--------------------------------------------------------------------*/
4733    
4734        if (repeat_min == 0 && repeat_max == -1)        if (repeat_min == 0 && repeat_max == -1)
4735          *code++ = OP_CRSTAR + repeat_type;          *code++ = OP_CRSTAR + repeat_type;
# Line 3920  we set the flag only if there is a liter Line 4747  we set the flag only if there is a liter
4747        }        }
4748    
4749      /* If previous was a bracket group, we may have to replicate it in certain      /* If previous was a bracket group, we may have to replicate it in certain
4750      cases. */      cases. Note that at this point we can encounter only the "basic" bracket
4751        opcodes such as BRA and CBRA, as this is the place where they get converted
4752        into the more special varieties such as BRAPOS and SBRA. A test for >=
4753        OP_ASSERT and <= OP_COND includes ASSERT, ASSERT_NOT, ASSERTBACK,
4754        ASSERTBACK_NOT, ONCE, BRA, CBRA, and COND. Originally, PCRE did not allow
4755        repetition of assertions, but now it does, for Perl compatibility. */
4756    
4757      else if (*previous == OP_BRA  || *previous == OP_CBRA ||      else if (*previous >= OP_ASSERT && *previous <= OP_COND)
              *previous == OP_ONCE || *previous == OP_COND)  
4758        {        {
4759        register int i;        register int i;
4760        int ketoffset = 0;        int len = (int)(code - previous);
       int len = code - previous;  
4761        uschar *bralink = NULL;        uschar *bralink = NULL;
4762          uschar *brazeroptr = NULL;
4763    
4764        /* Repeating a DEFINE group is pointless */        /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so
4765          we just ignore the repeat. */
4766    
4767        if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)        if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)
4768          {          goto END_REPEAT;
         *errorcodeptr = ERR55;  
         goto FAILED;  
         }  
4769    
4770        /* If the maximum repeat count is unlimited, find the end of the bracket        /* There is no sense in actually repeating assertions. The only potential
4771        by scanning through from the start, and compute the offset back to it        use of repetition is in cases when the assertion is optional. Therefore,
4772        from the current code pointer. There may be an OP_OPT setting following        if the minimum is greater than zero, just ignore the repeat. If the
4773        the final KET, so we can't find the end just by going back from the code        maximum is not not zero or one, set it to 1. */
4774        pointer. */  
4775          if (*previous < OP_ONCE)    /* Assertion */
4776        if (repeat_max == -1)          {
4777          {          if (repeat_min > 0) goto END_REPEAT;
4778          register uschar *ket = previous;          if (repeat_max < 0 || repeat_max > 1) repeat_max = 1;
         do ket += GET(ket, 1); while (*ket != OP_KET);  
         ketoffset = code - ket;  
4779          }          }
4780    
4781        /* The case of a zero minimum is special because of the need to stick        /* The case of a zero minimum is special because of the need to stick
# Line 3969  we set the flag only if there is a liter Line 4796  we set the flag only if there is a liter
4796          **   goto END_REPEAT;          **   goto END_REPEAT;
4797          **   }          **   }
4798    
4799          However, that fails when a group is referenced as a subroutine from          However, that fails when a group or a subgroup within it is referenced
4800          elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it          as a subroutine from elsewhere in the pattern, so now we stick in
4801          so that it is skipped on execution. As we don't have a list of which          OP_SKIPZERO in front of it so that it is skipped on execution. As we
4802          groups are referenced, we cannot do this selectively.          don't have a list of which groups are referenced, we cannot do this
4803            selectively.
4804    
4805          If the maximum is 1 or unlimited, we just have to stick in the BRAZERO          If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
4806          and do no more at this point. However, we do need to adjust any          and do no more at this point. However, we do need to adjust any
# Line 3992  we set the flag only if there is a liter Line 4820  we set the flag only if there is a liter
4820              *previous++ = OP_SKIPZERO;              *previous++ = OP_SKIPZERO;
4821              goto END_REPEAT;              goto END_REPEAT;
4822              }              }
4823              brazeroptr = previous;    /* Save for possessive optimizing */
4824            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
4825            }            }
4826    
# Line 4016  we set the flag only if there is a liter Line 4845  we set the flag only if there is a liter
4845            /* We chain together the bracket offset fields that have to be            /* We chain together the bracket offset fields that have to be
4846            filled in later when the ends of the brackets are reached. */            filled in later when the ends of the brackets are reached. */
4847    
4848            offset = (bralink == NULL)? 0 : previous - bralink;            offset = (bralink == NULL)? 0 : (int)(previous - bralink);
4849            bralink = previous;            bralink = previous;
4850            PUTINC(previous, 0, offset);            PUTINC(previous, 0, offset);
4851            }            }
# Line 4037  we set the flag only if there is a liter Line 4866  we set the flag only if there is a liter
4866            {            {
4867            /* In the pre-compile phase, we don't actually do the replication. We            /* In the pre-compile phase, we don't actually do the replication. We
4868            just adjust the length as if we had. Do some paranoid checks for            just adjust the length as if we had. Do some paranoid checks for
4869            potential integer overflow. */            potential integer overflow. The INT64_OR_DOUBLE type is a 64-bit
4870              integer type when available, otherwise double. */
4871    
4872            if (lengthptr != NULL)            if (lengthptr != NULL)
4873              {              {
4874              int delta = (repeat_min - 1)*length_prevgroup;              int delta = (repeat_min - 1)*length_prevgroup;
4875              if ((double)(repeat_min - 1)*(double)length_prevgroup >              if ((INT64_OR_DOUBLE)(repeat_min - 1)*
4876                                                              (double)INT_MAX ||                    (INT64_OR_DOUBLE)length_prevgroup >
4877                        (INT64_OR_DOUBLE)INT_MAX ||
4878                  OFLOW_MAX - *lengthptr < delta)                  OFLOW_MAX - *lengthptr < delta)
4879                {                {
4880                *errorcodeptr = ERR20;                *errorcodeptr = ERR20;
# Line 4089  we set the flag only if there is a liter Line 4920  we set the flag only if there is a liter
4920          just adjust the length as if we had. For each repetition we must add 1          just adjust the length as if we had. For each repetition we must add 1
4921          to the length for BRAZERO and for all but the last repetition we must          to the length for BRAZERO and for all but the last repetition we must
4922          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
4923          paranoid checks to avoid integer overflow. */          paranoid checks to avoid integer overflow. The INT64_OR_DOUBLE type is
4924            a 64-bit integer type when available, otherwise double. */
4925    
4926          if (lengthptr != NULL && repeat_max > 0)          if (lengthptr != NULL && repeat_max > 0)
4927            {            {
4928            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
4929                        2 - 2*LINK_SIZE;   /* Last one doesn't nest */                        2 - 2*LINK_SIZE;   /* Last one doesn't nest */
4930            if ((double)repeat_max *            if ((INT64_OR_DOUBLE)repeat_max *
4931                  (double)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)                  (INT64_OR_DOUBLE)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
4932                    > (double)INT_MAX ||                    > (INT64_OR_DOUBLE)INT_MAX ||
4933                OFLOW_MAX - *lengthptr < delta)                OFLOW_MAX - *lengthptr < delta)
4934              {              {
4935              *errorcodeptr = ERR20;              *errorcodeptr = ERR20;
# Line 4122  we set the flag only if there is a liter Line 4954  we set the flag only if there is a liter
4954              {              {
4955              int offset;              int offset;
4956              *code++ = OP_BRA;              *code++ = OP_BRA;
4957              offset = (bralink == NULL)? 0 : code - bralink;              offset = (bralink == NULL)? 0 : (int)(code - bralink);
4958              bralink = code;              bralink = code;
4959              PUTINC(code, 0, offset);              PUTINC(code, 0, offset);
4960              }              }
# Line 4143  we set the flag only if there is a liter Line 4975  we set the flag only if there is a liter
4975          while (bralink != NULL)          while (bralink != NULL)
4976            {            {
4977            int oldlinkoffset;            int oldlinkoffset;
4978            int offset = code - bralink + 1;            int offset = (int)(code - bralink + 1);
4979            uschar *bra = code - offset;            uschar *bra = code - offset;
4980            oldlinkoffset = GET(bra, 1);            oldlinkoffset = GET(bra, 1);
4981            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
# Line 4153  we set the flag only if there is a liter Line 4985  we set the flag only if there is a liter
4985            }            }
4986          }          }
4987    
4988        /* If the maximum is unlimited, set a repeater in the final copy. We        /* If the maximum is unlimited, set a repeater in the final copy. For
4989        can't just offset backwards from the current code point, because we        ONCE brackets, that's all we need to do. However, possessively repeated
4990        don't know if there's been an options resetting after the ket. The        ONCE brackets can be converted into non-capturing brackets, as the
4991        correct offset was computed above.        behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to
4992          deal with possessive ONCEs specially.
4993        Then, when we are doing the actual compile phase, check to see whether  
4994        this group is a non-atomic one that could match an empty string. If so,        Otherwise, when we are doing the actual compile phase, check to see
4995          whether this group is one that could match an empty string. If so,
4996        convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so        convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
4997        that runtime checking can be done. [This check is also applied to        that runtime checking can be done. [This check is also applied to ONCE
4998        atomic groups at runtime, but in a different way.] */        groups at runtime, but in a different way.]
4999    
5000          Then, if the quantifier was possessive and the bracket is not a
5001          conditional, we convert the BRA code to the POS form, and the KET code to
5002          KETRPOS. (It turns out to be convenient at runtime to detect this kind of
5003          subpattern at both the start and at the end.) The use of special opcodes
5004          makes it possible to reduce greatly the stack usage in pcre_exec(). If
5005          the group is preceded by OP_BRAZERO, convert this to OP_BRAPOSZERO.
5006    
5007          Then, if the minimum number of matches is 1 or 0, cancel the possessive
5008          flag so that the default action below, of wrapping everything inside
5009          atomic brackets, does not happen. When the minimum is greater than 1,
5010          there will be earlier copies of the group, and so we still have to wrap
5011          the whole thing. */
5012    
5013        else        else
5014          {          {
5015          uschar *ketcode = code - ketoffset;          uschar *ketcode = code - 1 - LINK_SIZE;
5016          uschar *bracode = ketcode - GET(ketcode, 1);          uschar *bracode = ketcode - GET(ketcode, 1);
5017          *ketcode = OP_KETRMAX + repeat_type;  
5018          if (lengthptr == NULL && *bracode != OP_ONCE)          /* Convert possessive ONCE brackets to non-capturing */
5019    
5020            if ((*bracode == OP_ONCE || *bracode == OP_ONCE_NC) &&
5021                possessive_quantifier) *bracode = OP_BRA;
5022    
5023            /* For non-possessive ONCE brackets, all we need to do is to
5024            set the KET. */
5025    
5026            if (*bracode == OP_ONCE || *bracode == OP_ONCE_NC)
5027              *ketcode = OP_KETRMAX + repeat_type;
5028    
5029            /* Handle non-ONCE brackets and possessive ONCEs (which have been
5030            converted to non-capturing above). */
5031    
5032            else
5033            {            {
5034            uschar *scode = bracode;            /* In the compile phase, check for empty string matching. */
5035            do  
5036              if (lengthptr == NULL)
5037              {              {
5038              if (could_be_empty_branch(scode, ketcode, utf8))              uschar *scode = bracode;
5039                do
5040                {                {
5041                *bracode += OP_SBRA - OP_BRA;                if (could_be_empty_branch(scode, ketcode, utf8, cd))
5042                break;                  {
5043                    *bracode += OP_SBRA - OP_BRA;
5044                    break;
5045                    }
5046                  scode += GET(scode, 1);
5047                }                }
5048              scode += GET(scode, 1);              while (*scode == OP_ALT);
5049              }              }
5050            while (*scode == OP_ALT);  
5051              /* Handle possessive quantifiers. */
5052    
5053              if (possessive_quantifier)
5054                {
5055                /* For COND brackets, we wrap the whole thing in a possessively
5056                repeated non-capturing bracket, because we have not invented POS
5057                versions of the COND opcodes. Because we are moving code along, we
5058                must ensure that any pending recursive references are updated. */
5059    
5060                if (*bracode == OP_COND || *bracode == OP_SCOND)
5061                  {
5062                  int nlen = (int)(code - bracode);
5063                  *code = OP_END;
5064                  adjust_recurse(bracode, 1 + LINK_SIZE, utf8, cd, save_hwm);
5065                  memmove(bracode + 1+LINK_SIZE, bracode, nlen);
5066                  code += 1 + LINK_SIZE;
5067                  nlen += 1 + LINK_SIZE;
5068                  *bracode = OP_BRAPOS;
5069                  *code++ = OP_KETRPOS;
5070                  PUTINC(code, 0, nlen);
5071                  PUT(bracode, 1, nlen);
5072                  }
5073    
5074                /* For non-COND brackets, we modify the BRA code and use KETRPOS. */
5075    
5076                else
5077                  {
5078                  *bracode += 1;              /* Switch to xxxPOS opcodes */
5079                  *ketcode = OP_KETRPOS;
5080                  }
5081    
5082                /* If the minimum is zero, mark it as possessive, then unset the
5083                possessive flag when the minimum is 0 or 1. */
5084    
5085                if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
5086                if (repeat_min < 2) possessive_quantifier = FALSE;
5087                }
5088    
5089              /* Non-possessive quantifier */
5090    
5091              else *ketcode = OP_KETRMAX + repeat_type;
5092            }            }
5093          }          }
5094        }        }
# Line 4202  we set the flag only if there is a liter Line 5109  we set the flag only if there is a liter
5109        }        }
5110    
5111      /* If the character following a repeat is '+', or if certain optimization      /* If the character following a repeat is '+', or if certain optimization
5112      tests above succeeded, possessive_quantifier is TRUE. For some of the      tests above succeeded, possessive_quantifier is TRUE. For some opcodes,
5113      simpler opcodes, there is an special alternative opcode for this. For      there are special alternative opcodes for this case. For anything else, we
5114      anything else, we wrap the entire repeated item inside OP_ONCE brackets.      wrap the entire repeated item inside OP_ONCE brackets. Logically, the '+'
5115      The '+' notation is just syntactic sugar, taken from Sun's Java package,      notation is just syntactic sugar, taken from Sun's Java package, but the
5116      but the special opcodes can optimize it a bit. The repeated item starts at      special opcodes can optimize it.
5117      tempcode, not at previous, which might be the first part of a string whose  
5118      (former) last char we repeated.      Some (but not all) possessively repeated subpatterns have already been
5119        completely handled in the code just above. For them, possessive_quantifier
5120        is always FALSE at this stage.
5121    
5122        Note that the repeated item starts at tempcode, not at previous, which
5123        might be the first part of a string whose (former) last char we repeated.
5124    
5125      Possessifying an 'exact' quantifier has no effect, so we can ignore it. But      Possessifying an 'exact' quantifier has no effect, so we can ignore it. But
5126      an 'upto' may follow. We skip over an 'exact' item, and then test the      an 'upto' may follow. We skip over an 'exact' item, and then test the
# Line 4217  we set the flag only if there is a liter Line 5129  we set the flag only if there is a liter
5129      if (possessive_quantifier)      if (possessive_quantifier)
5130        {        {
5131        int len;        int len;
5132        if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||  
5133            *tempcode == OP_NOTEXACT)        if (*tempcode == OP_TYPEEXACT)
5134          tempcode += _pcre_OP_lengths[*tempcode] +          tempcode += _pcre_OP_lengths[*tempcode] +
5135            ((*tempcode == OP_TYPEEXACT &&            ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);
5136               (tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP))? 2:0);  
5137        len = code - tempcode;        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
5138            {
5139            tempcode += _pcre_OP_lengths[*tempcode];
5140    #ifdef SUPPORT_UTF8
5141            if (utf8 && tempcode[-1] >= 0xc0)
5142              tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];
5143    #endif
5144            }
5145    
5146          len = (int)(code - tempcode);
5147        if (len > 0) switch (*tempcode)        if (len > 0) switch (*tempcode)
5148          {          {
5149          case OP_STAR:  *tempcode = OP_POSSTAR; break;          case OP_STAR:  *tempcode = OP_POSSTAR; break;
# Line 4230  we set the flag only if there is a liter Line 5151  we set the flag only if there is a liter
5151          case OP_QUERY: *tempcode = OP_POSQUERY; break;          case OP_QUERY: *tempcode = OP_POSQUERY; break;
5152          case OP_UPTO:  *tempcode = OP_POSUPTO; break;          case OP_UPTO:  *tempcode = OP_POSUPTO; break;
5153    
5154          case OP_TYPESTAR:  *tempcode = OP_TYPEPOSSTAR; break;          case OP_STARI:  *tempcode = OP_POSSTARI; break;
5155          case OP_TYPEPLUS:  *tempcode = OP_TYPEPOSPLUS; break;          case OP_PLUSI:  *tempcode = OP_POSPLUSI; break;
5156          case OP_TYPEQUERY: *tempcode = OP_TYPEPOSQUERY; break;          case OP_QUERYI: *tempcode = OP_POSQUERYI; break;
5157          case OP_TYPEUPTO:  *tempcode = OP_TYPEPOSUPTO; break;          case OP_UPTOI:  *tempcode = OP_POSUPTOI; break;
5158    
5159          case OP_NOTSTAR:  *tempcode = OP_NOTPOSSTAR; break;          case OP_NOTSTAR:  *tempcode = OP_NOTPOSSTAR; break;
5160          case OP_NOTPLUS:  *tempcode = OP_NOTPOSPLUS; break;          case OP_NOTPLUS:  *tempcode = OP_NOTPOSPLUS; break;
5161          case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;          case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;
5162          case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;          case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;
5163    
5164            case OP_NOTSTARI:  *tempcode = OP_NOTPOSSTARI; break;
5165            case OP_NOTPLUSI:  *tempcode = OP_NOTPOSPLUSI; break;
5166            case OP_NOTQUERYI: *tempcode = OP_NOTPOSQUERYI; break;
5167            case OP_NOTUPTOI:  *tempcode = OP_NOTPOSUPTOI; break;
5168    
5169            case OP_TYPESTAR:  *tempcode = OP_TYPEPOSSTAR; break;
5170            case OP_TYPEPLUS:  *tempcode = OP_TYPEPOSPLUS; break;
5171            case OP_TYPEQUERY: *tempcode = OP_TYPEPOSQUERY; break;
5172            case OP_TYPEUPTO:  *tempcode = OP_TYPEPOSUPTO; break;
5173    
5174            /* Because we are moving code along, we must ensure that any
5175            pending recursive references are updated. */
5176    
5177          default:          default:
5178            *code = OP_END;
5179            adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);
5180          memmove(tempcode + 1+LINK_SIZE, tempcode, len);          memmove(tempcode + 1+LINK_SIZE, tempcode, len);
5181          code += 1 + LINK_SIZE;          code += 1 + LINK_SIZE;
5182          len += 1 + LINK_SIZE;          len += 1 + LINK_SIZE;
# Line 4276  we set the flag only if there is a liter Line 5212  we set the flag only if there is a liter
5212    
5213      /* First deal with various "verbs" that can be introduced by '*'. */      /* First deal with various "verbs" that can be introduced by '*'. */
5214    
5215      if (*(++ptr) == CHAR_ASTERISK && (cd->ctypes[ptr[1]] & ctype_letter) != 0)      if (*(++ptr) == CHAR_ASTERISK &&
5216             ((cd->ctypes[ptr[1]] & ctype_letter) != 0 || ptr[1] == ':'))
5217        {        {
5218        int i, namelen;        int i, namelen;
5219          int arglen = 0;
5220        const char *vn = verbnames;        const char *vn = verbnames;
5221        const uschar *name = ++ptr;        const uschar *name = ptr + 1;
5222          const uschar *arg = NULL;
5223        previous = NULL;        previous = NULL;
5224        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
5225          namelen = (int)(ptr - name);
5226    
5227          /* It appears that Perl allows any characters whatsoever, other than
5228          a closing parenthesis, to appear in arguments, so we no longer insist on
5229          letters, digits, and underscores. */
5230    
5231        if (*ptr == CHAR_COLON)        if (*ptr == CHAR_COLON)
5232          {          {
5233          *errorcodeptr = ERR59;   /* Not supported */          arg = ++ptr;
5234          goto FAILED;          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
5235            arglen = (int)(ptr - arg);
5236          }          }
5237    
5238        if (*ptr != CHAR_RIGHT_PARENTHESIS)        if (*ptr != CHAR_RIGHT_PARENTHESIS)
5239          {          {
5240          *errorcodeptr = ERR60;          *errorcodeptr = ERR60;
5241          goto FAILED;          goto FAILED;
5242          }          }
5243        namelen = ptr - name;  
5244          /* Scan the table of verb names */
5245    
5246        for (i = 0; i < verbcount; i++)        for (i = 0; i < verbcount; i++)
5247          {          {
5248          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
5249              strncmp((char *)name, vn, namelen) == 0)              strncmp((char *)name, vn, namelen) == 0)
5250            {            {
5251            *code = verbs[i].op;            /* Check for open captures before ACCEPT and convert it to
5252            if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;            ASSERT_ACCEPT if in an assertion. */
5253            break;  
5254              if (verbs[i].op == OP_ACCEPT)
5255                {
5256                open_capitem *oc;
5257                if (arglen != 0)
5258                  {
5259                  *errorcodeptr = ERR59;
5260                  goto FAILED;
5261                  }
5262                cd->had_accept = TRUE;
5263                for (oc = cd->open_caps; oc != NULL; oc = oc->next)
5264                  {
5265                  *code++ = OP_CLOSE;
5266                  PUT2INC(code, 0, oc->number);
5267                  }
5268                *code++ = (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
5269    
5270                /* Do not set firstbyte after *ACCEPT */
5271                if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
5272                }
5273    
5274              /* Handle other cases with/without an argument */
5275    
5276              else if (arglen == 0)
5277                {
5278                if (verbs[i].op < 0)   /* Argument is mandatory */
5279                  {
5280                  *errorcodeptr = ERR66;
5281                  goto FAILED;
5282                  }
5283                *code = verbs[i].op;
5284                if (*code++ == OP_THEN) cd->external_flags |= PCRE_HASTHEN;
5285                }
5286    
5287              else
5288                {
5289                if (verbs[i].op_arg < 0)   /* Argument is forbidden */
5290                  {
5291                  *errorcodeptr = ERR59;
5292                  goto FAILED;
5293                  }
5294                *code = verbs[i].op_arg;
5295                if (*code++ == OP_THEN_ARG) cd->external_flags |= PCRE_HASTHEN;
5296                *code++ = arglen;
5297                memcpy(code, arg, arglen);
5298                code += arglen;
5299                *code++ = 0;
5300                }
5301    
5302              break;  /* Found verb, exit loop */
5303            }            }
5304    
5305          vn += verbs[i].len + 1;          vn += verbs[i].len + 1;
5306          }          }
5307        if (i < verbcount) continue;  
5308        *errorcodeptr = ERR60;        if (i < verbcount) continue;    /* Successfully handled a verb */
5309          *errorcodeptr = ERR60;          /* Verb not recognized */
5310        goto FAILED;        goto FAILED;
5311        }        }
5312    
# Line 4425  we set the flag only if there is a liter Line 5425  we set the flag only if there is a liter
5425                recno * 10 + *ptr - CHAR_0 : -1;                recno * 10 + *ptr - CHAR_0 : -1;
5426            ptr++;            ptr++;
5427            }            }
5428          namelen = ptr - name;          namelen = (int)(ptr - name);
5429    
5430          if ((terminator > 0 && *ptr++ != terminator) ||          if ((terminator > 0 && *ptr++ != terminator) ||
5431              *ptr++ != CHAR_RIGHT_PARENTHESIS)              *ptr++ != CHAR_RIGHT_PARENTHESIS)
5432            {            {
5433            ptr--;      /* Error offset */            ptr--;      /* Error offset */
# Line 4462  we set the flag only if there is a liter Line 5462  we set the flag only if there is a liter
5462            }            }
5463    
5464          /* Otherwise (did not start with "+" or "-"), start by looking for the          /* Otherwise (did not start with "+" or "-"), start by looking for the
5465          name. */          name. If we find a name, add one to the opcode to change OP_CREF or
5466            OP_RREF into OP_NCREF or OP_NRREF. These behave exactly the same,
5467            except they record that the reference was originally to a name. The
5468            information is used to check duplicate names. */
5469    
5470          slot = cd->name_table;          slot = cd->name_table;
5471          for (i = 0; i < cd->names_found; i++)          for (i = 0; i < cd->names_found; i++)
# Line 4477  we set the flag only if there is a liter Line 5480  we set the flag only if there is a liter
5480            {            {
5481            recno = GET2(slot, 0);            recno = GET2(slot, 0);
5482            PUT2(code, 2+LINK_SIZE, recno);            PUT2(code, 2+LINK_SIZE, recno);
5483              code[1+LINK_SIZE]++;
5484            }            }
5485    
5486          /* Search the pattern for a forward reference */          /* Search the pattern for a forward reference */
5487    
5488          else if ((i = find_parens(ptr, cd, name, namelen,          else if ((i = find_parens(cd, name, namelen,
5489                          (options & PCRE_EXTENDED) != 0)) > 0)                          (options & PCRE_EXTENDED) != 0, utf8)) > 0)
5490            {            {
5491            PUT2(code, 2+LINK_SIZE, i);            PUT2(code, 2+LINK_SIZE, i);
5492              code[1+LINK_SIZE]++;
5493            }            }
5494    
5495          /* If terminator == 0 it means that the name followed directly after          /* If terminator == 0 it means that the name followed directly after
# Line 4549  we set the flag only if there is a liter Line 5554  we set the flag only if there is a liter
5554          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5555          case CHAR_EQUALS_SIGN:                 /* Positive lookahead */          case CHAR_EQUALS_SIGN:                 /* Positive lookahead */
5556          bravalue = OP_ASSERT;          bravalue = OP_ASSERT;
5557            cd->assert_depth += 1;
5558          ptr++;          ptr++;
5559          break;          break;
5560    
# Line 4563  we set the flag only if there is a liter Line 5569  we set the flag only if there is a liter
5569            continue;            continue;
5570            }            }
5571          bravalue = OP_ASSERT_NOT;          bravalue = OP_ASSERT_NOT;
5572            cd->assert_depth += 1;
5573          break;          break;
5574    
5575    
# Line 4572  we set the flag only if there is a liter Line 5579  we set the flag only if there is a liter
5579            {            {
5580            case CHAR_EQUALS_SIGN:               /* Positive lookbehind */            case CHAR_EQUALS_SIGN:               /* Positive lookbehind */
5581            bravalue = OP_ASSERTBACK;            bravalue = OP_ASSERTBACK;
5582              cd->assert_depth += 1;
5583            ptr += 2;            ptr += 2;
5584            break;            break;
5585    
5586            case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */            case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */
5587            bravalue = OP_ASSERTBACK_NOT;            bravalue = OP_ASSERTBACK_NOT;
5588              cd->assert_depth += 1;
5589            ptr += 2;            ptr += 2;
5590            break;            break;
5591    
# Line 4598  we set the flag only if there is a liter Line 5607  we set the flag only if there is a liter
5607    
5608          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5609          case CHAR_C:                 /* Callout - may be followed by digits; */          case CHAR_C:                 /* Callout - may be followed by digits; */
5610          previous_callout = code;  /* Save for later completion */          previous_callout = code;     /* Save for later completion */
5611          after_manual_callout = 1; /* Skip one item before completing */          after_manual_callout = 1;    /* Skip one item before completing */
5612          *code++ = OP_CALLOUT;          *code++ = OP_CALLOUT;
5613            {            {
5614            int n = 0;            int n = 0;
# Line 4616  we set the flag only if there is a liter Line 5625  we set the flag only if there is a liter
5625              goto FAILED;              goto FAILED;
5626              }              }
5627            *code++ = n;            *code++ = n;
5628            PUT(code, 0, ptr - cd->start_pattern + 1);  /* Pattern offset */            PUT(code, 0, (int)(ptr - cd->start_pattern + 1)); /* Pattern offset */
5629            PUT(code, LINK_SIZE, 0);                    /* Default length */            PUT(code, LINK_SIZE, 0);                          /* Default length */
5630            code += 2 * LINK_SIZE;            code += 2 * LINK_SIZE;
5631            }            }
5632          previous = NULL;          previous = NULL;
# Line 4626  we set the flag only if there is a liter Line 5635  we set the flag only if there is a liter
5635    
5636          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5637          case CHAR_P:              /* Python-style named subpattern handling */          case CHAR_P:              /* Python-style named subpattern handling */
5638          if (*(++ptr) == CHAR_EQUALS_SIGN ||          if (*(++ptr) == CHAR_EQUALS_SIGN ||
5639              *ptr == CHAR_GREATER_THAN_SIGN)  /* Reference or recursion */              *ptr == CHAR_GREATER_THAN_SIGN)  /* Reference or recursion */
5640            {            {
5641            is_recurse = *ptr == CHAR_GREATER_THAN_SIGN;            is_recurse = *ptr == CHAR_GREATER_THAN_SIGN;
# Line 4645  we set the flag only if there is a liter Line 5654  we set the flag only if there is a liter
5654          DEFINE_NAME:    /* Come here from (?< handling */          DEFINE_NAME:    /* Come here from (?< handling */
5655          case CHAR_APOSTROPHE:          case CHAR_APOSTROPHE:
5656            {            {
5657            terminator = (*ptr == CHAR_LESS_THAN_SIGN)?            terminator = (*ptr == CHAR_LESS_THAN_SIGN)?
5658              CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;              CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
5659            name = ++ptr;            name = ++ptr;
5660    
5661            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
5662            namelen = ptr - name;            namelen = (int)(ptr - name);
5663    
5664            /* In the pre-compile phase, just do a syntax check. */            /* In the pre-compile phase, just do a syntax check. */
5665    
# Line 4677  we set the flag only if there is a liter Line 5686  we set the flag only if there is a liter
5686                }                }
5687              }              }
5688    
5689            /* In the real compile, create the entry in the table */            /* In the real compile, create the entry in the table, maintaining
5690              alphabetical order. Duplicate names for different numbers are
5691              permitted only if PCRE_DUPNAMES is set. Duplicate names for the same
5692              number are always OK. (An existing number can be re-used if (?|
5693              appears in the pattern.) In either event, a duplicate name results in
5694              a duplicate entry in the table, even if the number is the same. This
5695              is because the number of names, and hence the table size, is computed
5696              in the pre-compile, and it affects various numbers and pointers which
5697              would all have to be modified, and the compiled code moved down, if
5698              duplicates with the same number were omitted from the table. This
5699              doesn't seem worth the hassle. However, *different* names for the
5700              same number are not permitted. */
5701    
5702            else            else
5703              {              {
5704                BOOL dupname = FALSE;
5705              slot = cd->name_table;              slot = cd->name_table;
5706    
5707              for (i = 0; i < cd->names_found; i++)              for (i = 0; i < cd->names_found; i++)
5708                {                {
5709                int crc = memcmp(name, slot+2, namelen);                int crc = memcmp(name, slot+2, namelen);
# Line 4689  we set the flag only if there is a liter Line 5711  we set the flag only if there is a liter
5711                  {                  {
5712                  if (slot[2+namelen] == 0)                  if (slot[2+namelen] == 0)
5713                    {                    {
5714                    if ((options & PCRE_DUPNAMES) == 0)                    if (GET2(slot, 0) != cd->bracount + 1 &&
5715                          (options & PCRE_DUPNAMES) == 0)
5716                      {                      {
5717                      *errorcodeptr = ERR43;                      *errorcodeptr = ERR43;
5718                      goto FAILED;                      goto FAILED;
5719                      }                      }
5720                      else dupname = TRUE;
5721                    }                    }
5722                  else crc = -1;      /* Current name is substring */                  else crc = -1;      /* Current name is a substring */
5723                  }                  }
5724    
5725                  /* Make space in the table and break the loop for an earlier
5726                  name. For a duplicate or later name, carry on. We do this for
5727                  duplicates so that in the simple case (when ?(| is not used) they
5728                  are in order of their numbers. */
5729    
5730                if (crc < 0)                if (crc < 0)
5731                  {                  {
5732                  memmove(slot + cd->name_entry_size, slot,                  memmove(slot + cd->name_entry_size, slot,
5733                    (cd->names_found - i) * cd->name_entry_size);                    (cd->names_found - i) * cd->name_entry_size);
5734                  break;                  break;
5735                  }                  }
5736    
5737                  /* Continue the loop for a later or duplicate name */
5738    
5739                slot += cd->name_entry_size;                slot += cd->name_entry_size;
5740                }                }
5741    
5742                /* For non-duplicate names, check for a duplicate number before
5743                adding the new name. */
5744    
5745                if (!dupname)
5746                  {
5747                  uschar *cslot = cd->name_table;
5748                  for (i = 0; i < cd->names_found; i++)
5749                    {
5750                    if (cslot != slot)
5751                      {
5752                      if (GET2(cslot, 0) == cd->bracount + 1)
5753                        {
5754                        *errorcodeptr = ERR65;
5755                        goto FAILED;
5756                        }
5757                      }
5758                    else i--;
5759                    cslot += cd->name_entry_size;
5760                    }
5761                  }
5762    
5763              PUT2(slot, 0, cd->bracount + 1);              PUT2(slot, 0, cd->bracount + 1);
5764              memcpy(slot + 2, name, namelen);              memcpy(slot + 2, name, namelen);
5765              slot[2+namelen] = 0;              slot[2+namelen] = 0;
5766              }              }
5767            }            }
5768    
5769          /* In both cases, count the number of names we've encountered. */          /* In both pre-compile and compile, count the number of names we've
5770            encountered. */
5771    
         ptr++;                    /* Move past > or ' */  
5772          cd->names_found++;          cd->names_found++;
5773            ptr++;                    /* Move past > or ' */
5774          goto NUMBERED_GROUP;          goto NUMBERED_GROUP;
5775    
5776    
# Line 4734  we set the flag only if there is a liter Line 5789  we set the flag only if there is a liter
5789          NAMED_REF_OR_RECURSE:          NAMED_REF_OR_RECURSE:
5790          name = ++ptr;          name = ++ptr;
5791          while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;          while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
5792          namelen = ptr - name;          namelen = (int)(ptr - name);
5793    
5794          /* In the pre-compile phase, do a syntax check and set a dummy          /* In the pre-compile phase, do a syntax check. We used to just set
5795          reference number. */          a dummy reference number, because it was not used in the first pass.
5796            However, with the change of recursive back references to be atomic,
5797            we have to look for the number so that this state can be identified, as
5798            otherwise the incorrect length is computed. If it's not a backwards
5799            reference, the dummy number will do. */
5800    
5801          if (lengthptr != NULL)          if (lengthptr != NULL)
5802            {            {
5803              const uschar *temp;
5804    
5805            if (namelen == 0)            if (namelen == 0)
5806              {              {
5807              *errorcodeptr = ERR62;              *errorcodeptr = ERR62;
# Line 4756  we set the flag only if there is a liter Line 5817  we set the flag only if there is a liter
5817              *errorcodeptr = ERR48;              *errorcodeptr = ERR48;
5818              goto FAILED;              goto FAILED;
5819              }              }
5820            recno = 0;  
5821              /* The name table does not exist in the first pass, so we cannot
5822              do a simple search as in the code below. Instead, we have to scan the
5823              pattern to find the number. It is important that we scan it only as
5824              far as we have got because the syntax of named subpatterns has not
5825              been checked for the rest of the pattern, and find_parens() assumes
5826              correct syntax. In any case, it's a waste of resources to scan
5827              further. We stop the scan at the current point by temporarily
5828              adjusting the value of cd->endpattern. */
5829    
5830              temp = cd->end_pattern;
5831              cd->end_pattern = ptr;
5832              recno = find_parens(cd, name, namelen,
5833                (options & PCRE_EXTENDED) != 0, utf8);
5834              cd->end_pattern = temp;
5835              if (recno < 0) recno = 0;    /* Forward ref; set dummy number */
5836            }            }
5837    
5838          /* In the real compile, seek the name in the table. We check the name          /* In the real compile, seek the name in the table. We check the name
# Line 4780  we set the flag only if there is a liter Line 5856  we set the flag only if there is a liter
5856              recno = GET2(slot, 0);              recno = GET2(slot, 0);
5857              }              }
5858            else if ((recno =                /* Forward back reference */            else if ((recno =                /* Forward back reference */
5859                      find_parens(ptr, cd, name, namelen,                      find_parens(cd, name, namelen,
5860                        (options & PCRE_EXTENDED) != 0)) <= 0)                        (options & PCRE_EXTENDED) != 0, utf8)) <= 0)
5861              {              {
5862              *errorcodeptr = ERR15;              *errorcodeptr = ERR15;
5863              goto FAILED;              goto FAILED;
# Line 4884  we set the flag only if there is a liter Line 5960  we set the flag only if there is a liter
5960            if (lengthptr == NULL)            if (lengthptr == NULL)
5961              {              {
5962              *code = OP_END;              *code = OP_END;
5963              if (recno != 0) called = find_bracket(cd->start_code, utf8, recno);              if (recno != 0)
5964                  called = _pcre_find_bracket(cd->start_code, utf8, recno);
5965    
5966              /* Forward reference */              /* Forward reference */
5967    
5968              if (called == NULL)              if (called == NULL)
5969                {                {
5970                if (find_parens(ptr, cd, NULL, recno,                if (find_parens(cd, NULL, recno,
5971                      (options & PCRE_EXTENDED) != 0) < 0)                      (options & PCRE_EXTENDED) != 0, utf8) < 0)
5972                  {                  {
5973                  *errorcodeptr = ERR15;                  *errorcodeptr = ERR15;
5974                  goto FAILED;                  goto FAILED;
5975                  }                  }
5976    
5977                  /* Fudge the value of "called" so that when it is inserted as an
5978                  offset below, what it actually inserted is the reference number
5979                  of the group. Then remember the forward reference. */
5980    
5981                called = cd->start_code + recno;                called = cd->start_code + recno;
5982                PUTINC(cd->hwm, 0, code + 2 + LINK_SIZE - cd->start_code);                PUTINC(cd->hwm, 0, (int)(code + 1 - cd->start_code));
5983                }                }
5984    
5985              /* If not a forward reference, and the subpattern is still open,              /* If not a forward reference, and the subpattern is still open,
5986              this is a recursive call. We check to see if this is a left              this is a recursive call. We check to see if this is a left
5987              recursion that could loop for ever, and diagnose that case. */              recursion that could loop for ever, and diagnose that case. We
5988                must not, however, do this check if we are in a conditional
5989                subpattern because the condition might be testing for recursion in
5990                a pattern such as /(?(R)a+|(?R)b)/, which is perfectly valid.
5991                Forever loops are also detected at runtime, so those that occur in