/[pcre]/code/branches/pcre16/pcre_compile.c
ViewVC logotype

Diff of /code/branches/pcre16/pcre_compile.c

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

code/trunk/pcre_compile.c revision 654 by ph10, Tue Aug 2 11:00:40 2011 UTC code/branches/pcre16/pcre_compile.c revision 769 by zherczeg, Sun Nov 27 17:40:33 2011 UTC
# Line 231  static const char posix_names[] = Line 231  static const char posix_names[] =
231    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
232    STRING_word0  STRING_xdigit;    STRING_word0  STRING_xdigit;
233    
234  static const uschar posix_name_lengths[] = {  static const pcre_uint8 posix_name_lengths[] = {
235    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
236    
237  /* Table of class bit maps for each POSIX class. Each class is formed from a  /* Table of class bit maps for each POSIX class. Each class is formed from a
# Line 266  substitutes must be in the order of the Line 266  substitutes must be in the order of the
266  both positive and negative cases. NULL means no substitute. */  both positive and negative cases. NULL means no substitute. */
267    
268  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
269  static const uschar *substitutes[] = {  static const pcre_uchar string_PNd[]  = {
270    (uschar *)"\\P{Nd}",    /* \D */    CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
271    (uschar *)"\\p{Nd}",    /* \d */    CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
272    (uschar *)"\\P{Xsp}",   /* \S */       /* NOTE: Xsp is Perl space */  static const pcre_uchar string_pNd[]  = {
273    (uschar *)"\\p{Xsp}",   /* \s */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
274    (uschar *)"\\P{Xwd}",   /* \W */    CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
275    (uschar *)"\\p{Xwd}"    /* \w */  static const pcre_uchar string_PXsp[] = {
276      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
277      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
278    static const pcre_uchar string_pXsp[] = {
279      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
280      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
281    static const pcre_uchar string_PXwd[] = {
282      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
283      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
284    static const pcre_uchar string_pXwd[] = {
285      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
286      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
287    
288    static const pcre_uchar *substitutes[] = {
289      string_PNd,           /* \D */
290      string_pNd,           /* \d */
291      string_PXsp,          /* \S */       /* NOTE: Xsp is Perl space */
292      string_pXsp,          /* \s */
293      string_PXwd,          /* \W */
294      string_pXwd           /* \w */
295  };  };
296    
297  static const uschar *posix_substitutes[] = {  static const pcre_uchar string_pL[] =   {
298    (uschar *)"\\p{L}",     /* alpha */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
299    (uschar *)"\\p{Ll}",    /* lower */    CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
300    (uschar *)"\\p{Lu}",    /* upper */  static const pcre_uchar string_pLl[] =  {
301    (uschar *)"\\p{Xan}",   /* alnum */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
302    NULL,                   /* ascii */    CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
303    (uschar *)"\\h",        /* blank */  static const pcre_uchar string_pLu[] =  {
304    NULL,                   /* cntrl */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
305    (uschar *)"\\p{Nd}",    /* digit */    CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
306    NULL,                   /* graph */  static const pcre_uchar string_pXan[] = {
307    NULL,                   /* print */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
308    NULL,                   /* punct */    CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
309    (uschar *)"\\p{Xps}",   /* space */    /* NOTE: Xps is POSIX space */  static const pcre_uchar string_h[] =    {
310    (uschar *)"\\p{Xwd}",   /* word */    CHAR_BACKSLASH, CHAR_h, '\0' };
311    NULL,                   /* xdigit */  static const pcre_uchar string_pXps[] = {
312      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
313      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
314    static const pcre_uchar string_PL[] =   {
315      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
316      CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
317    static const pcre_uchar string_PLl[] =  {
318      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
319      CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
320    static const pcre_uchar string_PLu[] =  {
321      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
322      CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
323    static const pcre_uchar string_PXan[] = {
324      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
325      CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
326    static const pcre_uchar string_H[] =    {
327      CHAR_BACKSLASH, CHAR_H, '\0' };
328    static const pcre_uchar string_PXps[] = {
329      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
330      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
331    
332    static const pcre_uchar *posix_substitutes[] = {
333      string_pL,            /* alpha */
334      string_pLl,           /* lower */
335      string_pLu,           /* upper */
336      string_pXan,          /* alnum */
337      NULL,                 /* ascii */
338      string_h,             /* blank */
339      NULL,                 /* cntrl */
340      string_pNd,           /* digit */
341      NULL,                 /* graph */
342      NULL,                 /* print */
343      NULL,                 /* punct */
344      string_pXps,          /* space */    /* NOTE: Xps is POSIX space */
345      string_pXwd,          /* word */
346      NULL,                 /* xdigit */
347    /* Negated cases */    /* Negated cases */
348    (uschar *)"\\P{L}",     /* ^alpha */    string_PL,            /* ^alpha */
349    (uschar *)"\\P{Ll}",    /* ^lower */    string_PLl,           /* ^lower */
350    (uschar *)"\\P{Lu}",    /* ^upper */    string_PLu,           /* ^upper */
351    (uschar *)"\\P{Xan}",   /* ^alnum */    string_PXan,          /* ^alnum */
352    NULL,                   /* ^ascii */    NULL,                 /* ^ascii */
353    (uschar *)"\\H",        /* ^blank */    string_H,             /* ^blank */
354    NULL,                   /* ^cntrl */    NULL,                 /* ^cntrl */
355    (uschar *)"\\P{Nd}",    /* ^digit */    string_PNd,           /* ^digit */
356    NULL,                   /* ^graph */    NULL,                 /* ^graph */
357    NULL,                   /* ^print */    NULL,                 /* ^print */
358    NULL,                   /* ^punct */    NULL,                 /* ^punct */
359    (uschar *)"\\P{Xps}",   /* ^space */   /* NOTE: Xps is POSIX space */    string_PXps,          /* ^space */   /* NOTE: Xps is POSIX space */
360    (uschar *)"\\P{Xwd}",   /* ^word */    string_PXwd,          /* ^word */
361    NULL                    /* ^xdigit */    NULL                  /* ^xdigit */
362  };  };
363  #define POSIX_SUBSIZE (sizeof(posix_substitutes)/sizeof(uschar *))  #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
364  #endif  #endif
365    
366  #define STRING(a)  # a  #define STRING(a)  # a
# Line 410  static const char error_texts[] = Line 464  static const char error_texts[] =
464    "this version of PCRE is not compiled with PCRE_UCP support\0"    "this version of PCRE is not compiled with PCRE_UCP support\0"
465    "\\c must be followed by an ASCII character\0"    "\\c must be followed by an ASCII character\0"
466    "\\k is not followed by a braced, angle-bracketed, or quoted name\0"    "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
467      /* 70 */
468      "internal error: unknown opcode in find_fixedlength()\0"
469    ;    ;
470    
471  /* 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 546  static const unsigned char ebcdic_charta Line 602  static const unsigned char ebcdic_charta
602  /* Definition to allow mutual recursion */  /* Definition to allow mutual recursion */
603    
604  static BOOL  static BOOL
605    compile_regex(int, uschar **, const uschar **, int *, BOOL, BOOL, int, int,    compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,
606      int *, int *, branch_chain *, compile_data *, int *);      int *, int *, branch_chain *, compile_data *, int *);
607    
608    
# Line 593  Returns:    TRUE or FALSE Line 649  Returns:    TRUE or FALSE
649  */  */
650    
651  static BOOL  static BOOL
652  is_counted_repeat(const uschar *p)  is_counted_repeat(const pcre_uchar *p)
653  {  {
654  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
655  while ((digitab[*p] & ctype_digit) != 0) p++;  while ((digitab[*p] & ctype_digit) != 0) p++;
# Line 635  Returns:         zero or positive => a d Line 691  Returns:         zero or positive => a d
691  */  */
692    
693  static int  static int
694  check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,  check_escape(const pcre_uchar **ptrptr, int *errorcodeptr, int bracount,
695    int options, BOOL isclass)    int options, BOOL isclass)
696  {  {
697  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf8 = (options & PCRE_UTF8) != 0;
698  const uschar *ptr = *ptrptr + 1;  const pcre_uchar *ptr = *ptrptr + 1;
699  int c, i;  int c, i;
700    
701  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
# Line 666  else if ((i = escapes[c - 0x48]) != 0) Line 722  else if ((i = escapes[c - 0x48]) != 0)
722    
723  else  else
724    {    {
725    const uschar *oldptr;    const pcre_uchar *oldptr;
726    BOOL braced, negated;    BOOL braced, negated;
727    
728    switch (c)    switch (c)
# Line 676  else Line 732  else
732    
733      case CHAR_l:      case CHAR_l:
734      case CHAR_L:      case CHAR_L:
735        *errorcodeptr = ERR37;
736        break;
737    
738      case CHAR_u:      case CHAR_u:
739        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
740          {
741          /* In JavaScript, \u must be followed by four hexadecimal numbers.
742          Otherwise it is a lowercase u letter. */
743          if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0
744               && (digitab[ptr[3]] & ctype_xdigit) != 0 && (digitab[ptr[4]] & ctype_xdigit) != 0)
745            {
746            c = 0;
747            for (i = 0; i < 4; ++i)
748              {
749              register int cc = *(++ptr);
750    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
751              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
752              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
753    #else           /* EBCDIC coding */
754              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
755              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
756    #endif
757              }
758            }
759          }
760        else
761          *errorcodeptr = ERR37;
762        break;
763    
764      case CHAR_U:      case CHAR_U:
765      *errorcodeptr = ERR37;      /* In JavaScript, \U is an uppercase U letter. */
766        if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
767      break;      break;
768    
769      /* In a character class, \g is just a literal "g". Outside a character      /* In a character class, \g is just a literal "g". Outside a character
# Line 710  else Line 795  else
795    
796      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
797        {        {
798        const uschar *p;        const pcre_uchar *p;
799        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
800          if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;          if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;
801        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
# Line 828  else Line 913  else
913      treated as a data character. */      treated as a data character. */
914    
915      case CHAR_x:      case CHAR_x:
916        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
917          {
918          /* In JavaScript, \x must be followed by two hexadecimal numbers.
919          Otherwise it is a lowercase x letter. */
920          if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0)
921            {
922            c = 0;
923            for (i = 0; i < 2; ++i)
924              {
925              register int cc = *(++ptr);
926    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
927              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
928              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
929    #else           /* EBCDIC coding */
930              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
931              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
932    #endif
933              }
934            }
935          break;
936          }
937    
938      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
939        {        {
940        const uschar *pt = ptr + 2;        const pcre_uchar *pt = ptr + 2;
941        int count = 0;        int count = 0;
942    
943        c = 0;        c = 0;
# Line 961  Returns:         type value from ucp_typ Line 1068  Returns:         type value from ucp_typ
1068  */  */
1069    
1070  static int  static int
1071  get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
1072  {  {
1073  int c, i, bot, top;  int c, i, bot, top;
1074  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
1075  char name[32];  pcre_uchar name[32];
1076    
1077  c = *(++ptr);  c = *(++ptr);
1078  if (c == 0) goto ERROR_RETURN;  if (c == 0) goto ERROR_RETURN;
# Line 1006  else Line 1113  else
1113  /* Search for a recognized property name using binary chop */  /* Search for a recognized property name using binary chop */
1114    
1115  bot = 0;  bot = 0;
1116  top = _pcre_utt_size;  top = PRIV(utt_size);
1117    
1118  while (bot < top)  while (bot < top)
1119    {    {
1120    i = (bot + top) >> 1;    i = (bot + top) >> 1;
1121    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);    c = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
1122    if (c == 0)    if (c == 0)
1123      {      {
1124      *dptr = _pcre_utt[i].value;      *dptr = PRIV(utt)[i].value;
1125      return _pcre_utt[i].type;      return PRIV(utt)[i].type;
1126      }      }
1127    if (c > 0) bot = i + 1; else top = i;    if (c > 0) bot = i + 1; else top = i;
1128    }    }
# Line 1053  Returns:         pointer to '}' on succe Line 1160  Returns:         pointer to '}' on succe
1160                   current ptr on error, with errorcodeptr set non-zero                   current ptr on error, with errorcodeptr set non-zero
1161  */  */
1162    
1163  static const uschar *  static const pcre_uchar *
1164  read_repeat_counts(const uschar *p, int *minp, int *maxp, int *errorcodeptr)  read_repeat_counts(const pcre_uchar *p, int *minp, int *maxp, int *errorcodeptr)
1165  {  {
1166  int min = 0;  int min = 0;
1167  int max = -1;  int max = -1;
# Line 1139  Returns:       the number of the named s Line 1246  Returns:       the number of the named s
1246  */  */
1247    
1248  static int  static int
1249  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,  find_parens_sub(pcre_uchar **ptrptr, compile_data *cd, const pcre_uchar *name, int lorn,
1250    BOOL xmode, BOOL utf8, int *count)    BOOL xmode, BOOL utf8, int *count)
1251  {  {
1252  uschar *ptr = *ptrptr;  pcre_uchar *ptr = *ptrptr;
1253  int start_count = *count;  int start_count = *count;
1254  int hwm_count = start_count;  int hwm_count = start_count;
1255  BOOL dup_parens = FALSE;  BOOL dup_parens = FALSE;
# Line 1209  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1316  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1316          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1317        {        {
1318        int term;        int term;
1319        const uschar *thisname;        const pcre_uchar *thisname;
1320        *count += 1;        *count += 1;
1321        if (name == NULL && *count == lorn) return *count;        if (name == NULL && *count == lorn) return *count;
1322        term = *ptr++;        term = *ptr++;
# Line 1217  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1324  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1324        thisname = ptr;        thisname = ptr;
1325        while (*ptr != term) ptr++;        while (*ptr != term) ptr++;
1326        if (name != NULL && lorn == ptr - thisname &&        if (name != NULL && lorn == ptr - thisname &&
1327            strncmp((const char *)name, (const char *)thisname, lorn) == 0)            STRNCMP_UC_UC(name, thisname, lorn) == 0)
1328          return *count;          return *count;
1329        term++;        term++;
1330        }        }
# Line 1260  for (; ptr < cd->end_pattern; ptr++) Line 1367  for (; ptr < cd->end_pattern; ptr++)
1367          {          {
1368          if (ptr[2] == CHAR_E)          if (ptr[2] == CHAR_E)
1369            ptr+= 2;            ptr+= 2;
1370          else if (strncmp((const char *)ptr+2,          else if (STRNCMP_UC_C8(ptr + 2,
1371                   STR_Q STR_BACKSLASH STR_E, 3) == 0)                   STR_Q STR_BACKSLASH STR_E, 3) == 0)
1372            ptr += 4;            ptr += 4;
1373          else          else
# Line 1372  Returns:       the number of the found s Line 1479  Returns:       the number of the found s
1479  */  */
1480    
1481  static int  static int
1482  find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode,  find_parens(compile_data *cd, const pcre_uchar *name, int lorn, BOOL xmode,
1483    BOOL utf8)    BOOL utf8)
1484  {  {
1485  uschar *ptr = (uschar *)cd->start_pattern;  pcre_uchar *ptr = (pcre_uchar *)cd->start_pattern;
1486  int count = 0;  int count = 0;
1487  int rc;  int rc;
1488    
# Line 1413  Arguments: Line 1520  Arguments:
1520  Returns:       pointer to the first significant opcode  Returns:       pointer to the first significant opcode
1521  */  */
1522    
1523  static const uschar*  static const pcre_uchar*
1524  first_significant_code(const uschar *code, BOOL skipassert)  first_significant_code(const pcre_uchar *code, BOOL skipassert)
1525  {  {
1526  for (;;)  for (;;)
1527    {    {
# Line 1425  for (;;) Line 1532  for (;;)
1532      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1533      if (!skipassert) return code;      if (!skipassert) return code;
1534      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
1535      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1536      break;      break;
1537    
1538      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
# Line 1439  for (;;) Line 1546  for (;;)
1546      case OP_RREF:      case OP_RREF:
1547      case OP_NRREF:      case OP_NRREF:
1548      case OP_DEF:      case OP_DEF:
1549      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1550      break;      break;
1551    
1552      default:      default:
# Line 1475  Arguments: Line 1582  Arguments:
1582    
1583  Returns:   the fixed length,  Returns:   the fixed length,
1584               or -1 if there is no fixed length,               or -1 if there is no fixed length,
1585               or -2 if \C was encountered               or -2 if \C was encountered (in UTF-8 mode only)
1586               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
1587                 or -4 if an unknown opcode was encountered (internal error)
1588  */  */
1589    
1590  static int  static int
1591  find_fixedlength(uschar *code, BOOL utf8, BOOL atend, compile_data *cd)  find_fixedlength(pcre_uchar *code, BOOL utf8, BOOL atend, compile_data *cd)
1592  {  {
1593  int length = -1;  int length = -1;
1594    
1595  register int branchlength = 0;  register int branchlength = 0;
1596  register uschar *cc = code + 1 + LINK_SIZE;  register pcre_uchar *cc = code + 1 + LINK_SIZE;
1597    
1598  /* Scan along the opcodes for this branch. If we get to the end of the  /* Scan along the opcodes for this branch. If we get to the end of the
1599  branch, check the length against that of the other branches. */  branch, check the length against that of the other branches. */
# Line 1493  branch, check the length against that of Line 1601  branch, check the length against that of
1601  for (;;)  for (;;)
1602    {    {
1603    int d;    int d;
1604    uschar *ce, *cs;    pcre_uchar *ce, *cs;
1605    register int op = *cc;    register int op = *cc;
1606    switch (op)    switch (op)
1607      {      {
1608      /* We only need to continue for OP_CBRA (normal capturing bracket) and      /* We only need to continue for OP_CBRA (normal capturing bracket) and
1609      OP_BRA (normal non-capturing bracket) because the other variants of these      OP_BRA (normal non-capturing bracket) because the other variants of these
1610      opcodes are all concerned with unlimited repeated groups, which of course      opcodes are all concerned with unlimited repeated groups, which of course
1611      are not of fixed length. They will cause a -1 response from the default      are not of fixed length. */
     case of this switch. */  
1612    
1613      case OP_CBRA:      case OP_CBRA:
1614      case OP_BRA:      case OP_BRA:
1615      case OP_ONCE:      case OP_ONCE:
1616        case OP_ONCE_NC:
1617      case OP_COND:      case OP_COND:
1618      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), utf8, atend, cd);      d = find_fixedlength(cc + ((op == OP_CBRA)? IMM2_SIZE : 0), utf8, atend, cd);
1619      if (d < 0) return d;      if (d < 0) return d;
1620      branchlength += d;      branchlength += d;
1621      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1622      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1623      break;      break;
1624    
1625      /* 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.
1626      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
1627      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
1628      Note that we must not include the OP_KETRxxx opcodes here, because they      the same code. Note that we must not include the OP_KETRxxx opcodes here,
1629      all imply an unlimited repeat. */      because they all imply an unlimited repeat. */
1630    
1631      case OP_ALT:      case OP_ALT:
1632      case OP_KET:      case OP_KET:
1633      case OP_END:      case OP_END:
1634        case OP_ACCEPT:
1635        case OP_ASSERT_ACCEPT:
1636      if (length < 0) length = branchlength;      if (length < 0) length = branchlength;
1637        else if (length != branchlength) return -1;        else if (length != branchlength) return -1;
1638      if (*cc != OP_ALT) return length;      if (*cc != OP_ALT) return length;
# Line 1536  for (;;) Line 1646  for (;;)
1646    
1647      case OP_RECURSE:      case OP_RECURSE:
1648      if (!atend) return -3;      if (!atend) return -3;
1649      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */      cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1650      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */      do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
1651      if (cc > cs && cc < ce) return -1;                /* Recursion */      if (cc > cs && cc < ce) return -1;                    /* Recursion */
1652      d = find_fixedlength(cs + 2, utf8, atend, cd);      d = find_fixedlength(cs + 2, utf8, atend, cd);
1653      if (d < 0) return d;      if (d < 0) return d;
1654      branchlength += d;      branchlength += d;
# Line 1556  for (;;) Line 1666  for (;;)
1666    
1667      /* Skip over things that don't match chars */      /* Skip over things that don't match chars */
1668    
1669      case OP_REVERSE:      case OP_MARK:
1670      case OP_CREF:      case OP_PRUNE_ARG:
1671      case OP_NCREF:      case OP_SKIP_ARG:
1672      case OP_RREF:      case OP_THEN_ARG:
1673      case OP_NRREF:      cc += cc[1] + PRIV(OP_lengths)[*cc];
1674      case OP_DEF:      break;
1675    
1676      case OP_CALLOUT:      case OP_CALLOUT:
     case OP_SOD:  
     case OP_SOM:  
     case OP_SET_SOM:  
     case OP_EOD:  
     case OP_EODN:  
1677      case OP_CIRC:      case OP_CIRC:
1678      case OP_CIRCM:      case OP_CIRCM:
1679        case OP_CLOSE:
1680        case OP_COMMIT:
1681        case OP_CREF:
1682        case OP_DEF:
1683      case OP_DOLL:      case OP_DOLL:
1684      case OP_DOLLM:      case OP_DOLLM:
1685        case OP_EOD:
1686        case OP_EODN:
1687        case OP_FAIL:
1688        case OP_NCREF:
1689        case OP_NRREF:
1690      case OP_NOT_WORD_BOUNDARY:      case OP_NOT_WORD_BOUNDARY:
1691        case OP_PRUNE:
1692        case OP_REVERSE:
1693        case OP_RREF:
1694        case OP_SET_SOM:
1695        case OP_SKIP:
1696        case OP_SOD:
1697        case OP_SOM:
1698        case OP_THEN:
1699      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
1700      cc += _pcre_OP_lengths[*cc];      cc += PRIV(OP_lengths)[*cc];
1701      break;      break;
1702    
1703      /* Handle literal characters */      /* Handle literal characters */
# Line 1586  for (;;) Line 1709  for (;;)
1709      branchlength++;      branchlength++;
1710      cc += 2;      cc += 2;
1711  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1712      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];      if (utf8 && cc[-1] >= 0xc0) cc += PRIV(utf8_table4)[cc[-1] & 0x3f];
1713  #endif  #endif
1714      break;      break;
1715    
# Line 1594  for (;;) Line 1717  for (;;)
1717      need to skip over a multibyte character in UTF8 mode.  */      need to skip over a multibyte character in UTF8 mode.  */
1718    
1719      case OP_EXACT:      case OP_EXACT:
1720        case OP_EXACTI:
1721        case OP_NOTEXACT:
1722        case OP_NOTEXACTI:
1723      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1724      cc += 4;      cc += 2 + IMM2_SIZE;
1725  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1726      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];      if (utf8 && cc[-1] >= 0xc0) cc += PRIV(utf8_table4)[cc[-1] & 0x3f];
1727  #endif  #endif
1728      break;      break;
1729    
1730      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1731      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1732      if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;      if (cc[1 + IMM2_SIZE] == OP_PROP || cc[1 + IMM2_SIZE] == OP_NOTPROP) cc += 2;
1733      cc += 4;      cc += 1 + IMM2_SIZE + 1;
1734      break;      break;
1735    
1736      /* Handle single-char matchers */      /* Handle single-char matchers */
# Line 1614  for (;;) Line 1740  for (;;)
1740      cc += 2;      cc += 2;
1741      /* Fall through */      /* Fall through */
1742    
1743        case OP_HSPACE:
1744        case OP_VSPACE:
1745        case OP_NOT_HSPACE:
1746        case OP_NOT_VSPACE:
1747      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
1748      case OP_DIGIT:      case OP_DIGIT:
1749      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
# Line 1626  for (;;) Line 1756  for (;;)
1756      cc++;      cc++;
1757      break;      break;
1758    
1759      /* The single-byte matcher isn't allowed */      /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
1760        otherwise \C is coded as OP_ALLANY. */
1761    
1762      case OP_ANYBYTE:      case OP_ANYBYTE:
1763      return -2;      return -2;
# Line 1645  for (;;) Line 1776  for (;;)
1776    
1777      switch (*cc)      switch (*cc)
1778        {        {
1779          case OP_CRPLUS:
1780          case OP_CRMINPLUS:
1781        case OP_CRSTAR:        case OP_CRSTAR:
1782        case OP_CRMINSTAR:        case OP_CRMINSTAR:
1783        case OP_CRQUERY:        case OP_CRQUERY:
# Line 1653  for (;;) Line 1786  for (;;)
1786    
1787        case OP_CRRANGE:        case OP_CRRANGE:
1788        case OP_CRMINRANGE:        case OP_CRMINRANGE:
1789        if (GET2(cc,1) != GET2(cc,3)) return -1;        if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
1790        branchlength += GET2(cc,1);        branchlength += GET2(cc,1);
1791        cc += 5;        cc += 1 + 2 * IMM2_SIZE;
1792        break;        break;
1793    
1794        default:        default:
# Line 1665  for (;;) Line 1798  for (;;)
1798    
1799      /* Anything else is variable length */      /* Anything else is variable length */
1800    
1801      default:      case OP_ANYNL:
1802        case OP_BRAMINZERO:
1803        case OP_BRAPOS:
1804        case OP_BRAPOSZERO:
1805        case OP_BRAZERO:
1806        case OP_CBRAPOS:
1807        case OP_EXTUNI:
1808        case OP_KETRMAX:
1809        case OP_KETRMIN:
1810        case OP_KETRPOS:
1811        case OP_MINPLUS:
1812        case OP_MINPLUSI:
1813        case OP_MINQUERY:
1814        case OP_MINQUERYI:
1815        case OP_MINSTAR:
1816        case OP_MINSTARI:
1817        case OP_MINUPTO:
1818        case OP_MINUPTOI:
1819        case OP_NOTMINPLUS:
1820        case OP_NOTMINPLUSI:
1821        case OP_NOTMINQUERY:
1822        case OP_NOTMINQUERYI:
1823        case OP_NOTMINSTAR:
1824        case OP_NOTMINSTARI:
1825        case OP_NOTMINUPTO:
1826        case OP_NOTMINUPTOI:
1827        case OP_NOTPLUS:
1828        case OP_NOTPLUSI:
1829        case OP_NOTPOSPLUS:
1830        case OP_NOTPOSPLUSI:
1831        case OP_NOTPOSQUERY:
1832        case OP_NOTPOSQUERYI:
1833        case OP_NOTPOSSTAR:
1834        case OP_NOTPOSSTARI:
1835        case OP_NOTPOSUPTO:
1836        case OP_NOTPOSUPTOI:
1837        case OP_NOTQUERY:
1838        case OP_NOTQUERYI:
1839        case OP_NOTSTAR:
1840        case OP_NOTSTARI:
1841        case OP_NOTUPTO:
1842        case OP_NOTUPTOI:
1843        case OP_PLUS:
1844        case OP_PLUSI:
1845        case OP_POSPLUS:
1846        case OP_POSPLUSI:
1847        case OP_POSQUERY:
1848        case OP_POSQUERYI:
1849        case OP_POSSTAR:
1850        case OP_POSSTARI:
1851        case OP_POSUPTO:
1852        case OP_POSUPTOI:
1853        case OP_QUERY:
1854        case OP_QUERYI:
1855        case OP_REF:
1856        case OP_REFI:
1857        case OP_SBRA:
1858        case OP_SBRAPOS:
1859        case OP_SCBRA:
1860        case OP_SCBRAPOS:
1861        case OP_SCOND:
1862        case OP_SKIPZERO:
1863        case OP_STAR:
1864        case OP_STARI:
1865        case OP_TYPEMINPLUS:
1866        case OP_TYPEMINQUERY:
1867        case OP_TYPEMINSTAR:
1868        case OP_TYPEMINUPTO:
1869        case OP_TYPEPLUS:
1870        case OP_TYPEPOSPLUS:
1871        case OP_TYPEPOSQUERY:
1872        case OP_TYPEPOSSTAR:
1873        case OP_TYPEPOSUPTO:
1874        case OP_TYPEQUERY:
1875        case OP_TYPESTAR:
1876        case OP_TYPEUPTO:
1877        case OP_UPTO:
1878        case OP_UPTOI:
1879      return -1;      return -1;
1880    
1881        /* Catch unrecognized opcodes so that when new ones are added they
1882        are not forgotten, as has happened in the past. */
1883    
1884        default:
1885        return -4;
1886      }      }
1887    }    }
1888  /* Control never gets here */  /* Control never gets here */
# Line 1693  Arguments: Line 1909  Arguments:
1909  Returns:      pointer to the opcode for the bracket, or NULL if not found  Returns:      pointer to the opcode for the bracket, or NULL if not found
1910  */  */
1911    
1912  const uschar *  const pcre_uchar *
1913  _pcre_find_bracket(const uschar *code, BOOL utf8, int number)  PRIV(find_bracket)(const pcre_uchar *code, BOOL utf8, int number)
1914  {  {
1915  for (;;)  for (;;)
1916    {    {
# Line 1712  for (;;) Line 1928  for (;;)
1928    
1929    else if (c == OP_REVERSE)    else if (c == OP_REVERSE)
1930      {      {
1931      if (number < 0) return (uschar *)code;      if (number < 0) return (pcre_uchar *)code;
1932      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
1933      }      }
1934    
1935    /* Handle capturing bracket */    /* Handle capturing bracket */
# Line 1722  for (;;) Line 1938  for (;;)
1938             c == OP_CBRAPOS || c == OP_SCBRAPOS)             c == OP_CBRAPOS || c == OP_SCBRAPOS)
1939      {      {
1940      int n = GET2(code, 1+LINK_SIZE);      int n = GET2(code, 1+LINK_SIZE);
1941      if (n == number) return (uschar *)code;      if (n == number) return (pcre_uchar *)code;
1942      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
1943      }      }
1944    
1945    /* Otherwise, we can get the item's length from the table, except that for    /* Otherwise, we can get the item's length from the table, except that for
# Line 1751  for (;;) Line 1967  for (;;)
1967        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
1968        case OP_TYPEEXACT:        case OP_TYPEEXACT:
1969        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
1970        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP
1971            || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
1972        break;        break;
1973    
1974        case OP_MARK:        case OP_MARK:
# Line 1761  for (;;) Line 1978  for (;;)
1978        break;        break;
1979    
1980        case OP_THEN_ARG:        case OP_THEN_ARG:
1981        code += code[1+LINK_SIZE];        code += code[1];
1982        break;        break;
1983        }        }
1984    
1985      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
1986    
1987      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
1988    
1989    /* In UTF-8 mode, opcodes that are followed by a character may be followed by    /* In UTF-8 mode, opcodes that are followed by a character may be followed by
1990    a multi-byte character. The length in the table is a minimum, so we have to    a multi-byte character. The length in the table is a minimum, so we have to
# Line 1804  for (;;) Line 2021  for (;;)
2021        case OP_MINQUERYI:        case OP_MINQUERYI:
2022        case OP_POSQUERY:        case OP_POSQUERY:
2023        case OP_POSQUERYI:        case OP_POSQUERYI:
2024        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += PRIV(utf8_table4)[code[-1] & 0x3f];
2025        break;        break;
2026        }        }
2027  #else  #else
# Line 1830  Arguments: Line 2047  Arguments:
2047  Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found  Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found
2048  */  */
2049    
2050  static const uschar *  static const pcre_uchar *
2051  find_recurse(const uschar *code, BOOL utf8)  find_recurse(const pcre_uchar *code, BOOL utf8)
2052  {  {
2053  for (;;)  for (;;)
2054    {    {
# Line 1870  for (;;) Line 2087  for (;;)
2087        case OP_TYPEUPTO:        case OP_TYPEUPTO:
2088        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2089        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2090        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP
2091            || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2092        break;        break;
2093    
2094        case OP_MARK:        case OP_MARK:
# Line 1880  for (;;) Line 2098  for (;;)
2098        break;        break;
2099    
2100        case OP_THEN_ARG:        case OP_THEN_ARG:
2101        code += code[1+LINK_SIZE];        code += code[1];
2102        break;        break;
2103        }        }
2104    
2105      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
2106    
2107      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2108    
2109      /* In UTF-8 mode, opcodes that are followed by a character may be followed      /* In UTF-8 mode, opcodes that are followed by a character may be followed
2110      by a multi-byte character. The length in the table is a minimum, so we have      by a multi-byte character. The length in the table is a minimum, so we have
# Line 1923  for (;;) Line 2141  for (;;)
2141        case OP_MINQUERYI:        case OP_MINQUERYI:
2142        case OP_POSQUERY:        case OP_POSQUERY:
2143        case OP_POSQUERYI:        case OP_POSQUERYI:
2144        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += PRIV(utf8_table4)[code[-1] & 0x3f];
2145        break;        break;
2146        }        }
2147  #else  #else
# Line 1957  Returns:      TRUE if what is matched co Line 2175  Returns:      TRUE if what is matched co
2175  */  */
2176    
2177  static BOOL  static BOOL
2178  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8,  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
2179    compile_data *cd)    BOOL utf8, compile_data *cd)
2180  {  {
2181  register int c;  register int c;
2182  for (code = first_significant_code(code + _pcre_OP_lengths[*code], TRUE);  for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
2183       code < endcode;       code < endcode;
2184       code = first_significant_code(code + _pcre_OP_lengths[c], TRUE))       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
2185    {    {
2186    const uschar *ccode;    const pcre_uchar *ccode;
2187    
2188    c = *code;    c = *code;
2189    
# Line 1988  for (code = first_significant_code(code Line 2206  for (code = first_significant_code(code
2206    
2207    if (c == OP_RECURSE)    if (c == OP_RECURSE)
2208      {      {
2209      const uschar *scode;      const pcre_uchar *scode;
2210      BOOL empty_branch;      BOOL empty_branch;
2211    
2212      /* Test for forward reference */      /* Test for forward reference */
# Line 2024  for (code = first_significant_code(code Line 2242  for (code = first_significant_code(code
2242    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2243        c == OP_BRAPOSZERO)        c == OP_BRAPOSZERO)
2244      {      {
2245      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2246      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
2247      c = *code;      c = *code;
2248      continue;      continue;
# Line 2045  for (code = first_significant_code(code Line 2263  for (code = first_significant_code(code
2263    
2264    if (c == OP_BRA  || c == OP_BRAPOS ||    if (c == OP_BRA  || c == OP_BRAPOS ||
2265        c == OP_CBRA || c == OP_CBRAPOS ||        c == OP_CBRA || c == OP_CBRAPOS ||
2266        c == OP_ONCE || c == OP_COND)        c == OP_ONCE || c == OP_ONCE_NC ||
2267          c == OP_COND)
2268      {      {
2269      BOOL empty_branch;      BOOL empty_branch;
2270      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
# Line 2079  for (code = first_significant_code(code Line 2298  for (code = first_significant_code(code
2298      {      {
2299      /* Check for quantifiers after a class. XCLASS is used for classes that      /* Check for quantifiers after a class. XCLASS is used for classes that
2300      cannot be represented just by a bit map. This includes negated single      cannot be represented just by a bit map. This includes negated single
2301      high-valued characters. The length in _pcre_OP_lengths[] is zero; the      high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
2302      actual length is stored in the compiled code, so we must update "code"      actual length is stored in the compiled code, so we must update "code"
2303      here. */      here. */
2304    
# Line 2166  for (code = first_significant_code(code Line 2385  for (code = first_significant_code(code
2385      case OP_TYPEUPTO:      case OP_TYPEUPTO:
2386      case OP_TYPEMINUPTO:      case OP_TYPEMINUPTO:
2387      case OP_TYPEPOSUPTO:      case OP_TYPEPOSUPTO:
2388      if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;      if (code[1 + IMM2_SIZE] == OP_PROP
2389          || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2390      break;      break;
2391    
2392      /* End of branch */      /* End of branch */
# Line 2194  for (code = first_significant_code(code Line 2414  for (code = first_significant_code(code
2414      case OP_MINQUERYI:      case OP_MINQUERYI:
2415      case OP_POSQUERY:      case OP_POSQUERY:
2416      case OP_POSQUERYI:      case OP_POSQUERYI:
2417      if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];      if (utf8 && code[1] >= 0xc0) code += PRIV(utf8_table4)[code[1] & 0x3f];
2418      break;      break;
2419    
2420      case OP_UPTO:      case OP_UPTO:
# Line 2203  for (code = first_significant_code(code Line 2423  for (code = first_significant_code(code
2423      case OP_MINUPTOI:      case OP_MINUPTOI:
2424      case OP_POSUPTO:      case OP_POSUPTO:
2425      case OP_POSUPTOI:      case OP_POSUPTOI:
2426      if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];      if (utf8 && code[1 + IMM2_SIZE] >= 0xc0) code += PRIV(utf8_table4)[code[1 + IMM2_SIZE] & 0x3f];
2427      break;      break;
2428  #endif  #endif
2429    
# Line 2217  for (code = first_significant_code(code Line 2437  for (code = first_significant_code(code
2437      break;      break;
2438    
2439      case OP_THEN_ARG:      case OP_THEN_ARG:
2440      code += code[1+LINK_SIZE];      code += code[1];
2441      break;      break;
2442    
2443      /* None of the remaining opcodes are required to match a character. */      /* None of the remaining opcodes are required to match a character. */
# Line 2254  Returns:      TRUE if what is matched co Line 2474  Returns:      TRUE if what is matched co
2474  */  */
2475    
2476  static BOOL  static BOOL
2477  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
2478    BOOL utf8, compile_data *cd)    branch_chain *bcptr, BOOL utf8, compile_data *cd)
2479  {  {
2480  while (bcptr != NULL && bcptr->current_branch >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2481    {    {
# Line 2295  I think. Line 2515  I think.
2515  A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.  A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
2516  It seems that the appearance of a nested POSIX class supersedes an apparent  It seems that the appearance of a nested POSIX class supersedes an apparent
2517  external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or  external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
2518  a digit. Also, unescaped square brackets may also appear as part of class  a digit.
2519  names. For example, [:a[:abc]b:] gives unknown class "[:abc]b:]"in Perl.  
2520    In Perl, unescaped square brackets may also appear as part of class names. For
2521    example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
2522    [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
2523    seem right at all. PCRE does not allow closing square brackets in POSIX class
2524    names.
2525    
2526  Arguments:  Arguments:
2527    ptr      pointer to the initial [    ptr      pointer to the initial [
# Line 2306  Returns:   TRUE or FALSE Line 2531  Returns:   TRUE or FALSE
2531  */  */
2532    
2533  static BOOL  static BOOL
2534  check_posix_syntax(const uschar *ptr, const uschar **endptr)  check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
2535  {  {
2536  int terminator;          /* Don't combine these lines; the Solaris cc */  int terminator;          /* Don't combine these lines; the Solaris cc */
2537  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
# Line 2314  for (++ptr; *ptr != 0; ptr++) Line 2539  for (++ptr; *ptr != 0; ptr++)
2539    {    {
2540    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2541      ptr++;      ptr++;
2542      else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2543    else    else
2544      {      {
2545      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
# Line 2349  Returns:     a value representing the na Line 2575  Returns:     a value representing the na
2575  */  */
2576    
2577  static int  static int
2578  check_posix_name(const uschar *ptr, int len)  check_posix_name(const pcre_uchar *ptr, int len)
2579  {  {
2580  const char *pn = posix_names;  const char *pn = posix_names;
2581  register int yield = 0;  register int yield = 0;
2582  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
2583    {    {
2584    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
2585      strncmp((const char *)ptr, pn, len) == 0) return yield;      STRNCMP_UC_C8(ptr, pn, len) == 0) return yield;
2586    pn += posix_name_lengths[yield] + 1;    pn += posix_name_lengths[yield] + 1;
2587    yield++;    yield++;
2588    }    }
# Line 2396  Returns:     nothing Line 2622  Returns:     nothing
2622  */  */
2623    
2624  static void  static void
2625  adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,  adjust_recurse(pcre_uchar *group, int adjust, BOOL utf8, compile_data *cd,
2626    uschar *save_hwm)    pcre_uchar *save_hwm)
2627  {  {
2628  uschar *ptr = group;  pcre_uchar *ptr = group;
2629    
2630  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (pcre_uchar *)find_recurse(ptr, utf8)) != NULL)
2631    {    {
2632    int offset;    int offset;
2633    uschar *hc;    pcre_uchar *hc;
2634    
2635    /* See if this recursion is on the forward reference list. If so, adjust the    /* See if this recursion is on the forward reference list. If so, adjust the
2636    reference. */    reference. */
# Line 2449  Arguments: Line 2675  Arguments:
2675  Returns:         new code pointer  Returns:         new code pointer
2676  */  */
2677    
2678  static uschar *  static pcre_uchar *
2679  auto_callout(uschar *code, const uschar *ptr, compile_data *cd)  auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
2680  {  {
2681  *code++ = OP_CALLOUT;  *code++ = OP_CALLOUT;
2682  *code++ = 255;  *code++ = 255;
2683  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
2684  PUT(code, LINK_SIZE, 0);                       /* Default length */  PUT(code, LINK_SIZE, 0);                       /* Default length */
2685  return code + 2*LINK_SIZE;  return code + 2 * LINK_SIZE;
2686  }  }
2687    
2688    
# Line 2478  Returns:             nothing Line 2704  Returns:             nothing
2704  */  */
2705    
2706  static void  static void
2707  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)  complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
2708  {  {
2709  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
2710  PUT(previous_callout, 2 + LINK_SIZE, length);  PUT(previous_callout, 2 + LINK_SIZE, length);
# Line 2561  switch(ptype) Line 2787  switch(ptype)
2787            prop->chartype == ucp_Lt) == negated;            prop->chartype == ucp_Lt) == negated;
2788    
2789    case PT_GC:    case PT_GC:
2790    return (pdata == _pcre_ucp_gentype[prop->chartype]) == negated;    return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
2791    
2792    case PT_PC:    case PT_PC:
2793    return (pdata == prop->chartype) == negated;    return (pdata == prop->chartype) == negated;
# Line 2572  switch(ptype) Line 2798  switch(ptype)
2798    /* These are specials */    /* These are specials */
2799    
2800    case PT_ALNUM:    case PT_ALNUM:
2801    return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2802            _pcre_ucp_gentype[prop->chartype] == ucp_N) == negated;            PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
2803    
2804    case PT_SPACE:    /* Perl space */    case PT_SPACE:    /* Perl space */
2805    return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2806            c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)            c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2807            == negated;            == negated;
2808    
2809    case PT_PXSPACE:  /* POSIX space */    case PT_PXSPACE:  /* POSIX space */
2810    return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2811            c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||            c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2812            c == CHAR_FF || c == CHAR_CR)            c == CHAR_FF || c == CHAR_CR)
2813            == negated;            == negated;
2814    
2815    case PT_WORD:    case PT_WORD:
2816    return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2817            _pcre_ucp_gentype[prop->chartype] == ucp_N ||            PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2818            c == CHAR_UNDERSCORE) == negated;            c == CHAR_UNDERSCORE) == negated;
2819    }    }
2820  return FALSE;  return FALSE;
# Line 2616  Returns:        TRUE if possessifying is Line 2842  Returns:        TRUE if possessifying is
2842  */  */
2843    
2844  static BOOL  static BOOL
2845  check_auto_possessive(const uschar *previous, BOOL utf8, const uschar *ptr,  check_auto_possessive(const pcre_uchar *previous, BOOL utf8,
2846    int options, compile_data *cd)    const pcre_uchar *ptr, int options, compile_data *cd)
2847  {  {
2848  int c, next;  int c, next;
2849  int op_code = *previous++;  int op_code = *previous++;
# Line 2692  if ((options & PCRE_EXTENDED) != 0) Line 2918  if ((options & PCRE_EXTENDED) != 0)
2918  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
2919    
2920  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
2921    strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)    STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
2922      return FALSE;      return FALSE;
2923    
2924  /* Now compare the next item with the previous opcode. First, handle cases when  /* Now compare the next item with the previous opcode. First, handle cases when
# Line 2954  switch(op_code) Line 3180  switch(op_code)
3180        to the original \d etc. At this point, ptr will point to a zero byte. */        to the original \d etc. At this point, ptr will point to a zero byte. */
3181    
3182        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3183          strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)          STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
3184            return FALSE;            return FALSE;
3185    
3186        /* Do the property check. */        /* Do the property check. */
# Line 3045  Returns:         TRUE on success Line 3271  Returns:         TRUE on success
3271  */  */
3272    
3273  static BOOL  static BOOL
3274  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,  compile_branch(int *optionsptr, pcre_uchar **codeptr,
3275    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,    const pcre_uchar **ptrptr, int *errorcodeptr, int *firstbyteptr,
3276    int cond_depth, compile_data *cd, int *lengthptr)    int *reqbyteptr, branch_chain *bcptr, int cond_depth, compile_data *cd,
3277      int *lengthptr)
3278  {  {
3279  int repeat_type, op_type;  int repeat_type, op_type;
3280  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
# Line 3060  int options = *optionsptr; Line 3287  int options = *optionsptr;
3287  int after_manual_callout = 0;  int after_manual_callout = 0;
3288  int length_prevgroup = 0;  int length_prevgroup = 0;
3289  register int c;  register int c;
3290  register uschar *code = *codeptr;  register pcre_uchar *code = *codeptr;
3291  uschar *last_code = code;  pcre_uchar *last_code = code;
3292  uschar *orig_code = code;  pcre_uchar *orig_code = code;
3293  uschar *tempcode;  pcre_uchar *tempcode;
3294  BOOL inescq = FALSE;  BOOL inescq = FALSE;
3295  BOOL groupsetfirstbyte = FALSE;  BOOL groupsetfirstbyte = FALSE;
3296  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
3297  const uschar *tempptr;  const pcre_uchar *tempptr;
3298  const uschar *nestptr = NULL;  const pcre_uchar *nestptr = NULL;
3299  uschar *previous = NULL;  pcre_uchar *previous = NULL;
3300  uschar *previous_callout = NULL;  pcre_uchar *previous_callout = NULL;
3301  uschar *save_hwm = NULL;  pcre_uchar *save_hwm = NULL;
3302  uschar classbits[32];  pcre_uchar classbits[32];
3303    
3304  /* We can fish out the UTF-8 setting once and for all into a BOOL, but we  /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
3305  must not do this for other options (e.g. PCRE_EXTENDED) because they may change  must not do this for other options (e.g. PCRE_EXTENDED) because they may change
# Line 3081  dynamically as we process the pattern. * Line 3308  dynamically as we process the pattern. *
3308  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3309  BOOL class_utf8;  BOOL class_utf8;
3310  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf8 = (options & PCRE_UTF8) != 0;
3311  uschar *class_utf8data;  pcre_uint8 *class_utf8data;
3312  uschar *class_utf8data_base;  pcre_uint8 *class_utf8data_base;
3313  uschar utf8_char[6];  pcre_uint8 utf8_char[6];
3314  #else  #else
3315  BOOL utf8 = FALSE;  BOOL utf8 = FALSE;
 uschar *utf8_char = NULL;  
3316  #endif  #endif
3317    
3318  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 3137  for (;; ptr++) Line 3363  for (;; ptr++)
3363    int subfirstbyte;    int subfirstbyte;
3364    int terminator;    int terminator;
3365    int mclength;    int mclength;
3366    uschar mcbuffer[8];    int tempbracount;
3367      pcre_uchar mcbuffer[8];
3368    
3369    /* Get next byte in the pattern */    /* Get next byte in the pattern */
3370    
# Line 3184  for (;; ptr++) Line 3411  for (;; ptr++)
3411        }        }
3412    
3413      *lengthptr += (int)(code - last_code);      *lengthptr += (int)(code - last_code);
3414      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),
3415          c));
3416    
3417      /* 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
3418      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 3194  for (;; ptr++) Line 3422  for (;; ptr++)
3422        {        {
3423        if (previous > orig_code)        if (previous > orig_code)
3424          {          {
3425          memmove(orig_code, previous, code - previous);          memmove(orig_code, previous, IN_UCHARS(code - previous));
3426          code -= previous - orig_code;          code -= previous - orig_code;
3427          previous = orig_code;          previous = orig_code;
3428          }          }
# Line 3392  for (;; ptr++) Line 3620  for (;; ptr++)
3620          {          {
3621          if (ptr[1] == CHAR_E)          if (ptr[1] == CHAR_E)
3622            ptr++;            ptr++;
3623          else if (strncmp((const char *)ptr+1,          else if (STRNCMP_UC_C8(ptr + 1,
3624                            STR_Q STR_BACKSLASH STR_E, 3) == 0)                            STR_Q STR_BACKSLASH STR_E, 3) == 0)
3625            ptr += 3;            ptr += 3;
3626          else          else
# Line 3435  for (;; ptr++) Line 3663  for (;; ptr++)
3663      than 256), because in that case the compiled code doesn't use the bit map.      than 256), because in that case the compiled code doesn't use the bit map.
3664      */      */
3665    
3666      memset(classbits, 0, 32 * sizeof(uschar));      memset(classbits, 0, 32 * sizeof(pcre_uint8));
3667    
3668  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3669      class_utf8 = FALSE;                       /* No chars >= 256 */      class_utf8 = FALSE;                       /* No chars >= 256 */
# Line 3449  for (;; ptr++) Line 3677  for (;; ptr++)
3677    
3678      if (c != 0) do      if (c != 0) do
3679        {        {
3680        const uschar *oldptr;        const pcre_uchar *oldptr;
3681    
3682  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3683        if (utf8 && c > 127)        if (utf8 && c > 127)
# Line 3495  for (;; ptr++) Line 3723  for (;; ptr++)
3723          {          {
3724          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
3725          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
3726          register const uschar *cbits = cd->cbits;          register const pcre_uint8 *cbits = cd->cbits;
3727          uschar pbits[32];          pcre_uint8 pbits[32];
3728    
3729          if (ptr[1] != CHAR_COLON)          if (ptr[1] != CHAR_COLON)
3730            {            {
# Line 3551  for (;; ptr++) Line 3779  for (;; ptr++)
3779          /* Copy in the first table (always present) */          /* Copy in the first table (always present) */
3780    
3781          memcpy(pbits, cbits + posix_class_maps[posix_class],          memcpy(pbits, cbits + posix_class_maps[posix_class],
3782            32 * sizeof(uschar));            32 * sizeof(pcre_uint8));
3783    
3784          /* If there is a second table, add or remove it as required. */          /* If there is a second table, add or remove it as required. */
3785    
# Line 3613  for (;; ptr++) Line 3841  for (;; ptr++)
3841    
3842          if (c < 0)          if (c < 0)
3843            {            {
3844            register const uschar *cbits = cd->cbits;            register const pcre_uint8 *cbits = cd->cbits;
3845            class_charcount += 2;     /* Greater than 1 is what matters */            class_charcount += 2;     /* Greater than 1 is what matters */
3846    
3847            switch (-c)            switch (-c)
# Line 3673  for (;; ptr++) Line 3901  for (;; ptr++)
3901                {                {
3902                class_utf8 = TRUE;                class_utf8 = TRUE;
3903                *class_utf8data++ = XCL_SINGLE;                *class_utf8data++ = XCL_SINGLE;
3904                class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x1680, class_utf8data);
3905                *class_utf8data++ = XCL_SINGLE;                *class_utf8data++ = XCL_SINGLE;
3906                class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x180e, class_utf8data);
3907                *class_utf8data++ = XCL_RANGE;                *class_utf8data++ = XCL_RANGE;
3908                class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x2000, class_utf8data);
3909                class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x200A, class_utf8data);
3910                *class_utf8data++ = XCL_SINGLE;                *class_utf8data++ = XCL_SINGLE;
3911                class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x202f, class_utf8data);
3912                *class_utf8data++ = XCL_SINGLE;                *class_utf8data++ = XCL_SINGLE;
3913                class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x205f, class_utf8data);
3914                *class_utf8data++ = XCL_SINGLE;                *class_utf8data++ = XCL_SINGLE;
3915                class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x3000, class_utf8data);
3916                }                }
3917  #endif  #endif
3918              continue;              continue;
# Line 3708  for (;; ptr++) Line 3936  for (;; ptr++)
3936                {                {
3937                class_utf8 = TRUE;                class_utf8 = TRUE;
3938                *class_utf8data++ = XCL_RANGE;                *class_utf8data++ = XCL_RANGE;
3939                class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x0100, class_utf8data);
3940                class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x167f, class_utf8data);
3941                *class_utf8data++ = XCL_RANGE;                *class_utf8data++ = XCL_RANGE;
3942                class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x1681, class_utf8data);
3943                class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x180d, class_utf8data);
3944                *class_utf8data++ = XCL_RANGE;                *class_utf8data++ = XCL_RANGE;
3945                class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x180f, class_utf8data);
3946                class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x1fff, class_utf8data);
3947                *class_utf8data++ = XCL_RANGE;                *class_utf8data++ = XCL_RANGE;
3948                class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x200B, class_utf8data);
3949                class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x202e, class_utf8data);
3950                *class_utf8data++ = XCL_RANGE;                *class_utf8data++ = XCL_RANGE;
3951                class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x2030, class_utf8data);
3952                class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x205e, class_utf8data);
3953                *class_utf8data++ = XCL_RANGE;                *class_utf8data++ = XCL_RANGE;
3954                class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x2060, class_utf8data);
3955                class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x2fff, class_utf8data);
3956                *class_utf8data++ = XCL_RANGE;                *class_utf8data++ = XCL_RANGE;
3957                class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x3001, class_utf8data);
3958                class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x7fffffff, class_utf8data);
3959                }                }
3960  #endif  #endif
3961              continue;              continue;
# Line 3743  for (;; ptr++) Line 3971  for (;; ptr++)
3971                {                {
3972                class_utf8 = TRUE;                class_utf8 = TRUE;
3973                *class_utf8data++ = XCL_RANGE;                *class_utf8data++ = XCL_RANGE;
3974                class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x2028, class_utf8data);
3975                class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x2029, class_utf8data);
3976                }                }
3977  #endif  #endif
3978              continue;              continue;
# Line 3771  for (;; ptr++) Line 3999  for (;; ptr++)
3999                {                {
4000                class_utf8 = TRUE;                class_utf8 = TRUE;
4001                *class_utf8data++ = XCL_RANGE;                *class_utf8data++ = XCL_RANGE;
4002                class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x0100, class_utf8data);
4003                class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x2027, class_utf8data);
4004                *class_utf8data++ = XCL_RANGE;                *class_utf8data++ = XCL_RANGE;
4005                class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x2029, class_utf8data);
4006                class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);                class_utf8data += PRIV(ord2utf8)(0x7fffffff, class_utf8data);
4007                }                }
4008  #endif  #endif
4009              continue;              continue;
# Line 3953  for (;; ptr++) Line 4181  for (;; ptr++)
4181                else                else
4182                  {                  {
4183                  *class_utf8data++ = XCL_RANGE;                  *class_utf8data++ = XCL_RANGE;
4184                  class_utf8data += _pcre_ord2utf8(occ, class_utf8data);                  class_utf8data += PRIV(ord2utf8)(occ, class_utf8data);
4185                  }                  }
4186                class_utf8data += _pcre_ord2utf8(ocd, class_utf8data);                class_utf8data += PRIV(ord2utf8)(ocd, class_utf8data);
4187                }                }
4188              }              }
4189  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
# Line 3964  for (;; ptr++) Line 4192  for (;; ptr++)
4192            overlapping ranges. */            overlapping ranges. */
4193    
4194            *class_utf8data++ = XCL_RANGE;            *class_utf8data++ = XCL_RANGE;
4195            class_utf8data += _pcre_ord2utf8(c, class_utf8data);            class_utf8data += PRIV(ord2utf8)(c, class_utf8data);
4196            class_utf8data += _pcre_ord2utf8(d, class_utf8data);            class_utf8data += PRIV(ord2utf8)(d, class_utf8data);
4197    
4198            /* With UCP support, we are done. Without UCP support, there is no            /* With UCP support, we are done. Without UCP support, there is no
4199            caseless matching for UTF-8 characters > 127; we can use the bit map            caseless matching for UTF-8 characters > 127; we can use the bit map
# Line 4019  for (;; ptr++) Line 4247  for (;; ptr++)
4247          {          {
4248          class_utf8 = TRUE;          class_utf8 = TRUE;
4249          *class_utf8data++ = XCL_SINGLE;          *class_utf8data++ = XCL_SINGLE;
4250          class_utf8data += _pcre_ord2utf8(c, class_utf8data);          class_utf8data += PRIV(ord2utf8)(c, class_utf8data);
4251    
4252  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4253          if ((options & PCRE_CASELESS) != 0)          if ((options & PCRE_CASELESS) != 0)
# Line 4028  for (;; ptr++) Line 4256  for (;; ptr++)
4256            if ((othercase = UCD_OTHERCASE(c)) != c)            if ((othercase = UCD_OTHERCASE(c)) != c)
4257              {              {
4258              *class_utf8data++ = XCL_SINGLE;              *class_utf8data++ = XCL_SINGLE;
4259              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);              class_utf8data += PRIV(ord2utf8)(othercase, class_utf8data);
4260              }              }
4261            }            }
4262  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
# Line 4109  for (;; ptr++) Line 4337  for (;; ptr++)
4337    
4338  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4339        if (utf8 && class_lastchar > 127)        if (utf8 && class_lastchar > 127)
4340          mclength = _pcre_ord2utf8(class_lastchar, mcbuffer);          mclength = PRIV(ord2utf8)(class_lastchar, mcbuffer);
4341        else        else
4342  #endif  #endif
4343          {          {
# Line 4256  for (;; ptr++) Line 4484  for (;; ptr++)
4484      past, but it no longer happens for non-repeated recursions. In fact, the      past, but it no longer happens for non-repeated recursions. In fact, the
4485      repeated ones could be re-implemented independently so as not to need this,      repeated ones could be re-implemented independently so as not to need this,
4486      but for the moment we rely on the code for repeating groups. */      but for the moment we rely on the code for repeating groups. */
4487    
4488      if (*previous == OP_RECURSE)      if (*previous == OP_RECURSE)
4489        {        {
4490        memmove(previous + 1 + LINK_SIZE, previous, 1 + LINK_SIZE);        memmove(previous + 1 + LINK_SIZE, previous, IN_UCHARS(1 + LINK_SIZE));
4491        *previous = OP_ONCE;        *previous = OP_ONCE;
4492        PUT(previous, 1, 2 + 2*LINK_SIZE);        PUT(previous, 1, 2 + 2*LINK_SIZE);
4493        previous[2 + 2*LINK_SIZE] = OP_KET;        previous[2 + 2*LINK_SIZE] = OP_KET;
# Line 4298  for (;; ptr++) Line 4526  for (;; ptr++)
4526  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4527        if (utf8 && (code[-1] & 0x80) != 0)        if (utf8 && (code[-1] & 0x80) != 0)
4528          {          {
4529          uschar *lastchar = code - 1;          pcre_uchar *lastchar = code - 1;
4530          while((*lastchar & 0xc0) == 0x80) lastchar--;          while((*lastchar & 0xc0) == 0x80) lastchar--;
4531          c = code - lastchar;            /* Length of UTF-8 character */          c = code - lastchar;            /* Length of UTF-8 character */
4532          memcpy(utf8_char, lastchar, c); /* Save the char */          memcpy(utf8_char, lastchar, c); /* Save the char */
# Line 4360  for (;; ptr++) Line 4588  for (;; ptr++)
4588    
4589      else if (*previous < OP_EODN)      else if (*previous < OP_EODN)
4590        {        {
4591        uschar *oldcode;        pcre_uchar *oldcode;
4592        int prop_type, prop_value;        int prop_type, prop_value;
4593        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */
4594        c = *previous;        c = *previous;
# Line 4582  for (;; ptr++) Line 4810  for (;; ptr++)
4810        {        {
4811        register int i;        register int i;
4812        int len = (int)(code - previous);        int len = (int)(code - previous);
4813        uschar *bralink = NULL;        pcre_uchar *bralink = NULL;
4814        uschar *brazeroptr = NULL;        pcre_uchar *brazeroptr = NULL;
4815    
4816        /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so        /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so
4817        we just ignore the repeat. */        we just ignore the repeat. */
# Line 4637  for (;; ptr++) Line 4865  for (;; ptr++)
4865            {            {
4866            *code = OP_END;            *code = OP_END;
4867            adjust_recurse(previous, 1, utf8, cd, save_hwm);            adjust_recurse(previous, 1, utf8, cd, save_hwm);
4868            memmove(previous+1, previous, len);            memmove(previous + 1, previous, IN_UCHARS(len));
4869            code++;            code++;
4870            if (repeat_max == 0)            if (repeat_max == 0)
4871              {              {
# Line 4661  for (;; ptr++) Line 4889  for (;; ptr++)
4889            int offset;            int offset;
4890            *code = OP_END;            *code = OP_END;
4891            adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd, save_hwm);            adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd, save_hwm);
4892            memmove(previous + 2 + LINK_SIZE, previous, len);            memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len));
4893            code += 2 + LINK_SIZE;            code += 2 + LINK_SIZE;
4894            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
4895            *previous++ = OP_BRA;            *previous++ = OP_BRA;
# Line 4714  for (;; ptr++) Line 4942  for (;; ptr++)
4942              if (groupsetfirstbyte && reqbyte < 0) reqbyte = firstbyte;              if (groupsetfirstbyte && reqbyte < 0) reqbyte = firstbyte;
4943              for (i = 1; i < repeat_min; i++)              for (i = 1; i < repeat_min; i++)
4944                {                {
4945                uschar *hc;                pcre_uchar *hc;
4946                uschar *this_hwm = cd->hwm;                pcre_uchar *this_hwm = cd->hwm;
4947                memcpy(code, previous, len);                memcpy(code, previous, IN_UCHARS(len));
4948                for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)                for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
4949                  {                  {
4950                  PUT(cd->hwm, 0, GET(hc, 0) + len);                  PUT(cd->hwm, 0, GET(hc, 0) + len);
# Line 4766  for (;; ptr++) Line 4994  for (;; ptr++)
4994    
4995          else for (i = repeat_max - 1; i >= 0; i--)          else for (i = repeat_max - 1; i >= 0; i--)
4996            {            {
4997            uschar *hc;            pcre_uchar *hc;
4998            uschar *this_hwm = cd->hwm;            pcre_uchar *this_hwm = cd->hwm;
4999    
5000            *code++ = OP_BRAZERO + repeat_type;            *code++ = OP_BRAZERO + repeat_type;
5001    
# Line 4783  for (;; ptr++) Line 5011  for (;; ptr++)
5011              PUTINC(code, 0, offset);              PUTINC(code, 0, offset);
5012              }              }
5013    
5014            memcpy(code, previous, len);            memcpy(code, previous, IN_UCHARS(len));
5015            for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)            for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
5016              {              {
5017              PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));              PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));
# Line 4800  for (;; ptr++) Line 5028  for (;; ptr++)
5028            {            {
5029            int oldlinkoffset;            int oldlinkoffset;
5030            int offset = (int)(code - bralink + 1);            int offset = (int)(code - bralink + 1);
5031            uschar *bra = code - offset;            pcre_uchar *bra = code - offset;
5032            oldlinkoffset = GET(bra, 1);            oldlinkoffset = GET(bra, 1);
5033            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
5034            *code++ = OP_KET;            *code++ = OP_KET;
# Line 4814  for (;; ptr++) Line 5042  for (;; ptr++)
5042        ONCE brackets can be converted into non-capturing brackets, as the        ONCE brackets can be converted into non-capturing brackets, as the
5043        behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to        behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to
5044        deal with possessive ONCEs specially.        deal with possessive ONCEs specially.
5045    
5046        Otherwise, if the quantifier was possessive, we convert the BRA code to        Otherwise, when we are doing the actual compile phase, check to see
5047        the POS form, and the KET code to KETRPOS. (It turns out to be convenient        whether this group is one that could match an empty string. If so,
5048        at runtime to detect this kind of subpattern at both the start and at the        convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
5049        end.) The use of special opcodes makes it possible to reduce greatly the        that runtime checking can be done. [This check is also applied to ONCE
5050        stack usage in pcre_exec(). If the group is preceded by OP_BRAZERO,        groups at runtime, but in a different way.]
5051        convert this to OP_BRAPOSZERO. Then cancel the possessive flag so that  
5052        the default action below, of wrapping everything inside atomic brackets,        Then, if the quantifier was possessive and the bracket is not a
5053        does not happen.        conditional, we convert the BRA code to the POS form, and the KET code to
5054          KETRPOS. (It turns out to be convenient at runtime to detect this kind of
5055        Then, when we are doing the actual compile phase, check to see whether        subpattern at both the start and at the end.) The use of special opcodes
5056        this group is one that could match an empty string. If so, convert the        makes it possible to reduce greatly the stack usage in pcre_exec(). If
5057        initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so that runtime        the group is preceded by OP_BRAZERO, convert this to OP_BRAPOSZERO.
5058        checking can be done. [This check is also applied to ONCE groups at  
5059        runtime, but in a different way.] */        Then, if the minimum number of matches is 1 or 0, cancel the possessive
5060          flag so that the default action below, of wrapping everything inside
5061          atomic brackets, does not happen. When the minimum is greater than 1,
5062          there will be earlier copies of the group, and so we still have to wrap
5063          the whole thing. */
5064    
5065        else        else
5066          {          {
5067          uschar *ketcode = code - 1 - LINK_SIZE;          pcre_uchar *ketcode = code - 1 - LINK_SIZE;
5068          uschar *bracode = ketcode - GET(ketcode, 1);          pcre_uchar *bracode = ketcode - GET(ketcode, 1);
5069    
5070          if (*bracode == OP_ONCE && possessive_quantifier) *bracode = OP_BRA;          /* Convert possessive ONCE brackets to non-capturing */
5071          if (*bracode == OP_ONCE)  
5072            if ((*bracode == OP_ONCE || *bracode == OP_ONCE_NC) &&
5073                possessive_quantifier) *bracode = OP_BRA;
5074    
5075            /* For non-possessive ONCE brackets, all we need to do is to
5076            set the KET. */
5077    
5078            if (*bracode == OP_ONCE || *bracode == OP_ONCE_NC)
5079            *ketcode = OP_KETRMAX + repeat_type;            *ketcode = OP_KETRMAX + repeat_type;
5080    
5081            /* Handle non-ONCE brackets and possessive ONCEs (which have been
5082            converted to non-capturing above). */
5083    
5084          else          else
5085            {            {
5086            if (possessive_quantifier)            /* In the compile phase, check for empty string matching. */
5087              {  
             *bracode += 1;                   /* Switch to xxxPOS opcodes */  
             *ketcode = OP_KETRPOS;  
             if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;  
             possessive_quantifier = FALSE;  
             }  
           else *ketcode = OP_KETRMAX + repeat_type;  
   
5088            if (lengthptr == NULL)            if (lengthptr == NULL)
5089              {              {
5090              uschar *scode = bracode;              pcre_uchar *scode = bracode;
5091              do              do
5092                {                {
5093                if (could_be_empty_branch(scode, ketcode, utf8, cd))                if (could_be_empty_branch(scode, ketcode, utf8, cd))
# Line 4863  for (;; ptr++) Line 5099  for (;; ptr++)
5099                }                }
5100              while (*scode == OP_ALT);              while (*scode == OP_ALT);
5101              }              }
5102    
5103              /* Handle possessive quantifiers. */
5104    
5105              if (possessive_quantifier)
5106                {
5107                /* For COND brackets, we wrap the whole thing in a possessively
5108                repeated non-capturing bracket, because we have not invented POS
5109                versions of the COND opcodes. Because we are moving code along, we
5110                must ensure that any pending recursive references are updated. */
5111    
5112                if (*bracode == OP_COND || *bracode == OP_SCOND)
5113                  {
5114                  int nlen = (int)(code - bracode);
5115                  *code = OP_END;
5116                  adjust_recurse(bracode, 1 + LINK_SIZE, utf8, cd, save_hwm);
5117                  memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen));
5118                  code += 1 + LINK_SIZE;
5119                  nlen += 1 + LINK_SIZE;
5120                  *bracode = OP_BRAPOS;
5121                  *code++ = OP_KETRPOS;
5122                  PUTINC(code, 0, nlen);
5123                  PUT(bracode, 1, nlen);
5124                  }
5125    
5126                /* For non-COND brackets, we modify the BRA code and use KETRPOS. */
5127    
5128                else
5129                  {
5130                  *bracode += 1;              /* Switch to xxxPOS opcodes */
5131                  *ketcode = OP_KETRPOS;
5132                  }
5133    
5134                /* If the minimum is zero, mark it as possessive, then unset the
5135                possessive flag when the minimum is 0 or 1. */
5136    
5137                if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
5138                if (repeat_min < 2) possessive_quantifier = FALSE;
5139                }
5140    
5141              /* Non-possessive quantifier */
5142    
5143              else *ketcode = OP_KETRMAX + repeat_type;
5144            }            }
5145          }          }
5146        }        }
# Line 4889  for (;; ptr++) Line 5167  for (;; ptr++)
5167      notation is just syntactic sugar, taken from Sun's Java package, but the      notation is just syntactic sugar, taken from Sun's Java package, but the
5168      special opcodes can optimize it.      special opcodes can optimize it.
5169    
5170      Possessively repeated subpatterns have already been handled in the code      Some (but not all) possessively repeated subpatterns have already been
5171      just above, so possessive_quantifier is always FALSE for them at this      completely handled in the code just above. For them, possessive_quantifier
5172      stage.      is always FALSE at this stage.
5173    
5174      Note that the repeated item starts at tempcode, not at previous, which      Note that the repeated item starts at tempcode, not at previous, which
5175      might be the first part of a string whose (former) last char we repeated.      might be the first part of a string whose (former) last char we repeated.
# Line 4905  for (;; ptr++) Line 5183  for (;; ptr++)
5183        int len;        int len;
5184    
5185        if (*tempcode == OP_TYPEEXACT)        if (*tempcode == OP_TYPEEXACT)
5186          tempcode += _pcre_OP_lengths[*tempcode] +          tempcode += PRIV(OP_lengths)[*tempcode] +
5187            ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);            ((tempcode[1 + IMM2_SIZE] == OP_PROP
5188              || tempcode[1 + IMM2_SIZE] == OP_NOTPROP)? 2 : 0);
5189    
5190        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
5191          {          {
5192          tempcode += _pcre_OP_lengths[*tempcode];          tempcode += PRIV(OP_lengths)[*tempcode];
5193  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
5194          if (utf8 && tempcode[-1] >= 0xc0)          if (utf8 && tempcode[-1] >= 0xc0)
5195            tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];            tempcode += PRIV(utf8_table4)[tempcode[-1] & 0x3f];
5196  #endif  #endif
5197          }          }
5198    
# Line 4951  for (;; ptr++) Line 5230  for (;; ptr++)
5230          default:          default:
5231          *code = OP_END;          *code = OP_END;
5232          adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);          adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);
5233          memmove(tempcode + 1+LINK_SIZE, tempcode, len);          memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
5234          code += 1 + LINK_SIZE;          code += 1 + LINK_SIZE;
5235          len += 1 + LINK_SIZE;          len += 1 + LINK_SIZE;
5236          tempcode[0] = OP_ONCE;          tempcode[0] = OP_ONCE;
# Line 4992  for (;; ptr++) Line 5271  for (;; ptr++)
5271        int i, namelen;        int i, namelen;
5272        int arglen = 0;        int arglen = 0;
5273        const char *vn = verbnames;        const char *vn = verbnames;
5274        const uschar *name = ptr + 1;        const pcre_uchar *name = ptr + 1;
5275        const uschar *arg = NULL;        const pcre_uchar *arg = NULL;
5276        previous = NULL;        previous = NULL;
5277        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
5278        namelen = (int)(ptr - name);        namelen = (int)(ptr - name);
# Line 5020  for (;; ptr++) Line 5299  for (;; ptr++)
5299        for (i = 0; i < verbcount; i++)        for (i = 0; i < verbcount; i++)
5300          {          {
5301          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
5302              strncmp((char *)name, vn, namelen) == 0)              STRNCMP_UC_C8(name, vn, namelen) == 0)
5303            {            {
5304            /* Check for open captures before ACCEPT and convert it to            /* Check for open captures before ACCEPT and convert it to
5305            ASSERT_ACCEPT if in an assertion. */            ASSERT_ACCEPT if in an assertion. */
# Line 5040  for (;; ptr++) Line 5319  for (;; ptr++)
5319                PUT2INC(code, 0, oc->number);                PUT2INC(code, 0, oc->number);
5320                }                }
5321              *code++ = (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;              *code++ = (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
5322    
5323                /* Do not set firstbyte after *ACCEPT */
5324                if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
5325              }              }
5326    
5327            /* Handle other cases with/without an argument */            /* Handle other cases with/without an argument */
# Line 5052  for (;; ptr++) Line 5334  for (;; ptr++)
5334                goto FAILED;                goto FAILED;
5335                }                }
5336              *code = verbs[i].op;              *code = verbs[i].op;
5337              if (*code++ == OP_THEN)              if (*code++ == OP_THEN) cd->external_flags |= PCRE_HASTHEN;
               {  
               PUT(code, 0, code - bcptr->current_branch - 1);  
               code += LINK_SIZE;  
               }  
5338              }              }
5339    
5340            else            else
# Line 5067  for (;; ptr++) Line 5345  for (;; ptr++)
5345                goto FAILED;                goto FAILED;
5346                }                }
5347              *code = verbs[i].op_arg;              *code = verbs[i].op_arg;
5348              if (*code++ == OP_THEN_ARG)              if (*code++ == OP_THEN_ARG) cd->external_flags |= PCRE_HASTHEN;
               {  
               PUT(code, 0, code - bcptr->current_branch - 1);  
               code += LINK_SIZE;  
               }  
5349              *code++ = arglen;              *code++ = arglen;
5350              memcpy(code, arg, arglen);              memcpy(code, arg, IN_UCHARS(arglen));
5351              code += arglen;              code += arglen;
5352              *code++ = 0;              *code++ = 0;
5353              }              }
# Line 5096  for (;; ptr++) Line 5370  for (;; ptr++)
5370        {        {
5371        int i, set, unset, namelen;        int i, set, unset, namelen;
5372        int *optset;        int *optset;
5373        const uschar *name;        const pcre_uchar *name;
5374        uschar *slot;        pcre_uchar *slot;
5375    
5376        switch (*(++ptr))        switch (*(++ptr))
5377          {          {
# Line 5150  for (;; ptr++) Line 5424  for (;; ptr++)
5424            break;            break;
5425    
5426          /* Most other conditions use OP_CREF (a couple change to OP_RREF          /* Most other conditions use OP_CREF (a couple change to OP_RREF
5427          below), and all need to skip 3 bytes at the start of the group. */          below), and all need to skip 1+IMM2_SIZE bytes at the start of the group. */
5428    
5429          code[1+LINK_SIZE] = OP_CREF;          code[1+LINK_SIZE] = OP_CREF;
5430          skipbytes = 3;          skipbytes = 1+IMM2_SIZE;
5431          refsign = -1;          refsign = -1;
5432    
5433          /* Check for a test for recursion in a named group. */          /* Check for a test for recursion in a named group. */
# Line 5249  for (;; ptr++) Line 5523  for (;; ptr++)
5523          slot = cd->name_table;          slot = cd->name_table;
5524          for (i = 0; i < cd->names_found; i++)          for (i = 0; i < cd->names_found; i++)
5525            {            {
5526            if (strncmp((char *)name, (char *)slot+2, namelen) == 0) break;            if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) == 0) break;
5527            slot += cd->name_entry_size;            slot += cd->name_entry_size;
5528            }            }
5529    
# Line 5306  for (;; ptr++) Line 5580  for (;; ptr++)
5580          /* Similarly, check for the (?(DEFINE) "condition", which is always          /* Similarly, check for the (?(DEFINE) "condition", which is always
5581          false. */          false. */
5582    
5583          else if (namelen == 6 && strncmp((char *)name, STRING_DEFINE, 6) == 0)          else if (namelen == 6 && STRNCMP_UC_C8(name, STRING_DEFINE, 6) == 0)
5584            {            {
5585            code[1+LINK_SIZE] = OP_DEF;            code[1+LINK_SIZE] = OP_DEF;
5586            skipbytes = 1;            skipbytes = 1;
# Line 5386  for (;; ptr++) Line 5660  for (;; ptr++)
5660    
5661          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5662          case CHAR_C:                 /* Callout - may be followed by digits; */          case CHAR_C:                 /* Callout - may be followed by digits; */
5663          previous_callout = code;  /* Save for later completion */          previous_callout = code;     /* Save for later completion */
5664          after_manual_callout = 1; /* Skip one item before completing */          after_manual_callout = 1;    /* Skip one item before completing */
5665          *code++ = OP_CALLOUT;          *code++ = OP_CALLOUT;
5666            {            {
5667            int n = 0;            int n = 0;
# Line 5509  for (;; ptr++) Line 5783  for (;; ptr++)
5783                if (crc < 0)                if (crc < 0)
5784                  {                  {
5785                  memmove(slot + cd->name_entry_size, slot,                  memmove(slot + cd->name_entry_size, slot,
5786                    (cd->names_found - i) * cd->name_entry_size);                    IN_UCHARS((cd->names_found - i) * cd->name_entry_size));
5787                  break;                  break;
5788                  }                  }
5789    
# Line 5523  for (;; ptr++) Line 5797  for (;; ptr++)
5797    
5798              if (!dupname)              if (!dupname)
5799                {                {
5800                uschar *cslot = cd->name_table;                pcre_uchar *cslot = cd->name_table;
5801                for (i = 0; i < cd->names_found; i++)                for (i = 0; i < cd->names_found; i++)
5802                  {                  {
5803                  if (cslot != slot)                  if (cslot != slot)
# Line 5540  for (;; ptr++) Line 5814  for (;; ptr++)
5814                }                }
5815    
5816              PUT2(slot, 0, cd->bracount + 1);              PUT2(slot, 0, cd->bracount + 1);
5817              memcpy(slot + 2, name, namelen);              memcpy(slot + 2, name, IN_UCHARS(namelen));
5818              slot[2+namelen] = 0;              slot[2 + namelen] = 0;
5819              }              }
5820            }            }
5821    
# Line 5579  for (;; ptr++) Line 5853  for (;; ptr++)
5853    
5854          if (lengthptr != NULL)          if (lengthptr != NULL)
5855            {            {
5856            const uschar *temp;            const pcre_uchar *temp;
5857    
5858            if (namelen == 0)            if (namelen == 0)
5859              {              {
# Line 5624  for (;; ptr++) Line 5898  for (;; ptr++)
5898            slot = cd->name_table;            slot = cd->name_table;
5899            for (i = 0; i < cd->names_found; i++)            for (i = 0; i < cd->names_found; i++)
5900              {              {
5901              if (strncmp((char *)name, (char *)slot+2, namelen) == 0 &&              if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) == 0 &&
5902                  slot[2+namelen] == 0)                  slot[2+namelen] == 0)
5903                break;                break;
5904              slot += cd->name_entry_size;              slot += cd->name_entry_size;
# Line 5661  for (;; ptr++) Line 5935  for (;; ptr++)
5935          case CHAR_0: case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4:          case CHAR_0: case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4:
5936          case CHAR_5: case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:          case CHAR_5: case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
5937            {            {
5938            const uschar *called;            const pcre_uchar *called;
5939            terminator = CHAR_RIGHT_PARENTHESIS;            terminator = CHAR_RIGHT_PARENTHESIS;
5940    
5941            /* Come here from the \g<...> and \g'...' code (Oniguruma            /* Come here from the \g<...> and \g'...' code (Oniguruma
# Line 5740  for (;; ptr++) Line 6014  for (;; ptr++)
6014              {              {
6015              *code = OP_END;              *code = OP_END;
6016              if (recno != 0)              if (recno != 0)
6017                called = _pcre_find_bracket(cd->start_code, utf8, recno);                called = PRIV(find_bracket)(cd->start_code, utf8, recno);
6018    
6019              /* Forward reference */              /* Forward reference */
6020    
# Line 5894  for (;; ptr++) Line 6168  for (;; ptr++)
6168        NUMBERED_GROUP:        NUMBERED_GROUP:
6169        cd->bracount += 1;        cd->bracount += 1;
6170        PUT2(code, 1+LINK_SIZE, cd->bracount);        PUT2(code, 1+LINK_SIZE, cd->bracount);
6171        skipbytes = 2;        skipbytes = IMM2_SIZE;
6172        }        }
6173    
6174      /* Process nested bracketed regex. Assertions used not to be repeatable,      /* Process nested bracketed regex. Assertions used not to be repeatable,
# Line 5906  for (;; ptr++) Line 6180  for (;; ptr++)
6180      *code = bravalue;      *code = bravalue;
6181      tempcode = code;      tempcode = code;
6182      tempreqvary = cd->req_varyopt;        /* Save value before bracket */      tempreqvary = cd->req_varyopt;        /* Save value before bracket */
6183        tempbracount = cd->bracount;          /* Save value before bracket */
6184      length_prevgroup = 0;                 /* Initialize for pre-compile phase */      length_prevgroup = 0;                 /* Initialize for pre-compile phase */
6185    
6186      if (!compile_regex(      if (!compile_regex(
# Line 5928  for (;; ptr++) Line 6203  for (;; ptr++)
6203           ))           ))
6204        goto FAILED;        goto FAILED;
6205    
6206        /* If this was an atomic group and there are no capturing groups within it,
6207        generate OP_ONCE_NC instead of OP_ONCE. */
6208    
6209        if (bravalue == OP_ONCE && cd->bracount <= tempbracount)
6210          *code = OP_ONCE_NC;
6211    
6212      if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NOT)      if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NOT)
6213        cd->assert_depth -= 1;        cd->assert_depth -= 1;
6214    
6215      /* 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
6216      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.
6217      and any option resetting that may follow it. The pattern pointer (ptr)      The pattern pointer (ptr) is on the bracket.
     is on the bracket. */  
6218    
6219      /* 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
6220      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
6221      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
6222      not be available. */      not be available. */
6223    
6224      if (bravalue == OP_COND && lengthptr == NULL)      if (bravalue == OP_COND && lengthptr == NULL)
6225        {        {
6226        uschar *tc = code;        pcre_uchar *tc = code;
6227        int condcount = 0;        int condcount = 0;
6228    
6229        do {        do {
# Line 6118  for (;; ptr++) Line 6398  for (;; ptr++)
6398    
6399        if (-c == ESC_g)        if (-c == ESC_g)
6400          {          {
6401          const uschar *p;          const pcre_uchar *p;
6402          save_hwm = cd->hwm;   /* Normally this is set when '(' is read */          save_hwm = cd->hwm;   /* Normally this is set when '(' is read */
6403          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
6404            CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;            CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
# Line 6258  for (;; ptr++) Line 6538  for (;; ptr++)
6538            }            }
6539          else          else
6540  #endif  #endif
6541            {          /* In non-UTF-8 mode, we turn \C into OP_ALLANY instead of OP_ANYBYTE
6542            so that it works in DFA mode and in lookbehinds. */
6543    
6544              {
6545            previous = (-c > ESC_b && -c < ESC_Z)? code : NULL;            previous = (-c > ESC_b && -c < ESC_Z)? code : NULL;
6546            *code++ = -c;            *code++ = (!utf8 && c == -ESC_C)? OP_ALLANY : -c;
6547            }            }
6548          }          }
6549        continue;        continue;
# Line 6272  for (;; ptr++) Line 6555  for (;; ptr++)
6555    
6556  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
6557      if (utf8 && c > 127)      if (utf8 && c > 127)
6558        mclength = _pcre_ord2utf8(c, mcbuffer);        mclength = PRIV(ord2utf8)(c, mcbuffer);
6559      else      else
6560  #endif  #endif
6561    
# Line 6335  for (;; ptr++) Line 6618  for (;; ptr++)
6618        else firstbyte = reqbyte = REQ_NONE;        else firstbyte = reqbyte = REQ_NONE;
6619        }        }
6620    
6621      /* 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
6622      1 or the matching is caseful. */      1 or the matching is caseful. */
6623    
6624      else      else
# Line 6394  Returns:         TRUE on success Line 6677  Returns:         TRUE on success
6677  */  */
6678    
6679  static BOOL  static BOOL
6680  compile_regex(int options, uschar **codeptr, const uschar **ptrptr,  compile_regex(int options, pcre_uchar **codeptr, const pcre_uchar **ptrptr,
6681    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
6682    int cond_depth, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,    int cond_depth, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
6683    compile_data *cd, int *lengthptr)    compile_data *cd, int *lengthptr)
6684  {  {
6685  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
6686  uschar *code = *codeptr;  pcre_uchar *code = *codeptr;
6687  uschar *last_branch = code;  pcre_uchar *last_branch = code;
6688  uschar *start_bracket = code;  pcre_uchar *start_bracket = code;
6689  uschar *reverse_count = NULL;  pcre_uchar *reverse_count = NULL;
6690  open_capitem capitem;  open_capitem capitem;
6691  int capnumber = 0;  int capnumber = 0;
6692  int firstbyte, reqbyte;  int firstbyte, reqbyte;
# Line 6552  for (;;) Line 6835  for (;;)
6835          }          }
6836        else if (fixed_length < 0)        else if (fixed_length < 0)
6837          {          {
6838          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;          *errorcodeptr = (fixed_length == -2)? ERR36 :
6839                            (fixed_length == -4)? ERR70: ERR25;
6840          *ptrptr = ptr;          *ptrptr = ptr;
6841          return FALSE;          return FALSE;
6842          }          }
# Line 6597  for (;;) Line 6881  for (;;)
6881        if (cd->open_caps->flag)        if (cd->open_caps->flag)
6882          {          {
6883          memmove(start_bracket + 1 + LINK_SIZE, start_bracket,          memmove(start_bracket + 1 + LINK_SIZE, start_bracket,
6884            code - start_bracket);            IN_UCHARS(code - start_bracket));
6885          *start_bracket = OP_ONCE;          *start_bracket = OP_ONCE;
6886          code += 1 + LINK_SIZE;          code += 1 + LINK_SIZE;
6887          PUT(start_bracket, 1, (int)(code - start_bracket));          PUT(start_bracket, 1, (int)(code - start_bracket));
# Line 6699  Returns:     TRUE or FALSE Line 6983  Returns:     TRUE or FALSE
6983  */  */
6984    
6985  static BOOL  static BOOL
6986  is_anchored(register const uschar *code, unsigned int bracket_map,  is_anchored(register const pcre_uchar *code, unsigned int bracket_map,
6987    unsigned int backref_map)    unsigned int backref_map)
6988  {  {
6989  do {  do {
6990     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],     const pcre_uchar *scode = first_significant_code(
6991       FALSE);       code + PRIV(OP_lengths)[*code], FALSE);
6992     register int op = *scode;     register int op = *scode;
6993    
6994     /* Non-capturing brackets */     /* Non-capturing brackets */
# Line 6727  do { Line 7011  do {
7011    
7012     /* Other brackets */     /* Other brackets */
7013    
7014     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_ONCE_NC ||
7015                op == OP_COND)
7016       {       {
7017       if (!is_anchored(scode, bracket_map, backref_map)) return FALSE;       if (!is_anchored(scode, bracket_map, backref_map)) return FALSE;
7018       }       }
# Line 6775  Returns:         TRUE or FALSE Line 7060  Returns:         TRUE or FALSE
7060  */  */
7061    
7062  static BOOL  static BOOL
7063  is_startline(const uschar *code, unsigned int bracket_map,  is_startline(const pcre_uchar *code, unsigned int bracket_map,
7064    unsigned int backref_map)    unsigned int backref_map)
7065  {  {
7066  do {  do {
7067     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],     const pcre_uchar *scode = first_significant_code(
7068       FALSE);       code + PRIV(OP_lengths)[*code], FALSE);
7069     register int op = *scode;     register int op = *scode;
7070    
7071     /* 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 6791  do { Line 7076  do {
7076     if (op == OP_COND)     if (op == OP_COND)
7077       {       {
7078       scode += 1 + LINK_SIZE;       scode += 1 + LINK_SIZE;
7079       if (*scode == OP_CALLOUT) scode += _pcre_OP_lengths[OP_CALLOUT];       if (*scode == OP_CALLOUT) scode += PRIV(OP_lengths)[OP_CALLOUT];
7080       switch (*scode)       switch (*scode)
7081         {         {
7082         case OP_CREF:         case OP_CREF:
# Line 6831  do { Line 7116  do {
7116    
7117     /* Other brackets */     /* Other brackets */
7118    
7119     else if (op == OP_ASSERT || op == OP_ONCE)     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_ONCE_NC)
7120       {       {
7121       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
7122       }       }
# Line 6878  Returns:     -1 or the fixed first char Line 7163  Returns:     -1 or the fixed first char
7163  */  */
7164    
7165  static int  static int
7166  find_firstassertedchar(const uschar *code, BOOL inassert)  find_firstassertedchar(const pcre_uchar *code, BOOL inassert)
7167  {  {
7168  register int c = -1;  register int c = -1;
7169  do {  do {
7170     int d;     int d;
7171     int xl = (*code == OP_CBRA || *code == OP_SCBRA ||     int xl = (*code == OP_CBRA || *code == OP_SCBRA ||
7172               *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? 2:0;               *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? IMM2_SIZE:0;
7173     const uschar *scode = first_significant_code(code + 1+LINK_SIZE + xl, TRUE);     const pcre_uchar *scode = first_significant_code(code + 1+LINK_SIZE + xl,
7174         TRUE);
7175     register int op = *scode;     register int op = *scode;
7176    
7177     switch(op)     switch(op)
# Line 6901  do { Line 7187  do {
7187       case OP_SCBRAPOS:       case OP_SCBRAPOS:
7188       case OP_ASSERT:       case OP_ASSERT:
7189       case OP_ONCE:       case OP_ONCE:
7190         case OP_ONCE_NC:
7191       case OP_COND:       case OP_COND:
7192       if ((d = find_firstassertedchar(scode, op == OP_ASSERT)) < 0)       if ((d = find_firstassertedchar(scode, op == OP_ASSERT)) < 0)
7193         return -1;         return -1;
# Line 6908  do { Line 7195  do {
7195       break;       break;
7196    
7197       case OP_EXACT:       case OP_EXACT:
7198       scode += 2;       scode += IMM2_SIZE;
7199       /* Fall through */       /* Fall through */
7200    
7201       case OP_CHAR:       case OP_CHAR:
# Line 6921  do { Line 7208  do {
7208       break;       break;
7209    
7210       case OP_EXACTI:       case OP_EXACTI:
7211       scode += 2;       scode += IMM2_SIZE;
7212       /* Fall through */       /* Fall through */
7213    
7214       case OP_CHARI:       case OP_CHARI:
# Line 6964  Returns:        pointer to compiled data Line 7251  Returns:        pointer to compiled data
7251                  with errorptr and erroroffset set                  with errorptr and erroroffset set
7252  */  */
7253    
7254    #ifdef COMPILE_PCRE8
7255  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
7256  pcre_compile(const char *pattern, int options, const char **errorptr,  pcre_compile(const char *pattern, int options, const char **errorptr,
7257    int *erroroffset, const unsigned char *tables)    int *erroroffset, const unsigned char *tables)
7258    #else
7259    PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
7260    pcre16_compile(PCRE_SPTR16 pattern, int options, const char **errorptr,
7261      int *erroroffset, const unsigned char *tables)
7262    #endif
7263  {  {
7264    #ifdef COMPILE_PCRE8
7265  return pcre_compile2(pattern, options, NULL, errorptr, erroroffset, tables);  return pcre_compile2(pattern, options, NULL, errorptr, erroroffset, tables);
7266    #else
7267    return pcre16_compile2(pattern, options, NULL, errorptr, erroroffset, tables);
7268    #endif
7269  }  }
7270    
7271    
7272    #ifdef COMPILE_PCRE8
7273  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
7274  pcre_compile2(const char *pattern, int options, int *errorcodeptr,  pcre_compile2(const char *pattern, int options, int *errorcodeptr,
7275    const char **errorptr, int *erroroffset, const unsigned char *tables)    const char **errorptr, int *erroroffset, const unsigned char *tables)
7276    #else
7277    PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
7278    pcre16_compile2(PCRE_SPTR16 pattern, int options, int *errorcodeptr,
7279      const char **errorptr, int *erroroffset, const unsigned char *tables)
7280    #endif
7281  {  {
7282  real_pcre *re;  real_pcre *re;
7283  int length = 1;  /* For final END opcode */  int length = 1;  /* For final END opcode */
# Line 6983  int errorcode = 0; Line 7286  int errorcode = 0;
7286  int skipatstart = 0;  int skipatstart = 0;
7287  BOOL utf8;  BOOL utf8;
7288  size_t size;  size_t size;
7289  uschar *code;  pcre_uchar *code;
7290  const uschar *codestart;  const pcre_uchar *codestart;
7291  const uschar *ptr;  const pcre_uchar *ptr;
7292  compile_data compile_block;  compile_data compile_block;
7293  compile_data *cd = &compile_block;  compile_data *cd = &compile_block;
7294    
# Line 6995  as soon as possible, so that a fairly la Line 7298  as soon as possible, so that a fairly la
7298  this purpose. The same space is used in the second phase for remembering where  this purpose. The same space is used in the second phase for remembering where
7299  to fill in forward references to subpatterns. */  to fill in forward references to subpatterns. */
7300    
7301  uschar cworkspace[COMPILE_WORK_SIZE];  pcre_uchar cworkspace[COMPILE_WORK_SIZE];
7302    
7303  /* Set this early so that early errors get offset 0. */  /* Set this early so that early errors get offset 0. */
7304    
7305  ptr = (const uschar *)pattern;  ptr = (const pcre_uchar *)pattern;
7306    
7307  /* We can't pass back an error message if errorptr is NULL; I guess the best we  /* We can't pass back an error message if errorptr is NULL; I guess the best we
7308  can do is just return NULL, but we can set a code value if there is a code  can do is just return NULL, but we can set a code value if there is a code
# Line 7026  if (erroroffset == NULL) Line 7329  if (erroroffset == NULL)
7329    
7330  /* Set up pointers to the individual character tables */  /* Set up pointers to the individual character tables */
7331    
7332  if (tables == NULL) tables = _pcre_default_tables;  if (tables == NULL) tables = PRIV(default_tables);
7333  cd->lcc = tables + lcc_offset;  cd->lcc = tables + lcc_offset;
7334  cd->fcc = tables + fcc_offset;  cd->fcc = tables + fcc_offset;
7335  cd->cbits = tables + cbits_offset;  cd->cbits = tables + cbits_offset;
# Line 7049  while (ptr[skipatstart] == CHAR_LEFT_PAR Line 7352  while (ptr[skipatstart] == CHAR_LEFT_PAR
7352    int newnl = 0;    int newnl = 0;
7353    int newbsr = 0;    int newbsr = 0;
7354    
7355    if (strncmp((char *)(ptr+skipatstart+2), STRING_UTF8_RIGHTPAR, 5) == 0)    if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UTF8_RIGHTPAR, 5) == 0)
7356      { skipatstart += 7; options |= PCRE_UTF8; continue; }      { skipatstart += 7; options |= PCRE_UTF8; continue; }
7357    else if (strncmp((char *)(ptr+skipatstart+2), STRING_UCP_RIGHTPAR, 4) == 0)    else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UCP_RIGHTPAR, 4) == 0)
7358      { skipatstart += 6; options |= PCRE_UCP; continue; }      { skipatstart += 6; options |= PCRE_UCP; continue; }
7359    else if (strncmp((char *)(ptr+skipatstart+2), STRING_NO_START_OPT_RIGHTPAR, 13) == 0)    else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_NO_START_OPT_RIGHTPAR, 13) == 0)
7360      { skipatstart += 15; options |= PCRE_NO_START_OPTIMIZE; continue; }      { skipatstart += 15; options |= PCRE_NO_START_OPTIMIZE; continue; }
7361    
7362    if (strncmp((char *)(ptr+skipatstart+2), STRING_CR_RIGHTPAR, 3) == 0)    if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_CR_RIGHTPAR, 3) == 0)
7363      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
7364    else if (strncmp((char *)(ptr+skipatstart+2), STRING_LF_RIGHTPAR, 3)  == 0)    else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_LF_RIGHTPAR, 3)  == 0)
7365      { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }      { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
7366    else if (strncmp((char *)(ptr+skipatstart+2), STRING_CRLF_RIGHTPAR, 5)  == 0)    else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_CRLF_RIGHTPAR, 5)  == 0)
7367      { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }      { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
7368    else if (strncmp((char *)(ptr+skipatstart+2), STRING_ANY_RIGHTPAR, 4) == 0)    else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_ANY_RIGHTPAR, 4) == 0)
7369      { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }      { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
7370    else if (strncmp((char *)(ptr+skipatstart+2), STRING_ANYCRLF_RIGHTPAR, 8) == 0)    else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_ANYCRLF_RIGHTPAR, 8) == 0)
7371      { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }      { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
7372    
7373    else if (strncmp((char *)(ptr+skipatstart+2), STRING_BSR_ANYCRLF_RIGHTPAR, 12) == 0)    else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_BSR_ANYCRLF_RIGHTPAR, 12) == 0)
7374      { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }      { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
7375    else if (strncmp((char *)(ptr+skipatstart+2), STRING_BSR_UNICODE_RIGHTPAR, 12) == 0)    else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_BSR_UNICODE_RIGHTPAR, 12) == 0)
7376      { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }      { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
7377    
7378    if (newnl != 0)    if (newnl != 0)
# Line 7082  while (ptr[skipatstart] == CHAR_LEFT_PAR Line 7385  while (ptr[skipatstart] == CHAR_LEFT_PAR
7385  utf8 = (options & PCRE_UTF8) != 0;  utf8 = (options & PCRE_UTF8) != 0;
7386    
7387  /* Can't support UTF8 unless PCRE has been compiled to include the code. The  /* Can't support UTF8 unless PCRE has been compiled to include the code. The
7388  return of an error code from _pcre_valid_utf8() is a new feature, introduced in  return of an error code from PRIV(valid_utf8)() is a new feature, introduced in
7389  release 8.13. It is passed back from pcre_[dfa_]exec(), but at the moment is  release 8.13. It is passed back from pcre_[dfa_]exec(), but at the moment is
7390  not used here. */  not used here. */
7391    
7392  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
7393  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&
7394       (errorcode = _pcre_valid_utf8((USPTR)pattern, -1, erroroffset)) != 0)       (errorcode = PRIV(valid_utf8)((PCRE_PUCHAR)pattern, -1, erroroffset)) != 0)
7395    {    {
7396    errorcode = ERR44;    errorcode = ERR44;
7397    goto PCRE_EARLY_ERROR_RETURN2;    goto PCRE_EARLY_ERROR_RETURN2;
# Line 7170  cd->backref_map = 0; Line 7473  cd->backref_map = 0;
7473  /* Reflect pattern for debugging output */  /* Reflect pattern for debugging output */
7474    
7475  DPRINTF(("------------------------------------------------------------------\n"));  DPRINTF(("------------------------------------------------------------------\n"));
7476  DPRINTF(("%s\n", pattern));  #ifdef PCRE_DEBUG
7477    print_puchar(stdout, (PCRE_PUCHAR)pattern);
7478    #endif
7479    DPRINTF(("\n"));
7480    
7481  /* Pretend to compile the pattern while actually just accumulating the length  /* Pretend to compile the pattern while actually just accumulating the length
7482  of memory required. This behaviour is triggered by passing a non-NULL final  of memory required. This behaviour is triggered by passing a non-NULL final
# Line 7186  cd->name_table = NULL; Line 7492  cd->name_table = NULL;
7492  cd->start_workspace = cworkspace;  cd->start_workspace = cworkspace;
7493  cd->start_code = cworkspace;  cd->start_code = cworkspace;
7494  cd->hwm = cworkspace;  cd->hwm = cworkspace;
7495  cd->start_pattern = (const uschar *)pattern;  cd->start_pattern = (const pcre_uchar *)pattern;
7496  cd->end_pattern = (const uschar *)(pattern + strlen(pattern));  cd->end_pattern = (const pcre_uchar *)(pattern + STRLEN_UC((const pcre_uchar *)pattern));
7497  cd->req_varyopt = 0;  cd->req_varyopt = 0;
7498  cd->external_options = options;  cd->external_options = options;
7499  cd->external_flags = 0;  cd->external_flags = 0;
# Line 7207  code = cworkspace; Line 7513  code = cworkspace;
7513  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
7514    
7515  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
7516    cd->hwm - cworkspace));    (int)(cd->hwm - cworkspace)));
7517    
7518  if (length > MAX_PATTERN_SIZE)  if (length > MAX_PATTERN_SIZE)
7519    {    {
# Line 7220  externally provided function. Integer ov Line 7526  externally provided function. Integer ov
7526  because nowadays we limit the maximum value of cd->names_found and  because nowadays we limit the maximum value of cd->names_found and
7527  cd->name_entry_size. */  cd->name_entry_size. */
7528    
7529  size = length + sizeof(real_pcre) + cd->names_found * (cd->name_entry_size + 3);  size = sizeof(real_pcre) + (length + cd->names_found * (cd->name_entry_size + 3)) * sizeof(pcre_uchar);
7530  re = (real_pcre *)(pcre_malloc)(size);  re = (real_pcre *)(pcre_malloc)(size);
7531    
7532  if (re == NULL)  if (re == NULL)
# Line 7242  re->flags = cd->external_flags; Line 7548  re->flags = cd->external_flags;
7548  re->dummy1 = 0;  re->dummy1 = 0;
7549  re->first_byte = 0;  re->first_byte = 0;
7550  re->req_byte = 0;  re->req_byte = 0;
7551  re->name_table_offset = sizeof(real_pcre);  re->name_table_offset = sizeof(real_pcre) / sizeof(pcre_uchar);
7552  re->name_entry_size = cd->name_entry_size;  re->name_entry_size = cd->name_entry_size;
7553  re->name_count = cd->names_found;  re->name_count = cd->names_found;
7554  re->ref_count = 0;  re->ref_count = 0;
7555  re->tables = (tables == _pcre_default_tables)? NULL : tables;  re->tables = (tables == PRIV(default_tables))? NULL : tables;
7556  re->nullpad = NULL;  re->nullpad = NULL;
7557    
7558  /* The starting points of the name/number translation table and of the code are  /* The starting points of the name/number translation table and of the code are
# Line 7260  cd->final_bracount = cd->bracount;  /* S Line 7566  cd->final_bracount = cd->bracount;  /* S
7566  cd->assert_depth = 0;  cd->assert_depth = 0;
7567  cd->bracount = 0;  cd->bracount = 0;
7568  cd->names_found = 0;  cd->names_found = 0;
7569  cd->name_table = (uschar *)re + re->name_table_offset;  cd->name_table = (pcre_uchar *)re + re->name_table_offset;
7570  codestart = cd->name_table + re->name_entry_size * re->name_count;  codestart = cd->name_table + re->name_entry_size * re->name_count;
7571  cd->start_code = codestart;  cd->start_code = codestart;
7572  cd->hwm = cworkspace;  cd->hwm = cworkspace;
# Line 7273  cd->open_caps = NULL; Line 7579  cd->open_caps = NULL;
7579  error, errorcode will be set non-zero, so we don't need to look at the result  error, errorcode will be set non-zero, so we don't need to look at the result
7580  of the function here. */  of the function here. */
7581    
7582  ptr = (const uschar *)pattern + skipatstart;  ptr = (const pcre_uchar *)pattern + skipatstart;
7583  code = (uschar *)codestart;  code = (pcre_uchar *)codestart;
7584  *code = OP_BRA;  *code = OP_BRA;
7585  (void)compile_regex(re->options, &code, &ptr, &errorcode, FALSE, FALSE, 0, 0,  (void)compile_regex(re->options, &code, &ptr, &errorcode, FALSE, FALSE, 0, 0,
7586    &firstbyte, &reqbyte, NULL, cd, NULL);    &firstbyte, &reqbyte, NULL, cd, NULL);
# Line 7282  re->top_bracket = cd->bracount; Line 7588  re->top_bracket = cd->bracount;
7588  re->top_backref = cd->top_backref;  re->top_backref = cd->top_backref;
7589  re->flags = cd->external_flags;  re->flags = cd->external_flags;
7590    
7591  if (cd->had_accept) reqbyte = -1;   /* Must disable after (*ACCEPT) */  if (cd->had_accept) reqbyte = REQ_NONE;   /* Must disable after (*ACCEPT) */
7592    
7593  /* 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. */
7594    
# Line 7302  if (code - codestart > length) errorcode Line 7608  if (code - codestart > length) errorcode
7608  while (errorcode == 0 && cd->hwm > cworkspace)  while (errorcode == 0 && cd->hwm > cworkspace)
7609    {    {
7610    int offset, recno;    int offset, recno;
7611    const uschar *groupptr;    const pcre_uchar *groupptr;
7612    cd->hwm -= LINK_SIZE;    cd->hwm -= LINK_SIZE;
7613    offset = GET(cd->hwm, 0);    offset = GET(cd->hwm, 0);
7614    recno = GET(codestart, offset);    recno = GET(codestart, offset);
7615    groupptr = _pcre_find_bracket(codestart, utf8, recno);    groupptr = PRIV(find_bracket)(codestart, utf8, recno);
7616    if (groupptr == NULL) errorcode = ERR53;    if (groupptr == NULL) errorcode = ERR53;
7617      else PUT(((uschar *)codestart), offset, (int)(groupptr - codestart));      else PUT(((pcre_uchar *)codestart), offset, (int)(groupptr - codestart));
7618    }    }
7619    
7620  /* 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 7326  length, and set their lengths. */ Line 7632  length, and set their lengths. */
7632    
7633  if (cd->check_lookbehind)  if (cd->check_lookbehind)
7634    {    {
7635    uschar *cc = (uschar *)codestart;    pcre_uchar *cc = (pcre_uchar *)codestart;
7636    
7637    /* Loop, searching for OP_REVERSE items, and process those that do not have    /* Loop, searching for OP_REVERSE items, and process those that do not have
7638    their length set. (Actually, it will also re-process any that have a length    their length set. (Actually, it will also re-process any that have a length
7639    of zero, but that is a pathological case, and it does no harm.) When we find    of zero, but that is a pathological case, and it does no harm.) When we find
7640    one, we temporarily terminate the branch it is in while we scan it. */    one, we temporarily terminate the branch it is in while we scan it. */
7641    
7642    for (cc = (uschar *)_pcre_find_bracket(codestart, utf8, -1);    for (cc = (pcre_uchar *)PRIV(find_bracket)(codestart, utf8, -1);
7643         cc != NULL;         cc != NULL;
7644         cc = (uschar *)_pcre_find_bracket(cc, utf8, -1))         cc = (pcre_uchar *)PRIV(find_bracket)(cc, utf8, -1))
7645      {      {
7646      if (GET(cc, 1) == 0)      if (GET(cc, 1) == 0)
7647        {        {
7648        int fixed_length;        int fixed_length;
7649        uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);        pcre_uchar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);
7650        int end_op = *be;        int end_op = *be;
7651        *be = OP_END;        *be = OP_END;
7652        fixed_length = find_fixedlength(cc, (re->options & PCRE_UTF8) != 0, TRUE,        fixed_length = find_fixedlength(cc, (re->options & PCRE_UTF8) != 0, TRUE,
# Line 7349  if (cd->check_lookbehind) Line 7655  if (cd->check_lookbehind)
7655        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
7656        if (fixed_length < 0)        if (fixed_length < 0)
7657          {          {
7658          errorcode = (fixed_length == -2)? ERR36 : ERR25;          errorcode = (fixed_length == -2)? ERR36 :
7659                        (fixed_length == -4)? ERR70 : ERR25;
7660          break;          break;
7661          }          }
7662        PUT(cc, 1, fixed_length);        PUT(cc, 1, fixed_length);
# Line 7364  if (errorcode != 0) Line 7671  if (errorcode != 0)
7671    {    {
7672    (pcre_free)(re);    (pcre_free)(re);
7673    PCRE_EARLY_ERROR_RETURN:    PCRE_EARLY_ERROR_RETURN:
7674    *erroroffset = (int)(ptr - (const uschar *)pattern);    *erroroffset = (int)(ptr - (const pcre_uchar *)pattern);
7675    PCRE_EARLY_ERROR_RETURN2:    PCRE_EARLY_ERROR_RETURN2:
7676    *errorptr = find_error_text(errorcode);    *errorptr = find_error_text(errorcode);
7677    if (errorcodeptr != NULL) *errorcodeptr = errorcode;    if (errorcodeptr != NULL) *errorcodeptr = errorcode;
# Line 7450  if (code - codestart > length) Line 7757  if (code - codestart > length)
7757    {    {
7758    (pcre_free)(re);    (pcre_free)(re);
7759    *errorptr = find_error_text(ERR23);    *errorptr = find_error_text(ERR23);
7760    *erroroffset = ptr - (uschar *)pattern;    *erroroffset = ptr - (pcre_uchar *)pattern;
7761    if (errorcodeptr != NULL) *errorcodeptr = ERR23;    if (errorcodeptr != NULL) *errorcodeptr = ERR23;
7762    return NULL;    return NULL;
7763    }    }

Legend:
Removed from v.654  
changed lines
  Added in v.769

  ViewVC Help
Powered by ViewVC 1.1.5