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

Diff of /code/trunk/pcre_compile.c

Parent Directory | Revision Log | View Patch Patch

-revision 708 by ph10,
Fri Sep 23 11:03:03 2011 UTC
+revision 849 by ph10,
Wed Jan  4 17:02:01 2012 UTC
 Line 6
  and semantics are as close as possible to those of the Perl 5 language.
                         Written by Philip Hazel
-            Copyright (c) 1997-2011 University of Cambridge
+            Copyright (c) 1997-2012 University of Cambridge
  -----------------------------------------------------------------------------
  Redistribution and use in source and binary forms, with or without
 Line 53 
 supporting internal functions that are n
  #include "pcre_internal.h"
- /* When PCRE_DEBUG is defined, we need the pcre_printint() function, which is
+ /* When PCRE_DEBUG is defined, we need the pcre(16)_printint() function, which
- also used by pcretest. PCRE_DEBUG is not defined when building a production
+ is also used by pcretest. PCRE_DEBUG is not defined when building a production
- library. */
+ library. We do not need to select pcre16_printint.c specially, because the
+ COMPILE_PCREx macro will already be appropriately set. */
  #ifdef PCRE_DEBUG
- #include "pcre_printint.src"
+ /* pcre_printint.c should not include any headers */
+ #define PCRE_INCLUDED
+ #include "pcre_printint.c"
+ #undef PCRE_INCLUDED
  #endif
-Line 88 
 so this number is very generous.
+Line 92 
 so this number is very generous.
  The same workspace is used during the second, actual compile phase for
  remembering forward references to groups so that they can be filled in at the
  end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE
- is 4 there is plenty of room. */
+ is 4 there is plenty of room for most patterns. However, the memory can get
+ filled up by repetitions of forward references, for example patterns like
+ /(?1){0,1999}(b)/, and one user did hit the limit. The code has been changed so
+ that the workspace is expanded using malloc() in this situation. The value
+ below is therefore a minimum, and we put a maximum on it for safety. The
+ minimum is now also defined in terms of LINK_SIZE so that the use of malloc()
+ kicks in at the same number of forward references in all cases. */
- #define COMPILE_WORK_SIZE (4096)
+ #define COMPILE_WORK_SIZE (2048*LINK_SIZE)
+ #define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)
  /* The overrun tests check for a slightly smaller size so that they detect the
  overrun before it actually does run off the end of the data block. */
- #define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100)
+ #define WORK_SIZE_SAFETY_MARGIN (100)
+ /* Private flags added to firstchar and reqchar. */
+ #define REQ_CASELESS   0x10000000l      /* Indicates caselessness */
+ #define REQ_VARY       0x20000000l      /* Reqchar followed non-literal item */
+ /* Repeated character flags. */
+ #define UTF_LENGTH     0x10000000l      /* The char contains its length. */
  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
  are simple data values; negative values are for special things like \d and so
-Line 231 
 static const char posix_names[] =
+Line 250 
 static const char posix_names[] =
    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
    STRING_word0  STRING_xdigit;
- static const uschar posix_name_lengths[] = {
+ static const pcre_uint8 posix_name_lengths[] = {
 , 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
  /* 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 285 
 substitutes must be in the order of the
  both positive and negative cases. NULL means no substitute. */
  #ifdef SUPPORT_UCP
- static const uschar *substitutes[] = {
+ static const pcre_uchar string_PNd[]  = {
-   (uschar *)"\\P{Nd}",    /* \D */
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-   (uschar *)"\\p{Nd}",    /* \d */
+   CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-   (uschar *)"\\P{Xsp}",   /* \S */       /* NOTE: Xsp is Perl space */
+ static const pcre_uchar string_pNd[]  = {
-   (uschar *)"\\p{Xsp}",   /* \s */
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-   (uschar *)"\\P{Xwd}",   /* \W */
+   CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-   (uschar *)"\\p{Xwd}"    /* \w */
+ static const pcre_uchar string_PXsp[] = {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_pXsp[] = {
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_PXwd[] = {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_pXwd[] = {
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar *substitutes[] = {
+   string_PNd,           /* \D */
+   string_pNd,           /* \d */
+   string_PXsp,          /* \S */       /* NOTE: Xsp is Perl space */
+   string_pXsp,          /* \s */
+   string_PXwd,          /* \W */
+   string_pXwd           /* \w */
  };
- static const uschar *posix_substitutes[] = {
+ static const pcre_uchar string_pL[] =   {
-   (uschar *)"\\p{L}",     /* alpha */
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-   (uschar *)"\\p{Ll}",    /* lower */
+   CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-   (uschar *)"\\p{Lu}",    /* upper */
+ static const pcre_uchar string_pLl[] =  {
-   (uschar *)"\\p{Xan}",   /* alnum */
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-   NULL,                   /* ascii */
+   CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-   (uschar *)"\\h",        /* blank */
+ static const pcre_uchar string_pLu[] =  {
-   NULL,                   /* cntrl */
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-   (uschar *)"\\p{Nd}",    /* digit */
+   CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-   NULL,                   /* graph */
+ static const pcre_uchar string_pXan[] = {
-   NULL,                   /* print */
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-   NULL,                   /* punct */
+   CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-   (uschar *)"\\p{Xps}",   /* space */    /* NOTE: Xps is POSIX space */
+ static const pcre_uchar string_h[] =    {
-   (uschar *)"\\p{Xwd}",   /* word */
+   CHAR_BACKSLASH, CHAR_h, '\0' };
-   NULL,                   /* xdigit */
+ static const pcre_uchar string_pXps[] = {
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_PL[] =   {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_PLl[] =  {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_PLu[] =  {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_PXan[] = {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_H[] =    {
+   CHAR_BACKSLASH, CHAR_H, '\0' };
+ static const pcre_uchar string_PXps[] = {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar *posix_substitutes[] = {
+   string_pL,            /* alpha */
+   string_pLl,           /* lower */
+   string_pLu,           /* upper */
+   string_pXan,          /* alnum */
+   NULL,                 /* ascii */
+   string_h,             /* blank */
+   NULL,                 /* cntrl */
+   string_pNd,           /* digit */
+   NULL,                 /* graph */
+   NULL,                 /* print */
+   NULL,                 /* punct */
+   string_pXps,          /* space */    /* NOTE: Xps is POSIX space */
+   string_pXwd,          /* word */
+   NULL,                 /* xdigit */
    /* Negated cases */
-   (uschar *)"\\P{L}",     /* ^alpha */
+   string_PL,            /* ^alpha */
-   (uschar *)"\\P{Ll}",    /* ^lower */
+   string_PLl,           /* ^lower */
-   (uschar *)"\\P{Lu}",    /* ^upper */
+   string_PLu,           /* ^upper */
-   (uschar *)"\\P{Xan}",   /* ^alnum */
+   string_PXan,          /* ^alnum */
-   NULL,                   /* ^ascii */
+   NULL,                 /* ^ascii */
-   (uschar *)"\\H",        /* ^blank */
+   string_H,             /* ^blank */
-   NULL,                   /* ^cntrl */
+   NULL,                 /* ^cntrl */
-   (uschar *)"\\P{Nd}",    /* ^digit */
+   string_PNd,           /* ^digit */
-   NULL,                   /* ^graph */
+   NULL,                 /* ^graph */
-   NULL,                   /* ^print */
+   NULL,                 /* ^print */
-   NULL,                   /* ^punct */
+   NULL,                 /* ^punct */
-   (uschar *)"\\P{Xps}",   /* ^space */   /* NOTE: Xps is POSIX space */
+   string_PXps,          /* ^space */   /* NOTE: Xps is POSIX space */
-   (uschar *)"\\P{Xwd}",   /* ^word */
+   string_PXwd,          /* ^word */
-   NULL                    /* ^xdigit */
+   NULL                  /* ^xdigit */
  };
- #define POSIX_SUBSIZE (sizeof(posix_substitutes)/sizeof(uschar *))
+ #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
  #endif
  #define STRING(a)  # a
-Line 365 
 static const char error_texts[] =
+Line 438 
 static const char error_texts[] =
    /* 30 */
    "unknown POSIX class name\0"
    "POSIX collating elements are not supported\0"
-   "this version of PCRE is not compiled with PCRE_UTF8 support\0"
+   "this version of PCRE is compiled without UTF support\0"
    "spare error\0"  /** DEAD **/
    "character value in \\x{...} sequence is too large\0"
    /* 35 */
-Line 388 
 static const char error_texts[] =
+Line 461 
 static const char error_texts[] =
    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
    /* 50 */
    "repeated subpattern is too long\0"    /** DEAD **/
-   "octal value is greater than \\377 (not in UTF-8 mode)\0"
+   "octal value is greater than \\377 in 8-bit non-UTF-8 mode\0"
    "internal error: overran compiling workspace\0"
    "internal error: previously-checked referenced subpattern not found\0"
    "DEFINE group contains more than one branch\0"
-Line 407 
 static const char error_texts[] =
+Line 480 
 static const char error_texts[] =
    /* 65 */
    "different names for subpatterns of the same number are not allowed\0"
    "(*MARK) must have an argument\0"
-   "this version of PCRE is not compiled with PCRE_UCP support\0"
+   "this version of PCRE is not compiled with Unicode property support\0"
    "\\c must be followed by an ASCII character\0"
    "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
+   /* 70 */
+   "internal error: unknown opcode in find_fixedlength()\0"
+   "\\N is not supported in a class\0"
+   "too many forward references\0"
+   "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
+   "invalid UTF-16 string\0"
    ;
  /* Table to identify digits and hex digits. This is used when compiling
-Line 428 
 For convenience, we use the same bit def
+Line 507 
 For convenience, we use the same bit def
  Then we can use ctype_digit and ctype_xdigit in the code. */
+ /* Using a simple comparison for decimal numbers rather than a memory read
+ is much faster, and the resulting code is simpler (the compiler turns it
+ into a subtraction and unsigned comparison). */
+ #define IS_DIGIT(x) ((x) >= CHAR_0 && (x) <= CHAR_9)
  #ifndef EBCDIC
  /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
  UTF-8 mode. */
- static const unsigned char digitab[] =
+ static const pcre_uint8 digitab[] =
    {
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */
-Line 472 
 static const unsigned char digitab[] =
+Line 557 
 static const unsigned char digitab[] =
  /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
- static const unsigned char digitab[] =
+ static const pcre_uint8 digitab[] =
    {
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */
-Line 507 
 static const unsigned char digitab[] =
+Line 592 
 static const unsigned char digitab[] =
 x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */
 x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */
- static const unsigned char ebcdic_chartab[] = { /* chartable partial dup */
+ static const pcre_uint8 ebcdic_chartab[] = { /* chartable partial dup */
 x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */
 x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
 x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */
-Line 546 
 static const unsigned char ebcdic_charta
+Line 631 
 static const unsigned char ebcdic_charta
  /* Definition to allow mutual recursion */
  static BOOL
-   compile_regex(int, uschar **, const uschar **, int *, BOOL, BOOL, int, int,
+   compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,
      int *, int *, branch_chain *, compile_data *, int *);
-Line 578 
 return s;
+Line 663 
 return s;
  /*************************************************
+ *           Expand the workspace                 *
+ *************************************************/
+ /* This function is called during the second compiling phase, if the number of
+ forward references fills the existing workspace, which is originally a block on
+ the stack. A larger block is obtained from malloc() unless the ultimate limit
+ has been reached or the increase will be rather small.
+ Argument: pointer to the compile data block
+ Returns:  0 if all went well, else an error number
+ */
+ static int
+ expand_workspace(compile_data *cd)
+ {
+ pcre_uchar *newspace;
+ int newsize = cd->workspace_size * 2;
+ if (newsize > COMPILE_WORK_SIZE_MAX) newsize = COMPILE_WORK_SIZE_MAX;
+ if (cd->workspace_size >= COMPILE_WORK_SIZE_MAX ||
+     newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)
+  return ERR72;
+ newspace = (PUBL(malloc))(IN_UCHARS(newsize));
+ if (newspace == NULL) return ERR21;
+ memcpy(newspace, cd->start_workspace, cd->workspace_size * sizeof(pcre_uchar));
+ cd->hwm = (pcre_uchar *)newspace + (cd->hwm - cd->start_workspace);
+ if (cd->workspace_size > COMPILE_WORK_SIZE)
+   (PUBL(free))((void *)cd->start_workspace);
+ cd->start_workspace = newspace;
+ cd->workspace_size = newsize;
+ return 0;
+ }
+ /*************************************************
  *            Check for counted repeat            *
  *************************************************/
-Line 593 
 Returns:    TRUE or FALSE
+Line 715 
 Returns:    TRUE or FALSE
  */
  static BOOL
- is_counted_repeat(const uschar *p)
+ is_counted_repeat(const pcre_uchar *p)
  {
- if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
+ if (!IS_DIGIT(*p)) return FALSE;
- while ((digitab[*p] & ctype_digit) != 0) p++;
+ p++;
+ while (IS_DIGIT(*p)) p++;
  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
  if (*p++ != CHAR_COMMA) return FALSE;
  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
- if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
+ if (!IS_DIGIT(*p)) return FALSE;
- while ((digitab[*p] & ctype_digit) != 0) p++;
+ p++;
+ while (IS_DIGIT(*p)) p++;
  return (*p == CHAR_RIGHT_CURLY_BRACKET);
  }
-Line 635 
 Returns:         zero or positive => a d
+Line 759 
 Returns:         zero or positive => a d
  */
  static int
- check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,
+ check_escape(const pcre_uchar **ptrptr, int *errorcodeptr, int bracount,
    int options, BOOL isclass)
  {
- BOOL utf8 = (options & PCRE_UTF8) != 0;
+ /* PCRE_UTF16 has the same value as PCRE_UTF8. */
- const uschar *ptr = *ptrptr + 1;
+ BOOL utf = (options & PCRE_UTF8) != 0;
- int c, i;
+ const pcre_uchar *ptr = *ptrptr + 1;
+ pcre_int32 c;
+ int i;
  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
  ptr--;                            /* Set pointer back to the last byte */
-Line 654 
 in a table. A non-zero result is somethi
+Line 780 
 in a table. A non-zero result is somethi
  Otherwise further processing may be required. */
  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
- else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */
+ /* Not alphanumeric */
+ else if (c < CHAR_0 || c > CHAR_z) {}
  else if ((i = escapes[c - CHAR_0]) != 0) c = i;
  #else           /* EBCDIC coding */
- else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
+ /* Not alphanumeric */
+ else if (c < 'a' || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}
  else if ((i = escapes[c - 0x48]) != 0)  c = i;
  #endif
-Line 666 
 else if ((i = escapes[c - 0x48]) != 0)
+Line 794 
 else if ((i = escapes[c - 0x48]) != 0)
  else
    {
-   const uschar *oldptr;
+   const pcre_uchar *oldptr;
    BOOL braced, negated;
    switch (c)
-Line 676 
 else
+Line 804 
 else
      case CHAR_l:
      case CHAR_L:
+     *errorcodeptr = ERR37;
+     break;
      case CHAR_u:
+     if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
+       {
+       /* In JavaScript, \u must be followed by four hexadecimal numbers.
+       Otherwise it is a lowercase u letter. */
+       if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
+         && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0
+         && MAX_255(ptr[3]) && (digitab[ptr[3]] & ctype_xdigit) != 0
+         && MAX_255(ptr[4]) && (digitab[ptr[4]] & ctype_xdigit) != 0)
+         {
+         c = 0;
+         for (i = 0; i < 4; ++i)
+           {
+           register int cc = *(++ptr);
+ #ifndef EBCDIC  /* ASCII/UTF-8 coding */
+           if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
+           c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
+ #else           /* EBCDIC coding */
+           if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
+           c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
+ #endif
+           }
+         }
+       }
+     else
+       *errorcodeptr = ERR37;
+     break;
      case CHAR_U:
-     *errorcodeptr = ERR37;
+     /* In JavaScript, \U is an uppercase U letter. */
+     if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
      break;
      /* In a character class, \g is just a literal "g". Outside a character
-Line 710 
 else
+Line 869 
 else
      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
        {
-       const uschar *p;
+       const pcre_uchar *p;
        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
-         if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;
+         if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
          {
          c = -ESC_k;
-Line 730 
 else
+Line 889 
 else
        }
      else negated = FALSE;
+     /* The integer range is limited by the machine's int representation. */
      c = 0;
-     while ((digitab[ptr[1]] & ctype_digit) != 0)
+     while (IS_DIGIT(ptr[1]))
+       {
+       if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */
+         {
+         c = -1;
+         break;
+         }
        c = c * 10 + *(++ptr) - CHAR_0;
+       }
-     if (c < 0)   /* Integer overflow */
+     if (((unsigned int)c) > INT_MAX) /* Integer overflow */
        {
+       while (IS_DIGIT(ptr[1]))
+         ptr++;
        *errorcodeptr = ERR61;
        break;
        }
-Line 783 
 else
+Line 951 
 else
      if (!isclass)
        {
        oldptr = ptr;
+       /* The integer range is limited by the machine's int representation. */
        c -= CHAR_0;
-       while ((digitab[ptr[1]] & ctype_digit) != 0)
+       while (IS_DIGIT(ptr[1]))
+         {
+         if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */
+           {
+           c = -1;
+           break;
+           }
          c = c * 10 + *(++ptr) - CHAR_0;
-       if (c < 0)    /* Integer overflow */
+         }
+       if (((unsigned int)c) > INT_MAX) /* Integer overflow */
          {
+         while (IS_DIGIT(ptr[1]))
+           ptr++;
          *errorcodeptr = ERR61;
          break;
          }
-Line 813 
 else
+Line 991 
 else
      /* \0 always starts an octal number, but we may drop through to here with a
      larger first octal digit. The original code used just to take the least
      significant 8 bits of octal numbers (I think this is what early Perls used
-     to do). Nowadays we allow for larger numbers in UTF-8 mode, but no more
+     to do). Nowadays we allow for larger numbers in UTF-8 mode and 16-bit mode,
-     than 3 octal digits. */
+     but no more than 3 octal digits. */
      case CHAR_0:
      c -= CHAR_0;
      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
          c = c * 8 + *(++ptr) - CHAR_0;
-     if (!utf8 && c > 255) *errorcodeptr = ERR51;
+ #ifdef COMPILE_PCRE8
+     if (!utf && c > 0xff) *errorcodeptr = ERR51;
+ #endif
      break;
      /* \x is complicated. \x{ddd} is a character number which can be greater
-     than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is
+     than 0xff in utf or non-8bit mode, but only if the ddd are hex digits.
-     treated as a data character. */
+     If not, { is treated as a data character. */
      case CHAR_x:
+     if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
+       {
+       /* In JavaScript, \x must be followed by two hexadecimal numbers.
+       Otherwise it is a lowercase x letter. */
+       if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
+         && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)
+         {
+         c = 0;
+         for (i = 0; i < 2; ++i)
+           {
+           register int cc = *(++ptr);
+ #ifndef EBCDIC  /* ASCII/UTF-8 coding */
+           if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
+           c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
+ #else           /* EBCDIC coding */
+           if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
+           c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
+ #endif
+           }
+         }
+       break;
+       }
      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
        {
-       const uschar *pt = ptr + 2;
+       const pcre_uchar *pt = ptr + 2;
-       int count = 0;
        c = 0;
-       while ((digitab[*pt] & ctype_xdigit) != 0)
+       while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0)
          {
          register int cc = *pt++;
          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
-         count++;
  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
-Line 847 
 else
+Line 1048 
 else
          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
  #endif
+ #ifdef COMPILE_PCRE8
+         if (c > (utf ? 0x10ffff : 0xff)) { c = -1; break; }
+ #else
+ #ifdef COMPILE_PCRE16
+         if (c > (utf ? 0x10ffff : 0xffff)) { c = -1; break; }
+ #endif
+ #endif
+         }
+       if (c < 0)
+         {
+         while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0) pt++;
+         *errorcodeptr = ERR34;
          }
        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
          {
-         if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;
+         if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
          ptr = pt;
          break;
          }
-Line 863 
 else
+Line 1078 
 else
      /* Read just a single-byte hex-defined char */
      c = 0;
-     while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)
+     while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)
        {
        int cc;                                  /* Some compilers don't like */
        cc = *(++ptr);                           /* ++ in initializers */
-Line 961 
 Returns:         type value from ucp_typ
+Line 1176 
 Returns:         type value from ucp_typ
  */
  static int
- get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
+ get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
  {
  int c, i, bot, top;
- const uschar *ptr = *ptrptr;
+ const pcre_uchar *ptr = *ptrptr;
- char name[32];
+ pcre_uchar name[32];
  c = *(++ptr);
  if (c == 0) goto ERROR_RETURN;
-Line 982 
 if (c == CHAR_LEFT_CURLY_BRACKET)
+Line 1197 
 if (c == CHAR_LEFT_CURLY_BRACKET)
      *negptr = TRUE;
      ptr++;
      }
-   for (i = 0; i < (int)sizeof(name) - 1; i++)
+   for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
      {
      c = *(++ptr);
      if (c == 0) goto ERROR_RETURN;
-Line 1006 
 else
+Line 1221 
 else
  /* Search for a recognized property name using binary chop */
  bot = 0;
- top = _pcre_utt_size;
+ top = PRIV(utt_size);
  while (bot < top)
    {
    i = (bot + top) >> 1;
-   c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);
+   c = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
    if (c == 0)
      {
-     *dptr = _pcre_utt[i].value;
+     *dptr = PRIV(utt)[i].value;
-     return _pcre_utt[i].type;
+     return PRIV(utt)[i].type;
      }
    if (c > 0) bot = i + 1; else top = i;
    }
-Line 1053 
 Returns:         pointer to '}' on succe
+Line 1268 
 Returns:         pointer to '}' on succe
                   current ptr on error, with errorcodeptr set non-zero
  */
- static const uschar *
+ static const pcre_uchar *
- 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)
  {
  int min = 0;
  int max = -1;
-Line 1062 
 int max = -1;
+Line 1277 
 int max = -1;
  /* Read the minimum value and do a paranoid check: a negative value indicates
  an integer overflow. */
- while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;
+ while (IS_DIGIT(*p)) min = min * 10 + *p++ - CHAR_0;
  if (min < 0 || min > 65535)
    {
    *errorcodeptr = ERR5;
-Line 1077 
 if (*p == CHAR_RIGHT_CURLY_BRACKET) max
+Line 1292 
 if (*p == CHAR_RIGHT_CURLY_BRACKET) max
    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
      {
      max = 0;
-     while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;
+     while(IS_DIGIT(*p)) max = max * 10 + *p++ - CHAR_0;
      if (max < 0 || max > 65535)
        {
        *errorcodeptr = ERR5;
-Line 1132 
 Arguments:
+Line 1347 
 Arguments:
    name         name to seek, or NULL if seeking a numbered subpattern
    lorn         name length, or subpattern number if name is NULL
    xmode        TRUE if we are in /x mode
-   utf8         TRUE if we are in UTF-8 mode
+   utf          TRUE if we are in UTF-8 / UTF-16 mode
    count        pointer to the current capturing subpattern number (updated)
  Returns:       the number of the named subpattern, or -1 if not found
  */
  static int
- 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,
-   BOOL xmode, BOOL utf8, int *count)
+   BOOL xmode, BOOL utf, int *count)
  {
- uschar *ptr = *ptrptr;
+ pcre_uchar *ptr = *ptrptr;
  int start_count = *count;
  int hwm_count = start_count;
  BOOL dup_parens = FALSE;
-Line 1209 
 if (ptr[0] == CHAR_LEFT_PARENTHESIS)
+Line 1424 
 if (ptr[0] == CHAR_LEFT_PARENTHESIS)
          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
        {
        int term;
-       const uschar *thisname;
+       const pcre_uchar *thisname;
        *count += 1;
        if (name == NULL && *count == lorn) return *count;
        term = *ptr++;
-Line 1217 
 if (ptr[0] == CHAR_LEFT_PARENTHESIS)
+Line 1432 
 if (ptr[0] == CHAR_LEFT_PARENTHESIS)
        thisname = ptr;
        while (*ptr != term) ptr++;
        if (name != NULL && lorn == ptr - thisname &&
-           strncmp((const char *)name, (const char *)thisname, lorn) == 0)
+           STRNCMP_UC_UC(name, thisname, lorn) == 0)
          return *count;
        term++;
        }
-Line 1260 
 for (; ptr < cd->end_pattern; ptr++)
+Line 1475 
 for (; ptr < cd->end_pattern; ptr++)
          {
          if (ptr[2] == CHAR_E)
            ptr+= 2;
-         else if (strncmp((const char *)ptr+2,
+         else if (STRNCMP_UC_C8(ptr + 2,
                   STR_Q STR_BACKSLASH STR_E, 3) == 0)
            ptr += 4;
          else
-Line 1308 
 for (; ptr < cd->end_pattern; ptr++)
+Line 1523 
 for (; ptr < cd->end_pattern; ptr++)
        {
        if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
        ptr++;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
+       if (utf) FORWARDCHAR(ptr);
  #endif
        }
      if (*ptr == 0) goto FAIL_EXIT;
-Line 1320 
 for (; ptr < cd->end_pattern; ptr++)
+Line 1535 
 for (; ptr < cd->end_pattern; ptr++)
    if (*ptr == CHAR_LEFT_PARENTHESIS)
      {
-     int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, count);
+     int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, count);
      if (rc > 0) return rc;
      if (*ptr == 0) goto FAIL_EXIT;
      }
-Line 1366 
 Arguments:
+Line 1581 
 Arguments:
    name         name to seek, or NULL if seeking a numbered subpattern
    lorn         name length, or subpattern number if name is NULL
    xmode        TRUE if we are in /x mode
-   utf8         TRUE if we are in UTF-8 mode
+   utf          TRUE if we are in UTF-8 / UTF-16 mode
  Returns:       the number of the found subpattern, or -1 if not found
  */
  static int
- 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,
-   BOOL utf8)
+   BOOL utf)
  {
- uschar *ptr = (uschar *)cd->start_pattern;
+ pcre_uchar *ptr = (pcre_uchar *)cd->start_pattern;
  int count = 0;
  int rc;
-Line 1386 
 matching closing parens. That is why we
+Line 1601 
 matching closing parens. That is why we
  for (;;)
    {
-   rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, &count);
+   rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, &count);
    if (rc > 0 || *ptr++ == 0) break;
    }
-Line 1413 
 Arguments:
+Line 1628 
 Arguments:
  Returns:       pointer to the first significant opcode
  */
- static const uschar*
+ static const pcre_uchar*
- first_significant_code(const uschar *code, BOOL skipassert)
+ first_significant_code(const pcre_uchar *code, BOOL skipassert)
  {
  for (;;)
    {
-Line 1425 
 for (;;)
+Line 1640 
 for (;;)
      case OP_ASSERTBACK_NOT:
      if (!skipassert) return code;
      do code += GET(code, 1); while (*code == OP_ALT);
-     code += _pcre_OP_lengths[*code];
+     code += PRIV(OP_lengths)[*code];
      break;
      case OP_WORD_BOUNDARY:
-Line 1439 
 for (;;)
+Line 1654 
 for (;;)
      case OP_RREF:
      case OP_NRREF:
      case OP_DEF:
-     code += _pcre_OP_lengths[*code];
+     code += PRIV(OP_lengths)[*code];
      break;
      default:
-Line 1469 
 and doing the check at the end; a flag s
+Line 1684 
 and doing the check at the end; a flag s
  Arguments:
    code     points to the start of the pattern (the bracket)
-   utf8     TRUE in UTF-8 mode
+   utf      TRUE in UTF-8 / UTF-16 mode
    atend    TRUE if called when the pattern is complete
    cd       the "compile data" structure
  Returns:   the fixed length,
               or -1 if there is no fixed length,
-              or -2 if \C was encountered
+              or -2 if \C was encountered (in UTF-8 mode only)
               or -3 if an OP_RECURSE item was encountered and atend is FALSE
+              or -4 if an unknown opcode was encountered (internal error)
  */
  static int
- find_fixedlength(uschar *code, BOOL utf8, BOOL atend, compile_data *cd)
+ find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd)
  {
  int length = -1;
  register int branchlength = 0;
- register uschar *cc = code + 1 + LINK_SIZE;
+ register pcre_uchar *cc = code + 1 + LINK_SIZE;
  /* Scan along the opcodes for this branch. If we get to the end of the
  branch, check the length against that of the other branches. */
-Line 1493 
 branch, check the length against that of
+Line 1709 
 branch, check the length against that of
  for (;;)
    {
    int d;
-   uschar *ce, *cs;
+   pcre_uchar *ce, *cs;
    register int op = *cc;
    switch (op)
      {
      /* We only need to continue for OP_CBRA (normal capturing bracket) and
      OP_BRA (normal non-capturing bracket) because the other variants of these
      opcodes are all concerned with unlimited repeated groups, which of course
-     are not of fixed length. They will cause a -1 response from the default
+     are not of fixed length. */
-     case of this switch. */
      case OP_CBRA:
      case OP_BRA:
      case OP_ONCE:
+     case OP_ONCE_NC:
      case OP_COND:
-     d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), utf8, atend, cd);
+     d = find_fixedlength(cc + ((op == OP_CBRA)? IMM2_SIZE : 0), utf, atend, cd);
      if (d < 0) return d;
      branchlength += d;
      do cc += GET(cc, 1); while (*cc == OP_ALT);
      cc += 1 + LINK_SIZE;
      break;
-     /* 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.
-     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
-     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
-     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,
-     all imply an unlimited repeat. */
+     because they all imply an unlimited repeat. */
      case OP_ALT:
      case OP_KET:
      case OP_END:
+     case OP_ACCEPT:
+     case OP_ASSERT_ACCEPT:
      if (length < 0) length = branchlength;
        else if (length != branchlength) return -1;
      if (*cc != OP_ALT) return length;
-Line 1536 
 for (;;)
+Line 1755 
 for (;;)
      case OP_RECURSE:
      if (!atend) return -3;
-     cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
+     cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
-     do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */
+     do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
-     if (cc > cs && cc < ce) return -1;                /* Recursion */
+     if (cc > cs && cc < ce) return -1;                    /* Recursion */
-     d = find_fixedlength(cs + 2, utf8, atend, cd);
+     d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd);
      if (d < 0) return d;
      branchlength += d;
      cc += 1 + LINK_SIZE;
-Line 1552 
 for (;;)
+Line 1771 
 for (;;)
      case OP_ASSERTBACK:
      case OP_ASSERTBACK_NOT:
      do cc += GET(cc, 1); while (*cc == OP_ALT);
-     /* Fall through */
+     cc += PRIV(OP_lengths)[*cc];
+     break;
      /* Skip over things that don't match chars */
-     case OP_REVERSE:
+     case OP_MARK:
-     case OP_CREF:
+     case OP_PRUNE_ARG:
-     case OP_NCREF:
+     case OP_SKIP_ARG:
-     case OP_RREF:
+     case OP_THEN_ARG:
-     case OP_NRREF:
+     cc += cc[1] + PRIV(OP_lengths)[*cc];
-     case OP_DEF:
+     break;
      case OP_CALLOUT:
-     case OP_SOD:
-     case OP_SOM:
-     case OP_SET_SOM:
-     case OP_EOD:
-     case OP_EODN:
      case OP_CIRC:
      case OP_CIRCM:
+     case OP_CLOSE:
+     case OP_COMMIT:
+     case OP_CREF:
+     case OP_DEF:
      case OP_DOLL:
      case OP_DOLLM:
+     case OP_EOD:
+     case OP_EODN:
+     case OP_FAIL:
+     case OP_NCREF:
+     case OP_NRREF:
      case OP_NOT_WORD_BOUNDARY:
+     case OP_PRUNE:
+     case OP_REVERSE:
+     case OP_RREF:
+     case OP_SET_SOM:
+     case OP_SKIP:
+     case OP_SOD:
+     case OP_SOM:
+     case OP_THEN:
      case OP_WORD_BOUNDARY:
-     cc += _pcre_OP_lengths[*cc];
+     cc += PRIV(OP_lengths)[*cc];
      break;
      /* Handle literal characters */
-Line 1585 
 for (;;)
+Line 1818 
 for (;;)
      case OP_NOTI:
      branchlength++;
      cc += 2;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-     if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
+     if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
  #endif
      break;
-Line 1594 
 for (;;)
+Line 1827 
 for (;;)
      need to skip over a multibyte character in UTF8 mode.  */
      case OP_EXACT:
+     case OP_EXACTI:
+     case OP_NOTEXACT:
+     case OP_NOTEXACTI:
      branchlength += GET2(cc,1);
-     cc += 4;
+     cc += 2 + IMM2_SIZE;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-     if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
+     if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
  #endif
      break;
      case OP_TYPEEXACT:
      branchlength += GET2(cc,1);
-     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;
-     cc += 4;
+     cc += 1 + IMM2_SIZE + 1;
      break;
      /* Handle single-char matchers */
-Line 1614 
 for (;;)
+Line 1850 
 for (;;)
      cc += 2;
      /* Fall through */
+     case OP_HSPACE:
+     case OP_VSPACE:
+     case OP_NOT_HSPACE:
+     case OP_NOT_VSPACE:
      case OP_NOT_DIGIT:
      case OP_DIGIT:
      case OP_NOT_WHITESPACE:
-Line 1626 
 for (;;)
+Line 1866 
 for (;;)
      cc++;
      break;
-     /* The single-byte matcher isn't allowed */
+     /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
+     otherwise \C is coded as OP_ALLANY. */
      case OP_ANYBYTE:
      return -2;
      /* Check a class for variable quantification */
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || defined COMPILE_PCRE16
      case OP_XCLASS:
-     cc += GET(cc, 1) - 33;
+     cc += GET(cc, 1) - PRIV(OP_lengths)[OP_CLASS];
      /* Fall through */
  #endif
      case OP_CLASS:
      case OP_NCLASS:
-     cc += 33;
+     cc += PRIV(OP_lengths)[OP_CLASS];
      switch (*cc)
        {
+       case OP_CRPLUS:
+       case OP_CRMINPLUS:
        case OP_CRSTAR:
        case OP_CRMINSTAR:
        case OP_CRQUERY:
-Line 1653 
 for (;;)
+Line 1896 
 for (;;)
        case OP_CRRANGE:
        case OP_CRMINRANGE:
-       if (GET2(cc,1) != GET2(cc,3)) return -1;
+       if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
        branchlength += GET2(cc,1);
-       cc += 5;
+       cc += 1 + 2 * IMM2_SIZE;
        break;
        default:
-Line 1665 
 for (;;)
+Line 1908 
 for (;;)
      /* Anything else is variable length */
-     default:
+     case OP_ANYNL:
+     case OP_BRAMINZERO:
+     case OP_BRAPOS:
+     case OP_BRAPOSZERO:
+     case OP_BRAZERO:
+     case OP_CBRAPOS:
+     case OP_EXTUNI:
+     case OP_KETRMAX:
+     case OP_KETRMIN:
+     case OP_KETRPOS:
+     case OP_MINPLUS:
+     case OP_MINPLUSI:
+     case OP_MINQUERY:
+     case OP_MINQUERYI:
+     case OP_MINSTAR:
+     case OP_MINSTARI:
+     case OP_MINUPTO:
+     case OP_MINUPTOI:
+     case OP_NOTMINPLUS:
+     case OP_NOTMINPLUSI:
+     case OP_NOTMINQUERY:
+     case OP_NOTMINQUERYI:
+     case OP_NOTMINSTAR:
+     case OP_NOTMINSTARI:
+     case OP_NOTMINUPTO:
+     case OP_NOTMINUPTOI:
+     case OP_NOTPLUS:
+     case OP_NOTPLUSI:
+     case OP_NOTPOSPLUS:
+     case OP_NOTPOSPLUSI:
+     case OP_NOTPOSQUERY:
+     case OP_NOTPOSQUERYI:
+     case OP_NOTPOSSTAR:
+     case OP_NOTPOSSTARI:
+     case OP_NOTPOSUPTO:
+     case OP_NOTPOSUPTOI:
+     case OP_NOTQUERY:
+     case OP_NOTQUERYI:
+     case OP_NOTSTAR:
+     case OP_NOTSTARI:
+     case OP_NOTUPTO:
+     case OP_NOTUPTOI:
+     case OP_PLUS:
+     case OP_PLUSI:
+     case OP_POSPLUS:
+     case OP_POSPLUSI:
+     case OP_POSQUERY:
+     case OP_POSQUERYI:
+     case OP_POSSTAR:
+     case OP_POSSTARI:
+     case OP_POSUPTO:
+     case OP_POSUPTOI:
+     case OP_QUERY:
+     case OP_QUERYI:
+     case OP_REF:
+     case OP_REFI:
+     case OP_SBRA:
+     case OP_SBRAPOS:
+     case OP_SCBRA:
+     case OP_SCBRAPOS:
+     case OP_SCOND:
+     case OP_SKIPZERO:
+     case OP_STAR:
+     case OP_STARI:
+     case OP_TYPEMINPLUS:
+     case OP_TYPEMINQUERY:
+     case OP_TYPEMINSTAR:
+     case OP_TYPEMINUPTO:
+     case OP_TYPEPLUS:
+     case OP_TYPEPOSPLUS:
+     case OP_TYPEPOSQUERY:
+     case OP_TYPEPOSSTAR:
+     case OP_TYPEPOSUPTO:
+     case OP_TYPEQUERY:
+     case OP_TYPESTAR:
+     case OP_TYPEUPTO:
+     case OP_UPTO:
+     case OP_UPTOI:
      return -1;
+     /* Catch unrecognized opcodes so that when new ones are added they
+     are not forgotten, as has happened in the past. */
+     default:
+     return -4;
      }
    }
  /* Control never gets here */
-Line 1687 
 length.
+Line 2013 
 length.
  Arguments:
    code        points to start of expression
-   utf8        TRUE in UTF-8 mode
+   utf         TRUE in UTF-8 / UTF-16 mode
    number      the required bracket number or negative to find a lookbehind
  Returns:      pointer to the opcode for the bracket, or NULL if not found
  */
- const uschar *
+ const pcre_uchar *
- _pcre_find_bracket(const uschar *code, BOOL utf8, int number)
+ PRIV(find_bracket)(const pcre_uchar *code, BOOL utf, int number)
  {
  for (;;)
    {
-Line 1712 
 for (;;)
+Line 2038 
 for (;;)
    else if (c == OP_REVERSE)
      {
-     if (number < 0) return (uschar *)code;
+     if (number < 0) return (pcre_uchar *)code;
-     code += _pcre_OP_lengths[c];
+     code += PRIV(OP_lengths)[c];
      }
    /* Handle capturing bracket */
-Line 1722 
 for (;;)
+Line 2048 
 for (;;)
             c == OP_CBRAPOS || c == OP_SCBRAPOS)
      {
      int n = GET2(code, 1+LINK_SIZE);
-     if (n == number) return (uschar *)code;
+     if (n == number) return (pcre_uchar *)code;
-     code += _pcre_OP_lengths[c];
+     code += PRIV(OP_lengths)[c];
      }
    /* Otherwise, we can get the item's length from the table, except that for
-Line 1751 
 for (;;)
+Line 2077 
 for (;;)
        case OP_TYPEMINUPTO:
        case OP_TYPEEXACT:
        case OP_TYPEPOSUPTO:
-       if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+       if (code[1 + IMM2_SIZE] == OP_PROP
+         || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
        break;
        case OP_MARK:
-Line 1761 
 for (;;)
+Line 2088 
 for (;;)
        break;
        case OP_THEN_ARG:
-       code += code[1+LINK_SIZE];
+       code += code[1];
        break;
        }
      /* Add in the fixed length from the table */
-     code += _pcre_OP_lengths[c];
+     code += PRIV(OP_lengths)[c];
    /* In UTF-8 mode, opcodes that are followed by a character may be followed by
    a multi-byte character. The length in the table is a minimum, so we have to
    arrange to skip the extra bytes. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-     if (utf8) switch(c)
+     if (utf) switch(c)
        {
        case OP_CHAR:
        case OP_CHARI:
-Line 1804 
 for (;;)
+Line 2131 
 for (;;)
        case OP_MINQUERYI:
        case OP_POSQUERY:
        case OP_POSQUERYI:
-       if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
+       if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
        break;
        }
  #else
-     (void)(utf8);  /* Keep compiler happy by referencing function argument */
+     (void)(utf);  /* Keep compiler happy by referencing function argument */
  #endif
      }
    }
-Line 1825 
 instance of OP_RECURSE.
+Line 2152 
 instance of OP_RECURSE.
  Arguments:
    code        points to start of expression
-   utf8        TRUE in UTF-8 mode
+   utf         TRUE in UTF-8 / UTF-16 mode
  Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found
  */
- static const uschar *
+ static const pcre_uchar *
- find_recurse(const uschar *code, BOOL utf8)
+ find_recurse(const pcre_uchar *code, BOOL utf)
  {
  for (;;)
    {
-Line 1870 
 for (;;)
+Line 2197 
 for (;;)
        case OP_TYPEUPTO:
        case OP_TYPEMINUPTO:
        case OP_TYPEEXACT:
-       if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+       if (code[1 + IMM2_SIZE] == OP_PROP
+         || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
        break;
        case OP_MARK:
-Line 1880 
 for (;;)
+Line 2208 
 for (;;)
        break;
        case OP_THEN_ARG:
-       code += code[1+LINK_SIZE];
+       code += code[1];
        break;
        }
      /* Add in the fixed length from the table */
-     code += _pcre_OP_lengths[c];
+     code += PRIV(OP_lengths)[c];
      /* In UTF-8 mode, opcodes that are followed by a character may be followed
      by a multi-byte character. The length in the table is a minimum, so we have
      to arrange to skip the extra bytes. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-     if (utf8) switch(c)
+     if (utf) switch(c)
        {
        case OP_CHAR:
        case OP_CHARI:
-Line 1923 
 for (;;)
+Line 2251 
 for (;;)
        case OP_MINQUERYI:
        case OP_POSQUERY:
        case OP_POSQUERYI:
-       if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
+       if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
        break;
        }
  #else
-     (void)(utf8);  /* Keep compiler happy by referencing function argument */
+     (void)(utf);  /* Keep compiler happy by referencing function argument */
  #endif
      }
    }
-Line 1950 
 bracket whose current branch will alread
+Line 2278 
 bracket whose current branch will alread
  Arguments:
    code        points to start of search
    endcode     points to where to stop
-   utf8        TRUE if in UTF8 mode
+   utf         TRUE if in UTF-8 / UTF-16 mode
    cd          contains pointers to tables etc.
  Returns:      TRUE if what is matched could be empty
  */
  static BOOL
- could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8,
+ could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
-   compile_data *cd)
+   BOOL utf, compile_data *cd)
  {
  register int c;
- for (code = first_significant_code(code + _pcre_OP_lengths[*code], TRUE);
+ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
       code < endcode;
-      code = first_significant_code(code + _pcre_OP_lengths[c], TRUE))
+      code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
    {
-   const uschar *ccode;
+   const pcre_uchar *ccode;
    c = *code;
-Line 1988 
 for (code = first_significant_code(code
+Line 2316 
 for (code = first_significant_code(code
    if (c == OP_RECURSE)
      {
-     const uschar *scode;
+     const pcre_uchar *scode;
      BOOL empty_branch;
      /* Test for forward reference */
-Line 2006 
 for (code = first_significant_code(code
+Line 2334 
 for (code = first_significant_code(code
      do
        {
-       if (could_be_empty_branch(scode, endcode, utf8, cd))
+       if (could_be_empty_branch(scode, endcode, utf, cd))
          {
          empty_branch = TRUE;
          break;
-Line 2024 
 for (code = first_significant_code(code
+Line 2352 
 for (code = first_significant_code(code
    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
        c == OP_BRAPOSZERO)
      {
-     code += _pcre_OP_lengths[c];
+     code += PRIV(OP_lengths)[c];
      do code += GET(code, 1); while (*code == OP_ALT);
      c = *code;
      continue;
-Line 2045 
 for (code = first_significant_code(code
+Line 2373 
 for (code = first_significant_code(code
    if (c == OP_BRA  || c == OP_BRAPOS ||
        c == OP_CBRA || c == OP_CBRAPOS ||
-       c == OP_ONCE || c == OP_COND)
+       c == OP_ONCE || c == OP_ONCE_NC ||
+       c == OP_COND)
      {
      BOOL empty_branch;
      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
-Line 2061 
 for (code = first_significant_code(code
+Line 2390 
 for (code = first_significant_code(code
        empty_branch = FALSE;
        do
          {
-         if (!empty_branch && could_be_empty_branch(code, endcode, utf8, cd))
+         if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd))
            empty_branch = TRUE;
          code += GET(code, 1);
          }
-Line 2079 
 for (code = first_significant_code(code
+Line 2408 
 for (code = first_significant_code(code
      {
      /* Check for quantifiers after a class. XCLASS is used for classes that
      cannot be represented just by a bit map. This includes negated single
-     high-valued characters. The length in _pcre_OP_lengths[] is zero; the
+     high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
      actual length is stored in the compiled code, so we must update "code"
      here. */
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
      case OP_XCLASS:
      ccode = code += GET(code, 1);
      goto CHECK_CLASS_REPEAT;
-Line 2091 
 for (code = first_significant_code(code
+Line 2420 
 for (code = first_significant_code(code
      case OP_CLASS:
      case OP_NCLASS:
-     ccode = code + 33;
+     ccode = code + PRIV(OP_lengths)[OP_CLASS];
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
      CHECK_CLASS_REPEAT:
  #endif
-Line 2166 
 for (code = first_significant_code(code
+Line 2495 
 for (code = first_significant_code(code
      case OP_TYPEUPTO:
      case OP_TYPEMINUPTO:
      case OP_TYPEPOSUPTO:
-     if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+     if (code[1 + IMM2_SIZE] == OP_PROP
+       || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
      break;
      /* End of branch */
-Line 2181 
 for (code = first_significant_code(code
+Line 2511 
 for (code = first_significant_code(code
      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
      MINUPTO, and POSUPTO may be followed by a multibyte character */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
      case OP_STAR:
      case OP_STARI:
      case OP_MINSTAR:
-Line 2194 
 for (code = first_significant_code(code
+Line 2524 
 for (code = first_significant_code(code
      case OP_MINQUERYI:
      case OP_POSQUERY:
      case OP_POSQUERYI:
-     if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];
+     if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
      break;
      case OP_UPTO:
-Line 2203 
 for (code = first_significant_code(code
+Line 2533 
 for (code = first_significant_code(code
      case OP_MINUPTOI:
      case OP_POSUPTO:
      case OP_POSUPTOI:
-     if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];
+     if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);
      break;
  #endif
-Line 2217 
 for (code = first_significant_code(code
+Line 2547 
 for (code = first_significant_code(code
      break;
      case OP_THEN_ARG:
-     code += code[1+LINK_SIZE];
+     code += code[1];
      break;
      /* None of the remaining opcodes are required to match a character. */
-Line 2247 
 Arguments:
+Line 2577 
 Arguments:
    code        points to start of the recursion
    endcode     points to where to stop (current RECURSE item)
    bcptr       points to the chain of current (unclosed) branch starts
-   utf8        TRUE if in UTF-8 mode
+   utf         TRUE if in UTF-8 / UTF-16 mode
    cd          pointers to tables etc
  Returns:      TRUE if what is matched could be empty
  */
  static BOOL
- could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,
+ could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
-   BOOL utf8, compile_data *cd)
+   branch_chain *bcptr, BOOL utf, compile_data *cd)
  {
  while (bcptr != NULL && bcptr->current_branch >= code)
    {
-   if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8, cd))
+   if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd))
      return FALSE;
    bcptr = bcptr->outer;
    }
-Line 2311 
 Returns:   TRUE or FALSE
+Line 2641 
 Returns:   TRUE or FALSE
  */
  static BOOL
- check_posix_syntax(const uschar *ptr, const uschar **endptr)
+ check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
  {
  int terminator;          /* Don't combine these lines; the Solaris cc */
  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
-Line 2355 
 Returns:     a value representing the na
+Line 2685 
 Returns:     a value representing the na
  */
  static int
- check_posix_name(const uschar *ptr, int len)
+ check_posix_name(const pcre_uchar *ptr, int len)
  {
  const char *pn = posix_names;
  register int yield = 0;
  while (posix_name_lengths[yield] != 0)
    {
    if (len == posix_name_lengths[yield] &&
-     strncmp((const char *)ptr, pn, len) == 0) return yield;
+     STRNCMP_UC_C8(ptr, pn, len) == 0) return yield;
    pn += posix_name_lengths[yield] + 1;
    yield++;
    }
-Line 2394 
 value in the reference (which is a group
+Line 2724 
 value in the reference (which is a group
  Arguments:
    group      points to the start of the group
    adjust     the amount by which the group is to be moved
-   utf8       TRUE in UTF-8 mode
+   utf        TRUE in UTF-8 / UTF-16 mode
    cd         contains pointers to tables etc.
    save_hwm   the hwm forward reference pointer at the start of the group
-Line 2402 
 Returns:     nothing
+Line 2732 
 Returns:     nothing
  */
  static void
- adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,
+ adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
-   uschar *save_hwm)
+   pcre_uchar *save_hwm)
  {
- uschar *ptr = group;
+ pcre_uchar *ptr = group;
- while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)
+ while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
    {
    int offset;
-   uschar *hc;
+   pcre_uchar *hc;
    /* See if this recursion is on the forward reference list. If so, adjust the
    reference. */
-Line 2455 
 Arguments:
+Line 2785 
 Arguments:
  Returns:         new code pointer
  */
- static uschar *
+ static pcre_uchar *
- auto_callout(uschar *code, const uschar *ptr, compile_data *cd)
+ auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
  {
  *code++ = OP_CALLOUT;
  *code++ = 255;
  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
  PUT(code, LINK_SIZE, 0);                       /* Default length */
- return code + 2*LINK_SIZE;
+ return code + 2 * LINK_SIZE;
  }
-Line 2484 
 Returns:             nothing
+Line 2814 
 Returns:             nothing
  */
  static void
- complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)
+ complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
  {
  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
  PUT(previous_callout, 2 + LINK_SIZE, length);
-Line 2567 
 switch(ptype)
+Line 2897 
 switch(ptype)
            prop->chartype == ucp_Lt) == negated;
    case PT_GC:
-   return (pdata == _pcre_ucp_gentype[prop->chartype]) == negated;
+   return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
    case PT_PC:
    return (pdata == prop->chartype) == negated;
-Line 2578 
 switch(ptype)
+Line 2908 
 switch(ptype)
    /* These are specials */
    case PT_ALNUM:
-   return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
+   return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-           _pcre_ucp_gentype[prop->chartype] == ucp_N) == negated;
+           PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
    case PT_SPACE:    /* Perl space */
-   return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
+   return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
            c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
            == negated;
    case PT_PXSPACE:  /* POSIX space */
-   return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
+   return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
            c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
            c == CHAR_FF || c == CHAR_CR)
            == negated;
    case PT_WORD:
-   return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
+   return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-           _pcre_ucp_gentype[prop->chartype] == ucp_N ||
+           PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
            c == CHAR_UNDERSCORE) == negated;
    }
  return FALSE;
-Line 2613 
 sense to automatically possessify the re
+Line 2943 
 sense to automatically possessify the re
  Arguments:
    previous      pointer to the repeated opcode
-   utf8          TRUE in UTF-8 mode
+   utf           TRUE in UTF-8 / UTF-16 mode
    ptr           next character in pattern
    options       options bits
    cd            contains pointers to tables etc.
-Line 2622 
 Returns:        TRUE if possessifying is
+Line 2952 
 Returns:        TRUE if possessifying is
  */
  static BOOL
- check_auto_possessive(const uschar *previous, BOOL utf8, const uschar *ptr,
+ check_auto_possessive(const pcre_uchar *previous, BOOL utf,
-   int options, compile_data *cd)
+   const pcre_uchar *ptr, int options, compile_data *cd)
  {
- int c, next;
+ pcre_int32 c, next;
  int op_code = *previous++;
  /* Skip whitespace and comments in extended mode */
-Line 2634 
 if ((options & PCRE_EXTENDED) != 0)
+Line 2964 
 if ((options & PCRE_EXTENDED) != 0)
    {
    for (;;)
      {
-     while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
+     while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
      if (*ptr == CHAR_NUMBER_SIGN)
        {
        ptr++;
-Line 2642 
 if ((options & PCRE_EXTENDED) != 0)
+Line 2972 
 if ((options & PCRE_EXTENDED) != 0)
          {
          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
          ptr++;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
+         if (utf) FORWARDCHAR(ptr);
  #endif
          }
        }
-Line 2661 
 if (*ptr == CHAR_BACKSLASH)
+Line 2991 
 if (*ptr == CHAR_BACKSLASH)
    if (temperrorcode != 0) return FALSE;
    ptr++;    /* Point after the escape sequence */
    }
+ else if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_meta) == 0)
- else if ((cd->ctypes[*ptr] & ctype_meta) == 0)
    {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-   if (utf8) { GETCHARINC(next, ptr); } else
+   if (utf) { GETCHARINC(next, ptr); } else
  #endif
    next = *ptr++;
    }
  else return FALSE;
  /* Skip whitespace and comments in extended mode */
-Line 2678 
 if ((options & PCRE_EXTENDED) != 0)
+Line 3006 
 if ((options & PCRE_EXTENDED) != 0)
    {
    for (;;)
      {
-     while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
+     while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
      if (*ptr == CHAR_NUMBER_SIGN)
        {
        ptr++;
-Line 2686 
 if ((options & PCRE_EXTENDED) != 0)
+Line 3014 
 if ((options & PCRE_EXTENDED) != 0)
          {
          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
          ptr++;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
+         if (utf) FORWARDCHAR(ptr);
  #endif
          }
        }
-Line 2698 
 if ((options & PCRE_EXTENDED) != 0)
+Line 3026 
 if ((options & PCRE_EXTENDED) != 0)
  /* If the next thing is itself optional, we have to give up. */
  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
-   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)
      return FALSE;
  /* Now compare the next item with the previous opcode. First, handle cases when
-Line 2707 
 the next item is a character. */
+Line 3035 
 the next item is a character. */
  if (next >= 0) switch(op_code)
    {
    case OP_CHAR:
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
    GETCHARTEST(c, previous);
  #else
    c = *previous;
-Line 2719 
 if (next >= 0) switch(op_code)
+Line 3047 
 if (next >= 0) switch(op_code)
    high-valued characters. */
    case OP_CHARI:
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
    GETCHARTEST(c, previous);
  #else
    c = *previous;
  #endif
    if (c == next) return FALSE;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-   if (utf8)
+   if (utf)
      {
      unsigned int othercase;
      if (next < 128) othercase = cd->fcc[next]; else
-Line 2738 
 if (next >= 0) switch(op_code)
+Line 3066 
 if (next >= 0) switch(op_code)
      return (unsigned int)c != othercase;
      }
    else
- #endif  /* SUPPORT_UTF8 */
+ #endif  /* SUPPORT_UTF */
-   return (c != cd->fcc[next]);  /* Non-UTF-8 mode */
+   return (c != TABLE_GET(next, cd->fcc, next));  /* Non-UTF-8 mode */
    /* For OP_NOT and OP_NOTI, the data is always a single-byte character. These
    opcodes are not used for multi-byte characters, because they are coded using
-Line 2750 
 if (next >= 0) switch(op_code)
+Line 3078 
 if (next >= 0) switch(op_code)
    case OP_NOTI:
    if ((c = *previous) == next) return TRUE;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-   if (utf8)
+   if (utf)
      {
      unsigned int othercase;
      if (next < 128) othercase = cd->fcc[next]; else
-Line 2763 
 if (next >= 0) switch(op_code)
+Line 3091 
 if (next >= 0) switch(op_code)
      return (unsigned int)c == othercase;
      }
    else
- #endif  /* SUPPORT_UTF8 */
+ #endif  /* SUPPORT_UTF */
-   return (c == cd->fcc[next]);  /* Non-UTF-8 mode */
+   return (c == TABLE_GET(next, cd->fcc, next));  /* Non-UTF-8 mode */
    /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.
    When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
-Line 2855 
 switch(op_code)
+Line 3183 
 switch(op_code)
    {
    case OP_CHAR:
    case OP_CHARI:
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
    GETCHARTEST(c, previous);
  #else
    c = *previous;
-Line 2960 
 switch(op_code)
+Line 3288 
 switch(op_code)
        to the original \d etc. At this point, ptr will point to a zero byte. */
        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
-         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)
            return FALSE;
        /* Do the property check. */
-Line 3038 
 Arguments:
+Line 3366 
 Arguments:
    codeptr        points to the pointer to the current code point
    ptrptr         points to the current pattern pointer
    errorcodeptr   points to error code variable
-   firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)
+   firstcharptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)
-   reqbyteptr     set to the last literal character required, else < 0
+   reqcharptr     set to the last literal character required, else < 0
    bcptr          points to current branch chain
    cond_depth     conditional nesting depth
    cd             contains pointers to tables etc.
-Line 3051 
 Returns:         TRUE on success
+Line 3379 
 Returns:         TRUE on success
  */
  static BOOL
- compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,
+ compile_branch(int *optionsptr, pcre_uchar **codeptr,
-   int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
+   const pcre_uchar **ptrptr, int *errorcodeptr, pcre_int32 *firstcharptr,
-   int cond_depth, compile_data *cd, int *lengthptr)
+   pcre_int32 *reqcharptr, branch_chain *bcptr, int cond_depth,
+   compile_data *cd, int *lengthptr)
  {
  int repeat_type, op_type;
  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
  int bravalue = 0;
  int greedy_default, greedy_non_default;
- int firstbyte, reqbyte;
+ pcre_int32 firstchar, reqchar;
- int zeroreqbyte, zerofirstbyte;
+ pcre_int32 zeroreqchar, zerofirstchar;
- int req_caseopt, reqvary, tempreqvary;
+ pcre_int32 req_caseopt, reqvary, tempreqvary;
  int options = *optionsptr;               /* May change dynamically */
  int after_manual_callout = 0;
  int length_prevgroup = 0;
  register int c;
- register uschar *code = *codeptr;
+ register pcre_uchar *code = *codeptr;
- uschar *last_code = code;
+ pcre_uchar *last_code = code;
- uschar *orig_code = code;
+ pcre_uchar *orig_code = code;
- uschar *tempcode;
+ pcre_uchar *tempcode;
  BOOL inescq = FALSE;
- BOOL groupsetfirstbyte = FALSE;
+ BOOL groupsetfirstchar = FALSE;
- const uschar *ptr = *ptrptr;
+ const pcre_uchar *ptr = *ptrptr;
- const uschar *tempptr;
+ const pcre_uchar *tempptr;
- const uschar *nestptr = NULL;
+ const pcre_uchar *nestptr = NULL;
- uschar *previous = NULL;
+ pcre_uchar *previous = NULL;
- uschar *previous_callout = NULL;
+ pcre_uchar *previous_callout = NULL;
- uschar *save_hwm = NULL;
+ pcre_uchar *save_hwm = NULL;
- uschar classbits[32];
+ pcre_uint8 classbits[32];
  /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
  must not do this for other options (e.g. PCRE_EXTENDED) because they may change
  dynamically as we process the pattern. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
- BOOL class_utf8;
+ /* PCRE_UTF16 has the same value as PCRE_UTF8. */
- BOOL utf8 = (options & PCRE_UTF8) != 0;
+ BOOL utf = (options & PCRE_UTF8) != 0;
- uschar *class_utf8data;
+ pcre_uchar utf_chars[6];
- uschar *class_utf8data_base;
- uschar utf8_char[6];
  #else
- BOOL utf8 = FALSE;
+ BOOL utf = FALSE;
+ #endif
+ /* Helper variables for OP_XCLASS opcode (for characters > 255). */
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+ BOOL xclass;
+ pcre_uchar *class_uchardata;
+ pcre_uchar *class_uchardata_base;
  #endif
  #ifdef PCRE_DEBUG
-Line 3105 
 greedy_non_default = greedy_default ^ 1;
+Line 3440 
 greedy_non_default = greedy_default ^ 1;
  /* Initialize no first byte, no required byte. REQ_UNSET means "no char
  matching encountered yet". It gets changed to REQ_NONE if we hit something that
- matches a non-fixed char first char; reqbyte just remains unset if we never
+ matches a non-fixed char first char; reqchar just remains unset if we never
  find one.
  When we hit a repeat whose minimum is zero, we may have to adjust these values
  to take the zero repeat into account. This is implemented by setting them to
- zerofirstbyte and zeroreqbyte when such a repeat is encountered. The individual
+ zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual
  item types that can be repeated set these backoff variables appropriately. */
- firstbyte = reqbyte = zerofirstbyte = zeroreqbyte = REQ_UNSET;
+ firstchar = reqchar = zerofirstchar = zeroreqchar = REQ_UNSET;
- /* The variable req_caseopt contains either the REQ_CASELESS value or zero,
+ /* The variable req_caseopt contains either the REQ_CASELESS value
- according to the current setting of the caseless flag. REQ_CASELESS is a bit
+ or zero, according to the current setting of the caseless flag. The
- value > 255. It is added into the firstbyte or reqbyte variables to record the
+ REQ_CASELESS leaves the lower 28 bit empty. It is added into the
- case status of the value. This is used only for ASCII characters. */
+ firstchar or reqchar variables to record the case status of the
+ value. This is used only for ASCII characters. */
- req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
+ req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
  /* Switch on next character until the end of the branch */
-Line 3132 
 for (;; ptr++)
+Line 3468 
 for (;; ptr++)
    BOOL is_quantifier;
    BOOL is_recurse;
    BOOL reset_bracount;
-   int class_charcount;
+   int class_has_8bitchar;
-   int class_lastchar;
+   int class_single_char;
    int newoptions;
    int recno;
    int refsign;
    int skipbytes;
-   int subreqbyte;
+   int subreqchar;
-   int subfirstbyte;
+   int subfirstchar;
    int terminator;
    int mclength;
-   uschar mcbuffer[8];
+   int tempbracount;
+   pcre_uchar mcbuffer[8];
-   /* Get next byte in the pattern */
+   /* Get next character in the pattern */
    c = *ptr;
-Line 3166 
 for (;; ptr++)
+Line 3503 
 for (;; ptr++)
  #ifdef PCRE_DEBUG
      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
  #endif
-     if (code > cd->start_workspace + WORK_SIZE_CHECK)   /* Check for overrun */
+     if (code > cd->start_workspace + cd->workspace_size -
+         WORK_SIZE_SAFETY_MARGIN)                       /* Check for overrun */
        {
        *errorcodeptr = ERR52;
        goto FAILED;
-Line 3189 
 for (;; ptr++)
+Line 3527 
 for (;; ptr++)
        }
      *lengthptr += (int)(code - last_code);
-     DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));
+     DPRINTF(("length=%d added %d c=%c (0x%x)\n", *lengthptr,
+       (int)(code - last_code), c, c));
      /* If "previous" is set and it is not at the start of the work space, move
      it back to there, in order to avoid filling up the work space. Otherwise,
-Line 3199 
 for (;; ptr++)
+Line 3538 
 for (;; ptr++)
        {
        if (previous > orig_code)
          {
-         memmove(orig_code, previous, code - previous);
+         memmove(orig_code, previous, IN_UCHARS(code - previous));
          code -= previous - orig_code;
          previous = orig_code;
          }
-Line 3215 
 for (;; ptr++)
+Line 3554 
 for (;; ptr++)
    /* In the real compile phase, just check the workspace used by the forward
    reference list. */
-   else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK)
+   else if (cd->hwm > cd->start_workspace + cd->workspace_size -
+            WORK_SIZE_SAFETY_MARGIN)
      {
      *errorcodeptr = ERR52;
      goto FAILED;
-Line 3267 
 for (;; ptr++)
+Line 3607 
 for (;; ptr++)
    if ((options & PCRE_EXTENDED) != 0)
      {
-     if ((cd->ctypes[c] & ctype_space) != 0) continue;
+     if (MAX_255(*ptr) && (cd->ctypes[c] & ctype_space) != 0) continue;
      if (c == CHAR_NUMBER_SIGN)
        {
        ptr++;
-Line 3275 
 for (;; ptr++)
+Line 3615 
 for (;; ptr++)
          {
          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
          ptr++;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
+         if (utf) FORWARDCHAR(ptr);
  #endif
          }
        if (*ptr != 0) continue;
-Line 3300 
 for (;; ptr++)
+Line 3640 
 for (;; ptr++)
      case 0:                        /* The branch terminates at string end */
      case CHAR_VERTICAL_LINE:       /* or | or ) */
      case CHAR_RIGHT_PARENTHESIS:
-     *firstbyteptr = firstbyte;
+     *firstcharptr = firstchar;
-     *reqbyteptr = reqbyte;
+     *reqcharptr = reqchar;
      *codeptr = code;
      *ptrptr = ptr;
      if (lengthptr != NULL)
-Line 3325 
 for (;; ptr++)
+Line 3665 
 for (;; ptr++)
      previous = NULL;
      if ((options & PCRE_MULTILINE) != 0)
        {
-       if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+       if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
        *code++ = OP_CIRCM;
        }
      else *code++ = OP_CIRC;
-Line 3337 
 for (;; ptr++)
+Line 3677 
 for (;; ptr++)
      break;
      /* There can never be a first char if '.' is first, whatever happens about
-     repeats. The value of reqbyte doesn't change either. */
+     repeats. The value of reqchar doesn't change either. */
      case CHAR_DOT:
-     if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+     if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
-     zerofirstbyte = firstbyte;
+     zerofirstchar = firstchar;
-     zeroreqbyte = reqbyte;
+     zeroreqchar = reqchar;
      previous = code;
      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
      break;
-Line 3397 
 for (;; ptr++)
+Line 3737 
 for (;; ptr++)
          {
          if (ptr[1] == CHAR_E)
            ptr++;
-         else if (strncmp((const char *)ptr+1,
+         else if (STRNCMP_UC_C8(ptr + 1, STR_Q STR_BACKSLASH STR_E, 3) == 0)
-                           STR_Q STR_BACKSLASH STR_E, 3) == 0)
            ptr += 3;
          else
            break;
-Line 3417 
 for (;; ptr++)
+Line 3756 
 for (;; ptr++)
          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
        {
        *code++ = negate_class? OP_ALLANY : OP_FAIL;
-       if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+       if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
-       zerofirstbyte = firstbyte;
+       zerofirstchar = firstchar;
        break;
        }
-Line 3428 
 for (;; ptr++)
+Line 3767 
 for (;; ptr++)
      should_flip_negation = FALSE;
-     /* Keep a count of chars with values < 256 so that we can optimize the case
+     /* For optimization purposes, we track some properties of the class.
-     of just a single character (as long as it's < 256). However, For higher
+     class_has_8bitchar will be non-zero, if the class contains at least one
-     valued UTF-8 characters, we don't yet do any optimization. */
+     < 256 character. class_single_char will be 1 if the class contains only
+     a single character. */
-     class_charcount = 0;
+     class_has_8bitchar = 0;
-     class_lastchar = -1;
+     class_single_char = 0;
      /* Initialize the 32-char bit map to all zeros. We build the map in a
      temporary bit of memory, in case the class contains only 1 character (less
      than 256), because in that case the compiled code doesn't use the bit map.
      */
-     memset(classbits, 0, 32 * sizeof(uschar));
+     memset(classbits, 0, 32 * sizeof(pcre_uint8));
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-     class_utf8 = FALSE;                       /* No chars >= 256 */
+     xclass = FALSE;                           /* No chars >= 256 */
-     class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */
+     class_uchardata = code + LINK_SIZE + 2;   /* For UTF-8 items */
-     class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */
+     class_uchardata_base = class_uchardata;   /* For resetting in pass 1 */
  #endif
      /* Process characters until ] is reached. By writing this as a "do" it
-Line 3454 
 for (;; ptr++)
+Line 3794 
 for (;; ptr++)
      if (c != 0) do
        {
-       const uschar *oldptr;
+       const pcre_uchar *oldptr;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       if (utf8 && c > 127)
+       if (utf && HAS_EXTRALEN(c))
          {                           /* Braces are required because the */
          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
          }
+ #endif
-       /* In the pre-compile phase, accumulate the length of any UTF-8 extra
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+       /* In the pre-compile phase, accumulate the length of any extra
        data and reset the pointer. This is so that very large classes that
-       contain a zillion UTF-8 characters no longer overwrite the work space
+       contain a zillion > 255 characters no longer overwrite the work space
        (which is on the stack). */
        if (lengthptr != NULL)
          {
-         *lengthptr += class_utf8data - class_utf8data_base;
+         *lengthptr += class_uchardata - class_uchardata_base;
-         class_utf8data = class_utf8data_base;
+         class_uchardata = class_uchardata_base;
          }
  #endif
        /* Inside \Q...\E everything is literal except \E */
-Line 3500 
 for (;; ptr++)
+Line 3841 
 for (;; ptr++)
          {
          BOOL local_negate = FALSE;
          int posix_class, taboffset, tabopt;
-         register const uschar *cbits = cd->cbits;
+         register const pcre_uint8 *cbits = cd->cbits;
-         uschar pbits[32];
+         pcre_uint8 pbits[32];
          if (ptr[1] != CHAR_COLON)
            {
-Line 3556 
 for (;; ptr++)
+Line 3897 
 for (;; ptr++)
          /* Copy in the first table (always present) */
          memcpy(pbits, cbits + posix_class_maps[posix_class],
-* sizeof(uschar));
+* sizeof(pcre_uint8));
          /* If there is a second table, add or remove it as required. */
-Line 3587 
 for (;; ptr++)
+Line 3928 
 for (;; ptr++)
            for (c = 0; c < 32; c++) classbits[c] |= pbits[c];
          ptr = tempptr + 1;
-         class_charcount = 10;  /* Set > 1; assumes more than 1 per class */
+         /* Every class contains at least one < 256 characters. */
+         class_has_8bitchar = 1;
+         /* Every class contains at least two characters. */
+         class_single_char = 2;
          continue;    /* End of POSIX syntax handling */
          }
        /* Backslash may introduce a single character, or it may introduce one
        of the specials, which just set a flag. The sequence \b is a special
        case. Inside a class (and only there) it is treated as backspace. We
-       assume that other escapes have more than one character in them, so set
+       assume that other escapes have more than one character in them, so
-       class_charcount bigger than one. Unrecognized escapes fall through and
+       speculatively set both class_has_8bitchar and class_single_char bigger
-       are either treated as literal characters (by default), or are faulted if
+       than one. Unrecognized escapes fall through and are either treated
+       as literal characters (by default), or are faulted if
        PCRE_EXTRA is set. */
        if (c == CHAR_BACKSLASH)
-Line 3605 
 for (;; ptr++)
+Line 3950 
 for (;; ptr++)
          if (*errorcodeptr != 0) goto FAILED;
          if (-c == ESC_b) c = CHAR_BS;    /* \b is backspace in a class */
+         else if (-c == ESC_N)            /* \N is not supported in a class */
+           {
+           *errorcodeptr = ERR71;
+           goto FAILED;
+           }
          else if (-c == ESC_Q)            /* Handle start of quoted string */
            {
            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
-Line 3618 
 for (;; ptr++)
+Line 3968 
 for (;; ptr++)
          if (c < 0)
            {
-           register const uschar *cbits = cd->cbits;
+           register const pcre_uint8 *cbits = cd->cbits;
-           class_charcount += 2;     /* Greater than 1 is what matters */
+           /* Every class contains at least two < 256 characters. */
+           class_has_8bitchar++;
+           /* Every class contains at least two characters. */
+           class_single_char += 2;
            switch (-c)
              {
-Line 3632 
 for (;; ptr++)
+Line 3985 
 for (;; ptr++)
              case ESC_SU:
              nestptr = ptr;
              ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
-             class_charcount -= 2;                /* Undo! */
+             class_has_8bitchar--;                /* Undo! */
              continue;
  #endif
              case ESC_d:
-Line 3673 
 for (;; ptr++)
+Line 4026 
 for (;; ptr++)
              SETBIT(classbits, 0x09); /* VT */
              SETBIT(classbits, 0x20); /* SPACE */
              SETBIT(classbits, 0xa0); /* NSBP */
- #ifdef SUPPORT_UTF8
+ #ifndef COMPILE_PCRE8
-             if (utf8)
+             xclass = TRUE;
+             *class_uchardata++ = XCL_SINGLE;
+             *class_uchardata++ = 0x1680;
+             *class_uchardata++ = XCL_SINGLE;
+             *class_uchardata++ = 0x180e;
+             *class_uchardata++ = XCL_RANGE;
+             *class_uchardata++ = 0x2000;
+             *class_uchardata++ = 0x200a;
+             *class_uchardata++ = XCL_SINGLE;
+             *class_uchardata++ = 0x202f;
+             *class_uchardata++ = XCL_SINGLE;
+             *class_uchardata++ = 0x205f;
+             *class_uchardata++ = XCL_SINGLE;
+             *class_uchardata++ = 0x3000;
+ #elif defined SUPPORT_UTF
+             if (utf)
                {
-               class_utf8 = TRUE;
+               xclass = TRUE;
-               *class_utf8data++ = XCL_SINGLE;
+               *class_uchardata++ = XCL_SINGLE;
-               class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x1680, class_uchardata);
-               *class_utf8data++ = XCL_SINGLE;
+               *class_uchardata++ = XCL_SINGLE;
-               class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x180e, class_uchardata);
-               *class_utf8data++ = XCL_RANGE;
+               *class_uchardata++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x2000, class_uchardata);
-               class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x200a, class_uchardata);
-               *class_utf8data++ = XCL_SINGLE;
+               *class_uchardata++ = XCL_SINGLE;
-               class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x202f, class_uchardata);
-               *class_utf8data++ = XCL_SINGLE;
+               *class_uchardata++ = XCL_SINGLE;
-               class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x205f, class_uchardata);
-               *class_utf8data++ = XCL_SINGLE;
+               *class_uchardata++ = XCL_SINGLE;
-               class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x3000, class_uchardata);
                }
  #endif
              continue;
-Line 3707 
 for (;; ptr++)
+Line 4075 
 for (;; ptr++)
                  }
                classbits[c] |= x;
                }
+ #ifndef COMPILE_PCRE8
- #ifdef SUPPORT_UTF8
+             xclass = TRUE;
-             if (utf8)
+             *class_uchardata++ = XCL_RANGE;
+             *class_uchardata++ = 0x0100;
+             *class_uchardata++ = 0x167f;
+             *class_uchardata++ = XCL_RANGE;
+             *class_uchardata++ = 0x1681;
+             *class_uchardata++ = 0x180d;
+             *class_uchardata++ = XCL_RANGE;
+             *class_uchardata++ = 0x180f;
+             *class_uchardata++ = 0x1fff;
+             *class_uchardata++ = XCL_RANGE;
+             *class_uchardata++ = 0x200b;
+             *class_uchardata++ = 0x202e;
+             *class_uchardata++ = XCL_RANGE;
+             *class_uchardata++ = 0x2030;
+             *class_uchardata++ = 0x205e;
+             *class_uchardata++ = XCL_RANGE;
+             *class_uchardata++ = 0x2060;
+             *class_uchardata++ = 0x2fff;
+             *class_uchardata++ = XCL_RANGE;
+             *class_uchardata++ = 0x3001;
+ #ifdef SUPPORT_UTF
+             if (utf)
+               class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
+             else
+ #endif
+               *class_uchardata++ = 0xffff;
+ #elif defined SUPPORT_UTF
+             if (utf)
                {
-               class_utf8 = TRUE;
+               xclass = TRUE;
-               *class_utf8data++ = XCL_RANGE;
+               *class_uchardata++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x0100, class_uchardata);
-               class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x167f, class_uchardata);
-               *class_utf8data++ = XCL_RANGE;
+               *class_uchardata++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x1681, class_uchardata);
-               class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x180d, class_uchardata);
-               *class_utf8data++ = XCL_RANGE;
+               *class_uchardata++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x180f, class_uchardata);
-               class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x1fff, class_uchardata);
-               *class_utf8data++ = XCL_RANGE;
+               *class_uchardata++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x200b, class_uchardata);
-               class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x202e, class_uchardata);
-               *class_utf8data++ = XCL_RANGE;
+               *class_uchardata++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x2030, class_uchardata);
-               class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x205e, class_uchardata);
-               *class_utf8data++ = XCL_RANGE;
+               *class_uchardata++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x2060, class_uchardata);
-               class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x2fff, class_uchardata);
-               *class_utf8data++ = XCL_RANGE;
+               *class_uchardata++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x3001, class_uchardata);
-               class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
                }
  #endif
              continue;
-Line 3743 
 for (;; ptr++)
+Line 4138 
 for (;; ptr++)
              SETBIT(classbits, 0x0c); /* FF */
              SETBIT(classbits, 0x0d); /* CR */
              SETBIT(classbits, 0x85); /* NEL */
- #ifdef SUPPORT_UTF8
+ #ifndef COMPILE_PCRE8
-             if (utf8)
+             xclass = TRUE;
+             *class_uchardata++ = XCL_RANGE;
+             *class_uchardata++ = 0x2028;
+             *class_uchardata++ = 0x2029;
+ #elif defined SUPPORT_UTF
+             if (utf)
                {
-               class_utf8 = TRUE;
+               xclass = TRUE;
-               *class_utf8data++ = XCL_RANGE;
+               *class_uchardata++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x2028, class_uchardata);
-               class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x2029, class_uchardata);
                }
  #endif
              continue;
-Line 3771 
 for (;; ptr++)
+Line 4171 
 for (;; ptr++)
                classbits[c] |= x;
                }
- #ifdef SUPPORT_UTF8
+ #ifndef COMPILE_PCRE8
-             if (utf8)
+             xclass = TRUE;
+             *class_uchardata++ = XCL_RANGE;
+             *class_uchardata++ = 0x0100;
+             *class_uchardata++ = 0x2027;
+             *class_uchardata++ = XCL_RANGE;
+             *class_uchardata++ = 0x202a;
+ #ifdef SUPPORT_UTF
+             if (utf)
+               class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
+             else
+ #endif
+               *class_uchardata++ = 0xffff;
+ #elif defined SUPPORT_UTF
+             if (utf)
                {
-               class_utf8 = TRUE;
+               xclass = TRUE;
-               *class_utf8data++ = XCL_RANGE;
+               *class_uchardata++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x0100, class_uchardata);
-               class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x2027, class_uchardata);
-               *class_utf8data++ = XCL_RANGE;
+               *class_uchardata++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x202a, class_uchardata);
-               class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
                }
  #endif
              continue;
-Line 3793 
 for (;; ptr++)
+Line 4206 
 for (;; ptr++)
                int pdata;
                int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
                if (ptype < 0) goto FAILED;
-               class_utf8 = TRUE;
+               xclass = TRUE;
-               *class_utf8data++ = ((-c == ESC_p) != negated)?
+               *class_uchardata++ = ((-c == ESC_p) != negated)?
                  XCL_PROP : XCL_NOTPROP;
-               *class_utf8data++ = ptype;
+               *class_uchardata++ = ptype;
-               *class_utf8data++ = pdata;
+               *class_uchardata++ = pdata;
-               class_charcount -= 2;   /* Not a < 256 character */
+               class_has_8bitchar--;                /* Undo! */
                continue;
                }
  #endif
-Line 3812 
 for (;; ptr++)
+Line 4225 
 for (;; ptr++)
                *errorcodeptr = ERR7;
                goto FAILED;
                }
-             class_charcount -= 2;  /* Undo the default count from above */
+             class_has_8bitchar--;    /* Undo the speculative increase. */
-             c = *ptr;              /* Get the final character and fall through */
+             class_single_char -= 2;  /* Undo the speculative increase. */
+             c = *ptr;                /* Get the final character and fall through */
              break;
              }
            }
          /* Fall through if we have a single character (c >= 0). This may be
-         greater than 256 in UTF-8 mode. */
+         greater than 256. */
          }   /* End of backslash handling */
-Line 3867 
 for (;; ptr++)
+Line 4281 
 for (;; ptr++)
            goto LONE_SINGLE_CHARACTER;
            }
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         if (utf8)
+         if (utf)
            {                           /* Braces are required because the */
            GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */
            }
-Line 3912 
 for (;; ptr++)
+Line 4326 
 for (;; ptr++)
          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
+         /* Since we found a character range, single character optimizations
+         cannot be done anymore. */
+         class_single_char = 2;
          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
          matching, we have to use an XCLASS with extra data items. Caseless
          matching for characters > 127 is available only if UCP support is
          available. */
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF && !(defined COMPILE_PCRE8)
-         if (utf8 && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127)))
+         if ((d > 255) || (utf && ((options & PCRE_CASELESS) != 0 && d > 127)))
+ #elif defined  SUPPORT_UTF
+         if (utf && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127)))
+ #elif !(defined COMPILE_PCRE8)
+         if (d > 255)
+ #endif
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
            {
-           class_utf8 = TRUE;
+           xclass = TRUE;
            /* With UCP support, we can find the other case equivalents of
            the relevant characters. There may be several ranges. Optimize how
            they fit with the basic range. */
  #ifdef SUPPORT_UCP
+ #ifndef COMPILE_PCRE8
+           if (utf && (options & PCRE_CASELESS) != 0)
+ #else
            if ((options & PCRE_CASELESS) != 0)
+ #endif
              {
              unsigned int occ, ocd;
              unsigned int cc = c;
-Line 3953 
 for (;; ptr++)
+Line 4381 
 for (;; ptr++)
                if (occ == ocd)
                  {
-                 *class_utf8data++ = XCL_SINGLE;
+                 *class_uchardata++ = XCL_SINGLE;
                  }
                else
                  {
-                 *class_utf8data++ = XCL_RANGE;
+                 *class_uchardata++ = XCL_RANGE;
-                 class_utf8data += _pcre_ord2utf8(occ, class_utf8data);
+                 class_uchardata += PRIV(ord2utf)(occ, class_uchardata);
                  }
-               class_utf8data += _pcre_ord2utf8(ocd, class_utf8data);
+               class_uchardata += PRIV(ord2utf)(ocd, class_uchardata);
                }
              }
  #endif  /* SUPPORT_UCP */
-Line 3968 
 for (;; ptr++)
+Line 4396 
 for (;; ptr++)
            /* Now record the original range, possibly modified for UCP caseless
            overlapping ranges. */
-           *class_utf8data++ = XCL_RANGE;
+           *class_uchardata++ = XCL_RANGE;
-           class_utf8data += _pcre_ord2utf8(c, class_utf8data);
+ #ifdef SUPPORT_UTF
-           class_utf8data += _pcre_ord2utf8(d, class_utf8data);
+ #ifndef COMPILE_PCRE8
+           if (utf)
+             {
+             class_uchardata += PRIV(ord2utf)(c, class_uchardata);
+             class_uchardata += PRIV(ord2utf)(d, class_uchardata);
+             }
+           else
+             {
+             *class_uchardata++ = c;
+             *class_uchardata++ = d;
+             }
+ #else
+           class_uchardata += PRIV(ord2utf)(c, class_uchardata);
+           class_uchardata += PRIV(ord2utf)(d, class_uchardata);
+ #endif
+ #else /* SUPPORT_UTF */
+           *class_uchardata++ = c;
+           *class_uchardata++ = d;
+ #endif /* SUPPORT_UTF */
            /* With UCP support, we are done. Without UCP support, there is no
-           caseless matching for UTF-8 characters > 127; we can use the bit map
+           caseless matching for UTF characters > 127; we can use the bit map
-           for the smaller ones. */
+           for the smaller ones. As for 16 bit characters without UTF, we
+           can still use  */
  #ifdef SUPPORT_UCP
-           continue;    /* With next character in the class */
+ #ifndef COMPILE_PCRE8
- #else
+           if (utf)
-           if ((options & PCRE_CASELESS) == 0 || c > 127) continue;
+ #endif
+             continue;    /* With next character in the class */
+ #endif  /* SUPPORT_UCP */
+ #if defined SUPPORT_UTF && !defined(SUPPORT_UCP) && !(defined COMPILE_PCRE8)
+           if (utf)
+             {
+             if ((options & PCRE_CASELESS) == 0 || c > 127) continue;
+             /* Adjust upper limit and fall through to set up the map */
+             d = 127;
+             }
+           else
+             {
+             if (c > 255) continue;
+             /* Adjust upper limit and fall through to set up the map */
+             d = 255;
+             }
+ #elif defined SUPPORT_UTF && !defined(SUPPORT_UCP)
+           if ((options & PCRE_CASELESS) == 0 || c > 127) continue;
            /* Adjust upper limit and fall through to set up the map */
            d = 127;
+ #else
- #endif  /* SUPPORT_UCP */
+           if (c > 255) continue;
+           /* Adjust upper limit and fall through to set up the map */
+           d = 255;
+ #endif  /* SUPPORT_UTF && !SUPPORT_UCP && !COMPILE_PCRE8 */
            }
- #endif  /* SUPPORT_UTF8 */
+ #endif  /* SUPPORT_UTF || !COMPILE_PCRE8 */
-         /* We use the bit map for all cases when not in UTF-8 mode; else
+         /* We use the bit map for 8 bit mode, or when the characters fall
-         ranges that lie entirely within 0-127 when there is UCP support; else
+         partially or entirely to [0-255] ([0-127] for UCP) ranges. */
-         for partial ranges without UCP support. */
-         class_charcount += d - c + 1;
+         class_has_8bitchar = 1;
-         class_lastchar = d;
          /* We can save a bit of time by skipping this in the pre-compile. */
-Line 4003 
 for (;; ptr++)
+Line 4467 
 for (;; ptr++)
            classbits[c/8] |= (1 << (c&7));
            if ((options & PCRE_CASELESS) != 0)
              {
-             int uc = cd->fcc[c];           /* flip case */
+             int uc = cd->fcc[c]; /* flip case */
              classbits[uc/8] |= (1 << (uc&7));
              }
            }
-Line 4017 
 for (;; ptr++)
+Line 4481 
 for (;; ptr++)
        LONE_SINGLE_CHARACTER:
-       /* Handle a character that cannot go in the bit map */
+       /* Only the value of 1 matters for class_single_char. */
+       if (class_single_char < 2) class_single_char++;
- #ifdef SUPPORT_UTF8
+       /* If class_charcount is 1, we saw precisely one character. As long as
-       if (utf8 && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127)))
+       there were no negated characters >= 128 and there was no use of \p or \P,
+       in other words, no use of any XCLASS features, we can optimize.
+       In UTF-8 mode, we can optimize the negative case only if there were no
+       characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
+       operate on single-bytes characters only. This is an historical hangover.
+       Maybe one day we can tidy these opcodes to handle multi-byte characters.
+       The optimization throws away the bit map. We turn the item into a
+-character OP_CHAR[I] if it's positive, or OP_NOT[I] if it's negative.
+       Note that OP_NOT[I] does not support multibyte characters. In the positive
+       case, it can cause firstchar to be set. Otherwise, there can be no first
+       char if this item is first, whatever repeat count may follow. In the case
+       of reqchar, save the previous value for reinstating. */
+ #ifdef SUPPORT_UTF
+       if (class_single_char == 1 && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET
+         && (!utf || !negate_class || c < (MAX_VALUE_FOR_SINGLE_CHAR + 1)))
+ #else
+       if (class_single_char == 1 && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
+ #endif
          {
-         class_utf8 = TRUE;
+         ptr++;
-         *class_utf8data++ = XCL_SINGLE;
+         zeroreqchar = reqchar;
-         class_utf8data += _pcre_ord2utf8(c, class_utf8data);
+         /* The OP_NOT[I] opcodes work on single characters only. */
+         if (negate_class)
+           {
+           if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
+           zerofirstchar = firstchar;
+           *code++ = ((options & PCRE_CASELESS) != 0)? OP_NOTI: OP_NOT;
+           *code++ = c;
+           goto NOT_CHAR;
+           }
+         /* For a single, positive character, get the value into mcbuffer, and
+         then we can handle this with the normal one-character code. */
+ #ifdef SUPPORT_UTF
+         if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
+           mclength = PRIV(ord2utf)(c, mcbuffer);
+         else
+ #endif
+           {
+           mcbuffer[0] = c;
+           mclength = 1;
+           }
+         goto ONE_CHAR;
+         }       /* End of 1-char optimization */
+       /* Handle a character that cannot go in the bit map. */
+ #if defined SUPPORT_UTF && !(defined COMPILE_PCRE8)
+       if ((c > 255) || (utf && ((options & PCRE_CASELESS) != 0 && c > 127)))
+ #elif defined SUPPORT_UTF
+       if (utf && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127)))
+ #elif !(defined COMPILE_PCRE8)
+       if (c > 255)
+ #endif
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
+         {
+         xclass = TRUE;
+         *class_uchardata++ = XCL_SINGLE;
+ #ifdef SUPPORT_UTF
+ #ifndef COMPILE_PCRE8
+         /* In non 8 bit mode, we can get here even if we are not in UTF mode. */
+         if (!utf)
+           *class_uchardata++ = c;
+         else
+ #endif
+           class_uchardata += PRIV(ord2utf)(c, class_uchardata);
+ #else /* SUPPORT_UTF */
+         *class_uchardata++ = c;
+ #endif /* SUPPORT_UTF */
  #ifdef SUPPORT_UCP
+ #ifdef COMPILE_PCRE8
          if ((options & PCRE_CASELESS) != 0)
+ #else
+         /* In non 8 bit mode, we can get here even if we are not in UTF mode. */
+         if (utf && (options & PCRE_CASELESS) != 0)
+ #endif
            {
            unsigned int othercase;
            if ((othercase = UCD_OTHERCASE(c)) != c)
              {
-             *class_utf8data++ = XCL_SINGLE;
+             *class_uchardata++ = XCL_SINGLE;
-             class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);
+             class_uchardata += PRIV(ord2utf)(othercase, class_uchardata);
              }
            }
  #endif  /* SUPPORT_UCP */
          }
        else
- #endif  /* SUPPORT_UTF8 */
+ #endif  /* SUPPORT_UTF || COMPILE_PCRE16 */
        /* Handle a single-byte character */
          {
+         class_has_8bitchar = 1;
          classbits[c/8] |= (1 << (c&7));
          if ((options & PCRE_CASELESS) != 0)
            {
-           c = cd->fcc[c];   /* flip case */
+           c = cd->fcc[c]; /* flip case */
            classbits[c/8] |= (1 << (c&7));
            }
-         class_charcount++;
-         class_lastchar = c;
          }
        }
-Line 4072 
 for (;; ptr++)
+Line 4612 
 for (;; ptr++)
        goto FAILED;
        }
-     /* If class_charcount is 1, we saw precisely one character whose value is
+     /* If this is the first thing in the branch, there can be no first char
-     less than 256. As long as there were no characters >= 128 and there was no
+     setting, whatever the repeat count. Any reqchar setting must remain
-     use of \p or \P, in other words, no use of any XCLASS features, we can
+     unchanged after any kind of repeat. */
-     optimize.
+     if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
-     In UTF-8 mode, we can optimize the negative case only if there were no
+     zerofirstchar = firstchar;
-     characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
+     zeroreqchar = reqchar;
-     operate on single-bytes characters only. This is an historical hangover.
-     Maybe one day we can tidy these opcodes to handle multi-byte characters.
-     The optimization throws away the bit map. We turn the item into a
--character OP_CHAR[I] if it's positive, or OP_NOT[I] if it's negative.
-     Note that OP_NOT[I] does not support multibyte characters. In the positive
-     case, it can cause firstbyte to be set. Otherwise, there can be no first
-     char if this item is first, whatever repeat count may follow. In the case
-     of reqbyte, save the previous value for reinstating. */
- #ifdef SUPPORT_UTF8
-     if (class_charcount == 1 && !class_utf8 &&
-       (!utf8 || !negate_class || class_lastchar < 128))
- #else
-     if (class_charcount == 1)
- #endif
-       {
-       zeroreqbyte = reqbyte;
-       /* The OP_NOT[I] opcodes work on one-byte characters only. */
-       if (negate_class)
-         {
-         if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
-         zerofirstbyte = firstbyte;
-         *code++ = ((options & PCRE_CASELESS) != 0)? OP_NOTI: OP_NOT;
-         *code++ = class_lastchar;
-         break;
-         }
-       /* For a single, positive character, get the value into mcbuffer, and
-       then we can handle this with the normal one-character code. */
- #ifdef SUPPORT_UTF8
-       if (utf8 && class_lastchar > 127)
-         mclength = _pcre_ord2utf8(class_lastchar, mcbuffer);
-       else
- #endif
-         {
-         mcbuffer[0] = class_lastchar;
-         mclength = 1;
-         }
-       goto ONE_CHAR;
-       }       /* End of 1-char optimization */
-     /* The general case - not the one-char optimization. If this is the first
-     thing in the branch, there can be no first char setting, whatever the
-     repeat count. Any reqbyte setting must remain unchanged after any kind of
-     repeat. */
-     if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
-     zerofirstbyte = firstbyte;
-     zeroreqbyte = reqbyte;
      /* If there are characters with values > 255, we have to compile an
      extended class, with its own opcode, unless there was a negated special
-Line 4141 
 for (;; ptr++)
+Line 4628 
 for (;; ptr++)
      be listed) there are no characters < 256, we can omit the bitmap in the
      actual compiled code. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-     if (class_utf8 && (!should_flip_negation || (options & PCRE_UCP) != 0))
+     if (xclass && (!should_flip_negation || (options & PCRE_UCP) != 0))
+ #elif !defined COMPILE_PCRE8
+     if (xclass && !should_flip_negation)
+ #endif
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
        {
-       *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
+       *class_uchardata++ = XCL_END;    /* Marks the end of extra data */
        *code++ = OP_XCLASS;
        code += LINK_SIZE;
-       *code = negate_class? XCL_NOT : 0;
+       *code = negate_class? XCL_NOT:0;
        /* If the map is required, move up the extra data to make room for it;
        otherwise just move the code pointer to the end of the extra data. */
-       if (class_charcount > 0)
+       if (class_has_8bitchar > 0)
          {
          *code++ |= XCL_MAP;
-         memmove(code + 32, code, class_utf8data - code);
+         memmove(code + (32 / sizeof(pcre_uchar)), code,
+           IN_UCHARS(class_uchardata - code));
          memcpy(code, classbits, 32);
-         code = class_utf8data + 32;
+         code = class_uchardata + (32 / sizeof(pcre_uchar));
          }
-       else code = class_utf8data;
+       else code = class_uchardata;
        /* Now fill in the complete length of the item */
-       PUT(previous, 1, code - previous);
+       PUT(previous, 1, (int)(code - previous));
        break;   /* End of class handling */
        }
  #endif
-Line 4175 
 for (;; ptr++)
+Line 4667 
 for (;; ptr++)
      negating it if necessary. */
      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
-     if (negate_class)
+     if (lengthptr == NULL)    /* Save time in the pre-compile phase */
-       {
-       if (lengthptr == NULL)    /* Save time in the pre-compile phase */
-         for (c = 0; c < 32; c++) code[c] = ~classbits[c];
-       }
-     else
        {
+       if (negate_class)
+         for (c = 0; c < 32; c++) classbits[c] = ~classbits[c];
        memcpy(code, classbits, 32);
        }
-     code += 32;
+     code += 32 / sizeof(pcre_uchar);
+     NOT_CHAR:
      break;
-Line 4221 
 for (;; ptr++)
+Line 4711 
 for (;; ptr++)
      if (repeat_min == 0)
        {
-       firstbyte = zerofirstbyte;    /* Adjust for zero repeat */
+       firstchar = zerofirstchar;    /* Adjust for zero repeat */
-       reqbyte = zeroreqbyte;        /* Ditto */
+       reqchar = zeroreqchar;        /* Ditto */
        }
      /* Remember whether this is a variable length repeat */
-Line 4264 
 for (;; ptr++)
+Line 4754 
 for (;; ptr++)
      if (*previous == OP_RECURSE)
        {
-       memmove(previous + 1 + LINK_SIZE, previous, 1 + LINK_SIZE);
+       memmove(previous + 1 + LINK_SIZE, previous, IN_UCHARS(1 + LINK_SIZE));
        *previous = OP_ONCE;
        PUT(previous, 1, 2 + 2*LINK_SIZE);
        previous[2 + 2*LINK_SIZE] = OP_KET;
-Line 4287 
 for (;; ptr++)
+Line 4777 
 for (;; ptr++)
      /* If previous was a character match, abolish the item and generate a
      repeat item instead. If a char item has a minumum of more than one, ensure
-     that it is set in reqbyte - it might not be if a sequence such as x{3} is
+     that it is set in reqchar - it might not be if a sequence such as x{3} is
-     the first thing in a branch because the x will have gone into firstbyte
+     the first thing in a branch because the x will have gone into firstchar
      instead.  */
      if (*previous == OP_CHAR || *previous == OP_CHARI)
        {
        op_type = (*previous == OP_CHAR)? 0 : OP_STARI - OP_STAR;
-       /* Deal with UTF-8 characters that take up more than one byte. It's
+       /* Deal with UTF characters that take up more than one character. It's
        easier to write this out separately than try to macrify it. Use c to
-       hold the length of the character in bytes, plus 0x80 to flag that it's a
+       hold the length of the character in bytes, plus UTF_LENGTH to flag that
-       length rather than a small character. */
+       it's a length rather than a small character. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       if (utf8 && (code[-1] & 0x80) != 0)
+       if (utf && NOT_FIRSTCHAR(code[-1]))
          {
-         uschar *lastchar = code - 1;
+         pcre_uchar *lastchar = code - 1;
-         while((*lastchar & 0xc0) == 0x80) lastchar--;
+         BACKCHAR(lastchar);
-         c = code - lastchar;            /* Length of UTF-8 character */
+         c = (int)(code - lastchar);     /* Length of UTF-8 character */
-         memcpy(utf8_char, lastchar, c); /* Save the char */
+         memcpy(utf_chars, lastchar, IN_UCHARS(c)); /* Save the char */
-         c |= 0x80;                      /* Flag c as a length */
+         c |= UTF_LENGTH;                /* Flag c as a length */
          }
        else
- #endif
+ #endif /* SUPPORT_UTF */
-       /* Handle the case of a single byte - either with no UTF8 support, or
-       with UTF-8 disabled, or for a UTF-8 character < 128. */
+       /* Handle the case of a single charater - either with no UTF support, or
+       with UTF disabled, or for a single character UTF character. */
          {
          c = code[-1];
-         if (repeat_min > 1) reqbyte = c | req_caseopt | cd->req_varyopt;
+         if (repeat_min > 1) reqchar = c | req_caseopt | cd->req_varyopt;
          }
        /* If the repetition is unlimited, it pays to see if the next thing on
-Line 4327 
 for (;; ptr++)
+Line 4816 
 for (;; ptr++)
        if (!possessive_quantifier &&
            repeat_max < 0 &&
-           check_auto_possessive(previous, utf8, ptr + 1, options, cd))
+           check_auto_possessive(previous, utf, ptr + 1, options, cd))
          {
          repeat_type = 0;    /* Force greedy */
          possessive_quantifier = TRUE;
-Line 4348 
 for (;; ptr++)
+Line 4837 
 for (;; ptr++)
        c = previous[1];
        if (!possessive_quantifier &&
            repeat_max < 0 &&
-           check_auto_possessive(previous, utf8, ptr + 1, options, cd))
+           check_auto_possessive(previous, utf, ptr + 1, options, cd))
          {
          repeat_type = 0;    /* Force greedy */
          possessive_quantifier = TRUE;
-Line 4365 
 for (;; ptr++)
+Line 4854 
 for (;; ptr++)
      else if (*previous < OP_EODN)
        {
-       uschar *oldcode;
+       pcre_uchar *oldcode;
        int prop_type, prop_value;
        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */
        c = *previous;
        if (!possessive_quantifier &&
            repeat_max < 0 &&
-           check_auto_possessive(previous, utf8, ptr + 1, options, cd))
+           check_auto_possessive(previous, utf, ptr + 1, options, cd))
          {
          repeat_type = 0;    /* Force greedy */
          possessive_quantifier = TRUE;
-Line 4452 
 for (;; ptr++)
+Line 4941 
 for (;; ptr++)
          we have to insert the character for the previous code. For a repeated
          Unicode property match, there are two extra bytes that define the
          required property. In UTF-8 mode, long characters have their length in
-         c, with the 0x80 bit as a flag. */
+         c, with the UTF_LENGTH bit as a flag. */
          if (repeat_max < 0)
            {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-           if (utf8 && c >= 128)
+           if (utf && (c & UTF_LENGTH) != 0)
              {
-             memcpy(code, utf8_char, c & 7);
+             memcpy(code, utf_chars, IN_UCHARS(c & 7));
              code += c & 7;
              }
            else
-Line 4481 
 for (;; ptr++)
+Line 4970 
 for (;; ptr++)
          else if (repeat_max != repeat_min)
            {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-           if (utf8 && c >= 128)
+           if (utf && (c & UTF_LENGTH) != 0)
              {
-             memcpy(code, utf8_char, c & 7);
+             memcpy(code, utf_chars, IN_UCHARS(c & 7));
              code += c & 7;
              }
            else
-Line 4511 
 for (;; ptr++)
+Line 5000 
 for (;; ptr++)
        /* The character or character type itself comes last in all cases. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       if (utf8 && c >= 128)
+       if (utf && (c & UTF_LENGTH) != 0)
          {
-         memcpy(code, utf8_char, c & 7);
+         memcpy(code, utf_chars, IN_UCHARS(c & 7));
          code += c & 7;
          }
        else
-Line 4538 
 for (;; ptr++)
+Line 5027 
 for (;; ptr++)
      else if (*previous == OP_CLASS ||
               *previous == OP_NCLASS ||
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
               *previous == OP_XCLASS ||
  #endif
               *previous == OP_REF ||
-Line 4587 
 for (;; ptr++)
+Line 5076 
 for (;; ptr++)
        {
        register int i;
        int len = (int)(code - previous);
-       uschar *bralink = NULL;
+       pcre_uchar *bralink = NULL;
-       uschar *brazeroptr = NULL;
+       pcre_uchar *brazeroptr = NULL;
        /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so
        we just ignore the repeat. */
-Line 4641 
 for (;; ptr++)
+Line 5130 
 for (;; ptr++)
          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
            {
            *code = OP_END;
-           adjust_recurse(previous, 1, utf8, cd, save_hwm);
+           adjust_recurse(previous, 1, utf, cd, save_hwm);
-           memmove(previous+1, previous, len);
+           memmove(previous + 1, previous, IN_UCHARS(len));
            code++;
            if (repeat_max == 0)
              {
-Line 4665 
 for (;; ptr++)
+Line 5154 
 for (;; ptr++)
            {
            int offset;
            *code = OP_END;
-           adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd, save_hwm);
+           adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, save_hwm);
-           memmove(previous + 2 + LINK_SIZE, previous, len);
+           memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len));
            code += 2 + LINK_SIZE;
            *previous++ = OP_BRAZERO + repeat_type;
            *previous++ = OP_BRA;
-Line 4712 
 for (;; ptr++)
+Line 5201 
 for (;; ptr++)
              *lengthptr += delta;
              }
-           /* This is compiling for real */
+           /* This is compiling for real. If there is a set first byte for
+           the group, and we have not yet set a "required byte", set it. Make
+           sure there is enough workspace for copying forward references before
+           doing the copy. */
            else
              {
-             if (groupsetfirstbyte && reqbyte < 0) reqbyte = firstbyte;
+             if (groupsetfirstchar && reqchar < 0) reqchar = firstchar;
              for (i = 1; i < repeat_min; i++)
                {
-               uschar *hc;
+               pcre_uchar *hc;
-               uschar *this_hwm = cd->hwm;
+               pcre_uchar *this_hwm = cd->hwm;
-               memcpy(code, previous, len);
+               memcpy(code, previous, IN_UCHARS(len));
+               while (cd->hwm > cd->start_workspace + cd->workspace_size -
+                      WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))
+                 {
+                 int save_offset = save_hwm - cd->start_workspace;
+                 int this_offset = this_hwm - cd->start_workspace;
+                 *errorcodeptr = expand_workspace(cd);
+                 if (*errorcodeptr != 0) goto FAILED;
+                 save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;
+                 this_hwm = (pcre_uchar *)cd->start_workspace + this_offset;
+                 }
                for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
                  {
                  PUT(cd->hwm, 0, GET(hc, 0) + len);
-Line 4771 
 for (;; ptr++)
+Line 5276 
 for (;; ptr++)
          else for (i = repeat_max - 1; i >= 0; i--)
            {
-           uschar *hc;
+           pcre_uchar *hc;
-           uschar *this_hwm = cd->hwm;
+           pcre_uchar *this_hwm = cd->hwm;
            *code++ = OP_BRAZERO + repeat_type;
-Line 4788 
 for (;; ptr++)
+Line 5293 
 for (;; ptr++)
              PUTINC(code, 0, offset);
              }
-           memcpy(code, previous, len);
+           memcpy(code, previous, IN_UCHARS(len));
+           /* Ensure there is enough workspace for forward references before
+           copying them. */
+           while (cd->hwm > cd->start_workspace + cd->workspace_size -
+                  WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))
+             {
+             int save_offset = save_hwm - cd->start_workspace;
+             int this_offset = this_hwm - cd->start_workspace;
+             *errorcodeptr = expand_workspace(cd);
+             if (*errorcodeptr != 0) goto FAILED;
+             save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;
+             this_hwm = (pcre_uchar *)cd->start_workspace + this_offset;
+             }
            for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
              {
              PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));
-Line 4805 
 for (;; ptr++)
+Line 5325 
 for (;; ptr++)
            {
            int oldlinkoffset;
            int offset = (int)(code - bralink + 1);
-           uschar *bra = code - offset;
+           pcre_uchar *bra = code - offset;
            oldlinkoffset = GET(bra, 1);
            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
            *code++ = OP_KET;
-Line 4820 
 for (;; ptr++)
+Line 5340 
 for (;; ptr++)
        behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to
        deal with possessive ONCEs specially.
-       Otherwise, if the quantifier was possessive, we convert the BRA code to
+       Otherwise, when we are doing the actual compile phase, check to see
-       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,
-       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
-       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
-       stack usage in pcre_exec(). If the group is preceded by OP_BRAZERO,
+       groups at runtime, but in a different way.]
-       convert this to OP_BRAPOSZERO. Then cancel the possessive flag so that
-       the default action below, of wrapping everything inside atomic brackets,
+       Then, if the quantifier was possessive and the bracket is not a
-       does not happen.
+       conditional, we convert the BRA code to the POS form, and the KET code to
+       KETRPOS. (It turns out to be convenient at runtime to detect this kind of
-       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
-       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
-       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.
-       checking can be done. [This check is also applied to ONCE groups at
-       runtime, but in a different way.] */
+       Then, if the minimum number of matches is 1 or 0, cancel the possessive
+       flag so that the default action below, of wrapping everything inside
+       atomic brackets, does not happen. When the minimum is greater than 1,
+       there will be earlier copies of the group, and so we still have to wrap
+       the whole thing. */
        else
          {
-         uschar *ketcode = code - 1 - LINK_SIZE;
+         pcre_uchar *ketcode = code - 1 - LINK_SIZE;
-         uschar *bracode = ketcode - GET(ketcode, 1);
+         pcre_uchar *bracode = ketcode - GET(ketcode, 1);
+         /* Convert possessive ONCE brackets to non-capturing */
+         if ((*bracode == OP_ONCE || *bracode == OP_ONCE_NC) &&
+             possessive_quantifier) *bracode = OP_BRA;
-         if (*bracode == OP_ONCE && possessive_quantifier) *bracode = OP_BRA;
+         /* For non-possessive ONCE brackets, all we need to do is to
-         if (*bracode == OP_ONCE)
+         set the KET. */
+         if (*bracode == OP_ONCE || *bracode == OP_ONCE_NC)
            *ketcode = OP_KETRMAX + repeat_type;
+         /* Handle non-ONCE brackets and possessive ONCEs (which have been
+         converted to non-capturing above). */
          else
            {
-           if (possessive_quantifier)
+           /* In the compile phase, check for empty string matching. */
-             {
-             *bracode += 1;                   /* Switch to xxxPOS opcodes */
-             *ketcode = OP_KETRPOS;
-             if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
-             possessive_quantifier = FALSE;
-             }
-           else *ketcode = OP_KETRMAX + repeat_type;
            if (lengthptr == NULL)
              {
-             uschar *scode = bracode;
+             pcre_uchar *scode = bracode;
              do
                {
-               if (could_be_empty_branch(scode, ketcode, utf8, cd))
+               if (could_be_empty_branch(scode, ketcode, utf, cd))
                  {
                  *bracode += OP_SBRA - OP_BRA;
                  break;
-Line 4868 
 for (;; ptr++)
+Line 5396 
 for (;; ptr++)
                }
              while (*scode == OP_ALT);
              }
+           /* Handle possessive quantifiers. */
+           if (possessive_quantifier)
+             {
+             /* For COND brackets, we wrap the whole thing in a possessively
+             repeated non-capturing bracket, because we have not invented POS
+             versions of the COND opcodes. Because we are moving code along, we
+             must ensure that any pending recursive references are updated. */
+             if (*bracode == OP_COND || *bracode == OP_SCOND)
+               {
+               int nlen = (int)(code - bracode);
+               *code = OP_END;
+               adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, save_hwm);
+               memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen));
+               code += 1 + LINK_SIZE;
+               nlen += 1 + LINK_SIZE;
+               *bracode = OP_BRAPOS;
+               *code++ = OP_KETRPOS;
+               PUTINC(code, 0, nlen);
+               PUT(bracode, 1, nlen);
+               }
+             /* For non-COND brackets, we modify the BRA code and use KETRPOS. */
+             else
+               {
+               *bracode += 1;              /* Switch to xxxPOS opcodes */
+               *ketcode = OP_KETRPOS;
+               }
+             /* If the minimum is zero, mark it as possessive, then unset the
+             possessive flag when the minimum is 0 or 1. */
+             if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
+             if (repeat_min < 2) possessive_quantifier = FALSE;
+             }
+           /* Non-possessive quantifier */
+           else *ketcode = OP_KETRMAX + repeat_type;
            }
          }
        }
-Line 4894 
 for (;; ptr++)
+Line 5464 
 for (;; ptr++)
      notation is just syntactic sugar, taken from Sun's Java package, but the
      special opcodes can optimize it.
-     Possessively repeated subpatterns have already been handled in the code
+     Some (but not all) possessively repeated subpatterns have already been
-     just above, so possessive_quantifier is always FALSE for them at this
+     completely handled in the code just above. For them, possessive_quantifier
-     stage.
+     is always FALSE at this stage.
      Note that the repeated item starts at tempcode, not at previous, which
      might be the first part of a string whose (former) last char we repeated.
-Line 4910 
 for (;; ptr++)
+Line 5480 
 for (;; ptr++)
        int len;
        if (*tempcode == OP_TYPEEXACT)
-         tempcode += _pcre_OP_lengths[*tempcode] +
+         tempcode += PRIV(OP_lengths)[*tempcode] +
-           ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);
+           ((tempcode[1 + IMM2_SIZE] == OP_PROP
+           || tempcode[1 + IMM2_SIZE] == OP_NOTPROP)? 2 : 0);
        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
          {
-         tempcode += _pcre_OP_lengths[*tempcode];
+         tempcode += PRIV(OP_lengths)[*tempcode];
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         if (utf8 && tempcode[-1] >= 0xc0)
+         if (utf && HAS_EXTRALEN(tempcode[-1]))
-           tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];
+           tempcode += GET_EXTRALEN(tempcode[-1]);
  #endif
          }
-Line 4955 
 for (;; ptr++)
+Line 5526 
 for (;; ptr++)
          default:
          *code = OP_END;
-         adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);
+         adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm);
-         memmove(tempcode + 1+LINK_SIZE, tempcode, len);
+         memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
          code += 1 + LINK_SIZE;
          len += 1 + LINK_SIZE;
          tempcode[0] = OP_ONCE;
-Line 4968 
 for (;; ptr++)
+Line 5539 
 for (;; ptr++)
        }
      /* In all case we no longer have a previous item. We also set the
-     "follows varying string" flag for subsequently encountered reqbytes if
+     "follows varying string" flag for subsequently encountered reqchars if
      it isn't already set and we have just passed a varying length item. */
      END_REPEAT:
-Line 4991 
 for (;; ptr++)
+Line 5562 
 for (;; ptr++)
      /* First deal with various "verbs" that can be introduced by '*'. */
-     if (*(++ptr) == CHAR_ASTERISK &&
+     ptr++;
-          ((cd->ctypes[ptr[1]] & ctype_letter) != 0 || ptr[1] == ':'))
+     if (ptr[0] == CHAR_ASTERISK && (ptr[1] == ':'
+          || (MAX_255(ptr[1]) && ((cd->ctypes[ptr[1]] & ctype_letter) != 0))))
        {
        int i, namelen;
        int arglen = 0;
        const char *vn = verbnames;
-       const uschar *name = ptr + 1;
+       const pcre_uchar *name = ptr + 1;
-       const uschar *arg = NULL;
+       const pcre_uchar *arg = NULL;
        previous = NULL;
-       while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
+       ptr++;
+       while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;
        namelen = (int)(ptr - name);
        /* It appears that Perl allows any characters whatsoever, other than
-Line 5025 
 for (;; ptr++)
+Line 5598 
 for (;; ptr++)
        for (i = 0; i < verbcount; i++)
          {
          if (namelen == verbs[i].len &&
-             strncmp((char *)name, vn, namelen) == 0)
+             STRNCMP_UC_C8(name, vn, namelen) == 0)
            {
            /* Check for open captures before ACCEPT and convert it to
            ASSERT_ACCEPT if in an assertion. */
-Line 5046 
 for (;; ptr++)
+Line 5619 
 for (;; ptr++)
                }
              *code++ = (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
-             /* Do not set firstbyte after *ACCEPT */
+             /* Do not set firstchar after *ACCEPT */
-             if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+             if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
              }
            /* Handle other cases with/without an argument */
-Line 5060 
 for (;; ptr++)
+Line 5633 
 for (;; ptr++)
                goto FAILED;
                }
              *code = verbs[i].op;
-             if (*code++ == OP_THEN)
+             if (*code++ == OP_THEN) cd->external_flags |= PCRE_HASTHEN;
-               {
-               PUT(code, 0, code - bcptr->current_branch - 1);
-               code += LINK_SIZE;
-               cd->external_flags |= PCRE_HASTHEN;
-               }
              }
            else
-Line 5076 
 for (;; ptr++)
+Line 5644 
 for (;; ptr++)
                goto FAILED;
                }
              *code = verbs[i].op_arg;
-             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;
-               }
              *code++ = arglen;
-             memcpy(code, arg, arglen);
+             memcpy(code, arg, IN_UCHARS(arglen));
              code += arglen;
              *code++ = 0;
              }
-Line 5105 
 for (;; ptr++)
+Line 5669 
 for (;; ptr++)
        {
        int i, set, unset, namelen;
        int *optset;
-       const uschar *name;
+       const pcre_uchar *name;
-       uschar *slot;
+       pcre_uchar *slot;
        switch (*(++ptr))
          {
-Line 5159 
 for (;; ptr++)
+Line 5723 
 for (;; ptr++)
            break;
          /* Most other conditions use OP_CREF (a couple change to OP_RREF
-         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. */
          code[1+LINK_SIZE] = OP_CREF;
-         skipbytes = 3;
+         skipbytes = 1+IMM2_SIZE;
          refsign = -1;
          /* Check for a test for recursion in a named group. */
-Line 5195 
 for (;; ptr++)
+Line 5759 
 for (;; ptr++)
          /* We now expect to read a name; any thing else is an error */
-         if ((cd->ctypes[ptr[1]] & ctype_word) == 0)
+         if (!MAX_255(ptr[1]) || (cd->ctypes[ptr[1]] & ctype_word) == 0)
            {
            ptr += 1;  /* To get the right offset */
            *errorcodeptr = ERR28;
-Line 5206 
 for (;; ptr++)
+Line 5770 
 for (;; ptr++)
          recno = 0;
          name = ++ptr;
-         while ((cd->ctypes[*ptr] & ctype_word) != 0)
+         while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0)
            {
            if (recno >= 0)
-             recno = ((digitab[*ptr] & ctype_digit) != 0)?
+             recno = (IS_DIGIT(*ptr))? recno * 10 + *ptr - CHAR_0 : -1;
-               recno * 10 + *ptr - CHAR_0 : -1;
            ptr++;
            }
          namelen = (int)(ptr - name);
-Line 5258 
 for (;; ptr++)
+Line 5821 
 for (;; ptr++)
          slot = cd->name_table;
          for (i = 0; i < cd->names_found; i++)
            {
-           if (strncmp((char *)name, (char *)slot+2, namelen) == 0) break;
+           if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) == 0) break;
            slot += cd->name_entry_size;
            }
-Line 5274 
 for (;; ptr++)
+Line 5837 
 for (;; ptr++)
          /* Search the pattern for a forward reference */
          else if ((i = find_parens(cd, name, namelen,
-                         (options & PCRE_EXTENDED) != 0, utf8)) > 0)
+                         (options & PCRE_EXTENDED) != 0, utf)) > 0)
            {
            PUT2(code, 2+LINK_SIZE, i);
            code[1+LINK_SIZE]++;
-Line 5300 
 for (;; ptr++)
+Line 5863 
 for (;; ptr++)
            recno = 0;
            for (i = 1; i < namelen; i++)
              {
-             if ((digitab[name[i]] & ctype_digit) == 0)
+             if (!IS_DIGIT(name[i]))
                {
                *errorcodeptr = ERR15;
                goto FAILED;
-Line 5315 
 for (;; ptr++)
+Line 5878 
 for (;; ptr++)
          /* Similarly, check for the (?(DEFINE) "condition", which is always
          false. */
-         else if (namelen == 6 && strncmp((char *)name, STRING_DEFINE, 6) == 0)
+         else if (namelen == 6 && STRNCMP_UC_C8(name, STRING_DEFINE, 6) == 0)
            {
            code[1+LINK_SIZE] = OP_DEF;
            skipbytes = 1;
-Line 5378 
 for (;; ptr++)
+Line 5941 
 for (;; ptr++)
            break;
            default:                /* Could be name define, else bad */
-           if ((cd->ctypes[ptr[1]] & ctype_word) != 0) goto DEFINE_NAME;
+           if (MAX_255(ptr[1]) && (cd->ctypes[ptr[1]] & ctype_word) != 0)
+             goto DEFINE_NAME;
            ptr++;                  /* Correct offset for error */
            *errorcodeptr = ERR24;
            goto FAILED;
-Line 5395 
 for (;; ptr++)
+Line 5959 
 for (;; ptr++)
          /* ------------------------------------------------------------ */
          case CHAR_C:                 /* Callout - may be followed by digits; */
-         previous_callout = code;  /* Save for later completion */
+         previous_callout = code;     /* Save for later completion */
-         after_manual_callout = 1; /* Skip one item before completing */
+         after_manual_callout = 1;    /* Skip one item before completing */
          *code++ = OP_CALLOUT;
            {
            int n = 0;
-           while ((digitab[*(++ptr)] & ctype_digit) != 0)
+           ptr++;
-             n = n * 10 + *ptr - CHAR_0;
+           while(IS_DIGIT(*ptr))
+             n = n * 10 + *ptr++ - CHAR_0;
            if (*ptr != CHAR_RIGHT_PARENTHESIS)
              {
              *errorcodeptr = ERR39;
-Line 5446 
 for (;; ptr++)
+Line 6011 
 for (;; ptr++)
              CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
            name = ++ptr;
-           while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
+           while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
            namelen = (int)(ptr - name);
            /* In the pre-compile phase, just do a syntax check. */
-Line 5463 
 for (;; ptr++)
+Line 6028 
 for (;; ptr++)
                *errorcodeptr = ERR49;
                goto FAILED;
                }
-             if (namelen + 3 > cd->name_entry_size)
+             if (namelen + IMM2_SIZE + 1 > cd->name_entry_size)
                {
-               cd->name_entry_size = namelen + 3;
+               cd->name_entry_size = namelen + IMM2_SIZE + 1;
                if (namelen > MAX_NAME_SIZE)
                  {
                  *errorcodeptr = ERR48;
-Line 5494 
 for (;; ptr++)
+Line 6059 
 for (;; ptr++)
              for (i = 0; i < cd->names_found; i++)
                {
-               int crc = memcmp(name, slot+2, namelen);
+               int crc = memcmp(name, slot+IMM2_SIZE, IN_UCHARS(namelen));
                if (crc == 0)
                  {
-                 if (slot[2+namelen] == 0)
+                 if (slot[IMM2_SIZE+namelen] == 0)
                    {
                    if (GET2(slot, 0) != cd->bracount + 1 &&
                        (options & PCRE_DUPNAMES) == 0)
-Line 5518 
 for (;; ptr++)
+Line 6083 
 for (;; ptr++)
                if (crc < 0)
                  {
                  memmove(slot + cd->name_entry_size, slot,
-                   (cd->names_found - i) * cd->name_entry_size);
+                   IN_UCHARS((cd->names_found - i) * cd->name_entry_size));
                  break;
                  }
-Line 5532 
 for (;; ptr++)
+Line 6097 
 for (;; ptr++)
              if (!dupname)
                {
-               uschar *cslot = cd->name_table;
+               pcre_uchar *cslot = cd->name_table;
                for (i = 0; i < cd->names_found; i++)
                  {
                  if (cslot != slot)
-Line 5549 
 for (;; ptr++)
+Line 6114 
 for (;; ptr++)
                }
              PUT2(slot, 0, cd->bracount + 1);
-             memcpy(slot + 2, name, namelen);
+             memcpy(slot + IMM2_SIZE, name, IN_UCHARS(namelen));
-             slot[2+namelen] = 0;
+             slot[IMM2_SIZE + namelen] = 0;
              }
            }
-Line 5576 
 for (;; ptr++)
+Line 6141 
 for (;; ptr++)
          NAMED_REF_OR_RECURSE:
          name = ++ptr;
-         while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
+         while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
          namelen = (int)(ptr - name);
          /* In the pre-compile phase, do a syntax check. We used to just set
-Line 5588 
 for (;; ptr++)
+Line 6153 
 for (;; ptr++)
          if (lengthptr != NULL)
            {
-           const uschar *temp;
+           const pcre_uchar *temp;
            if (namelen == 0)
              {
-Line 5618 
 for (;; ptr++)
+Line 6183 
 for (;; ptr++)
            temp = cd->end_pattern;
            cd->end_pattern = ptr;
            recno = find_parens(cd, name, namelen,
-             (options & PCRE_EXTENDED) != 0, utf8);
+             (options & PCRE_EXTENDED) != 0, utf);
            cd->end_pattern = temp;
            if (recno < 0) recno = 0;    /* Forward ref; set dummy number */
            }
-Line 5633 
 for (;; ptr++)
+Line 6198 
 for (;; ptr++)
            slot = cd->name_table;
            for (i = 0; i < cd->names_found; i++)
              {
-             if (strncmp((char *)name, (char *)slot+2, namelen) == 0 &&
+             if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) == 0 &&
-                 slot[2+namelen] == 0)
+                 slot[IMM2_SIZE+namelen] == 0)
                break;
              slot += cd->name_entry_size;
              }
-Line 5645 
 for (;; ptr++)
+Line 6210 
 for (;; ptr++)
              }
            else if ((recno =                /* Forward back reference */
                      find_parens(cd, name, namelen,
-                       (options & PCRE_EXTENDED) != 0, utf8)) <= 0)
+                       (options & PCRE_EXTENDED) != 0, utf)) <= 0)
              {
              *errorcodeptr = ERR15;
              goto FAILED;
-Line 5670 
 for (;; ptr++)
+Line 6235 
 for (;; ptr++)
          case CHAR_0: case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4:
          case CHAR_5: case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
            {
-           const uschar *called;
+           const pcre_uchar *called;
            terminator = CHAR_RIGHT_PARENTHESIS;
            /* Come here from the \g<...> and \g'...' code (Oniguruma
-Line 5684 
 for (;; ptr++)
+Line 6249 
 for (;; ptr++)
            if ((refsign = *ptr) == CHAR_PLUS)
              {
              ptr++;
-             if ((digitab[*ptr] & ctype_digit) == 0)
+             if (!IS_DIGIT(*ptr))
                {
                *errorcodeptr = ERR63;
                goto FAILED;
-Line 5692 
 for (;; ptr++)
+Line 6257 
 for (;; ptr++)
              }
            else if (refsign == CHAR_MINUS)
              {
-             if ((digitab[ptr[1]] & ctype_digit) == 0)
+             if (!IS_DIGIT(ptr[1]))
                goto OTHER_CHAR_AFTER_QUERY;
              ptr++;
              }
            recno = 0;
-           while((digitab[*ptr] & ctype_digit) != 0)
+           while(IS_DIGIT(*ptr))
              recno = recno * 10 + *ptr++ - CHAR_0;
            if (*ptr != terminator)
-Line 5749 
 for (;; ptr++)
+Line 6314 
 for (;; ptr++)