/[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 512 by ph10, Tue Mar 30 11:11:52 2010 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-2010 University of Cambridge             Copyright (c) 1997-2011 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 124  static const short int escapes[] = { Line 124  static const short int escapes[] = {
124       -ESC_H,                  0,       -ESC_H,                  0,
125       0,                       -ESC_K,       0,                       -ESC_K,
126       0,                       0,       0,                       0,
127       0,                       0,       -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,
# Line 171  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 261  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 324  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 346  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"
# Line 360  static const char error_texts[] = Line 407  static const char error_texts[] =
407    /* 65 */    /* 65 */
408    "different names for subpatterns of the same number are not allowed\0"    "different names for subpatterns of the same number are not allowed\0"
409    "(*MARK) must have an argument\0"    "(*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
# Line 496  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 528  return s; Line 581  return s;
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 593  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 616  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 744  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 794  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 804  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 831  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 931  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 1039  top-level call starts at the beginning o Line 1164  top-level call starts at the beginning o
1164  start at a parenthesis. It scans along a pattern's text looking for capturing  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. We know that if (?P< is  returns when it reaches a given numbered subpattern. Recursion is used to keep
1168  encountered, the name will be terminated by '>' because that is checked in the  track of subpatterns that reset the capturing group numbers - the (?| feature.
1169  first pass. Recursion is used to keep track of subpatterns that reset the  
1170  capturing group numbers - the (?| feature.  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    ptrptr       address of the current character pointer (updated)    ptrptr       address of the current character pointer (updated)
# Line 1050  Arguments: Line 1186  Arguments:
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)    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
# Line 1057  Returns:       the number of the named s Line 1194  Returns:       the number of the named s
1194    
1195  static int  static int
1196  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,
1197    BOOL xmode, int *count)    BOOL xmode, BOOL utf8, int *count)
1198  {  {
1199  uschar *ptr = *ptrptr;  uschar *ptr = *ptrptr;
1200  int start_count = *count;  int start_count = *count;
# Line 1069  dealing with. The very first call may no Line 1206  dealing with. The very first call may no
1206    
1207  if (ptr[0] == CHAR_LEFT_PARENTHESIS)  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1208    {    {
1209    if (ptr[1] == CHAR_QUESTION_MARK &&    /* Handle specials such as (*SKIP) or (*UTF8) etc. */
1210        ptr[2] == CHAR_VERTICAL_LINE)  
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;      ptr += 3;
1228      dup_parens = TRUE;      dup_parens = TRUE;
1229      }      }
1230    
1231    /* Handle a normal, unnamed capturing parenthesis */    /* Handle comments; all characters are allowed until a ket is reached. */
1232    
1233    else if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)    else if (ptr[2] == CHAR_NUMBER_SIGN)
1234      {      {
1235      *count += 1;      for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
1236      if (name == NULL && *count == lorn) return *count;      goto FAIL_EXIT;
     ptr++;  
1237      }      }
1238    
1239    /* Handle a condition. If it is an assertion, just carry on so that it    /* 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    is processed as normal. If not, skip to the closing parenthesis of the
1241    condition (there can't be any nested parens. */    condition (there can't be any nested parens). */
1242    
1243    else if (ptr[2] == CHAR_LEFT_PARENTHESIS)    else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
1244      {      {
# Line 1099  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1250  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1250        }        }
1251      }      }
1252    
1253    /* We have either (? or (* and not a condition */    /* Start with (? but not a condition. */
1254    
1255    else    else
1256      {      {
# Line 1128  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1279  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1279    }    }
1280    
1281  /* Past any initial parenthesis handling, scan for parentheses or vertical  /* Past any initial parenthesis handling, scan for parentheses or vertical
1282  bars. */  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 != 0; ptr++)  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    
# Line 1204  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        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;      if (*ptr == 0) goto FAIL_EXIT;
1370      continue;      continue;
1371      }      }
# Line 1213  for (; *ptr != 0; ptr++) Line 1374  for (; *ptr != 0; ptr++)
1374    
1375    if (*ptr == CHAR_LEFT_PARENTHESIS)    if (*ptr == CHAR_LEFT_PARENTHESIS)
1376      {      {
1377      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, count);      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, count);
1378      if (rc > 0) return rc;      if (rc > 0) return rc;
1379      if (*ptr == 0) goto FAIL_EXIT;      if (*ptr == 0) goto FAIL_EXIT;
1380      }      }
# Line 1221  for (; *ptr != 0; ptr++) Line 1382  for (; *ptr != 0; ptr++)
1382    else if (*ptr == CHAR_RIGHT_PARENTHESIS)    else if (*ptr == CHAR_RIGHT_PARENTHESIS)
1383      {      {
1384      if (dup_parens && *count < hwm_count) *count = hwm_count;      if (dup_parens && *count < hwm_count) *count = hwm_count;
1385      *ptrptr = ptr;      goto FAIL_EXIT;
     return -1;  
1386      }      }
1387    
1388    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
# Line 1260  Arguments: Line 1420  Arguments:
1420    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1421    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1422    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1423      utf8         TRUE if we are in UTF-8 mode
1424    
1425  Returns:       the number of the found subpattern, or -1 if not found  Returns:       the number of the found subpattern, or -1 if not found
1426  */  */
1427    
1428  static int  static int
1429  find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode)  find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode,
1430      BOOL utf8)
1431  {  {
1432  uschar *ptr = (uschar *)cd->start_pattern;  uschar *ptr = (uschar *)cd->start_pattern;
1433  int count = 0;  int count = 0;
# Line 1278  matching closing parens. That is why we Line 1440  matching closing parens. That is why we
1440    
1441  for (;;)  for (;;)
1442    {    {
1443    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, &count);    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, &count);
1444    if (rc > 0 || *ptr++ == 0) break;    if (rc > 0 || *ptr++ == 0) break;
1445    }    }
1446    
# Line 1294  return rc; Line 1456  return rc;
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 1371  and doing the check at the end; a flag s Line 1523  and doing the check at the end; a flag s
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    atend    TRUE if called when the pattern is complete
1528    cd       the "compile data" structure    cd       the "compile data" structure
1529    
1530  Returns:   the fixed length,  Returns:   the fixed length,
1531               or -1 if there is no fixed length,               or -1 if there is no fixed length,
1532               or -2 if \C was encountered               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               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, BOOL atend, compile_data *cd)  find_fixedlength(uschar *code, BOOL utf8, BOOL atend, compile_data *cd)
1539  {  {
1540  int length = -1;  int length = -1;
1541    
# Line 1399  for (;;) Line 1552  for (;;)
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, atend, cd);      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 1435  for (;;) Line 1596  for (;;)
1596      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1597      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */
1598      if (cc > cs && cc < ce) return -1;                /* Recursion */      if (cc > cs && cc < ce) return -1;                /* Recursion */
1599      d = find_fixedlength(cs + 2, options, atend, cd);      d = find_fixedlength(cs + 2, utf8, atend, cd);
1600      if (d < 0) return d;      if (d < 0) return d;
1601      branchlength += d;      branchlength += d;
1602      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
# Line 1452  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_NCREF:  
     case OP_RREF:  
     case OP_NRREF:  
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:  
     case OP_SET_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 1475  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 && cc[-1] >= 0xc0)      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       cc += _pcre_utf8_table4[cc[-1] & 0x3f];  
1660  #endif  #endif
1661      break;      break;
1662    
# Line 1489  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 && cc[-1] >= 0xc0)      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       cc += _pcre_utf8_table4[cc[-1] & 0x3f];  
1674  #endif  #endif
1675      break;      break;
1676    
# Line 1510  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 1522  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 1541  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 1561  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 1595  _pcre_find_bracket(const uschar *code, B Line 1862  _pcre_find_bracket(const uschar *code, B
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 1613  for (;;) Line 1881  for (;;)
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 1651  for (;;) Line 1920  for (;;)
1920        case OP_MARK:        case OP_MARK:
1921        case OP_PRUNE_ARG:        case OP_PRUNE_ARG:
1922        case OP_SKIP_ARG:        case OP_SKIP_ARG:
1923          code += code[1];
1924          break;
1925    
1926        case OP_THEN_ARG:        case OP_THEN_ARG:
1927        code += code[1];        code += code[1];
1928        break;        break;
# Line 1668  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 1754  for (;;) Line 2039  for (;;)
2039        case OP_MARK:        case OP_MARK:
2040        case OP_PRUNE_ARG:        case OP_PRUNE_ARG:
2041        case OP_SKIP_ARG:        case OP_SKIP_ARG:
2042          code += code[1];
2043          break;
2044    
2045        case OP_THEN_ARG:        case OP_THEN_ARG:
2046        code += code[1];        code += code[1];
2047        break;        break;
# Line 1771  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 1823  could_be_empty_branch(const uschar *code Line 2124  could_be_empty_branch(const uschar *code
2124    compile_data *cd)    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 1841  for (code = first_significant_code(code Line 2142  for (code = first_significant_code(code
2142      continue;      continue;
2143      }      }
2144    
   /* Groups with zero repeats can of course be empty; skip them. */  
   
   if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)  
     {  
     code += _pcre_OP_lengths[c];  
     do code += GET(code, 1); while (*code == OP_ALT);  
     c = *code;  
     continue;  
     }  
   
2145    /* For a recursion/subroutine call, if its end has been reached, which    /* For a recursion/subroutine call, if its end has been reached, which
2146    implies a subroutine call, we can scan it. */    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)    if (c == OP_RECURSE)
2153      {      {
2154      BOOL empty_branch = FALSE;      const uschar *scode;
2155      const uschar *scode = cd->start_code + GET(code, 1);      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 */      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
2167    
2168        /* Completed backwards reference */
2169    
2170      do      do
2171        {        {
2172        if (could_be_empty_branch(scode, endcode, utf8, cd))        if (could_be_empty_branch(scode, endcode, utf8, cd))
# Line 1869  for (code = first_significant_code(code Line 2177  for (code = first_significant_code(code
2177        scode += GET(scode, 1);        scode += GET(scode, 1);
2178        }        }
2179      while (*scode == OP_ALT);      while (*scode == OP_ALT);
2180    
2181      if (!empty_branch) return FALSE;  /* All branches are non-empty */      if (!empty_branch) return FALSE;  /* All branches are non-empty */
2182      continue;      continue;
2183      }      }
2184    
2185      /* Groups with zero repeats can of course be empty; skip them. */
2186    
2187      if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2188          c == OP_BRAPOSZERO)
2189        {
2190        code += _pcre_OP_lengths[c];
2191        do code += GET(code, 1); while (*code == OP_ALT);
2192        c = *code;
2193        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 */
# Line 1962  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 2003  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 2011  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];      if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];
2362      break;      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        case OP_POSUPTOI:
2370      if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];      if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];
2371      break;      break;
2372  #endif  #endif
# Line 2032  for (code = first_significant_code(code Line 2377  for (code = first_significant_code(code
2377      case OP_MARK:      case OP_MARK:
2378      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
2379      case OP_SKIP_ARG:      case OP_SKIP_ARG:
2380        code += code[1];
2381        break;
2382    
2383      case OP_THEN_ARG:      case OP_THEN_ARG:
2384      code += code[1];      code += code[1];
2385      break;      break;
# Line 2056  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
# Line 2106  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 2120  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 2256  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 2282  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 2332  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 2345  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 2357  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 2371  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 2408  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 2421  if (*ptr == CHAR_ASTERISK || *ptr == CHA Line 2865  if (*ptr == CHAR_ASTERISK || *ptr == CHA
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 2458  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 2479  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 2526  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 2542  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 2611  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 2625  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 2688  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 2699  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 2708  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 2720  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 2733  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 PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 2784  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    
# Line 2820  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 2895  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 2938  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 2949  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 3143  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 3157  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 3204  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 3233  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 3255  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 3266  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 3303  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 3348  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 3367  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 3400  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 3501  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 3674  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 && (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));      while (((c = *(++ptr)) != 0 ||
4234               (nestptr != NULL &&
4235                 (ptr = nestptr, nestptr = NULL, c = *(++ptr)) != 0)) &&
4236               (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
4237    
4238      if (c == 0)                          /* Missing terminating ']' */      /* Check for missing terminating ']' */
4239    
4240        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 3710  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 3729  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 3766  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 3798  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 3861  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 3885  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 3925  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 3938  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 3971  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 4140  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 4174  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 4223  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 4246  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 4270  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 4379  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 4400  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 4410  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, cd))              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 4459  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 4488  we set the flag only if there is a liter Line 5143  we set the flag only if there is a liter
5143  #endif  #endif
5144          }          }
5145    
5146        len = code - tempcode;        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 4496  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          /* Because we are moving code along, we must ensure that any
5175          pending recursive references are updated. */          pending recursive references are updated. */
5176    
# Line 4557  we set the flag only if there is a liter Line 5222  we set the flag only if there is a liter
5222        const uschar *arg = NULL;        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 = ptr - name;        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          arg = ++ptr;          arg = ++ptr;
5234          while ((cd->ctypes[*ptr] & (ctype_letter|ctype_digit)) != 0          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
5235            || *ptr == '_') ptr++;          arglen = (int)(ptr - arg);
         arglen = ptr - arg;  
5236          }          }
5237    
5238        if (*ptr != CHAR_RIGHT_PARENTHESIS)        if (*ptr != CHAR_RIGHT_PARENTHESIS)
# Line 4580  we set the flag only if there is a liter Line 5248  we set the flag only if there is a liter
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            /* Check for open captures before ACCEPT */            /* Check for open captures before ACCEPT and convert it to
5252              ASSERT_ACCEPT if in an assertion. */
5253    
5254            if (verbs[i].op == OP_ACCEPT)            if (verbs[i].op == OP_ACCEPT)
5255              {              {
5256              open_capitem *oc;              open_capitem *oc;
5257                if (arglen != 0)
5258                  {
5259                  *errorcodeptr = ERR59;
5260                  goto FAILED;
5261                  }
5262              cd->had_accept = TRUE;              cd->had_accept = TRUE;
5263              for (oc = cd->open_caps; oc != NULL; oc = oc->next)              for (oc = cd->open_caps; oc != NULL; oc = oc->next)
5264                {                {
5265                *code++ = OP_CLOSE;                *code++ = OP_CLOSE;
5266                PUT2INC(code, 0, oc->number);                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 the cases with/without an argument */            /* Handle other cases with/without an argument */
5275    
5276            if (arglen == 0)            else if (arglen == 0)
5277              {              {
5278              if (verbs[i].op < 0)   /* Argument is mandatory */              if (verbs[i].op < 0)   /* Argument is mandatory */
5279                {                {
5280                *errorcodeptr = ERR66;                *errorcodeptr = ERR66;
5281                goto FAILED;                goto FAILED;
5282                }                }
5283              *code++ = verbs[i].op;              *code = verbs[i].op;
5284                if (*code++ == OP_THEN) cd->external_flags |= PCRE_HASTHEN;
5285              }              }
5286    
5287            else            else
# Line 4612  we set the flag only if there is a liter Line 5291  we set the flag only if there is a liter
5291                *errorcodeptr = ERR59;                *errorcodeptr = ERR59;
5292                goto FAILED;                goto FAILED;
5293                }                }
5294              *code++ = verbs[i].op_arg;              *code = verbs[i].op_arg;
5295                if (*code++ == OP_THEN_ARG) cd->external_flags |= PCRE_HASTHEN;
5296              *code++ = arglen;              *code++ = arglen;
5297              memcpy(code, arg, arglen);              memcpy(code, arg, arglen);
5298              code += arglen;              code += arglen;
# Line 4745  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)
# Line 4806  we set the flag only if there is a liter Line 5486  we set the flag only if there is a liter
5486          /* Search the pattern for a forward reference */          /* Search the pattern for a forward reference */
5487    
5488          else if ((i = find_parens(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]++;            code[1+LINK_SIZE]++;
# Line 4874  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 4888  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 4897  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 4923  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 4941  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 4975  we set the flag only if there is a liter Line 5659  we set the flag only if there is a liter
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 5105  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 5127  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 5152  we set the flag only if there is a liter Line 5857  we set the flag only if there is a liter
5857              }              }
5858            else if ((recno =                /* Forward back reference */            else if ((recno =                /* Forward back reference */
5859                      find_parens(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 5263  we set the flag only if there is a liter Line 5968  we set the flag only if there is a liter
5968              if (called == NULL)              if (called == NULL)
5969                {                {
5970                if (find_parens(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;
# Line 5271  we set the flag only if there is a liter Line 5976  we set the flag only if there is a liter
5976    
5977                /* Fudge the value of "called" so that when it is inserted as an                /* Fudge the value of "called" so that when it is inserted as an
5978                offset below, what it actually inserted is the reference number                offset below, what it actually inserted is the reference number
5979                of the group. */                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
5992                conditional subpatterns will be picked up then. */
5993    
5994              else if (GET(called, 1) == 0 &&              else if (GET(called, 1) == 0 && cond_depth <= 0 &&
5995                       could_be_empty(called, code, bcptr, utf8, cd))                       could_be_empty(called, code, bcptr, utf8, cd))
5996                {                {
5997                *errorcodeptr = ERR40;                *errorcodeptr = ERR40;
# Line 5289  we set the flag only if there is a liter Line 5999  we set the flag only if there is a liter
5999                }                }
6000              }              }
6001    
6002            /* Insert the recursion/subroutine item, automatically wrapped inside            /* Insert the recursion/subroutine item. */
           "once" brackets. Set up a "previous group" length so that a  
           subsequent quantifier will work. */  
   
           *code = OP_ONCE;  
           PUT(code, 1, 2 + 2*LINK_SIZE);  
           code += 1 + LINK_SIZE;  
6003    
6004            *code = OP_RECURSE;            *code = OP_RECURSE;
6005            PUT(code, 1, called - cd->start_code);            PUT(code, 1, (int)(called - cd->start_code));
6006            code += 1 + LINK_SIZE;            code += 1 + LINK_SIZE;
   
           *code = OP_KET;  
           PUT(code, 1, 2 + 2*LINK_SIZE);  
           code += 1 + LINK_SIZE;  
   
           length_prevgroup = 3 + 3*LINK_SIZE;  
6007            }            }
6008    
6009          /* Can't determine a first byte now */          /* Can't determine a first byte now */
# Line 5366  we set the flag only if there is a liter Line 6064  we set the flag only if there is a liter
6064          is necessary to ensure we correctly detect the start of the pattern in          is necessary to ensure we correctly detect the start of the pattern in
6065          both phases.          both phases.
6066    
6067          If we are not at the pattern start, compile code to change the ims          If we are not at the pattern start, reset the greedy defaults and the
6068          options if this setting actually changes any of them, and reset the          case value for firstbyte and reqbyte. */
         greedy defaults and the case value for firstbyte and reqbyte. */  
6069    
6070          if (*ptr == CHAR_RIGHT_PARENTHESIS)          if (*ptr == CHAR_RIGHT_PARENTHESIS)
6071            {            {
# Line 5379  we set the flag only if there is a liter Line 6076  we set the flag only if there is a liter
6076              }              }
6077            else            else
6078              {              {
             if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))  
               {  
               *code++ = OP_OPT;  
               *code++ = newoptions & PCRE_IMS;  
               }  
6079              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
6080              greedy_non_default = greedy_default ^ 1;              greedy_non_default = greedy_default ^ 1;
6081              req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;              req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
6082              }              }
6083    
6084            /* Change options at this level, and pass them back for use            /* Change options at this level, and pass them back for use
6085            in subsequent branches. When not at the start of the pattern, this            in subsequent branches. */
           information is also necessary so that a resetting item can be  
           compiled at the end of a group (if we are in a group). */  
6086    
6087            *optionsptr = options = newoptions;            *optionsptr = options = newoptions;
6088            previous = NULL;       /* This item can't be repeated */            previous = NULL;       /* This item can't be repeated */
# Line 5428  we set the flag only if there is a liter Line 6118  we set the flag only if there is a liter
6118        skipbytes = 2;        skipbytes = 2;
6119        }        }
6120    
6121      /* Process nested bracketed regex. Assertions may not be repeated, but      /* Process nested bracketed regex. Assertions used not to be repeatable,
6122      other kinds can be. All their opcodes are >= OP_ONCE. We copy code into a      but this was changed for Perl compatibility, so all kinds can now be
6123      non-register variable in order to be able to pass its address because some      repeated. We copy code into a non-register variable (tempcode) in order to
6124      compilers complain otherwise. Pass in a new setting for the ims options if      be able to pass its address because some compilers complain otherwise. */
     they have changed. */  
6125    
6126      previous = (bravalue >= OP_ONCE)? code : NULL;      previous = code;                      /* For handling repetition */
6127      *code = bravalue;      *code = bravalue;
6128      tempcode = code;      tempcode = code;
6129      tempreqvary = cd->req_varyopt;     /* Save value before bracket */      tempreqvary = cd->req_varyopt;        /* Save value before bracket */
6130      length_prevgroup = 0;              /* Initialize for pre-compile phase */      tempbracount = cd->bracount;          /* Save value before bracket */
6131        length_prevgroup = 0;                 /* Initialize for pre-compile phase */
6132    
6133      if (!compile_regex(      if (!compile_regex(
6134           newoptions,                   /* The complete new option state */           newoptions,                      /* The complete new option state */
6135           options & PCRE_IMS,           /* The previous ims option state */           &tempcode,                       /* Where to put code (updated) */
6136           &tempcode,                    /* Where to put code (updated) */           &ptr,                            /* Input pointer (updated) */
6137           &ptr,                         /* Input pointer (updated) */           errorcodeptr,                    /* Where to put an error message */
          errorcodeptr,                 /* Where to put an error message */  
6138           (bravalue == OP_ASSERTBACK ||           (bravalue == OP_ASSERTBACK ||
6139            bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */            bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */
6140           reset_bracount,               /* True if (?| group */           reset_bracount,                  /* True if (?| group */
6141           skipbytes,                    /* Skip over bracket number */           skipbytes,                       /* Skip over bracket number */
6142           &subfirstbyte,                /* For possible first char */           cond_depth +
6143           &subreqbyte,                  /* For possible last char */             ((bravalue == OP_COND)?1:0),   /* Depth of condition subpatterns */
6144           bcptr,                        /* Current branch chain */           &subfirstbyte,                   /* For possible first char */
6145           cd,                           /* Tables block */           &subreqbyte,                     /* For possible last char */
6146           (lengthptr == NULL)? NULL :   /* Actual compile phase */           bcptr,                           /* Current branch chain */
6147             &length_prevgroup           /* Pre-compile phase */           cd,                              /* Tables block */
6148             (lengthptr == NULL)? NULL :      /* Actual compile phase */
6149               &length_prevgroup              /* Pre-compile phase */
6150           ))           ))
6151        goto FAILED;        goto FAILED;
6152    
6153        /* If this was an atomic group and there are no capturing groups within it,
6154        generate OP_ONCE_NC instead of OP_ONCE. */
6155    
6156        if (bravalue == OP_ONCE && cd->bracount <= tempbracount)
6157          *code = OP_ONCE_NC;
6158    
6159        if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NOT)
6160          cd->assert_depth -= 1;
6161    
6162      /* At the end of compiling, code is still pointing to the start of the      /* At the end of compiling, code is still pointing to the start of the
6163      group, while tempcode has been updated to point past the end of the group      group, while tempcode has been updated to point past the end of the group.
6164      and any option resetting that may follow it. The pattern pointer (ptr)      The pattern pointer (ptr) is on the bracket.
     is on the bracket. */  
6165    
6166      /* If this is a conditional bracket, check that there are no more than      If this is a conditional bracket, check that there are no more than
6167      two branches in the group, or just one if it's a DEFINE group. We do this      two branches in the group, or just one if it's a DEFINE group. We do this
6168      in the real compile phase, not in the pre-pass, where the whole group may      in the real compile phase, not in the pre-pass, where the whole group may
6169      not be available. */      not be available. */
# Line 5529  we set the flag only if there is a liter Line 6228  we set the flag only if there is a liter
6228          goto FAILED;          goto FAILED;
6229          }          }
6230        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
6231        *code++ = OP_BRA;        code++;   /* This already contains bravalue */
6232        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
6233        *code++ = OP_KET;        *code++ = OP_KET;
6234        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
# Line 5602  we set the flag only if there is a liter Line 6301  we set the flag only if there is a liter
6301    
6302      /* ===================================================================*/      /* ===================================================================*/
6303      /* Handle metasequences introduced by \. For ones like \d, the ESC_ values      /* Handle metasequences introduced by \. For ones like \d, the ESC_ values
6304      are arranged to be the negation of the corresponding OP_values. For the      are arranged to be the negation of the corresponding OP_values in the
6305      back references, the values are ESC_REF plus the reference number. Only      default case when PCRE_UCP is not set. For the back references, the values
6306      back references and those types that consume a character may be repeated.      are ESC_REF plus the reference number. Only back references and those types
6307      We can test for values between ESC_b and ESC_Z for the latter; this may      that consume a character may be repeated. We can test for values between
6308      have to change if any new ones are ever created. */      ESC_b and ESC_Z for the latter; this may have to change if any new ones are
6309        ever created. */
6310    
6311      case CHAR_BACKSLASH:      case CHAR_BACKSLASH:
6312      tempptr = ptr;      tempptr = ptr;
# Line 5696  we set the flag only if there is a liter Line 6396  we set the flag only if there is a liter
6396          }          }
6397    
6398        /* \k<name> or \k'name' is a back reference by name (Perl syntax).        /* \k<name> or \k'name' is a back reference by name (Perl syntax).
6399        We also support \k{name} (.NET syntax) */        We also support \k{name} (.NET syntax).  */
6400    
6401        if (-c == ESC_k && (ptr[1] == CHAR_LESS_THAN_SIGN ||        if (-c == ESC_k)
           ptr[1] == CHAR_APOSTROPHE || ptr[1] == CHAR_LEFT_CURLY_BRACKET))  
6402          {          {
6403            if ((ptr[1] != CHAR_LESS_THAN_SIGN &&
6404              ptr[1] != CHAR_APOSTROPHE && ptr[1] != CHAR_LEFT_CURLY_BRACKET))
6405              {
6406              *errorcodeptr = ERR69;
6407              break;
6408              }
6409          is_recurse = FALSE;          is_recurse = FALSE;
6410          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
6411            CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?            CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?
# Line 5720  we set the flag only if there is a liter Line 6425  we set the flag only if there is a liter
6425          HANDLE_REFERENCE:    /* Come here from named backref handling */          HANDLE_REFERENCE:    /* Come here from named backref handling */
6426          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
6427          previous = code;          previous = code;
6428          *code++ = OP_REF;          *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;
6429          PUT2INC(code, 0, recno);          PUT2INC(code, 0, recno);
6430          cd->backref_map |= (recno < 32)? (1 << recno) : 1;          cd->backref_map |= (recno < 32)? (1 << recno) : 1;
6431          if (recno > cd->top_backref) cd->top_backref = recno;          if (recno > cd->top_backref) cd->top_backref = recno;
# Line 5766  we set the flag only if there is a liter Line 6471  we set the flag only if there is a liter
6471  #endif  #endif
6472    
6473        /* For the rest (including \X when Unicode properties are supported), we        /* For the rest (including \X when Unicode properties are supported), we
6474        can obtain the OP value by negating the escape value. */        can obtain the OP value by negating the escape value in the default
6475          situation when PCRE_UCP is not set. When it *is* set, we substitute
6476          Unicode property tests. */
6477    
6478        else        else
6479          {          {
6480          previous = (-c > ESC_b && -c < ESC_Z)? code : NULL;  #ifdef SUPPORT_UCP
6481          *code++ = -c;          if (-c >= ESC_DU && -c <= ESC_wu)
6482              {
6483              nestptr = ptr + 1;                   /* Where to resume */
6484              ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
6485              }
6486            else
6487    #endif
6488            /* In non-UTF-8 mode, we turn \C into OP_ALLANY instead of OP_ANYBYTE
6489            so that it works in DFA mode and in lookbehinds. */
6490    
6491              {
6492              previous = (-c > ESC_b && -c < ESC_Z)? code : NULL;
6493              *code++ = (!utf8 && c == -ESC_C)? OP_ALLANY : -c;
6494              }
6495          }          }
6496        continue;        continue;
6497        }        }
# Line 5816  we set the flag only if there is a liter Line 6536  we set the flag only if there is a liter
6536    
6537      ONE_CHAR:      ONE_CHAR:
6538      previous = code;      previous = code;
6539      *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;      *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARI : OP_CHAR;
6540      for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];      for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];
6541    
6542      /* Remember if \r or \n were seen */      /* Remember if \r or \n were seen */
# Line 5845  we set the flag only if there is a liter Line 6565  we set the flag only if there is a liter
6565        else firstbyte = reqbyte = REQ_NONE;        else firstbyte = reqbyte = REQ_NONE;
6566        }        }
6567    
6568      /* firstbyte was previously set; we can set reqbyte only the length is      /* firstbyte was previously set; we can set reqbyte only if the length is
6569      1 or the matching is caseful. */      1 or the matching is caseful. */
6570    
6571      else      else
# Line 5880  return FALSE; Line 6600  return FALSE;
6600  /* On entry, ptr is pointing past the bracket character, but on return it  /* On entry, ptr is pointing past the bracket character, but on return it
6601  points to the closing bracket, or vertical bar, or end of string. The code  points to the closing bracket, or vertical bar, or end of string. The code
6602  variable is pointing at the byte into which the BRA operator has been stored.  variable is pointing at the byte into which the BRA operator has been stored.
 If the ims options are changed at the start (for a (?ims: group) or during any  
 branch, we need to insert an OP_OPT item at the start of every following branch  
 to ensure they get set correctly at run time, and also pass the new options  
 into every subsequent branch compile.  
   
6603  This function is used during the pre-compile phase when we are trying to find  This function is used during the pre-compile phase when we are trying to find
6604  out the amount of memory needed, as well as during the real compile phase. The  out the amount of memory needed, as well as during the real compile phase. The
6605  value of lengthptr distinguishes the two phases.  value of lengthptr distinguishes the two phases.
6606    
6607  Arguments:  Arguments:
6608    options        option bits, including any changes for this subpattern    options        option bits, including any changes for this subpattern
   oldims         previous settings of ims option bits  
6609    codeptr        -> the address of the current code pointer    codeptr        -> the address of the current code pointer
6610    ptrptr         -> the address of the current pattern pointer    ptrptr         -> the address of the current pattern pointer
6611    errorcodeptr   -> pointer to error code variable    errorcodeptr   -> pointer to error code variable
6612    lookbehind     TRUE if this is a lookbehind assertion    lookbehind     TRUE if this is a lookbehind assertion
6613    reset_bracount TRUE to reset the count for each branch    reset_bracount TRUE to reset the count for each branch
6614    skipbytes      skip this many bytes at start (for brackets and OP_COND)    skipbytes      skip this many bytes at start (for brackets and OP_COND)
6615      cond_depth     depth of nesting for conditional subpatterns
6616    firstbyteptr   place to put the first required character, or a negative number    firstbyteptr   place to put the first required character, or a negative number
6617    reqbyteptr     place to put the last required character, or a negative number    reqbyteptr     place to put the last required character, or a negative number
6618    bcptr          pointer to the chain of currently open branches    bcptr          pointer to the chain of currently open branches
# Line 5909  Returns:         TRUE on success Line 6624  Returns:         TRUE on success
6624  */  */
6625    
6626  static BOOL  static BOOL
6627  compile_regex(int options, int oldims, uschar **codeptr, const uschar **ptrptr,  compile_regex(int options, uschar **codeptr, const uschar **ptrptr,
6628    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
6629    int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr, compile_data *cd,    int cond_depth, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
6630    int *lengthptr)    compile_data *cd, int *lengthptr)
6631  {  {
6632  const uschar *ptr = *ptrptr;  const uschar *ptr = *ptrptr;
6633  uschar *code = *codeptr;  uschar *code = *codeptr;
# Line 5926  int branchfirstbyte, branchreqbyte; Line 6641  int branchfirstbyte, branchreqbyte;
6641  int length;  int length;
6642  int orig_bracount;  int orig_bracount;
6643  int max_bracount;  int max_bracount;
 int old_external_options = cd->external_options;  
6644  branch_chain bc;  branch_chain bc;
6645    
6646  bc.outer = bcptr;  bc.outer = bcptr;
# Line 5950  pre-compile phase to find out whether an Line 6664  pre-compile phase to find out whether an
6664    
6665  /* If this is a capturing subpattern, add to the chain of open capturing items  /* If this is a capturing subpattern, add to the chain of open capturing items
6666  so that we can detect them if (*ACCEPT) is encountered. This is also used to  so that we can detect them if (*ACCEPT) is encountered. This is also used to
6667  detect groups that contain recursive back references to themselves. */  detect groups that contain recursive back references to themselves. Note that
6668    only OP_CBRA need be tested here; changing this opcode to one of its variants,
6669    e.g. OP_SCBRAPOS, happens later, after the group has been compiled. */
6670    
6671  if (*code == OP_CBRA)  if (*code == OP_CBRA)
6672    {    {
# Line 5976  for (;;) Line 6692  for (;;)
6692    
6693    if (reset_bracount) cd->bracount = orig_bracount;    if (reset_bracount) cd->bracount = orig_bracount;
6694    
   /* Handle a change of ims options at the start of the branch */  
   
   if ((options & PCRE_IMS) != oldims)  
     {  
     *code++ = OP_OPT;  
     *code++ = options & PCRE_IMS;  
     length += 2;  
     }  
   
6695    /* Set up dummy OP_REVERSE if lookbehind assertion */    /* Set up dummy OP_REVERSE if lookbehind assertion */
6696    
6697    if (lookbehind)    if (lookbehind)
# Line 5999  for (;;) Line 6706  for (;;)
6706    into the length. */    into the length. */
6707    
6708    if (!compile_branch(&options, &code, &ptr, errorcodeptr, &branchfirstbyte,    if (!compile_branch(&options, &code, &ptr, errorcodeptr, &branchfirstbyte,
6709          &branchreqbyte, &bc, cd, (lengthptr == NULL)? NULL : &length))          &branchreqbyte, &bc, cond_depth, cd,
6710            (lengthptr == NULL)? NULL : &length))
6711      {      {
6712      *ptrptr = ptr;      *ptrptr = ptr;
6713      return FALSE;      return FALSE;
6714      }      }
6715    
   /* If the external options have changed during this branch, it means that we  
   are at the top level, and a leading option setting has been encountered. We  
   need to re-set the original option values to take account of this so that,  
   during the pre-compile phase, we know to allow for a re-set at the start of  
   subsequent branches. */  
   
   if (old_external_options != cd->external_options)  
     oldims = cd->external_options & PCRE_IMS;  
   
6716    /* Keep the highest bracket count in case (?| was used and some branch    /* Keep the highest bracket count in case (?| was used and some branch
6717    has fewer than the rest. */    has fewer than the rest. */
6718    
# Line 6074  for (;;) Line 6773  for (;;)
6773        {        {
6774        int fixed_length;        int fixed_length;
6775        *code = OP_END;        *code = OP_END;
6776        fixed_length = find_fixedlength(last_branch, options, FALSE, cd);        fixed_length = find_fixedlength(last_branch,  (options & PCRE_UTF8) != 0,
6777            FALSE, cd);
6778        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
6779        if (fixed_length == -3)        if (fixed_length == -3)
6780          {          {
# Line 6082  for (;;) Line 6782  for (;;)
6782          }          }
6783        else if (fixed_length < 0)        else if (fixed_length < 0)
6784          {          {
6785          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;          *errorcodeptr = (fixed_length == -2)? ERR36 :
6786                            (fixed_length == -4)? ERR70: ERR25;
6787          *ptrptr = ptr;          *ptrptr = ptr;
6788          return FALSE;          return FALSE;
6789          }          }
# Line 6095  for (;;) Line 6796  for (;;)
6796    of offsets, with the field in the BRA item now becoming an offset to the    of offsets, with the field in the BRA item now becoming an offset to the
6797    first alternative. If there are no alternatives, it points to the end of the    first alternative. If there are no alternatives, it points to the end of the
6798    group. The length in the terminating ket is always the length of the whole    group. The length in the terminating ket is always the length of the whole
6799    bracketed item. If any of the ims options were changed inside the group,    bracketed item. Return leaving the pointer at the terminating char. */
   compile a resetting op-code following, except at the very end of the pattern.  
   Return leaving the pointer at the terminating char. */  
6800    
6801    if (*ptr != CHAR_VERTICAL_LINE)    if (*ptr != CHAR_VERTICAL_LINE)
6802      {      {
6803      if (lengthptr == NULL)      if (lengthptr == NULL)
6804        {        {
6805        int branch_length = code - last_branch;        int branch_length = (int)(code - last_branch);
6806        do        do
6807          {          {
6808          int prev_length = GET(last_branch, 1);          int prev_length = GET(last_branch, 1);
# Line 6117  for (;;) Line 6816  for (;;)
6816      /* Fill in the ket */      /* Fill in the ket */
6817    
6818      *code = OP_KET;      *code = OP_KET;
6819      PUT(code, 1, code - start_bracket);      PUT(code, 1, (int)(code - start_bracket));
6820      code += 1 + LINK_SIZE;      code += 1 + LINK_SIZE;
6821    
6822      /* If it was a capturing subpattern, check to see if it contained any      /* If it was a capturing subpattern, check to see if it contained any
# Line 6132  for (;;) Line 6831  for (;;)
6831            code - start_bracket);            code - start_bracket);
6832          *start_bracket = OP_ONCE;          *start_bracket = OP_ONCE;
6833          code += 1 + LINK_SIZE;          code += 1 + LINK_SIZE;
6834          PUT(start_bracket, 1, code - start_bracket);          PUT(start_bracket, 1, (int)(code - start_bracket));
6835          *code = OP_KET;          *code = OP_KET;
6836          PUT(code, 1, code - start_bracket);          PUT(code, 1, (int)(code - start_bracket));
6837          code += 1 + LINK_SIZE;          code += 1 + LINK_SIZE;
6838          length += 2 + 2*LINK_SIZE;          length += 2 + 2*LINK_SIZE;
6839          }          }
6840        cd->open_caps = cd->open_caps->next;        cd->open_caps = cd->open_caps->next;
6841        }        }
6842    
     /* Reset options if needed. */  
   
     if ((options & PCRE_IMS) != oldims && *ptr == CHAR_RIGHT_PARENTHESIS)  
       {  
       *code++ = OP_OPT;  
       *code++ = oldims;  
       length += 2;  
       }  
   
6843      /* Retain the highest bracket number, in case resetting was used. */      /* Retain the highest bracket number, in case resetting was used. */
6844    
6845      cd->bracount = max_bracount;      cd->bracount = max_bracount;
# Line 6189  for (;;) Line 6879  for (;;)
6879    else    else
6880      {      {
6881      *code = OP_ALT;      *code = OP_ALT;
6882      PUT(code, 1, code - last_branch);      PUT(code, 1, (int)(code - last_branch));
6883      bc.current_branch = last_branch = code;      bc.current_branch = last_branch = code;
6884      code += 1 + LINK_SIZE;      code += 1 + LINK_SIZE;
6885      }      }
# Line 6209  for (;;) Line 6899  for (;;)
6899  /* Try to find out if this is an anchored regular expression. Consider each  /* Try to find out if this is an anchored regular expression. Consider each
6900  alternative branch. If they all start with OP_SOD or OP_CIRC, or with a bracket  alternative branch. If they all start with OP_SOD or OP_CIRC, or with a bracket
6901  all of whose alternatives start with OP_SOD or OP_CIRC (recurse ad lib), then  all of whose alternatives start with OP_SOD or OP_CIRC (recurse ad lib), then
6902  it's anchored. However, if this is a multiline pattern, then only OP_SOD  it's anchored. However, if this is a multiline pattern, then only OP_SOD will
6903  counts, since OP_CIRC can match in the middle.  be found, because ^ generates OP_CIRCM in that mode.
6904    
6905  We can also consider a regex to be anchored if OP_SOM starts all its branches.  We can also consider a regex to be anchored if OP_SOM starts all its branches.
6906  This is the code for \G, which means "match at start of match position, taking  This is the code for \G, which means "match at start of match position, taking
# Line 6231  of the more common cases more precisely. Line 6921  of the more common cases more precisely.
6921    
6922  Arguments:  Arguments:
6923    code           points to start of expression (the bracket)    code           points to start of expression (the bracket)
   options        points to the options setting  
6924    bracket_map    a bitmap of which brackets we are inside while testing; this    bracket_map    a bitmap of which brackets we are inside while testing; this
6925                    handles up to substring 31; after that we just have to take                    handles up to substring 31; after that we just have to take
6926                    the less precise approach                    the less precise approach
# Line 6241  Returns:     TRUE or FALSE Line 6930  Returns:     TRUE or FALSE
6930  */  */
6931    
6932  static BOOL  static BOOL
6933  is_anchored(register const uschar *code, int *options, unsigned int bracket_map,  is_anchored(register const uschar *code, unsigned int bracket_map,
6934    unsigned int backref_map)    unsigned int backref_map)
6935  {  {
6936  do {  do {
6937     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
6938       options, PCRE_MULTILINE, FALSE);       FALSE);
6939     register int op = *scode;     register int op = *scode;
6940    
6941     /* Non-capturing brackets */     /* Non-capturing brackets */
6942    
6943     if (op == OP_BRA)     if (op == OP_BRA  || op == OP_BRAPOS ||
6944           op == OP_SBRA || op == OP_SBRAPOS)
6945       {       {
6946       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;       if (!is_anchored(scode, bracket_map, backref_map)) return FALSE;
6947       }       }
6948    
6949     /* Capturing brackets */     /* Capturing brackets */
6950    
6951     else if (op == OP_CBRA)     else if (op == OP_CBRA  || op == OP_CBRAPOS ||
6952                op == OP_SCBRA || op == OP_SCBRAPOS)
6953       {       {
6954       int n = GET2(scode, 1+LINK_SIZE);       int n = GET2(scode, 1+LINK_SIZE);
6955       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
6956       if (!is_anchored(scode, options, new_map, backref_map)) return FALSE;       if (!is_anchored(scode, new_map, backref_map)) return FALSE;
6957       }       }
6958    
6959     /* Other brackets */     /* Other brackets */
6960    
6961     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_ONCE_NC ||
6962                op == OP_COND)
6963       {       {
6964       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;       if (!is_anchored(scode, bracket_map, backref_map)) return FALSE;
6965       }       }
6966    
6967     /* .* is not anchored unless DOTALL is set (which generates OP_ALLANY) and     /* .* is not anchored unless DOTALL is set (which generates OP_ALLANY) and
# Line 6284  do { Line 6976  do {
6976    
6977     /* Check for explicit anchoring */     /* Check for explicit anchoring */
6978    
6979     else if (op != OP_SOD && op != OP_SOM &&     else if (op != OP_SOD && op != OP_SOM && op != OP_CIRC) return FALSE;
            ((*options & PCRE_MULTILINE) != 0 || op != OP_CIRC))  
      return FALSE;  
6980     code += GET(code, 1);     code += GET(code, 1);
6981     }     }
6982  while (*code == OP_ALT);   /* Loop for each alternative */  while (*code == OP_ALT);   /* Loop for each alternative */
# Line 6322  is_startline(const uschar *code, unsigne Line 7012  is_startline(const uschar *code, unsigne
7012  {  {
7013  do {  do {
7014     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
7015       NULL, 0, FALSE);       FALSE);
7016     register int op = *scode;     register int op = *scode;
7017    
7018     /* If we are at the start of a conditional assertion group, *both* the     /* If we are at the start of a conditional assertion group, *both* the
# Line 6349  do { Line 7039  do {
7039         scode += 1 + LINK_SIZE;         scode += 1 + LINK_SIZE;
7040         break;         break;
7041         }         }
7042       scode = first_significant_code(scode, NULL, 0, FALSE);       scode = first_significant_code(scode, FALSE);
7043       op = *scode;       op = *scode;
7044       }       }
7045    
7046     /* Non-capturing brackets */     /* Non-capturing brackets */
7047    
7048     if (op == OP_BRA)     if (op == OP_BRA  || op == OP_BRAPOS ||
7049           op == OP_SBRA || op == OP_SBRAPOS)
7050       {       {
7051       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
7052       }       }
7053    
7054     /* Capturing brackets */     /* Capturing brackets */
7055    
7056     else if (op == OP_CBRA)     else if (op == OP_CBRA  || op == OP_CBRAPOS ||
7057                op == OP_SCBRA || op == OP_SCBRAPOS)
7058       {       {
7059       int n = GET2(scode, 1+LINK_SIZE);       int n = GET2(scode, 1+LINK_SIZE);
7060       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
# Line 6371  do { Line 7063  do {
7063    
7064     /* Other brackets */     /* Other brackets */
7065    
7066     else if (op == OP_ASSERT || op == OP_ONCE)     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_ONCE_NC)
7067       {       {
7068       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
7069       }       }
# Line 6386  do { Line 7078  do {
7078    
7079     /* Check for explicit circumflex */     /* Check for explicit circumflex */
7080    
7081     else if (op != OP_CIRC) return FALSE;     else if (op != OP_CIRC && op != OP_CIRCM) return FALSE;
7082    
7083     /* Move on to the next alternative */     /* Move on to the next alternative */
7084    
# Line 6412  we return that char, otherwise -1. Line 7104  we return that char, otherwise -1.
7104    
7105  Arguments:  Arguments:
7106    code       points to start of expression (the bracket)    code       points to start of expression (the bracket)
   options    pointer to the options (used to check casing changes)  
7107    inassert   TRUE if in an assertion    inassert   TRUE if in an assertion
7108    
7109  Returns:     -1 or the fixed first char  Returns:     -1 or the fixed first char
7110  */  */
7111    
7112  static int  static int
7113  find_firstassertedchar(const uschar *code, int *options, BOOL inassert)  find_firstassertedchar(const uschar *code, BOOL inassert)
7114  {  {
7115  register int c = -1;  register int c = -1;
7116  do {  do {
7117     int d;     int d;
7118     const uschar *scode =     int xl = (*code == OP_CBRA || *code == OP_SCBRA ||
7119       first_significant_code(code + 1+LINK_SIZE, options, PCRE_CASELESS, TRUE);               *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? 2:0;
7120       const uschar *scode = first_significant_code(code + 1+LINK_SIZE + xl, TRUE);
7121     register int op = *scode;     register int op = *scode;
7122    
7123     switch(op)     switch(op)
# Line 6434  do { Line 7126  do {
7126       return -1;       return -1;
7127    
7128       case OP_BRA:       case OP_BRA:
7129         case OP_BRAPOS:
7130       case OP_CBRA:       case OP_CBRA:
7131         case OP_SCBRA:
7132         case OP_CBRAPOS:
7133         case OP_SCBRAPOS:
7134       case OP_ASSERT:       case OP_ASSERT:
7135       case OP_ONCE:       case OP_ONCE:
7136         case OP_ONCE_NC:
7137       case OP_COND:       case OP_COND:
7138       if ((d = find_firstassertedchar(scode, options, op == OP_ASSERT)) < 0)       if ((d = find_firstassertedchar(scode, op == OP_ASSERT)) < 0)
7139         return -1;         return -1;
7140       if (c < 0) c = d; else if (c != d) return -1;       if (c < 0) c = d; else if (c != d) return -1;
7141       break;       break;
7142    
7143       case OP_EXACT:       /* Fall through */       case OP_EXACT:
7144       scode += 2;       scode += 2;
7145         /* Fall through */
7146    
7147       case OP_CHAR:       case OP_CHAR:
      case OP_CHARNC:  
7148       case OP_PLUS:       case OP_PLUS:
7149       case OP_MINPLUS:       case OP_MINPLUS:
7150       case OP_POSPLUS:       case OP_POSPLUS:
7151       if (!inassert) return -1;       if (!inassert) return -1;
7152       if (c < 0)       if (c < 0) c = scode[1];
7153         {         else if (c != scode[1]) return -1;
7154         c = scode[1];       break;
7155         if ((*options & PCRE_CASELESS) != 0) c |= REQ_CASELESS;  
7156         }       case OP_EXACTI:
7157       else if (c != scode[1]) return -1;       scode += 2;
7158         /* Fall through */
7159    
7160         case OP_CHARI:
7161         case OP_PLUSI:
7162         case OP_MINPLUSI:
7163         case OP_POSPLUSI:
7164         if (!inassert) return -1;
7165         if (c < 0) c = scode[1] | REQ_CASELESS;
7166           else if (c != scode[1]) return -1;
7167       break;       break;
7168       }       }
7169    
# Line 6508  int length = 1;  /* For final END opcode Line 7214  int length = 1;  /* For final END opcode
7214  int firstbyte, reqbyte, newline;  int firstbyte, reqbyte, newline;
7215  int errorcode = 0;  int errorcode = 0;
7216  int skipatstart = 0;  int skipatstart = 0;
7217  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf8;
7218  size_t size;  size_t size;
7219  uschar *code;  uschar *code;
7220  const uschar *codestart;  const uschar *codestart;
# Line 6578  while (ptr[skipatstart] == CHAR_LEFT_PAR Line 7284  while (ptr[skipatstart] == CHAR_LEFT_PAR
7284    
7285    if (strncmp((char *)(ptr+skipatstart+2), STRING_UTF8_RIGHTPAR, 5) == 0)    if (strncmp((char *)(ptr+skipatstart+2), STRING_UTF8_RIGHTPAR, 5) == 0)
7286      { skipatstart += 7; options |= PCRE_UTF8; continue; }      { skipatstart += 7; options |= PCRE_UTF8; continue; }
7287      else if (strncmp((char *)(ptr+skipatstart+2), STRING_UCP_RIGHTPAR, 4) == 0)
7288        { skipatstart += 6; options |= PCRE_UCP; continue; }
7289      else if (strncmp((char *)(ptr+skipatstart+2), STRING_NO_START_OPT_RIGHTPAR, 13) == 0)
7290        { skipatstart += 15; options |= PCRE_NO_START_OPTIMIZE; continue; }
7291    
7292    if (strncmp((char *)(ptr+skipatstart+2), STRING_CR_RIGHTPAR, 3) == 0)    if (strncmp((char *)(ptr+skipatstart+2), STRING_CR_RIGHTPAR, 3) == 0)
7293      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
# Line 6602  while (ptr[skipatstart] == CHAR_LEFT_PAR Line 7312  while (ptr[skipatstart] == CHAR_LEFT_PAR
7312    else break;    else break;
7313    }    }
7314    
7315  /* Can't support UTF8 unless PCRE has been compiled to include the code. */  utf8 = (options & PCRE_UTF8) != 0;
7316    
7317    /* Can't support UTF8 unless PCRE has been compiled to include the code. The
7318    return of an error code from _pcre_valid_utf8() is a new feature, introduced in
7319    release 8.13. It is passed back from pcre_[dfa_]exec(), but at the moment is
7320    not used here. */
7321    
7322  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
7323  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&
7324       (*erroroffset = _pcre_valid_utf8((USPTR)pattern, -1)) >= 0)       (errorcode = _pcre_valid_utf8((USPTR)pattern, -1, erroroffset)) != 0)
7325    {    {
7326    errorcode = ERR44;    errorcode = ERR44;
7327    goto PCRE_EARLY_ERROR_RETURN2;    goto PCRE_EARLY_ERROR_RETURN2;
# Line 6619  if (utf8) Line 7334  if (utf8)
7334    }    }
7335  #endif  #endif
7336    
7337    /* Can't support UCP unless PCRE has been compiled to include the code. */
7338    
7339    #ifndef SUPPORT_UCP
7340    if ((options & PCRE_UCP) != 0)
7341      {
7342      errorcode = ERR67;
7343      goto PCRE_EARLY_ERROR_RETURN;
7344      }
7345    #endif
7346    
7347  /* Check validity of \R options. */  /* Check validity of \R options. */
7348    
7349  switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))  if ((options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) ==
7350         (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
7351    {    {
7352    case 0:    errorcode = ERR56;
7353    case PCRE_BSR_ANYCRLF:    goto PCRE_EARLY_ERROR_RETURN;
   case PCRE_BSR_UNICODE:  
   break;  
   default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;  
7354    }    }
7355    
7356  /* Handle different types of newline. The three bits give seven cases. The  /* Handle different types of newline. The three bits give seven cases. The
# Line 6712  outside can help speed up starting point Line 7435  outside can help speed up starting point
7435  ptr += skipatstart;  ptr += skipatstart;
7436  code = cworkspace;  code = cworkspace;
7437  *code = OP_BRA;  *code = OP_BRA;
7438  (void)compile_regex(cd->external_options, cd->external_options & PCRE_IMS,  (void)compile_regex(cd->external_options, &code, &ptr, &errorcode, FALSE,
7439    &code, &ptr, &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd,    FALSE, 0, 0, &firstbyte, &reqbyte, NULL, cd, &length);
   &length);  
7440  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
7441    
7442  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
# Line 6747  regex compiled on a system with 4-byte p Line 7469  regex compiled on a system with 4-byte p
7469  pointers. */  pointers. */
7470    
7471  re->magic_number = MAGIC_NUMBER;  re->magic_number = MAGIC_NUMBER;
7472  re->size = size;  re->size = (int)size;
7473  re->options = cd->external_options;  re->options = cd->external_options;
7474  re->flags = cd->external_flags;  re->flags = cd->external_flags;
7475  re->dummy1 = 0;  re->dummy1 = 0;
# Line 6768  field; this time it's used for rememberi Line 7490  field; this time it's used for rememberi
7490  */  */
7491    
7492  cd->final_bracount = cd->bracount;  /* Save for checking forward references */  cd->final_bracount = cd->bracount;  /* Save for checking forward references */
7493    cd->assert_depth = 0;
7494  cd->bracount = 0;  cd->bracount = 0;
7495  cd->names_found = 0;  cd->names_found = 0;
7496  cd->name_table = (uschar *)re + re->name_table_offset;  cd->name_table = (uschar *)re + re->name_table_offset;
# Line 6786  of the function here. */ Line 7509  of the function here. */
7509  ptr = (const uschar *)pattern + skipatstart;  ptr = (const uschar *)pattern + skipatstart;
7510  code = (uschar *)codestart;  code = (uschar *)codestart;
7511  *code = OP_BRA;  *code = OP_BRA;
7512  (void)compile_regex(re->options, re->options & PCRE_IMS, &code, &ptr,  (void)compile_regex(re->options, &code, &ptr, &errorcode, FALSE, FALSE, 0, 0,
7513    &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, NULL);    &firstbyte, &reqbyte, NULL, cd, NULL);
7514  re->top_bracket = cd->bracount;  re->top_bracket = cd->bracount;
7515  re->top_backref = cd->top_backref;  re->top_backref = cd->top_backref;
7516  re->flags = cd->external_flags;  re->flags = cd->external_flags;
7517    
7518  if (cd->had_accept) reqbyte = -1;   /* Must disable after (*ACCEPT) */  if (cd->had_accept) reqbyte = REQ_NONE;   /* Must disable after (*ACCEPT) */
7519    
7520  /* If not reached end of pattern on success, there's an excess bracket. */  /* If not reached end of pattern on success, there's an excess bracket. */
7521    
# Line 6818  while (errorcode == 0 && cd->hwm > cwork Line 7541  while (errorcode == 0 && cd->hwm > cwork
7541    recno = GET(codestart, offset);    recno = GET(codestart, offset);
7542    groupptr = _pcre_find_bracket(codestart, utf8, recno);    groupptr = _pcre_find_bracket(codestart, utf8, recno);
7543    if (groupptr == NULL) errorcode = ERR53;    if (groupptr == NULL) errorcode = ERR53;
7544      else PUT(((uschar *)codestart), offset, groupptr - codestart);      else PUT(((uschar *)codestart), offset, (int)(groupptr - codestart));
7545    }    }
7546    
7547  /* Give an error if there's back reference to a non-existent capturing  /* Give an error if there's back reference to a non-existent capturing
# Line 6853  if (cd->check_lookbehind) Line 7576  if (cd->check_lookbehind)
7576        uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);        uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);
7577        int end_op = *be;        int end_op = *be;
7578        *be = OP_END;        *be = OP_END;
7579        fixed_length = find_fixedlength(cc, re->options, TRUE, cd);        fixed_length = find_fixedlength(cc, (re->options & PCRE_UTF8) != 0, TRUE,
7580            cd);
7581        *be = end_op;        *be = end_op;
7582        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
7583        if (fixed_length < 0)        if (fixed_length < 0)
7584          {          {
7585          errorcode = (fixed_length == -2)? ERR36 : ERR25;          errorcode = (fixed_length == -2)? ERR36 :
7586                        (fixed_length == -4)? ERR70 : ERR25;
7587          break;          break;
7588          }          }
7589        PUT(cc, 1, fixed_length);        PUT(cc, 1, fixed_length);
# Line 6873  if (errorcode != 0) Line 7598  if (errorcode != 0)
7598    {    {
7599    (pcre_free)(re);    (pcre_free)(re);
7600    PCRE_EARLY_ERROR_RETURN:    PCRE_EARLY_ERROR_RETURN:
7601    *erroroffset = ptr - (const uschar *)pattern;    *erroroffset = (int)(ptr - (const uschar *)pattern);
7602    PCRE_EARLY_ERROR_RETURN2:    PCRE_EARLY_ERROR_RETURN2:
7603    *errorptr = find_error_text(errorcode);    *errorptr = find_error_text(errorcode);
7604    if (errorcodeptr != NULL) *errorcodeptr = errorcode;    if (errorcodeptr != NULL) *errorcodeptr = errorcode;
# Line 6892  start with ^. and also when all branches Line 7617  start with ^. and also when all branches
7617    
7618  if ((re->options & PCRE_ANCHORED) == 0)  if ((re->options & PCRE_ANCHORED) == 0)
7619    {    {
7620    int temp_options = re->options;   /* May get changed during these scans */    if (is_anchored(codestart, 0, cd->backref_map))
   if (is_anchored(codestart, &temp_options, 0, cd->backref_map))  
7621      re->options |= PCRE_ANCHORED;      re->options |= PCRE_ANCHORED;
7622    else    else
7623      {      {
7624      if (firstbyte < 0)      if (firstbyte < 0)
7625        firstbyte = find_firstassertedchar(codestart, &temp_options, FALSE);        firstbyte = find_firstassertedchar(codestart, FALSE);
7626      if (firstbyte >= 0)   /* Remove caseless flag for non-caseable chars */      if (firstbyte >= 0)   /* Remove caseless flag for non-caseable chars */
7627        {        {
7628        int ch = firstbyte & 255;        int ch = firstbyte & 255;

Legend:
Removed from v.512  
changed lines
  Added in v.758

  ViewVC Help
Powered by ViewVC 1.1.5