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

Diff of /code/trunk/pcre_compile.c

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

revision 773 by ph10, Wed Nov 30 18:10:27 2011 UTC revision 961 by ph10, Fri Apr 20 11:49:13 2012 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2011 University of Cambridge             Copyright (c) 1997-2012 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 53  supporting internal functions that are n Line 53  supporting internal functions that are n
53  #include "pcre_internal.h"  #include "pcre_internal.h"
54    
55    
56  /* When 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
57  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
58  library. */  library. We do not need to select pcre16_printint.c specially, because the
59    COMPILE_PCREx macro will already be appropriately set. */
60    
61  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
62  #include "pcre_printint.src"  /* pcre_printint.c should not include any headers */
63    #define PCRE_INCLUDED
64    #include "pcre_printint.c"
65    #undef PCRE_INCLUDED
66  #endif  #endif
67    
68    
# Line 88  so this number is very generous. Line 92  so this number is very generous.
92  The same workspace is used during the second, actual compile phase for  The same workspace is used during the second, actual compile phase for
93  remembering forward references to groups so that they can be filled in at the  remembering forward references to groups so that they can be filled in at the
94  end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE  end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE
95  is 4 there is plenty of room for most patterns. However, the memory can get  is 4 there is plenty of room for most patterns. However, the memory can get
96  filled up by repetitions of forward references, for example patterns like  filled up by repetitions of forward references, for example patterns like
97  /(?1){0,1999}(b)/, and one user did hit the limit. The code has been changed so  /(?1){0,1999}(b)/, and one user did hit the limit. The code has been changed so
98  that the workspace is expanded using malloc() in this situation. The value  that the workspace is expanded using malloc() in this situation. The value
99  below is therefore a minimum, and we put a maximum on it for safety. The  below is therefore a minimum, and we put a maximum on it for safety. The
100  minimum is now also defined in terms of LINK_SIZE so that the use of malloc()  minimum is now also defined in terms of LINK_SIZE so that the use of malloc()
101  kicks in at the same number of forward references in all cases. */  kicks in at the same number of forward references in all cases. */
102    
103  #define COMPILE_WORK_SIZE (2048*LINK_SIZE)  #define COMPILE_WORK_SIZE (2048*LINK_SIZE)
# Line 104  overrun before it actually does run off Line 108  overrun before it actually does run off
108    
109  #define WORK_SIZE_SAFETY_MARGIN (100)  #define WORK_SIZE_SAFETY_MARGIN (100)
110    
111    /* Private flags added to firstchar and reqchar. */
112    
113    #define REQ_CASELESS   0x10000000l      /* Indicates caselessness */
114    #define REQ_VARY       0x20000000l      /* Reqchar followed non-literal item */
115    
116    /* Repeated character flags. */
117    
118    #define UTF_LENGTH     0x10000000l      /* The char contains its length. */
119    
120  /* Table for handling escaped characters in the range '0'-'z'. Positive returns  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
121  are simple data values; negative values are for special things like \d and so  are simple data values; negative values are for special things like \d and so
# Line 238  static const char posix_names[] = Line 250  static const char posix_names[] =
250    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
251    STRING_word0  STRING_xdigit;    STRING_word0  STRING_xdigit;
252    
253  static const uschar posix_name_lengths[] = {  static const pcre_uint8 posix_name_lengths[] = {
254    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
255    
256  /* Table of class bit maps for each POSIX class. Each class is formed from a  /* Table of class bit maps for each POSIX class. Each class is formed from a
# Line 273  substitutes must be in the order of the Line 285  substitutes must be in the order of the
285  both positive and negative cases. NULL means no substitute. */  both positive and negative cases. NULL means no substitute. */
286    
287  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
288  static const uschar *substitutes[] = {  static const pcre_uchar string_PNd[]  = {
289    (uschar *)"\\P{Nd}",    /* \D */    CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
290    (uschar *)"\\p{Nd}",    /* \d */    CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
291    (uschar *)"\\P{Xsp}",   /* \S */       /* NOTE: Xsp is Perl space */  static const pcre_uchar string_pNd[]  = {
292    (uschar *)"\\p{Xsp}",   /* \s */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
293    (uschar *)"\\P{Xwd}",   /* \W */    CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
294    (uschar *)"\\p{Xwd}"    /* \w */  static const pcre_uchar string_PXsp[] = {
295      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
296      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
297    static const pcre_uchar string_pXsp[] = {
298      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
299      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
300    static const pcre_uchar string_PXwd[] = {
301      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
302      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
303    static const pcre_uchar string_pXwd[] = {
304      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
305      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
306    
307    static const pcre_uchar *substitutes[] = {
308      string_PNd,           /* \D */
309      string_pNd,           /* \d */
310      string_PXsp,          /* \S */       /* NOTE: Xsp is Perl space */
311      string_pXsp,          /* \s */
312      string_PXwd,          /* \W */
313      string_pXwd           /* \w */
314  };  };
315    
316  static const uschar *posix_substitutes[] = {  static const pcre_uchar string_pL[] =   {
317    (uschar *)"\\p{L}",     /* alpha */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
318    (uschar *)"\\p{Ll}",    /* lower */    CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
319    (uschar *)"\\p{Lu}",    /* upper */  static const pcre_uchar string_pLl[] =  {
320    (uschar *)"\\p{Xan}",   /* alnum */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
321    NULL,                   /* ascii */    CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
322    (uschar *)"\\h",        /* blank */  static const pcre_uchar string_pLu[] =  {
323    NULL,                   /* cntrl */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
324    (uschar *)"\\p{Nd}",    /* digit */    CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
325    NULL,                   /* graph */  static const pcre_uchar string_pXan[] = {
326    NULL,                   /* print */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
327    NULL,                   /* punct */    CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
328    (uschar *)"\\p{Xps}",   /* space */    /* NOTE: Xps is POSIX space */  static const pcre_uchar string_h[] =    {
329    (uschar *)"\\p{Xwd}",   /* word */    CHAR_BACKSLASH, CHAR_h, '\0' };
330    NULL,                   /* xdigit */  static const pcre_uchar string_pXps[] = {
331      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
332      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
333    static const pcre_uchar string_PL[] =   {
334      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
335      CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
336    static const pcre_uchar string_PLl[] =  {
337      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
338      CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
339    static const pcre_uchar string_PLu[] =  {
340      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
341      CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
342    static const pcre_uchar string_PXan[] = {
343      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
344      CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
345    static const pcre_uchar string_H[] =    {
346      CHAR_BACKSLASH, CHAR_H, '\0' };
347    static const pcre_uchar string_PXps[] = {
348      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
349      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
350    
351    static const pcre_uchar *posix_substitutes[] = {
352      string_pL,            /* alpha */
353      string_pLl,           /* lower */
354      string_pLu,           /* upper */
355      string_pXan,          /* alnum */
356      NULL,                 /* ascii */
357      string_h,             /* blank */
358      NULL,                 /* cntrl */
359      string_pNd,           /* digit */
360      NULL,                 /* graph */
361      NULL,                 /* print */
362      NULL,                 /* punct */
363      string_pXps,          /* space */    /* NOTE: Xps is POSIX space */
364      string_pXwd,          /* word */
365      NULL,                 /* xdigit */
366    /* Negated cases */    /* Negated cases */
367    (uschar *)"\\P{L}",     /* ^alpha */    string_PL,            /* ^alpha */
368    (uschar *)"\\P{Ll}",    /* ^lower */    string_PLl,           /* ^lower */
369    (uschar *)"\\P{Lu}",    /* ^upper */    string_PLu,           /* ^upper */
370    (uschar *)"\\P{Xan}",   /* ^alnum */    string_PXan,          /* ^alnum */
371    NULL,                   /* ^ascii */    NULL,                 /* ^ascii */
372    (uschar *)"\\H",        /* ^blank */    string_H,             /* ^blank */
373    NULL,                   /* ^cntrl */    NULL,                 /* ^cntrl */
374    (uschar *)"\\P{Nd}",    /* ^digit */    string_PNd,           /* ^digit */
375    NULL,                   /* ^graph */    NULL,                 /* ^graph */
376    NULL,                   /* ^print */    NULL,                 /* ^print */
377    NULL,                   /* ^punct */    NULL,                 /* ^punct */
378    (uschar *)"\\P{Xps}",   /* ^space */   /* NOTE: Xps is POSIX space */    string_PXps,          /* ^space */   /* NOTE: Xps is POSIX space */
379    (uschar *)"\\P{Xwd}",   /* ^word */    string_PXwd,          /* ^word */
380    NULL                    /* ^xdigit */    NULL                  /* ^xdigit */
381  };  };
382  #define POSIX_SUBSIZE (sizeof(posix_substitutes)/sizeof(uschar *))  #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
383  #endif  #endif
384    
385  #define STRING(a)  # a  #define STRING(a)  # a
# Line 372  static const char error_texts[] = Line 438  static const char error_texts[] =
438    /* 30 */    /* 30 */
439    "unknown POSIX class name\0"    "unknown POSIX class name\0"
440    "POSIX collating elements are not supported\0"    "POSIX collating elements are not supported\0"
441    "this version of PCRE is not compiled with PCRE_UTF8 support\0"    "this version of PCRE is compiled without UTF support\0"
442    "spare error\0"  /** DEAD **/    "spare error\0"  /** DEAD **/
443    "character value in \\x{...} sequence is too large\0"    "character value in \\x{...} sequence is too large\0"
444    /* 35 */    /* 35 */
# Line 395  static const char error_texts[] = Line 461  static const char error_texts[] =
461    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
462    /* 50 */    /* 50 */
463    "repeated subpattern is too long\0"    /** DEAD **/    "repeated subpattern is too long\0"    /** DEAD **/
464    "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"
465    "internal error: overran compiling workspace\0"    "internal error: overran compiling workspace\0"
466    "internal error: previously-checked referenced subpattern not found\0"    "internal error: previously-checked referenced subpattern not found\0"
467    "DEFINE group contains more than one branch\0"    "DEFINE group contains more than one branch\0"
# Line 414  static const char error_texts[] = Line 480  static const char error_texts[] =
480    /* 65 */    /* 65 */
481    "different names for subpatterns of the same number are not allowed\0"    "different names for subpatterns of the same number are not allowed\0"
482    "(*MARK) must have an argument\0"    "(*MARK) must have an argument\0"
483    "this version of PCRE is not compiled with PCRE_UCP support\0"    "this version of PCRE is not compiled with Unicode property support\0"
484    "\\c must be followed by an ASCII character\0"    "\\c must be followed by an ASCII character\0"
485    "\\k is not followed by a braced, angle-bracketed, or quoted name\0"    "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
486    /* 70 */    /* 70 */
487    "internal error: unknown opcode in find_fixedlength()\0"    "internal error: unknown opcode in find_fixedlength()\0"
488    "\\N is not supported in a class\0"    "\\N is not supported in a class\0"
489    "too many forward references\0"    "too many forward references\0"
490      "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
491      "invalid UTF-16 string\0"
492    ;    ;
493    
494  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
# Line 439  For convenience, we use the same bit def Line 507  For convenience, we use the same bit def
507    
508  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
509    
510    /* Using a simple comparison for decimal numbers rather than a memory read
511    is much faster, and the resulting code is simpler (the compiler turns it
512    into a subtraction and unsigned comparison). */
513    
514    #define IS_DIGIT(x) ((x) >= CHAR_0 && (x) <= CHAR_9)
515    
516  #ifndef EBCDIC  #ifndef EBCDIC
517    
518  /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in  /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
519  UTF-8 mode. */  UTF-8 mode. */
520    
521  static const unsigned char digitab[] =  static const pcre_uint8 digitab[] =
522    {    {
523    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
524    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */
# Line 483  static const unsigned char digitab[] = Line 557  static const unsigned char digitab[] =
557    
558  /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */  /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
559    
560  static const unsigned char digitab[] =  static const pcre_uint8 digitab[] =
561    {    {
562    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
563    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */
# Line 518  static const unsigned char digitab[] = Line 592  static const unsigned char digitab[] =
592    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */
593    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */
594    
595  static const unsigned char ebcdic_chartab[] = { /* chartable partial dup */  static const pcre_uint8 ebcdic_chartab[] = { /* chartable partial dup */
596    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */
597    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
598    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */
# Line 557  static const unsigned char ebcdic_charta Line 631  static const unsigned char ebcdic_charta
631  /* Definition to allow mutual recursion */  /* Definition to allow mutual recursion */
632    
633  static BOOL  static BOOL
634    compile_regex(int, uschar **, const uschar **, int *, BOOL, BOOL, int, int,    compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,
635      int *, int *, branch_chain *, compile_data *, int *);      int *, int *, branch_chain *, compile_data *, int *);
636    
637    
# Line 592  return s; Line 666  return s;
666  *           Expand the workspace                 *  *           Expand the workspace                 *
667  *************************************************/  *************************************************/
668    
669  /* This function is called during the second compiling phase, if the number of  /* This function is called during the second compiling phase, if the number of
670  forward references fills the existing workspace, which is originally a block on  forward references fills the existing workspace, which is originally a block on
671  the stack. A larger block is obtained from malloc() unless the ultimate limit  the stack. A larger block is obtained from malloc() unless the ultimate limit
672  has been reached or the increase will be rather small.  has been reached or the increase will be rather small.
673    
674  Argument: pointer to the compile data block  Argument: pointer to the compile data block
# Line 604  Returns:  0 if all went well, else an er Line 678  Returns:  0 if all went well, else an er
678  static int  static int
679  expand_workspace(compile_data *cd)  expand_workspace(compile_data *cd)
680  {  {
681  uschar *newspace;  pcre_uchar *newspace;
682  int newsize = cd->workspace_size * 2;  int newsize = cd->workspace_size * 2;
683    
684  if (newsize > COMPILE_WORK_SIZE_MAX) newsize = COMPILE_WORK_SIZE_MAX;  if (newsize > COMPILE_WORK_SIZE_MAX) newsize = COMPILE_WORK_SIZE_MAX;
# Line 612  if (cd->workspace_size >= COMPILE_WORK_S Line 686  if (cd->workspace_size >= COMPILE_WORK_S
686      newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)      newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)
687   return ERR72;   return ERR72;
688    
689  newspace = (pcre_malloc)(newsize);  newspace = (PUBL(malloc))(IN_UCHARS(newsize));
690  if (newspace == NULL) return ERR21;  if (newspace == NULL) return ERR21;
691    memcpy(newspace, cd->start_workspace, cd->workspace_size * sizeof(pcre_uchar));
692  memcpy(newspace, cd->start_workspace, cd->workspace_size);  cd->hwm = (pcre_uchar *)newspace + (cd->hwm - cd->start_workspace);
693  cd->hwm = (uschar *)newspace + (cd->hwm - cd->start_workspace);  if (cd->workspace_size > COMPILE_WORK_SIZE)
694  if (cd->workspace_size > COMPILE_WORK_SIZE)    (PUBL(free))((void *)cd->start_workspace);
   (pcre_free)((void *)cd->start_workspace);  
695  cd->start_workspace = newspace;  cd->start_workspace = newspace;
696  cd->workspace_size = newsize;  cd->workspace_size = newsize;
697  return 0;  return 0;
# Line 642  Returns:    TRUE or FALSE Line 715  Returns:    TRUE or FALSE
715  */  */
716    
717  static BOOL  static BOOL
718  is_counted_repeat(const uschar *p)  is_counted_repeat(const pcre_uchar *p)
719  {  {
720  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if (!IS_DIGIT(*p)) return FALSE;
721  while ((digitab[*p] & ctype_digit) != 0) p++;  p++;
722    while (IS_DIGIT(*p)) p++;
723  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
724    
725  if (*p++ != CHAR_COMMA) return FALSE;  if (*p++ != CHAR_COMMA) return FALSE;
726  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
727    
728  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if (!IS_DIGIT(*p)) return FALSE;
729  while ((digitab[*p] & ctype_digit) != 0) p++;  p++;
730    while (IS_DIGIT(*p)) p++;
731    
732  return (*p == CHAR_RIGHT_CURLY_BRACKET);  return (*p == CHAR_RIGHT_CURLY_BRACKET);
733  }  }
# Line 684  Returns:         zero or positive => a d Line 759  Returns:         zero or positive => a d
759  */  */
760    
761  static int  static int
762  check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,  check_escape(const pcre_uchar **ptrptr, int *errorcodeptr, int bracount,
763    int options, BOOL isclass)    int options, BOOL isclass)
764  {  {
765  BOOL utf8 = (options & PCRE_UTF8) != 0;  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
766  const uschar *ptr = *ptrptr + 1;  BOOL utf = (options & PCRE_UTF8) != 0;
767  int c, i;  const pcre_uchar *ptr = *ptrptr + 1;
768    pcre_int32 c;
769    int i;
770    
771  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
772  ptr--;                            /* Set pointer back to the last byte */  ptr--;                            /* Set pointer back to the last byte */
# Line 703  in a table. A non-zero result is somethi Line 780  in a table. A non-zero result is somethi
780  Otherwise further processing may be required. */  Otherwise further processing may be required. */
781    
782  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
783  else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */  /* Not alphanumeric */
784    else if (c < CHAR_0 || c > CHAR_z) {}
785  else if ((i = escapes[c - CHAR_0]) != 0) c = i;  else if ((i = escapes[c - CHAR_0]) != 0) c = i;
786    
787  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
788  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */  /* Not alphanumeric */
789    else if (c < 'a' || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}
790  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if ((i = escapes[c - 0x48]) != 0)  c = i;
791  #endif  #endif
792    
# Line 715  else if ((i = escapes[c - 0x48]) != 0) Line 794  else if ((i = escapes[c - 0x48]) != 0)
794    
795  else  else
796    {    {
797    const uschar *oldptr;    const pcre_uchar *oldptr;
798    BOOL braced, negated;    BOOL braced, negated;
799    
800    switch (c)    switch (c)
# Line 733  else Line 812  else
812        {        {
813        /* In JavaScript, \u must be followed by four hexadecimal numbers.        /* In JavaScript, \u must be followed by four hexadecimal numbers.
814        Otherwise it is a lowercase u letter. */        Otherwise it is a lowercase u letter. */
815        if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0        if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
816             && (digitab[ptr[3]] & ctype_xdigit) != 0 && (digitab[ptr[4]] & ctype_xdigit) != 0)          && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0
817            && MAX_255(ptr[3]) && (digitab[ptr[3]] & ctype_xdigit) != 0
818            && MAX_255(ptr[4]) && (digitab[ptr[4]] & ctype_xdigit) != 0)
819          {          {
820          c = 0;          c = 0;
821          for (i = 0; i < 4; ++i)          for (i = 0; i < 4; ++i)
# Line 788  else Line 869  else
869    
870      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
871        {        {
872        const uschar *p;        const pcre_uchar *p;
873        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
874          if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;          if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
875        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
876          {          {
877          c = -ESC_k;          c = -ESC_k;
# Line 808  else Line 889  else
889        }        }
890      else negated = FALSE;      else negated = FALSE;
891    
892        /* The integer range is limited by the machine's int representation. */
893      c = 0;      c = 0;
894      while ((digitab[ptr[1]] & ctype_digit) != 0)      while (IS_DIGIT(ptr[1]))
895          {
896          if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */
897            {
898            c = -1;
899            break;
900            }
901        c = c * 10 + *(++ptr) - CHAR_0;        c = c * 10 + *(++ptr) - CHAR_0;
902          }
903      if (c < 0)   /* Integer overflow */      if (((unsigned int)c) > INT_MAX) /* Integer overflow */
904        {        {
905          while (IS_DIGIT(ptr[1]))
906            ptr++;
907        *errorcodeptr = ERR61;        *errorcodeptr = ERR61;
908        break;        break;
909        }        }
# Line 861  else Line 951  else
951      if (!isclass)      if (!isclass)
952        {        {
953        oldptr = ptr;        oldptr = ptr;
954          /* The integer range is limited by the machine's int representation. */
955        c -= CHAR_0;        c -= CHAR_0;
956        while ((digitab[ptr[1]] & ctype_digit) != 0)        while (IS_DIGIT(ptr[1]))
957            {
958            if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */
959              {
960              c = -1;
961              break;
962              }
963          c = c * 10 + *(++ptr) - CHAR_0;          c = c * 10 + *(++ptr) - CHAR_0;
964        if (c < 0)    /* Integer overflow */          }
965          if (((unsigned int)c) > INT_MAX) /* Integer overflow */
966          {          {
967            while (IS_DIGIT(ptr[1]))
968              ptr++;
969          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
970          break;          break;
971          }          }
# Line 891  else Line 991  else
991      /* \0 always starts an octal number, but we may drop through to here with a      /* \0 always starts an octal number, but we may drop through to here with a
992      larger first octal digit. The original code used just to take the least      larger first octal digit. The original code used just to take the least
993      significant 8 bits of octal numbers (I think this is what early Perls used      significant 8 bits of octal numbers (I think this is what early Perls used
994      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,
995      than 3 octal digits. */      but no more than 3 octal digits. */
996    
997      case CHAR_0:      case CHAR_0:
998      c -= CHAR_0;      c -= CHAR_0;
999      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
1000          c = c * 8 + *(++ptr) - CHAR_0;          c = c * 8 + *(++ptr) - CHAR_0;
1001      if (!utf8 && c > 255) *errorcodeptr = ERR51;  #ifdef COMPILE_PCRE8
1002        if (!utf && c > 0xff) *errorcodeptr = ERR51;
1003    #endif
1004      break;      break;
1005    
1006      /* \x is complicated. \x{ddd} is a character number which can be greater      /* \x is complicated. \x{ddd} is a character number which can be greater
1007      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.
1008      treated as a data character. */      If not, { is treated as a data character. */
1009    
1010      case CHAR_x:      case CHAR_x:
1011      if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)      if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
1012        {        {
1013        /* In JavaScript, \x must be followed by two hexadecimal numbers.        /* In JavaScript, \x must be followed by two hexadecimal numbers.
1014        Otherwise it is a lowercase x letter. */        Otherwise it is a lowercase x letter. */
1015        if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0)        if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
1016            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)
1017          {          {
1018          c = 0;          c = 0;
1019          for (i = 0; i < 2; ++i)          for (i = 0; i < 2; ++i)
# Line 930  else Line 1033  else
1033    
1034      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
1035        {        {
1036        const uschar *pt = ptr + 2;        const pcre_uchar *pt = ptr + 2;
       int count = 0;  
1037    
1038        c = 0;        c = 0;
1039        while ((digitab[*pt] & ctype_xdigit) != 0)        while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0)
1040          {          {
1041          register int cc = *pt++;          register int cc = *pt++;
1042          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
         count++;  
1043    
1044  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1045          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
# Line 947  else Line 1048  else
1048          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
1049          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1050  #endif  #endif
1051    
1052    #ifdef COMPILE_PCRE8
1053            if (c > (utf ? 0x10ffff : 0xff)) { c = -1; break; }
1054    #else
1055    #ifdef COMPILE_PCRE16
1056            if (c > (utf ? 0x10ffff : 0xffff)) { c = -1; break; }
1057    #endif
1058    #endif
1059            }
1060    
1061          if (c < 0)
1062            {
1063            while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0) pt++;
1064            *errorcodeptr = ERR34;
1065          }          }
1066    
1067        if (*pt == CHAR_RIGHT_CURLY_BRACKET)        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
1068          {          {
1069          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
1070          ptr = pt;          ptr = pt;
1071          break;          break;
1072          }          }
# Line 963  else Line 1078  else
1078      /* Read just a single-byte hex-defined char */      /* Read just a single-byte hex-defined char */
1079    
1080      c = 0;      c = 0;
1081      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)
1082        {        {
1083        int cc;                                  /* Some compilers don't like */        int cc;                                  /* Some compilers don't like */
1084        cc = *(++ptr);                           /* ++ in initializers */        cc = *(++ptr);                           /* ++ in initializers */
# Line 1061  Returns:         type value from ucp_typ Line 1176  Returns:         type value from ucp_typ
1176  */  */
1177    
1178  static int  static int
1179  get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
1180  {  {
1181  int c, i, bot, top;  int c, i, bot, top;
1182  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
1183  char name[32];  pcre_uchar name[32];
1184    
1185  c = *(++ptr);  c = *(++ptr);
1186  if (c == 0) goto ERROR_RETURN;  if (c == 0) goto ERROR_RETURN;
# Line 1082  if (c == CHAR_LEFT_CURLY_BRACKET) Line 1197  if (c == CHAR_LEFT_CURLY_BRACKET)
1197      *negptr = TRUE;      *negptr = TRUE;
1198      ptr++;      ptr++;
1199      }      }
1200    for (i = 0; i < (int)sizeof(name) - 1; i++)    for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
1201      {      {
1202      c = *(++ptr);      c = *(++ptr);
1203      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
# Line 1106  else Line 1221  else
1221  /* Search for a recognized property name using binary chop */  /* Search for a recognized property name using binary chop */
1222    
1223  bot = 0;  bot = 0;
1224  top = _pcre_utt_size;  top = PRIV(utt_size);
1225    
1226  while (bot < top)  while (bot < top)
1227    {    {
1228    i = (bot + top) >> 1;    i = (bot + top) >> 1;
1229    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);    c = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
1230    if (c == 0)    if (c == 0)
1231      {      {
1232      *dptr = _pcre_utt[i].value;      *dptr = PRIV(utt)[i].value;
1233      return _pcre_utt[i].type;      return PRIV(utt)[i].type;
1234      }      }
1235    if (c > 0) bot = i + 1; else top = i;    if (c > 0) bot = i + 1; else top = i;
1236    }    }
# Line 1153  Returns:         pointer to '}' on succe Line 1268  Returns:         pointer to '}' on succe
1268                   current ptr on error, with errorcodeptr set non-zero                   current ptr on error, with errorcodeptr set non-zero
1269  */  */
1270    
1271  static const uschar *  static const pcre_uchar *
1272  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)
1273  {  {
1274  int min = 0;  int min = 0;
1275  int max = -1;  int max = -1;
# Line 1162  int max = -1; Line 1277  int max = -1;
1277  /* Read the minimum value and do a paranoid check: a negative value indicates  /* Read the minimum value and do a paranoid check: a negative value indicates
1278  an integer overflow. */  an integer overflow. */
1279    
1280  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;  while (IS_DIGIT(*p)) min = min * 10 + *p++ - CHAR_0;
1281  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
1282    {    {
1283    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 1177  if (*p == CHAR_RIGHT_CURLY_BRACKET) max Line 1292  if (*p == CHAR_RIGHT_CURLY_BRACKET) max
1292    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
1293      {      {
1294      max = 0;      max = 0;
1295      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;      while(IS_DIGIT(*p)) max = max * 10 + *p++ - CHAR_0;
1296      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
1297        {        {
1298        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 1232  Arguments: Line 1347  Arguments:
1347    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1348    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1349    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1350    utf8         TRUE if we are in UTF-8 mode    utf          TRUE if we are in UTF-8 / UTF-16 mode
1351    count        pointer to the current capturing subpattern number (updated)    count        pointer to the current capturing subpattern number (updated)
1352    
1353  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1354  */  */
1355    
1356  static int  static int
1357  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,
1358    BOOL xmode, BOOL utf8, int *count)    BOOL xmode, BOOL utf, int *count)
1359  {  {
1360  uschar *ptr = *ptrptr;  pcre_uchar *ptr = *ptrptr;
1361  int start_count = *count;  int start_count = *count;
1362  int hwm_count = start_count;  int hwm_count = start_count;
1363  BOOL dup_parens = FALSE;  BOOL dup_parens = FALSE;
# Line 1309  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1424  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1424          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1425        {        {
1426        int term;        int term;
1427        const uschar *thisname;        const pcre_uchar *thisname;
1428        *count += 1;        *count += 1;
1429        if (name == NULL && *count == lorn) return *count;        if (name == NULL && *count == lorn) return *count;
1430        term = *ptr++;        term = *ptr++;
# Line 1317  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1432  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1432        thisname = ptr;        thisname = ptr;
1433        while (*ptr != term) ptr++;        while (*ptr != term) ptr++;
1434        if (name != NULL && lorn == ptr - thisname &&        if (name != NULL && lorn == ptr - thisname &&
1435            strncmp((const char *)name, (const char *)thisname, lorn) == 0)            STRNCMP_UC_UC(name, thisname, lorn) == 0)
1436          return *count;          return *count;
1437        term++;        term++;
1438        }        }
# Line 1360  for (; ptr < cd->end_pattern; ptr++) Line 1475  for (; ptr < cd->end_pattern; ptr++)
1475          {          {
1476          if (ptr[2] == CHAR_E)          if (ptr[2] == CHAR_E)
1477            ptr+= 2;            ptr+= 2;
1478          else if (strncmp((const char *)ptr+2,          else if (STRNCMP_UC_C8(ptr + 2,
1479                   STR_Q STR_BACKSLASH STR_E, 3) == 0)                   STR_Q STR_BACKSLASH STR_E, 3) == 0)
1480            ptr += 4;            ptr += 4;
1481          else          else
# Line 1408  for (; ptr < cd->end_pattern; ptr++) Line 1523  for (; ptr < cd->end_pattern; ptr++)
1523        {        {
1524        if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }        if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
1525        ptr++;        ptr++;
1526  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1527        if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;        if (utf) FORWARDCHAR(ptr);
1528  #endif  #endif
1529        }        }
1530      if (*ptr == 0) goto FAIL_EXIT;      if (*ptr == 0) goto FAIL_EXIT;
# Line 1420  for (; ptr < cd->end_pattern; ptr++) Line 1535  for (; ptr < cd->end_pattern; ptr++)
1535    
1536    if (*ptr == CHAR_LEFT_PARENTHESIS)    if (*ptr == CHAR_LEFT_PARENTHESIS)
1537      {      {
1538      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, count);      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, count);
1539      if (rc > 0) return rc;      if (rc > 0) return rc;
1540      if (*ptr == 0) goto FAIL_EXIT;      if (*ptr == 0) goto FAIL_EXIT;
1541      }      }
# Line 1466  Arguments: Line 1581  Arguments:
1581    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1582    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1583    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1584    utf8         TRUE if we are in UTF-8 mode    utf          TRUE if we are in UTF-8 / UTF-16 mode
1585    
1586  Returns:       the number of the found subpattern, or -1 if not found  Returns:       the number of the found subpattern, or -1 if not found
1587  */  */
1588    
1589  static int  static int
1590  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,
1591    BOOL utf8)    BOOL utf)
1592  {  {
1593  uschar *ptr = (uschar *)cd->start_pattern;  pcre_uchar *ptr = (pcre_uchar *)cd->start_pattern;
1594  int count = 0;  int count = 0;
1595  int rc;  int rc;
1596    
# Line 1486  matching closing parens. That is why we Line 1601  matching closing parens. That is why we
1601    
1602  for (;;)  for (;;)
1603    {    {
1604    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, &count);    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, &count);
1605    if (rc > 0 || *ptr++ == 0) break;    if (rc > 0 || *ptr++ == 0) break;
1606    }    }
1607    
# Line 1513  Arguments: Line 1628  Arguments:
1628  Returns:       pointer to the first significant opcode  Returns:       pointer to the first significant opcode
1629  */  */
1630    
1631  static const uschar*  static const pcre_uchar*
1632  first_significant_code(const uschar *code, BOOL skipassert)  first_significant_code(const pcre_uchar *code, BOOL skipassert)
1633  {  {
1634  for (;;)  for (;;)
1635    {    {
# Line 1525  for (;;) Line 1640  for (;;)
1640      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1641      if (!skipassert) return code;      if (!skipassert) return code;
1642      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
1643      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1644      break;      break;
1645    
1646      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
# Line 1539  for (;;) Line 1654  for (;;)
1654      case OP_RREF:      case OP_RREF:
1655      case OP_NRREF:      case OP_NRREF:
1656      case OP_DEF:      case OP_DEF:
1657      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1658      break;      break;
1659    
1660      default:      default:
# Line 1569  and doing the check at the end; a flag s Line 1684  and doing the check at the end; a flag s
1684    
1685  Arguments:  Arguments:
1686    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1687    utf8     TRUE in UTF-8 mode    utf      TRUE in UTF-8 / UTF-16 mode
1688    atend    TRUE if called when the pattern is complete    atend    TRUE if called when the pattern is complete
1689    cd       the "compile data" structure    cd       the "compile data" structure
1690    
# Line 1581  Returns:   the fixed length, Line 1696  Returns:   the fixed length,
1696  */  */
1697    
1698  static int  static int
1699  find_fixedlength(uschar *code, BOOL utf8, BOOL atend, compile_data *cd)  find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd)
1700  {  {
1701  int length = -1;  int length = -1;
1702    
1703  register int branchlength = 0;  register int branchlength = 0;
1704  register uschar *cc = code + 1 + LINK_SIZE;  register pcre_uchar *cc = code + 1 + LINK_SIZE;
1705    
1706  /* Scan along the opcodes for this branch. If we get to the end of the  /* Scan along the opcodes for this branch. If we get to the end of the
1707  branch, check the length against that of the other branches. */  branch, check the length against that of the other branches. */
# Line 1594  branch, check the length against that of Line 1709  branch, check the length against that of
1709  for (;;)  for (;;)
1710    {    {
1711    int d;    int d;
1712    uschar *ce, *cs;    pcre_uchar *ce, *cs;
1713    register int op = *cc;    register int op = *cc;
1714    
1715    switch (op)    switch (op)
1716      {      {
1717      /* We only need to continue for OP_CBRA (normal capturing bracket) and      /* We only need to continue for OP_CBRA (normal capturing bracket) and
# Line 1608  for (;;) Line 1724  for (;;)
1724      case OP_ONCE:      case OP_ONCE:
1725      case OP_ONCE_NC:      case OP_ONCE_NC:
1726      case OP_COND:      case OP_COND:
1727      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);
1728      if (d < 0) return d;      if (d < 0) return d;
1729      branchlength += d;      branchlength += d;
1730      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
# Line 1639  for (;;) Line 1755  for (;;)
1755    
1756      case OP_RECURSE:      case OP_RECURSE:
1757      if (!atend) return -3;      if (!atend) return -3;
1758      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */      cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1759      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */      do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
1760      if (cc > cs && cc < ce) return -1;                /* Recursion */      if (cc > cs && cc < ce) return -1;                    /* Recursion */
1761      d = find_fixedlength(cs + 2, utf8, atend, cd);      d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd);
1762      if (d < 0) return d;      if (d < 0) return d;
1763      branchlength += d;      branchlength += d;
1764      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
# Line 1655  for (;;) Line 1771  for (;;)
1771      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1772      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1773      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1774      /* Fall through */      cc += PRIV(OP_lengths)[*cc];
1775        break;
1776    
1777      /* Skip over things that don't match chars */      /* Skip over things that don't match chars */
1778    
# Line 1663  for (;;) Line 1780  for (;;)
1780      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
1781      case OP_SKIP_ARG:      case OP_SKIP_ARG:
1782      case OP_THEN_ARG:      case OP_THEN_ARG:
1783      cc += cc[1] + _pcre_OP_lengths[*cc];      cc += cc[1] + PRIV(OP_lengths)[*cc];
1784      break;      break;
1785    
1786      case OP_CALLOUT:      case OP_CALLOUT:
# Line 1690  for (;;) Line 1807  for (;;)
1807      case OP_SOM:      case OP_SOM:
1808      case OP_THEN:      case OP_THEN:
1809      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
1810      cc += _pcre_OP_lengths[*cc];      cc += PRIV(OP_lengths)[*cc];
1811      break;      break;
1812    
1813      /* Handle literal characters */      /* Handle literal characters */
# Line 1701  for (;;) Line 1818  for (;;)
1818      case OP_NOTI:      case OP_NOTI:
1819      branchlength++;      branchlength++;
1820      cc += 2;      cc += 2;
1821  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1822      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1823  #endif  #endif
1824      break;      break;
1825    
# Line 1714  for (;;) Line 1831  for (;;)
1831      case OP_NOTEXACT:      case OP_NOTEXACT:
1832      case OP_NOTEXACTI:      case OP_NOTEXACTI:
1833      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1834      cc += 4;      cc += 2 + IMM2_SIZE;
1835  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1836      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1837  #endif  #endif
1838      break;      break;
1839    
1840      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1841      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1842      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;
1843      cc += 4;      cc += 1 + IMM2_SIZE + 1;
1844      break;      break;
1845    
1846      /* Handle single-char matchers */      /* Handle single-char matchers */
# Line 1749  for (;;) Line 1866  for (;;)
1866      cc++;      cc++;
1867      break;      break;
1868    
1869      /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;      /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
1870      otherwise \C is coded as OP_ALLANY. */      otherwise \C is coded as OP_ALLANY. */
1871    
1872      case OP_ANYBYTE:      case OP_ANYBYTE:
# Line 1757  for (;;) Line 1874  for (;;)
1874    
1875      /* Check a class for variable quantification */      /* Check a class for variable quantification */
1876    
1877  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || defined COMPILE_PCRE16
1878      case OP_XCLASS:      case OP_XCLASS:
1879      cc += GET(cc, 1) - 33;      cc += GET(cc, 1) - PRIV(OP_lengths)[OP_CLASS];
1880      /* Fall through */      /* Fall through */
1881  #endif  #endif
1882    
1883      case OP_CLASS:      case OP_CLASS:
1884      case OP_NCLASS:      case OP_NCLASS:
1885      cc += 33;      cc += PRIV(OP_lengths)[OP_CLASS];
1886    
1887      switch (*cc)      switch (*cc)
1888        {        {
# Line 1779  for (;;) Line 1896  for (;;)
1896    
1897        case OP_CRRANGE:        case OP_CRRANGE:
1898        case OP_CRMINRANGE:        case OP_CRMINRANGE:
1899        if (GET2(cc,1) != GET2(cc,3)) return -1;        if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
1900        branchlength += GET2(cc,1);        branchlength += GET2(cc,1);
1901        cc += 5;        cc += 1 + 2 * IMM2_SIZE;
1902        break;        break;
1903    
1904        default:        default:
# Line 1896  length. Line 2013  length.
2013    
2014  Arguments:  Arguments:
2015    code        points to start of expression    code        points to start of expression
2016    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 mode
2017    number      the required bracket number or negative to find a lookbehind    number      the required bracket number or negative to find a lookbehind
2018    
2019  Returns:      pointer to the opcode for the bracket, or NULL if not found  Returns:      pointer to the opcode for the bracket, or NULL if not found
2020  */  */
2021    
2022  const uschar *  const pcre_uchar *
2023  _pcre_find_bracket(const uschar *code, BOOL utf8, int number)  PRIV(find_bracket)(const pcre_uchar *code, BOOL utf, int number)
2024  {  {
2025  for (;;)  for (;;)
2026    {    {
# Line 1921  for (;;) Line 2038  for (;;)
2038    
2039    else if (c == OP_REVERSE)    else if (c == OP_REVERSE)
2040      {      {
2041      if (number < 0) return (uschar *)code;      if (number < 0) return (pcre_uchar *)code;
2042      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2043      }      }
2044    
2045    /* Handle capturing bracket */    /* Handle capturing bracket */
# Line 1931  for (;;) Line 2048  for (;;)
2048             c == OP_CBRAPOS || c == OP_SCBRAPOS)             c == OP_CBRAPOS || c == OP_SCBRAPOS)
2049      {      {
2050      int n = GET2(code, 1+LINK_SIZE);      int n = GET2(code, 1+LINK_SIZE);
2051      if (n == number) return (uschar *)code;      if (n == number) return (pcre_uchar *)code;
2052      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2053      }      }
2054    
2055    /* Otherwise, we can get the item's length from the table, except that for    /* Otherwise, we can get the item's length from the table, except that for
# Line 1960  for (;;) Line 2077  for (;;)
2077        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2078        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2079        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
2080        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP
2081            || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2082        break;        break;
2083    
2084        case OP_MARK:        case OP_MARK:
# Line 1976  for (;;) Line 2094  for (;;)
2094    
2095      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
2096    
2097      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2098    
2099    /* In UTF-8 mode, opcodes that are followed by a character may be followed by    /* In UTF-8 mode, opcodes that are followed by a character may be followed by
2100    a multi-byte character. The length in the table is a minimum, so we have to    a multi-byte character. The length in the table is a minimum, so we have to
2101    arrange to skip the extra bytes. */    arrange to skip the extra bytes. */
2102    
2103  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2104      if (utf8) switch(c)      if (utf) switch(c)
2105        {        {
2106        case OP_CHAR:        case OP_CHAR:
2107        case OP_CHARI:        case OP_CHARI:
# Line 2013  for (;;) Line 2131  for (;;)
2131        case OP_MINQUERYI:        case OP_MINQUERYI:
2132        case OP_POSQUERY:        case OP_POSQUERY:
2133        case OP_POSQUERYI:        case OP_POSQUERYI:
2134        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2135        break;        break;
2136        }        }
2137  #else  #else
2138      (void)(utf8);  /* Keep compiler happy by referencing function argument */      (void)(utf);  /* Keep compiler happy by referencing function argument */
2139  #endif  #endif
2140      }      }
2141    }    }
# Line 2034  instance of OP_RECURSE. Line 2152  instance of OP_RECURSE.
2152    
2153  Arguments:  Arguments:
2154    code        points to start of expression    code        points to start of expression
2155    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 mode
2156    
2157  Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found  Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found
2158  */  */
2159    
2160  static const uschar *  static const pcre_uchar *
2161  find_recurse(const uschar *code, BOOL utf8)  find_recurse(const pcre_uchar *code, BOOL utf)
2162  {  {
2163  for (;;)  for (;;)
2164    {    {
# Line 2079  for (;;) Line 2197  for (;;)
2197        case OP_TYPEUPTO:        case OP_TYPEUPTO:
2198        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2199        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2200        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP
2201            || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2202        break;        break;
2203    
2204        case OP_MARK:        case OP_MARK:
# Line 2095  for (;;) Line 2214  for (;;)
2214    
2215      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
2216    
2217      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2218    
2219      /* In UTF-8 mode, opcodes that are followed by a character may be followed      /* In UTF-8 mode, opcodes that are followed by a character may be followed
2220      by a multi-byte character. The length in the table is a minimum, so we have      by a multi-byte character. The length in the table is a minimum, so we have
2221      to arrange to skip the extra bytes. */      to arrange to skip the extra bytes. */
2222    
2223  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2224      if (utf8) switch(c)      if (utf) switch(c)
2225        {        {
2226        case OP_CHAR:        case OP_CHAR:
2227        case OP_CHARI:        case OP_CHARI:
2228          case OP_NOT:
2229          case OP_NOTI:
2230        case OP_EXACT:        case OP_EXACT:
2231        case OP_EXACTI:        case OP_EXACTI:
2232          case OP_NOTEXACT:
2233          case OP_NOTEXACTI:
2234        case OP_UPTO:        case OP_UPTO:
2235        case OP_UPTOI:        case OP_UPTOI:
2236          case OP_NOTUPTO:
2237          case OP_NOTUPTOI:
2238        case OP_MINUPTO:        case OP_MINUPTO:
2239        case OP_MINUPTOI:        case OP_MINUPTOI:
2240          case OP_NOTMINUPTO:
2241          case OP_NOTMINUPTOI:
2242        case OP_POSUPTO:        case OP_POSUPTO:
2243        case OP_POSUPTOI:        case OP_POSUPTOI:
2244          case OP_NOTPOSUPTO:
2245          case OP_NOTPOSUPTOI:
2246        case OP_STAR:        case OP_STAR:
2247        case OP_STARI:        case OP_STARI:
2248          case OP_NOTSTAR:
2249          case OP_NOTSTARI:
2250        case OP_MINSTAR:        case OP_MINSTAR:
2251        case OP_MINSTARI:        case OP_MINSTARI:
2252          case OP_NOTMINSTAR:
2253          case OP_NOTMINSTARI:
2254        case OP_POSSTAR:        case OP_POSSTAR:
2255        case OP_POSSTARI:        case OP_POSSTARI:
2256          case OP_NOTPOSSTAR:
2257          case OP_NOTPOSSTARI:
2258        case OP_PLUS:        case OP_PLUS:
2259        case OP_PLUSI:        case OP_PLUSI:
2260          case OP_NOTPLUS:
2261          case OP_NOTPLUSI:
2262        case OP_MINPLUS:        case OP_MINPLUS:
2263        case OP_MINPLUSI:        case OP_MINPLUSI:
2264          case OP_NOTMINPLUS:
2265          case OP_NOTMINPLUSI:
2266        case OP_POSPLUS:        case OP_POSPLUS:
2267        case OP_POSPLUSI:        case OP_POSPLUSI:
2268          case OP_NOTPOSPLUS:
2269          case OP_NOTPOSPLUSI:
2270        case OP_QUERY:        case OP_QUERY:
2271        case OP_QUERYI:        case OP_QUERYI:
2272          case OP_NOTQUERY:
2273          case OP_NOTQUERYI:
2274        case OP_MINQUERY:        case OP_MINQUERY:
2275        case OP_MINQUERYI:        case OP_MINQUERYI:
2276          case OP_NOTMINQUERY:
2277          case OP_NOTMINQUERYI:
2278        case OP_POSQUERY:        case OP_POSQUERY:
2279        case OP_POSQUERYI:        case OP_POSQUERYI:
2280        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_NOTPOSQUERY:
2281          case OP_NOTPOSQUERYI:
2282          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2283        break;        break;
2284        }        }
2285  #else  #else
2286      (void)(utf8);  /* Keep compiler happy by referencing function argument */      (void)(utf);  /* Keep compiler happy by referencing function argument */
2287  #endif  #endif
2288      }      }
2289    }    }
# Line 2159  bracket whose current branch will alread Line 2306  bracket whose current branch will alread
2306  Arguments:  Arguments:
2307    code        points to start of search    code        points to start of search
2308    endcode     points to where to stop    endcode     points to where to stop
2309    utf8        TRUE if in UTF8 mode    utf         TRUE if in UTF-8 / UTF-16 mode
2310    cd          contains pointers to tables etc.    cd          contains pointers to tables etc.
2311    
2312  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2313  */  */
2314    
2315  static BOOL  static BOOL
2316  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8,  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
2317    compile_data *cd)    BOOL utf, compile_data *cd)
2318  {  {
2319  register int c;  register int c;
2320  for (code = first_significant_code(code + _pcre_OP_lengths[*code], TRUE);  for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
2321       code < endcode;       code < endcode;
2322       code = first_significant_code(code + _pcre_OP_lengths[c], TRUE))       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
2323    {    {
2324    const uschar *ccode;    const pcre_uchar *ccode;
2325    
2326    c = *code;    c = *code;
2327    
# Line 2197  for (code = first_significant_code(code Line 2344  for (code = first_significant_code(code
2344    
2345    if (c == OP_RECURSE)    if (c == OP_RECURSE)
2346      {      {
2347      const uschar *scode;      const pcre_uchar *scode;
2348      BOOL empty_branch;      BOOL empty_branch;
2349    
2350      /* Test for forward reference */      /* Test for forward reference */
# Line 2215  for (code = first_significant_code(code Line 2362  for (code = first_significant_code(code
2362    
2363      do      do
2364        {        {
2365        if (could_be_empty_branch(scode, endcode, utf8, cd))        if (could_be_empty_branch(scode, endcode, utf, cd))
2366          {          {
2367          empty_branch = TRUE;          empty_branch = TRUE;
2368          break;          break;
# Line 2233  for (code = first_significant_code(code Line 2380  for (code = first_significant_code(code
2380    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2381        c == OP_BRAPOSZERO)        c == OP_BRAPOSZERO)
2382      {      {
2383      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2384      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
2385      c = *code;      c = *code;
2386      continue;      continue;
# Line 2271  for (code = first_significant_code(code Line 2418  for (code = first_significant_code(code
2418        empty_branch = FALSE;        empty_branch = FALSE;
2419        do        do
2420          {          {
2421          if (!empty_branch && could_be_empty_branch(code, endcode, utf8, cd))          if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd))
2422            empty_branch = TRUE;            empty_branch = TRUE;
2423          code += GET(code, 1);          code += GET(code, 1);
2424          }          }
# Line 2289  for (code = first_significant_code(code Line 2436  for (code = first_significant_code(code
2436      {      {
2437      /* Check for quantifiers after a class. XCLASS is used for classes that      /* Check for quantifiers after a class. XCLASS is used for classes that
2438      cannot be represented just by a bit map. This includes negated single      cannot be represented just by a bit map. This includes negated single
2439      high-valued characters. The length in _pcre_OP_lengths[] is zero; the      high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
2440      actual length is stored in the compiled code, so we must update "code"      actual length is stored in the compiled code, so we must update "code"
2441      here. */      here. */
2442    
2443  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2444      case OP_XCLASS:      case OP_XCLASS:
2445      ccode = code += GET(code, 1);      ccode = code += GET(code, 1);
2446      goto CHECK_CLASS_REPEAT;      goto CHECK_CLASS_REPEAT;
# Line 2301  for (code = first_significant_code(code Line 2448  for (code = first_significant_code(code
2448    
2449      case OP_CLASS:      case OP_CLASS:
2450      case OP_NCLASS:      case OP_NCLASS:
2451      ccode = code + 33;      ccode = code + PRIV(OP_lengths)[OP_CLASS];
2452    
2453  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2454      CHECK_CLASS_REPEAT:      CHECK_CLASS_REPEAT:
2455  #endif  #endif
2456    
# Line 2376  for (code = first_significant_code(code Line 2523  for (code = first_significant_code(code
2523      case OP_TYPEUPTO:      case OP_TYPEUPTO:
2524      case OP_TYPEMINUPTO:      case OP_TYPEMINUPTO:
2525      case OP_TYPEPOSUPTO:      case OP_TYPEPOSUPTO:
2526      if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;      if (code[1 + IMM2_SIZE] == OP_PROP
2527          || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2528      break;      break;
2529    
2530      /* End of branch */      /* End of branch */
# Line 2391  for (code = first_significant_code(code Line 2539  for (code = first_significant_code(code
2539      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
2540      MINUPTO, and POSUPTO may be followed by a multibyte character */      MINUPTO, and POSUPTO may be followed by a multibyte character */
2541    
2542  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2543      case OP_STAR:      case OP_STAR:
2544      case OP_STARI:      case OP_STARI:
2545      case OP_MINSTAR:      case OP_MINSTAR:
# Line 2404  for (code = first_significant_code(code Line 2552  for (code = first_significant_code(code
2552      case OP_MINQUERYI:      case OP_MINQUERYI:
2553      case OP_POSQUERY:      case OP_POSQUERY:
2554      case OP_POSQUERYI:      case OP_POSQUERYI:
2555      if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];      if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
2556      break;      break;
2557    
2558      case OP_UPTO:      case OP_UPTO:
# Line 2413  for (code = first_significant_code(code Line 2561  for (code = first_significant_code(code
2561      case OP_MINUPTOI:      case OP_MINUPTOI:
2562      case OP_POSUPTO:      case OP_POSUPTO:
2563      case OP_POSUPTOI:      case OP_POSUPTOI:
2564      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]);
2565      break;      break;
2566  #endif  #endif
2567    
# Line 2457  Arguments: Line 2605  Arguments:
2605    code        points to start of the recursion    code        points to start of the recursion
2606    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2607    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2608    utf8        TRUE if in UTF-8 mode    utf         TRUE if in UTF-8 / UTF-16 mode
2609    cd          pointers to tables etc    cd          pointers to tables etc
2610    
2611  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2612  */  */
2613    
2614  static BOOL  static BOOL
2615  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
2616    BOOL utf8, compile_data *cd)    branch_chain *bcptr, BOOL utf, compile_data *cd)
2617  {  {
2618  while (bcptr != NULL && bcptr->current_branch >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2619    {    {
2620    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8, cd))    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd))
2621      return FALSE;      return FALSE;
2622    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2623    }    }
# Line 2521  Returns:   TRUE or FALSE Line 2669  Returns:   TRUE or FALSE
2669  */  */
2670    
2671  static BOOL  static BOOL
2672  check_posix_syntax(const uschar *ptr, const uschar **endptr)  check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
2673  {  {
2674  int terminator;          /* Don't combine these lines; the Solaris cc */  int terminator;          /* Don't combine these lines; the Solaris cc */
2675  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
# Line 2565  Returns:     a value representing the na Line 2713  Returns:     a value representing the na
2713  */  */
2714    
2715  static int  static int
2716  check_posix_name(const uschar *ptr, int len)  check_posix_name(const pcre_uchar *ptr, int len)
2717  {  {
2718  const char *pn = posix_names;  const char *pn = posix_names;
2719  register int yield = 0;  register int yield = 0;
2720  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
2721    {    {
2722    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
2723      strncmp((const char *)ptr, pn, len) == 0) return yield;      STRNCMP_UC_C8(ptr, pn, len) == 0) return yield;
2724    pn += posix_name_lengths[yield] + 1;    pn += posix_name_lengths[yield] + 1;
2725    yield++;    yield++;
2726    }    }
# Line 2604  value in the reference (which is a group Line 2752  value in the reference (which is a group
2752  Arguments:  Arguments:
2753    group      points to the start of the group    group      points to the start of the group
2754    adjust     the amount by which the group is to be moved    adjust     the amount by which the group is to be moved
2755    utf8       TRUE in UTF-8 mode    utf        TRUE in UTF-8 / UTF-16 mode
2756    cd         contains pointers to tables etc.    cd         contains pointers to tables etc.
2757    save_hwm   the hwm forward reference pointer at the start of the group    save_hwm   the hwm forward reference pointer at the start of the group
2758    
# Line 2612  Returns:     nothing Line 2760  Returns:     nothing
2760  */  */
2761    
2762  static void  static void
2763  adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,  adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
2764    uschar *save_hwm)    pcre_uchar *save_hwm)
2765  {  {
2766  uschar *ptr = group;  pcre_uchar *ptr = group;
2767    
2768  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
2769    {    {
2770    int offset;    int offset;
2771    uschar *hc;    pcre_uchar *hc;
2772    
2773    /* See if this recursion is on the forward reference list. If so, adjust the    /* See if this recursion is on the forward reference list. If so, adjust the
2774    reference. */    reference. */
# Line 2665  Arguments: Line 2813  Arguments:
2813  Returns:         new code pointer  Returns:         new code pointer
2814  */  */
2815    
2816  static uschar *  static pcre_uchar *
2817  auto_callout(uschar *code, const uschar *ptr, compile_data *cd)  auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
2818  {  {
2819  *code++ = OP_CALLOUT;  *code++ = OP_CALLOUT;
2820  *code++ = 255;  *code++ = 255;
2821  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
2822  PUT(code, LINK_SIZE, 0);                       /* Default length */  PUT(code, LINK_SIZE, 0);                       /* Default length */
2823  return code + 2*LINK_SIZE;  return code + 2 * LINK_SIZE;
2824  }  }
2825    
2826    
# Line 2694  Returns:             nothing Line 2842  Returns:             nothing
2842  */  */
2843    
2844  static void  static void
2845  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)  complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
2846  {  {
2847  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
2848  PUT(previous_callout, 2 + LINK_SIZE, length);  PUT(previous_callout, 2 + LINK_SIZE, length);
# Line 2777  switch(ptype) Line 2925  switch(ptype)
2925            prop->chartype == ucp_Lt) == negated;            prop->chartype == ucp_Lt) == negated;
2926    
2927    case PT_GC:    case PT_GC:
2928    return (pdata == _pcre_ucp_gentype[prop->chartype]) == negated;    return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
2929    
2930    case PT_PC:    case PT_PC:
2931    return (pdata == prop->chartype) == negated;    return (pdata == prop->chartype) == negated;
# Line 2788  switch(ptype) Line 2936  switch(ptype)
2936    /* These are specials */    /* These are specials */
2937    
2938    case PT_ALNUM:    case PT_ALNUM:
2939    return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2940            _pcre_ucp_gentype[prop->chartype] == ucp_N) == negated;            PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
2941    
2942    case PT_SPACE:    /* Perl space */    case PT_SPACE:    /* Perl space */
2943    return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2944            c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)            c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2945            == negated;            == negated;
2946    
2947    case PT_PXSPACE:  /* POSIX space */    case PT_PXSPACE:  /* POSIX space */
2948    return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2949            c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||            c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2950            c == CHAR_FF || c == CHAR_CR)            c == CHAR_FF || c == CHAR_CR)
2951            == negated;            == negated;
2952    
2953    case PT_WORD:    case PT_WORD:
2954    return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2955            _pcre_ucp_gentype[prop->chartype] == ucp_N ||            PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2956            c == CHAR_UNDERSCORE) == negated;            c == CHAR_UNDERSCORE) == negated;
2957    }    }
2958  return FALSE;  return FALSE;
# Line 2823  sense to automatically possessify the re Line 2971  sense to automatically possessify the re
2971    
2972  Arguments:  Arguments:
2973    previous      pointer to the repeated opcode    previous      pointer to the repeated opcode
2974    utf8          TRUE in UTF-8 mode    utf           TRUE in UTF-8 / UTF-16 mode
2975    ptr           next character in pattern    ptr           next character in pattern
2976    options       options bits    options       options bits
2977    cd            contains pointers to tables etc.    cd            contains pointers to tables etc.
# Line 2832  Returns:        TRUE if possessifying is Line 2980  Returns:        TRUE if possessifying is
2980  */  */
2981    
2982  static BOOL  static BOOL
2983  check_auto_possessive(const uschar *previous, BOOL utf8, const uschar *ptr,  check_auto_possessive(const pcre_uchar *previous, BOOL utf,
2984    int options, compile_data *cd)    const pcre_uchar *ptr, int options, compile_data *cd)
2985  {  {
2986  int c, next;  pcre_int32 c, next;
2987  int op_code = *previous++;  int op_code = *previous++;
2988    
2989  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
# Line 2844  if ((options & PCRE_EXTENDED) != 0) Line 2992  if ((options & PCRE_EXTENDED) != 0)
2992    {    {
2993    for (;;)    for (;;)
2994      {      {
2995      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2996      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
2997        {        {
2998        ptr++;        ptr++;
# Line 2852  if ((options & PCRE_EXTENDED) != 0) Line 3000  if ((options & PCRE_EXTENDED) != 0)
3000          {          {
3001          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3002          ptr++;          ptr++;
3003  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3004          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
3005  #endif  #endif
3006          }          }
3007        }        }
# Line 2871  if (*ptr == CHAR_BACKSLASH) Line 3019  if (*ptr == CHAR_BACKSLASH)
3019    if (temperrorcode != 0) return FALSE;    if (temperrorcode != 0) return FALSE;
3020    ptr++;    /* Point after the escape sequence */    ptr++;    /* Point after the escape sequence */
3021    }    }
3022    else if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_meta) == 0)
 else if ((cd->ctypes[*ptr] & ctype_meta) == 0)  
3023    {    {
3024  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3025    if (utf8) { GETCHARINC(next, ptr); } else    if (utf) { GETCHARINC(next, ptr); } else
3026  #endif  #endif
3027    next = *ptr++;    next = *ptr++;
3028    }    }
   
3029  else return FALSE;  else return FALSE;
3030    
3031  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
# Line 2888  if ((options & PCRE_EXTENDED) != 0) Line 3034  if ((options & PCRE_EXTENDED) != 0)
3034    {    {
3035    for (;;)    for (;;)
3036      {      {
3037      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
3038      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
3039        {        {
3040        ptr++;        ptr++;
# Line 2896  if ((options & PCRE_EXTENDED) != 0) Line 3042  if ((options & PCRE_EXTENDED) != 0)
3042          {          {
3043          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3044          ptr++;          ptr++;
3045  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3046          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
3047  #endif  #endif
3048          }          }
3049        }        }
# Line 2908  if ((options & PCRE_EXTENDED) != 0) Line 3054  if ((options & PCRE_EXTENDED) != 0)
3054  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
3055    
3056  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3057    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)
3058      return FALSE;      return FALSE;
3059    
3060  /* Now compare the next item with the previous opcode. First, handle cases when  /* Now compare the next item with the previous opcode. First, handle cases when
# Line 2917  the next item is a character. */ Line 3063  the next item is a character. */
3063  if (next >= 0) switch(op_code)  if (next >= 0) switch(op_code)
3064    {    {
3065    case OP_CHAR:    case OP_CHAR:
3066  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3067    GETCHARTEST(c, previous);    GETCHARTEST(c, previous);
3068  #else  #else
3069    c = *previous;    c = *previous;
# Line 2929  if (next >= 0) switch(op_code) Line 3075  if (next >= 0) switch(op_code)
3075    high-valued characters. */    high-valued characters. */
3076    
3077    case OP_CHARI:    case OP_CHARI:
3078  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3079    GETCHARTEST(c, previous);    GETCHARTEST(c, previous);
3080  #else  #else
3081    c = *previous;    c = *previous;
3082  #endif  #endif
3083    if (c == next) return FALSE;    if (c == next) return FALSE;
3084  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3085    if (utf8)    if (utf)
3086      {      {
3087      unsigned int othercase;      unsigned int othercase;
3088      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
# Line 2948  if (next >= 0) switch(op_code) Line 3094  if (next >= 0) switch(op_code)
3094      return (unsigned int)c != othercase;      return (unsigned int)c != othercase;
3095      }      }
3096    else    else
3097  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3098    return (c != cd->fcc[next]);  /* Non-UTF-8 mode */    return (c != TABLE_GET((unsigned int)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  
   an XCLASS instead. */  
3099    
3100    case OP_NOT:    case OP_NOT:
3101    return (c = *previous) == next;  #ifdef SUPPORT_UTF
3102      GETCHARTEST(c, previous);
3103    #else
3104      c = *previous;
3105    #endif
3106      return c == next;
3107    
3108    case OP_NOTI:    case OP_NOTI:
3109    if ((c = *previous) == next) return TRUE;  #ifdef SUPPORT_UTF
3110  #ifdef SUPPORT_UTF8    GETCHARTEST(c, previous);
3111    if (utf8)  #else
3112      c = *previous;
3113    #endif
3114      if (c == next) return TRUE;
3115    #ifdef SUPPORT_UTF
3116      if (utf)
3117      {      {
3118      unsigned int othercase;      unsigned int othercase;
3119      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
3120  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3121      othercase = UCD_OTHERCASE(next);      othercase = UCD_OTHERCASE((unsigned int)next);
3122  #else  #else
3123      othercase = NOTACHAR;      othercase = NOTACHAR;
3124  #endif  #endif
3125      return (unsigned int)c == othercase;      return (unsigned int)c == othercase;
3126      }      }
3127    else    else
3128  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3129    return (c == cd->fcc[next]);  /* Non-UTF-8 mode */    return (c == TABLE_GET((unsigned int)next, cd->fcc, next));  /* Non-UTF-8 mode */
3130    
3131    /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.    /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.
3132    When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */    When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
# Line 3065  switch(op_code) Line 3217  switch(op_code)
3217    {    {
3218    case OP_CHAR:    case OP_CHAR:
3219    case OP_CHARI:    case OP_CHARI:
3220  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3221    GETCHARTEST(c, previous);    GETCHARTEST(c, previous);
3222  #else  #else
3223    c = *previous;    c = *previous;
# Line 3170  switch(op_code) Line 3322  switch(op_code)
3322        to the original \d etc. At this point, ptr will point to a zero byte. */        to the original \d etc. At this point, ptr will point to a zero byte. */
3323    
3324        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3325          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)
3326            return FALSE;            return FALSE;
3327    
3328        /* Do the property check. */        /* Do the property check. */
# Line 3197  switch(op_code) Line 3349  switch(op_code)
3349    return next == -ESC_d;    return next == -ESC_d;
3350    
3351    case OP_WHITESPACE:    case OP_WHITESPACE:
3352    return next == -ESC_S || next == -ESC_d || next == -ESC_w || next == -ESC_R;    return next == -ESC_S || next == -ESC_d || next == -ESC_w;
3353    
3354    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
3355    return next == -ESC_s || next == -ESC_h || next == -ESC_v;    return next == -ESC_s || next == -ESC_h || next == -ESC_v || next == -ESC_R;
3356    
3357    case OP_HSPACE:    case OP_HSPACE:
3358    return next == -ESC_S || next == -ESC_H || next == -ESC_d ||    return next == -ESC_S || next == -ESC_H || next == -ESC_d ||
# Line 3248  Arguments: Line 3400  Arguments:
3400    codeptr        points to the pointer to the current code point    codeptr        points to the pointer to the current code point
3401    ptrptr         points to the current pattern pointer    ptrptr         points to the current pattern pointer
3402    errorcodeptr   points to error code variable    errorcodeptr   points to error code variable
3403    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)    firstcharptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)
3404    reqbyteptr     set to the last literal character required, else < 0    reqcharptr     set to the last literal character required, else < 0
3405    bcptr          points to current branch chain    bcptr          points to current branch chain
3406    cond_depth     conditional nesting depth    cond_depth     conditional nesting depth
3407    cd             contains pointers to tables etc.    cd             contains pointers to tables etc.
# Line 3261  Returns:         TRUE on success Line 3413  Returns:         TRUE on success
3413  */  */
3414    
3415  static BOOL  static BOOL
3416  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,  compile_branch(int *optionsptr, pcre_uchar **codeptr,
3417    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,    const pcre_uchar **ptrptr, int *errorcodeptr, pcre_int32 *firstcharptr,
3418    int cond_depth, compile_data *cd, int *lengthptr)    pcre_int32 *reqcharptr, branch_chain *bcptr, int cond_depth,
3419      compile_data *cd, int *lengthptr)
3420  {  {
3421  int repeat_type, op_type;  int repeat_type, op_type;
3422  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
3423  int bravalue = 0;  int bravalue = 0;
3424  int greedy_default, greedy_non_default;  int greedy_default, greedy_non_default;
3425  int firstbyte, reqbyte;  pcre_int32 firstchar, reqchar;
3426  int zeroreqbyte, zerofirstbyte;  pcre_int32 zeroreqchar, zerofirstchar;
3427  int req_caseopt, reqvary, tempreqvary;  pcre_int32 req_caseopt, reqvary, tempreqvary;
3428  int options = *optionsptr;               /* May change dynamically */  int options = *optionsptr;               /* May change dynamically */
3429  int after_manual_callout = 0;  int after_manual_callout = 0;
3430  int length_prevgroup = 0;  int length_prevgroup = 0;
3431  register int c;  register int c;
3432  register uschar *code = *codeptr;  register pcre_uchar *code = *codeptr;
3433  uschar *last_code = code;  pcre_uchar *last_code = code;
3434  uschar *orig_code = code;  pcre_uchar *orig_code = code;
3435  uschar *tempcode;  pcre_uchar *tempcode;
3436  BOOL inescq = FALSE;  BOOL inescq = FALSE;
3437  BOOL groupsetfirstbyte = FALSE;  BOOL groupsetfirstchar = FALSE;
3438  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
3439  const uschar *tempptr;  const pcre_uchar *tempptr;
3440  const uschar *nestptr = NULL;  const pcre_uchar *nestptr = NULL;
3441  uschar *previous = NULL;  pcre_uchar *previous = NULL;
3442  uschar *previous_callout = NULL;  pcre_uchar *previous_callout = NULL;
3443  uschar *save_hwm = NULL;  pcre_uchar *save_hwm = NULL;
3444  uschar classbits[32];  pcre_uint8 classbits[32];
3445    
3446  /* We can fish out the UTF-8 setting once and for all into a BOOL, but we  /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
3447  must not do this for other options (e.g. PCRE_EXTENDED) because they may change  must not do this for other options (e.g. PCRE_EXTENDED) because they may change
3448  dynamically as we process the pattern. */  dynamically as we process the pattern. */
3449    
3450  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3451  BOOL class_utf8;  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
3452  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf = (options & PCRE_UTF8) != 0;
3453  uschar *class_utf8data;  pcre_uchar utf_chars[6];
 uschar *class_utf8data_base;  
 uschar utf8_char[6];  
3454  #else  #else
3455  BOOL utf8 = FALSE;  BOOL utf = FALSE;
3456    #endif
3457    
3458    /* Helper variables for OP_XCLASS opcode (for characters > 255). */
3459    
3460    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3461    BOOL xclass;
3462    pcre_uchar *class_uchardata;
3463    pcre_uchar *class_uchardata_base;
3464  #endif  #endif
3465    
3466  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 3315  greedy_non_default = greedy_default ^ 1; Line 3474  greedy_non_default = greedy_default ^ 1;
3474    
3475  /* Initialize no first byte, no required byte. REQ_UNSET means "no char  /* Initialize no first byte, no required byte. REQ_UNSET means "no char
3476  matching encountered yet". It gets changed to REQ_NONE if we hit something that  matching encountered yet". It gets changed to REQ_NONE if we hit something that
3477  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
3478  find one.  find one.
3479    
3480  When we hit a repeat whose minimum is zero, we may have to adjust these values  When we hit a repeat whose minimum is zero, we may have to adjust these values
3481  to take the zero repeat into account. This is implemented by setting them to  to take the zero repeat into account. This is implemented by setting them to
3482  zerofirstbyte and zeroreqbyte when such a repeat is encountered. The individual  zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual
3483  item types that can be repeated set these backoff variables appropriately. */  item types that can be repeated set these backoff variables appropriately. */
3484    
3485  firstbyte = reqbyte = zerofirstbyte = zeroreqbyte = REQ_UNSET;  firstchar = reqchar = zerofirstchar = zeroreqchar = REQ_UNSET;
3486    
3487  /* The variable req_caseopt contains either the REQ_CASELESS value or zero,  /* The variable req_caseopt contains either the REQ_CASELESS value
3488  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
3489  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
3490  case status of the value. This is used only for ASCII characters. */  firstchar or reqchar variables to record the case status of the
3491    value. This is used only for ASCII characters. */
3492    
3493  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
3494    
3495  /* Switch on next character until the end of the branch */  /* Switch on next character until the end of the branch */
3496    
# Line 3342  for (;; ptr++) Line 3502  for (;; ptr++)
3502    BOOL is_quantifier;    BOOL is_quantifier;
3503    BOOL is_recurse;    BOOL is_recurse;
3504    BOOL reset_bracount;    BOOL reset_bracount;
3505    int class_charcount;    int class_has_8bitchar;
3506    int class_lastchar;    int class_single_char;
3507    int newoptions;    int newoptions;
3508    int recno;    int recno;
3509    int refsign;    int refsign;
3510    int skipbytes;    int skipbytes;
3511    int subreqbyte;    int subreqchar;
3512    int subfirstbyte;    int subfirstchar;
3513    int terminator;    int terminator;
3514    int mclength;    int mclength;
3515    int tempbracount;    int tempbracount;
3516    uschar mcbuffer[8];    pcre_uchar mcbuffer[8];
3517    
3518    /* Get next byte in the pattern */    /* Get next character in the pattern */
3519    
3520    c = *ptr;    c = *ptr;
3521    
# Line 3377  for (;; ptr++) Line 3537  for (;; ptr++)
3537  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
3538      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
3539  #endif  #endif
3540      if (code > cd->start_workspace + cd->workspace_size -      if (code > cd->start_workspace + cd->workspace_size -
3541          WORK_SIZE_SAFETY_MARGIN)                       /* Check for overrun */          WORK_SIZE_SAFETY_MARGIN)                       /* Check for overrun */
3542        {        {
3543        *errorcodeptr = ERR52;        *errorcodeptr = ERR52;
# Line 3401  for (;; ptr++) Line 3561  for (;; ptr++)
3561        }        }
3562    
3563      *lengthptr += (int)(code - last_code);      *lengthptr += (int)(code - last_code);
3564      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, (int)(code - last_code),      DPRINTF(("length=%d added %d c=%c (0x%x)\n", *lengthptr,
3565        c));        (int)(code - last_code), c, c));
3566    
3567      /* If "previous" is set and it is not at the start of the work space, move      /* If "previous" is set and it is not at the start of the work space, move
3568      it back to there, in order to avoid filling up the work space. Otherwise,      it back to there, in order to avoid filling up the work space. Otherwise,
# Line 3412  for (;; ptr++) Line 3572  for (;; ptr++)
3572        {        {
3573        if (previous > orig_code)        if (previous > orig_code)
3574          {          {
3575          memmove(orig_code, previous, code - previous);          memmove(orig_code, previous, IN_UCHARS(code - previous));
3576          code -= previous - orig_code;          code -= previous - orig_code;
3577          previous = orig_code;          previous = orig_code;
3578          }          }
# Line 3428  for (;; ptr++) Line 3588  for (;; ptr++)
3588    /* In the real compile phase, just check the workspace used by the forward    /* In the real compile phase, just check the workspace used by the forward
3589    reference list. */    reference list. */
3590    
3591    else if (cd->hwm > cd->start_workspace + cd->workspace_size -    else if (cd->hwm > cd->start_workspace + cd->workspace_size -
3592             WORK_SIZE_SAFETY_MARGIN)             WORK_SIZE_SAFETY_MARGIN)
3593      {      {
3594      *errorcodeptr = ERR52;      *errorcodeptr = ERR52;
# Line 3481  for (;; ptr++) Line 3641  for (;; ptr++)
3641    
3642    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
3643      {      {
3644      if ((cd->ctypes[c] & ctype_space) != 0) continue;      if (MAX_255(*ptr) && (cd->ctypes[c] & ctype_space) != 0) continue;
3645      if (c == CHAR_NUMBER_SIGN)      if (c == CHAR_NUMBER_SIGN)
3646        {        {
3647        ptr++;        ptr++;
# Line 3489  for (;; ptr++) Line 3649  for (;; ptr++)
3649          {          {
3650          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
3651          ptr++;          ptr++;
3652  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3653          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
3654  #endif  #endif
3655          }          }
3656        if (*ptr != 0) continue;        if (*ptr != 0) continue;
# Line 3514  for (;; ptr++) Line 3674  for (;; ptr++)
3674      case 0:                        /* The branch terminates at string end */      case 0:                        /* The branch terminates at string end */
3675      case CHAR_VERTICAL_LINE:       /* or | or ) */      case CHAR_VERTICAL_LINE:       /* or | or ) */
3676      case CHAR_RIGHT_PARENTHESIS:      case CHAR_RIGHT_PARENTHESIS:
3677      *firstbyteptr = firstbyte;      *firstcharptr = firstchar;
3678      *reqbyteptr = reqbyte;      *reqcharptr = reqchar;
3679      *codeptr = code;      *codeptr = code;
3680      *ptrptr = ptr;      *ptrptr = ptr;
3681      if (lengthptr != NULL)      if (lengthptr != NULL)
# Line 3539  for (;; ptr++) Line 3699  for (;; ptr++)
3699      previous = NULL;      previous = NULL;
3700      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
3701        {        {
3702        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
3703        *code++ = OP_CIRCM;        *code++ = OP_CIRCM;
3704        }        }
3705      else *code++ = OP_CIRC;      else *code++ = OP_CIRC;
# Line 3551  for (;; ptr++) Line 3711  for (;; ptr++)
3711      break;      break;
3712    
3713      /* There can never be a first char if '.' is first, whatever happens about      /* There can never be a first char if '.' is first, whatever happens about
3714      repeats. The value of reqbyte doesn't change either. */      repeats. The value of reqchar doesn't change either. */
3715    
3716      case CHAR_DOT:      case CHAR_DOT:
3717      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;      if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
3718      zerofirstbyte = firstbyte;      zerofirstchar = firstchar;
3719      zeroreqbyte = reqbyte;      zeroreqchar = reqchar;
3720      previous = code;      previous = code;
3721      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
3722      break;      break;
# Line 3611  for (;; ptr++) Line 3771  for (;; ptr++)
3771          {          {
3772          if (ptr[1] == CHAR_E)          if (ptr[1] == CHAR_E)
3773            ptr++;            ptr++;
3774          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)  
3775            ptr += 3;            ptr += 3;
3776          else          else
3777            break;            break;
# Line 3631  for (;; ptr++) Line 3790  for (;; ptr++)
3790          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
3791        {        {
3792        *code++ = negate_class? OP_ALLANY : OP_FAIL;        *code++ = negate_class? OP_ALLANY : OP_FAIL;
3793        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
3794        zerofirstbyte = firstbyte;        zerofirstchar = firstchar;
3795        break;        break;
3796        }        }
3797    
# Line 3642  for (;; ptr++) Line 3801  for (;; ptr++)
3801    
3802      should_flip_negation = FALSE;      should_flip_negation = FALSE;
3803    
3804      /* 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.
3805      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
3806      valued UTF-8 characters, we don't yet do any optimization. */      < 256 character. class_single_char will be 1 if the class contains only
3807        a single character. */
3808    
3809      class_charcount = 0;      class_has_8bitchar = 0;
3810      class_lastchar = -1;      class_single_char = 0;
3811    
3812      /* Initialize the 32-char bit map to all zeros. We build the map in a      /* Initialize the 32-char bit map to all zeros. We build the map in a
3813      temporary bit of memory, in case the class contains only 1 character (less      temporary bit of memory, in case the class contains only 1 character (less
3814      than 256), because in that case the compiled code doesn't use the bit map.      than 256), because in that case the compiled code doesn't use the bit map.
3815      */      */
3816    
3817      memset(classbits, 0, 32 * sizeof(uschar));      memset(classbits, 0, 32 * sizeof(pcre_uint8));
3818    
3819  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3820      class_utf8 = FALSE;                       /* No chars >= 256 */      xclass = FALSE;                           /* No chars >= 256 */
3821      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */      class_uchardata = code + LINK_SIZE + 2;   /* For UTF-8 items */
3822      class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */      class_uchardata_base = class_uchardata;   /* For resetting in pass 1 */
3823  #endif  #endif
3824    
3825      /* Process characters until ] is reached. By writing this as a "do" it      /* Process characters until ] is reached. By writing this as a "do" it
# Line 3668  for (;; ptr++) Line 3828  for (;; ptr++)
3828    
3829      if (c != 0) do      if (c != 0) do
3830        {        {
3831        const uschar *oldptr;        const pcre_uchar *oldptr;
3832    
3833  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3834        if (utf8 && c > 127)        if (utf && HAS_EXTRALEN(c))
3835          {                           /* Braces are required because the */          {                           /* Braces are required because the */
3836          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
3837          }          }
3838    #endif
3839    
3840        /* In the pre-compile phase, accumulate the length of any UTF-8 extra  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3841          /* In the pre-compile phase, accumulate the length of any extra
3842        data and reset the pointer. This is so that very large classes that        data and reset the pointer. This is so that very large classes that
3843        contain a zillion UTF-8 characters no longer overwrite the work space        contain a zillion > 255 characters no longer overwrite the work space
3844        (which is on the stack). */        (which is on the stack). */
3845    
3846        if (lengthptr != NULL)        if (lengthptr != NULL)
3847          {          {
3848          *lengthptr += class_utf8data - class_utf8data_base;          *lengthptr += class_uchardata - class_uchardata_base;
3849          class_utf8data = class_utf8data_base;          class_uchardata = class_uchardata_base;
3850          }          }
   
3851  #endif  #endif
3852    
3853        /* Inside \Q...\E everything is literal except \E */        /* Inside \Q...\E everything is literal except \E */
# Line 3714  for (;; ptr++) Line 3875  for (;; ptr++)
3875          {          {
3876          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
3877          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
3878          register const uschar *cbits = cd->cbits;          register const pcre_uint8 *cbits = cd->cbits;
3879          uschar pbits[32];          pcre_uint8 pbits[32];
3880    
3881          if (ptr[1] != CHAR_COLON)          if (ptr[1] != CHAR_COLON)
3882            {            {
# Line 3770  for (;; ptr++) Line 3931  for (;; ptr++)
3931          /* Copy in the first table (always present) */          /* Copy in the first table (always present) */
3932    
3933          memcpy(pbits, cbits + posix_class_maps[posix_class],          memcpy(pbits, cbits + posix_class_maps[posix_class],
3934            32 * sizeof(uschar));            32 * sizeof(pcre_uint8));
3935    
3936          /* If there is a second table, add or remove it as required. */          /* If there is a second table, add or remove it as required. */
3937    
# Line 3801  for (;; ptr++) Line 3962  for (;; ptr++)
3962            for (c = 0; c < 32; c++) classbits[c] |= pbits[c];            for (c = 0; c < 32; c++) classbits[c] |= pbits[c];
3963    
3964          ptr = tempptr + 1;          ptr = tempptr + 1;
3965          class_charcount = 10;  /* Set > 1; assumes more than 1 per class */          /* Every class contains at least one < 256 characters. */
3966            class_has_8bitchar = 1;
3967            /* Every class contains at least two characters. */
3968            class_single_char = 2;
3969          continue;    /* End of POSIX syntax handling */          continue;    /* End of POSIX syntax handling */
3970          }          }
3971    
3972        /* Backslash may introduce a single character, or it may introduce one        /* Backslash may introduce a single character, or it may introduce one
3973        of the specials, which just set a flag. The sequence \b is a special        of the specials, which just set a flag. The sequence \b is a special
3974        case. Inside a class (and only there) it is treated as backspace. We        case. Inside a class (and only there) it is treated as backspace. We
3975        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
3976        class_charcount bigger than one. Unrecognized escapes fall through and        speculatively set both class_has_8bitchar and class_single_char bigger
3977        are either treated as literal characters (by default), or are faulted if        than one. Unrecognized escapes fall through and are either treated
3978          as literal characters (by default), or are faulted if
3979        PCRE_EXTRA is set. */        PCRE_EXTRA is set. */
3980    
3981        if (c == CHAR_BACKSLASH)        if (c == CHAR_BACKSLASH)
# Line 3822  for (;; ptr++) Line 3987  for (;; ptr++)
3987          else if (-c == ESC_N)            /* \N is not supported in a class */          else if (-c == ESC_N)            /* \N is not supported in a class */
3988            {            {
3989            *errorcodeptr = ERR71;            *errorcodeptr = ERR71;
3990            goto FAILED;            goto FAILED;
3991            }            }
3992          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
3993            {            {
3994            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
# Line 3837  for (;; ptr++) Line 4002  for (;; ptr++)
4002    
4003          if (c < 0)          if (c < 0)
4004            {            {
4005            register const uschar *cbits = cd->cbits;            register const pcre_uint8 *cbits = cd->cbits;
4006            class_charcount += 2;     /* Greater than 1 is what matters */            /* Every class contains at least two < 256 characters. */
4007              class_has_8bitchar++;
4008              /* Every class contains at least two characters. */
4009              class_single_char += 2;
4010    
4011            switch (-c)            switch (-c)
4012              {              {
# Line 3851  for (;; ptr++) Line 4019  for (;; ptr++)
4019              case ESC_SU:              case ESC_SU:
4020              nestptr = ptr;              nestptr = ptr;
4021              ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */              ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
4022              class_charcount -= 2;                /* Undo! */              class_has_8bitchar--;                /* Undo! */
4023              continue;              continue;
4024  #endif  #endif
4025              case ESC_d:              case ESC_d:
# Line 3892  for (;; ptr++) Line 4060  for (;; ptr++)
4060              SETBIT(classbits, 0x09); /* VT */              SETBIT(classbits, 0x09); /* VT */
4061              SETBIT(classbits, 0x20); /* SPACE */              SETBIT(classbits, 0x20); /* SPACE */
4062              SETBIT(classbits, 0xa0); /* NSBP */              SETBIT(classbits, 0xa0); /* NSBP */
4063  #ifdef SUPPORT_UTF8  #ifndef COMPILE_PCRE8
4064              if (utf8)              xclass = TRUE;
4065                *class_uchardata++ = XCL_SINGLE;
4066                *class_uchardata++ = 0x1680;
4067                *class_uchardata++ = XCL_SINGLE;
4068                *class_uchardata++ = 0x180e;
4069                *class_uchardata++ = XCL_RANGE;
4070                *class_uchardata++ = 0x2000;
4071                *class_uchardata++ = 0x200a;
4072                *class_uchardata++ = XCL_SINGLE;
4073                *class_uchardata++ = 0x202f;
4074                *class_uchardata++ = XCL_SINGLE;
4075                *class_uchardata++ = 0x205f;
4076                *class_uchardata++ = XCL_SINGLE;
4077                *class_uchardata++ = 0x3000;
4078    #elif defined SUPPORT_UTF
4079                if (utf)
4080                {                {
4081                class_utf8 = TRUE;                xclass = TRUE;
4082                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4083                class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x1680, class_uchardata);
4084                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4085                class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x180e, class_uchardata);
4086                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4087                class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2000, class_uchardata);
4088                class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x200a, class_uchardata);
4089                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4090                class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x202f, class_uchardata);
4091                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4092                class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x205f, class_uchardata);
4093                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4094                class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x3000, class_uchardata);
4095                }                }
4096  #endif  #endif
4097              continue;              continue;
# Line 3926  for (;; ptr++) Line 4109  for (;; ptr++)
4109                  }                  }
4110                classbits[c] |= x;                classbits[c] |= x;
4111                }                }
4112    #ifndef COMPILE_PCRE8
4113  #ifdef SUPPORT_UTF8              xclass = TRUE;
4114              if (utf8)              *class_uchardata++ = XCL_RANGE;
4115                *class_uchardata++ = 0x0100;
4116                *class_uchardata++ = 0x167f;
4117                *class_uchardata++ = XCL_RANGE;
4118                *class_uchardata++ = 0x1681;
4119                *class_uchardata++ = 0x180d;
4120                *class_uchardata++ = XCL_RANGE;
4121                *class_uchardata++ = 0x180f;
4122                *class_uchardata++ = 0x1fff;
4123                *class_uchardata++ = XCL_RANGE;
4124                *class_uchardata++ = 0x200b;
4125                *class_uchardata++ = 0x202e;
4126                *class_uchardata++ = XCL_RANGE;
4127                *class_uchardata++ = 0x2030;
4128                *class_uchardata++ = 0x205e;
4129                *class_uchardata++ = XCL_RANGE;
4130                *class_uchardata++ = 0x2060;
4131                *class_uchardata++ = 0x2fff;
4132                *class_uchardata++ = XCL_RANGE;
4133                *class_uchardata++ = 0x3001;
4134    #ifdef SUPPORT_UTF
4135                if (utf)
4136                  class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4137                else
4138    #endif
4139                  *class_uchardata++ = 0xffff;
4140    #elif defined SUPPORT_UTF
4141                if (utf)
4142                {                {
4143                class_utf8 = TRUE;                xclass = TRUE;
4144                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4145                class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x0100, class_uchardata);
4146                class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x167f, class_uchardata);
4147                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4148                class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x1681, class_uchardata);
4149                class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x180d, class_uchardata);
4150                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4151                class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x180f, class_uchardata);
4152                class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x1fff, class_uchardata);
4153                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4154                class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x200b, class_uchardata);
4155                class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x202e, class_uchardata);
4156                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4157                class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2030, class_uchardata);
4158                class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x205e, class_uchardata);
4159                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4160                class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2060, class_uchardata);
4161                class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2fff, class_uchardata);
4162                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4163                class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x3001, class_uchardata);
4164                class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4165                }                }
4166  #endif  #endif
4167              continue;              continue;
# Line 3962  for (;; ptr++) Line 4172  for (;; ptr++)
4172              SETBIT(classbits, 0x0c); /* FF */              SETBIT(classbits, 0x0c); /* FF */
4173              SETBIT(classbits, 0x0d); /* CR */              SETBIT(classbits, 0x0d); /* CR */
4174              SETBIT(classbits, 0x85); /* NEL */              SETBIT(classbits, 0x85); /* NEL */
4175  #ifdef SUPPORT_UTF8  #ifndef COMPILE_PCRE8
4176              if (utf8)              xclass = TRUE;
4177                *class_uchardata++ = XCL_RANGE;
4178                *class_uchardata++ = 0x2028;
4179                *class_uchardata++ = 0x2029;
4180    #elif defined SUPPORT_UTF
4181                if (utf)
4182                {                {
4183                class_utf8 = TRUE;                xclass = TRUE;
4184                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4185                class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2028, class_uchardata);
4186                class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2029, class_uchardata);
4187                }                }
4188  #endif  #endif
4189              continue;              continue;
# Line 3990  for (;; ptr++) Line 4205  for (;; ptr++)
4205                classbits[c] |= x;                classbits[c] |= x;
4206                }                }
4207    
4208  #ifdef SUPPORT_UTF8  #ifndef COMPILE_PCRE8
4209              if (utf8)              xclass = TRUE;
4210                *class_uchardata++ = XCL_RANGE;
4211                *class_uchardata++ = 0x0100;
4212                *class_uchardata++ = 0x2027;
4213                *class_uchardata++ = XCL_RANGE;
4214                *class_uchardata++ = 0x202a;
4215    #ifdef SUPPORT_UTF
4216                if (utf)
4217                  class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4218                else
4219    #endif
4220                  *class_uchardata++ = 0xffff;
4221    #elif defined SUPPORT_UTF
4222                if (utf)
4223                {                {
4224                class_utf8 = TRUE;                xclass = TRUE;
4225                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4226                class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x0100, class_uchardata);
4227                class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2027, class_uchardata);
4228                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4229                class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x202a, class_uchardata);
4230                class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4231                }                }
4232  #endif  #endif
4233              continue;              continue;
# Line 4012  for (;; ptr++) Line 4240  for (;; ptr++)
4240                int pdata;                int pdata;
4241                int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);                int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
4242                if (ptype < 0) goto FAILED;                if (ptype < 0) goto FAILED;
4243                class_utf8 = TRUE;                xclass = TRUE;
4244                *class_utf8data++ = ((-c == ESC_p) != negated)?                *class_uchardata++ = ((-c == ESC_p) != negated)?
4245                  XCL_PROP : XCL_NOTPROP;                  XCL_PROP : XCL_NOTPROP;
4246                *class_utf8data++ = ptype;                *class_uchardata++ = ptype;
4247                *class_utf8data++ = pdata;                *class_uchardata++ = pdata;
4248                class_charcount -= 2;   /* Not a < 256 character */                class_has_8bitchar--;                /* Undo! */
4249                continue;                continue;
4250                }                }
4251  #endif  #endif
# Line 4031  for (;; ptr++) Line 4259  for (;; ptr++)
4259                *errorcodeptr = ERR7;                *errorcodeptr = ERR7;
4260                goto FAILED;                goto FAILED;
4261                }                }
4262              class_charcount -= 2;  /* Undo the default count from above */              class_has_8bitchar--;    /* Undo the speculative increase. */
4263              c = *ptr;              /* Get the final character and fall through */              class_single_char -= 2;  /* Undo the speculative increase. */
4264                c = *ptr;                /* Get the final character and fall through */
4265              break;              break;
4266              }              }
4267            }            }
4268    
4269          /* Fall through if we have a single character (c >= 0). This may be          /* Fall through if we have a single character (c >= 0). This may be
4270          greater than 256 in UTF-8 mode. */          greater than 256. */
4271    
4272          }   /* End of backslash handling */          }   /* End of backslash handling */
4273    
# Line 4086  for (;; ptr++) Line 4315  for (;; ptr++)
4315            goto LONE_SINGLE_CHARACTER;            goto LONE_SINGLE_CHARACTER;
4316            }            }
4317    
4318  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4319          if (utf8)          if (utf)
4320            {                           /* Braces are required because the */            {                           /* Braces are required because the */
4321            GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */            GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */
4322            }            }
# Line 4131  for (;; ptr++) Line 4360  for (;; ptr++)
4360    
4361          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
4362    
4363            /* Since we found a character range, single character optimizations
4364            cannot be done anymore. */
4365            class_single_char = 2;
4366    
4367          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
4368          matching, we have to use an XCLASS with extra data items. Caseless          matching, we have to use an XCLASS with extra data items. Caseless
4369          matching for characters > 127 is available only if UCP support is          matching for characters > 127 is available only if UCP support is
4370          available. */          available. */
4371    
4372  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !(defined COMPILE_PCRE8)
4373          if (utf8 && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127)))          if ((d > 255) || (utf && ((options & PCRE_CASELESS) != 0 && d > 127)))
4374    #elif defined  SUPPORT_UTF
4375            if (utf && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127)))
4376    #elif !(defined COMPILE_PCRE8)
4377            if (d > 255)
4378    #endif
4379    #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
4380            {            {
4381            class_utf8 = TRUE;            xclass = TRUE;
4382    
4383            /* With UCP support, we can find the other case equivalents of            /* With UCP support, we can find the other case equivalents of
4384            the relevant characters. There may be several ranges. Optimize how            the relevant characters. There may be several ranges. Optimize how
4385            they fit with the basic range. */            they fit with the basic range. */
4386    
4387  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4388    #ifndef COMPILE_PCRE8
4389              if (utf && (options & PCRE_CASELESS) != 0)
4390    #else
4391            if ((options & PCRE_CASELESS) != 0)            if ((options & PCRE_CASELESS) != 0)
4392    #endif
4393              {              {
4394              unsigned int occ, ocd;              unsigned int occ, ocd;
4395              unsigned int cc = c;              unsigned int cc = c;
# Line 4172  for (;; ptr++) Line 4415  for (;; ptr++)
4415    
4416                if (occ == ocd)                if (occ == ocd)
4417                  {                  {
4418                  *class_utf8data++ = XCL_SINGLE;                  *class_uchardata++ = XCL_SINGLE;
4419                  }                  }
4420                else                else
4421                  {                  {
4422                  *class_utf8data++ = XCL_RANGE;                  *class_uchardata++ = XCL_RANGE;
4423                  class_utf8data += _pcre_ord2utf8(occ, class_utf8data);                  class_uchardata += PRIV(ord2utf)(occ, class_uchardata);
4424                  }                  }
4425                class_utf8data += _pcre_ord2utf8(ocd, class_utf8data);                class_uchardata += PRIV(ord2utf)(ocd, class_uchardata);
4426                }                }
4427              }              }
4428  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
# Line 4187  for (;; ptr++) Line 4430  for (;; ptr++)
4430            /* Now record the original range, possibly modified for UCP caseless            /* Now record the original range, possibly modified for UCP caseless
4431            overlapping ranges. */            overlapping ranges. */
4432    
4433            *class_utf8data++ = XCL_RANGE;            *class_uchardata++ = XCL_RANGE;
4434            class_utf8data += _pcre_ord2utf8(c, class_utf8data);  #ifdef SUPPORT_UTF
4435            class_utf8data += _pcre_ord2utf8(d, class_utf8data);  #ifndef COMPILE_PCRE8
4436              if (utf)
4437                {
4438                class_uchardata += PRIV(ord2utf)(c, class_uchardata);
4439                class_uchardata += PRIV(ord2utf)(d, class_uchardata);
4440                }
4441              else
4442                {
4443                *class_uchardata++ = c;
4444                *class_uchardata++ = d;
4445                }
4446    #else
4447              class_uchardata += PRIV(ord2utf)(c, class_uchardata);
4448              class_uchardata += PRIV(ord2utf)(d, class_uchardata);
4449    #endif
4450    #else /* SUPPORT_UTF */
4451              *class_uchardata++ = c;
4452              *class_uchardata++ = d;
4453    #endif /* SUPPORT_UTF */
4454    
4455            /* With UCP support, we are done. Without UCP support, there is no            /* With UCP support, we are done. Without UCP support, there is no
4456            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
4457            for the smaller ones. */            for the smaller ones. As for 16 bit characters without UTF, we
4458              can still use  */
4459    
4460  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4461            continue;    /* With next character in the class */  #ifndef COMPILE_PCRE8
4462  #else            if (utf)
4463            if ((options & PCRE_CASELESS) == 0 || c > 127) continue;  #endif
4464                continue;    /* With next character in the class */
4465    #endif  /* SUPPORT_UCP */
4466    
4467    #if defined SUPPORT_UTF && !defined(SUPPORT_UCP) && !(defined COMPILE_PCRE8)
4468              if (utf)
4469                {
4470                if ((options & PCRE_CASELESS) == 0 || c > 127) continue;
4471                /* Adjust upper limit and fall through to set up the map */
4472                d = 127;
4473                }
4474              else
4475                {
4476                if (c > 255) continue;
4477                /* Adjust upper limit and fall through to set up the map */
4478                d = 255;
4479                }
4480    #elif defined SUPPORT_UTF && !defined(SUPPORT_UCP)
4481              if ((options & PCRE_CASELESS) == 0 || c > 127) continue;
4482            /* Adjust upper limit and fall through to set up the map */            /* Adjust upper limit and fall through to set up the map */
   
4483            d = 127;            d = 127;
4484    #else
4485  #endif  /* SUPPORT_UCP */            if (c > 255) continue;
4486              /* Adjust upper limit and fall through to set up the map */
4487              d = 255;
4488    #endif  /* SUPPORT_UTF && !SUPPORT_UCP && !COMPILE_PCRE8 */
4489            }            }
4490  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF || !COMPILE_PCRE8 */
4491    
4492          /* 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
4493          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. */  
4494    
4495          class_charcount += d - c + 1;          class_has_8bitchar = 1;
         class_lastchar = d;  
4496    
4497          /* We can save a bit of time by skipping this in the pre-compile. */          /* We can save a bit of time by skipping this in the pre-compile. */
4498    
# Line 4222  for (;; ptr++) Line 4501  for (;; ptr++)
4501            classbits[c/8] |= (1 << (c&7));            classbits[c/8] |= (1 << (c&7));
4502            if ((options & PCRE_CASELESS) != 0)            if ((options & PCRE_CASELESS) != 0)
4503              {              {
4504              int uc = cd->fcc[c];           /* flip case */              int uc = cd->fcc[c]; /* flip case */
4505              classbits[uc/8] |= (1 << (uc&7));              classbits[uc/8] |= (1 << (uc&7));
4506              }              }
4507            }            }
# Line 4236  for (;; ptr++) Line 4515  for (;; ptr++)
4515    
4516        LONE_SINGLE_CHARACTER:        LONE_SINGLE_CHARACTER:
4517    
4518        /* Handle a character that cannot go in the bit map */        /* Only the value of 1 matters for class_single_char. */
4519    
4520          if (class_single_char < 2) class_single_char++;
4521    
4522          /* If class_charcount is 1, we saw precisely one character. As long as
4523          there was no use of \p or \P, in other words, no use of any XCLASS
4524          features, we can optimize.
4525    
4526          The optimization throws away the bit map. We turn the item into a
4527          1-character OP_CHAR[I] if it's positive, or OP_NOT[I] if it's negative.
4528          In the positive case, it can cause firstchar to be set. Otherwise, there
4529          can be no first char if this item is first, whatever repeat count may
4530          follow. In the case of reqchar, save the previous value for reinstating. */
4531    
4532  #ifdef SUPPORT_UTF8        if (class_single_char == 1 && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
       if (utf8 && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127)))  
4533          {          {
4534          class_utf8 = TRUE;          ptr++;
4535          *class_utf8data++ = XCL_SINGLE;          zeroreqchar = reqchar;
4536          class_utf8data += _pcre_ord2utf8(c, class_utf8data);  
4537            if (negate_class)
4538              {
4539              if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
4540              zerofirstchar = firstchar;
4541              *code++ = ((options & PCRE_CASELESS) != 0)? OP_NOTI: OP_NOT;
4542    #ifdef SUPPORT_UTF
4543              if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
4544                code += PRIV(ord2utf)(c, code);
4545              else
4546    #endif
4547                *code++ = c;
4548              goto NOT_CHAR;
4549              }
4550    
4551            /* For a single, positive character, get the value into mcbuffer, and
4552            then we can handle this with the normal one-character code. */
4553    
4554    #ifdef SUPPORT_UTF
4555            if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
4556              mclength = PRIV(ord2utf)(c, mcbuffer);
4557            else
4558    #endif
4559              {
4560              mcbuffer[0] = c;
4561              mclength = 1;
4562              }
4563            goto ONE_CHAR;
4564            }       /* End of 1-char optimization */
4565    
4566          /* Handle a character that cannot go in the bit map. */
4567    
4568    #if defined SUPPORT_UTF && !(defined COMPILE_PCRE8)
4569          if ((c > 255) || (utf && ((options & PCRE_CASELESS) != 0 && c > 127)))
4570    #elif defined SUPPORT_UTF
4571          if (utf && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127)))
4572    #elif !(defined COMPILE_PCRE8)
4573          if (c > 255)
4574    #endif
4575    
4576    #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
4577            {
4578            xclass = TRUE;
4579            *class_uchardata++ = XCL_SINGLE;
4580    #ifdef SUPPORT_UTF
4581    #ifndef COMPILE_PCRE8
4582            /* In non 8 bit mode, we can get here even if we are not in UTF mode. */
4583            if (!utf)
4584              *class_uchardata++ = c;
4585            else
4586    #endif
4587              class_uchardata += PRIV(ord2utf)(c, class_uchardata);
4588    #else /* SUPPORT_UTF */
4589            *class_uchardata++ = c;
4590    #endif /* SUPPORT_UTF */
4591    
4592  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4593    #ifdef COMPILE_PCRE8
4594          if ((options & PCRE_CASELESS) != 0)          if ((options & PCRE_CASELESS) != 0)
4595    #else
4596            /* In non 8 bit mode, we can get here even if we are not in UTF mode. */
4597            if (utf && (options & PCRE_CASELESS) != 0)
4598    #endif
4599            {            {
4600            unsigned int othercase;            unsigned int othercase;
4601            if ((othercase = UCD_OTHERCASE(c)) != c)            if ((int)(othercase = UCD_OTHERCASE(c)) != c)
4602              {              {
4603              *class_utf8data++ = XCL_SINGLE;              *class_uchardata++ = XCL_SINGLE;
4604              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);              class_uchardata += PRIV(ord2utf)(othercase, class_uchardata);
4605              }              }
4606            }            }
4607  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
4608    
4609          }          }
4610        else        else
4611  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF || COMPILE_PCRE16 */
4612    
4613        /* Handle a single-byte character */        /* Handle a single-byte character */
4614          {          {
4615            class_has_8bitchar = 1;
4616          classbits[c/8] |= (1 << (c&7));          classbits[c/8] |= (1 << (c&7));
4617          if ((options & PCRE_CASELESS) != 0)          if ((options & PCRE_CASELESS) != 0)
4618            {            {
4619            c = cd->fcc[c];   /* flip case */            c = cd->fcc[c]; /* flip case */
4620            classbits[c/8] |= (1 << (c&7));            classbits[c/8] |= (1 << (c&7));
4621            }            }
         class_charcount++;  
         class_lastchar = c;  
4622          }          }
4623        }        }
4624    
# Line 4291  for (;; ptr++) Line 4639  for (;; ptr++)
4639        goto FAILED;        goto FAILED;
4640        }        }
4641    
4642      /* 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
4643      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
4644      use of \p or \P, in other words, no use of any XCLASS features, we can      unchanged after any kind of repeat. */
4645      optimize.  
4646        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
4647      In UTF-8 mode, we can optimize the negative case only if there were no      zerofirstchar = firstchar;
4648      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  
     1-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;  
4649    
4650      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
4651      extended class, with its own opcode, unless there was a negated special      extended class, with its own opcode, unless there was a negated special
# Line 4360  for (;; ptr++) Line 4655  for (;; ptr++)
4655      be listed) there are no characters < 256, we can omit the bitmap in the      be listed) there are no characters < 256, we can omit the bitmap in the
4656      actual compiled code. */      actual compiled code. */
4657    
4658  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4659      if (class_utf8 && (!should_flip_negation || (options & PCRE_UCP) != 0))      if (xclass && (!should_flip_negation || (options & PCRE_UCP) != 0))
4660    #elif !defined COMPILE_PCRE8
4661        if (xclass && !should_flip_negation)
4662    #endif
4663    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
4664        {        {
4665        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */        *class_uchardata++ = XCL_END;    /* Marks the end of extra data */
4666        *code++ = OP_XCLASS;        *code++ = OP_XCLASS;
4667        code += LINK_SIZE;        code += LINK_SIZE;
4668        *code = negate_class? XCL_NOT : 0;        *code = negate_class? XCL_NOT:0;
4669    
4670        /* If the map is required, move up the extra data to make room for it;        /* If the map is required, move up the extra data to make room for it;
4671        otherwise just move the code pointer to the end of the extra data. */        otherwise just move the code pointer to the end of the extra data. */
4672    
4673        if (class_charcount > 0)        if (class_has_8bitchar > 0)
4674          {          {
4675          *code++ |= XCL_MAP;          *code++ |= XCL_MAP;
4676          memmove(code + 32, code, class_utf8data - code);          memmove(code + (32 / sizeof(pcre_uchar)), code,
4677              IN_UCHARS(class_uchardata - code));
4678          memcpy(code, classbits, 32);          memcpy(code, classbits, 32);
4679          code = class_utf8data + 32;          code = class_uchardata + (32 / sizeof(pcre_uchar));
4680          }          }
4681        else code = class_utf8data;        else code = class_uchardata;
4682    
4683        /* Now fill in the complete length of the item */        /* Now fill in the complete length of the item */
4684    
4685        PUT(previous, 1, code - previous);        PUT(previous, 1, (int)(code - previous));
4686        break;   /* End of class handling */        break;   /* End of class handling */
4687        }        }
4688  #endif  #endif
# Line 4394  for (;; ptr++) Line 4694  for (;; ptr++)
4694      negating it if necessary. */      negating it if necessary. */
4695    
4696      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
4697      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  
4698        {        {
4699          if (negate_class)
4700            for (c = 0; c < 32; c++) classbits[c] = ~classbits[c];
4701        memcpy(code, classbits, 32);        memcpy(code, classbits, 32);
4702        }        }
4703      code += 32;      code += 32 / sizeof(pcre_uchar);
4704        NOT_CHAR:
4705      break;      break;
4706    
4707    
# Line 4440  for (;; ptr++) Line 4738  for (;; ptr++)
4738    
4739      if (repeat_min == 0)      if (repeat_min == 0)
4740        {        {
4741        firstbyte = zerofirstbyte;    /* Adjust for zero repeat */        firstchar = zerofirstchar;    /* Adjust for zero repeat */
4742        reqbyte = zeroreqbyte;        /* Ditto */        reqchar = zeroreqchar;        /* Ditto */
4743        }        }
4744    
4745      /* Remember whether this is a variable length repeat */      /* Remember whether this is a variable length repeat */
# Line 4480  for (;; ptr++) Line 4778  for (;; ptr++)
4778      past, but it no longer happens for non-repeated recursions. In fact, the      past, but it no longer happens for non-repeated recursions. In fact, the
4779      repeated ones could be re-implemented independently so as not to need this,      repeated ones could be re-implemented independently so as not to need this,
4780      but for the moment we rely on the code for repeating groups. */      but for the moment we rely on the code for repeating groups. */
4781    
4782      if (*previous == OP_RECURSE)      if (*previous == OP_RECURSE)
4783        {        {
4784        memmove(previous + 1 + LINK_SIZE, previous, 1 + LINK_SIZE);        memmove(previous + 1 + LINK_SIZE, previous, IN_UCHARS(1 + LINK_SIZE));
4785        *previous = OP_ONCE;        *previous = OP_ONCE;
4786        PUT(previous, 1, 2 + 2*LINK_SIZE);        PUT(previous, 1, 2 + 2*LINK_SIZE);
4787        previous[2 + 2*LINK_SIZE] = OP_KET;        previous[2 + 2*LINK_SIZE] = OP_KET;
# Line 4504  for (;; ptr++) Line 4802  for (;; ptr++)
4802    
4803      /* Now handle repetition for the different types of item. */      /* Now handle repetition for the different types of item. */
4804    
4805      /* If previous was a character match, abolish the item and generate a      /* If previous was a character or negated character match, abolish the item
4806      repeat item instead. If a char item has a minumum of more than one, ensure      and generate a repeat item instead. If a char item has a minimum of more
4807      that it is set in reqbyte - it might not be if a sequence such as x{3} is      than one, ensure that it is set in reqchar - it might not be if a sequence
4808      the first thing in a branch because the x will have gone into firstbyte      such as x{3} is the first thing in a branch because the x will have gone
4809      instead.  */      into firstchar instead.  */
4810    
4811      if (*previous == OP_CHAR || *previous == OP_CHARI)      if (*previous == OP_CHAR || *previous == OP_CHARI
4812            || *previous == OP_NOT || *previous == OP_NOTI)
4813        {        {
4814        op_type = (*previous == OP_CHAR)? 0 : OP_STARI - OP_STAR;        switch (*previous)
4815            {
4816            default: /* Make compiler happy. */
4817            case OP_CHAR:  op_type = OP_STAR - OP_STAR; break;
4818            case OP_CHARI: op_type = OP_STARI - OP_STAR; break;
4819            case OP_NOT:   op_type = OP_NOTSTAR - OP_STAR; break;
4820            case OP_NOTI:  op_type = OP_NOTSTARI - OP_STAR; break;
4821            }
4822    
4823        /* 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
4824        easier to write this out separately than try to macrify it. Use c to        easier to write this out separately than try to macrify it. Use c to
4825        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
4826        length rather than a small character. */        it's a length rather than a small character. */
4827    
4828  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4829        if (utf8 && (code[-1] & 0x80) != 0)        if (utf && NOT_FIRSTCHAR(code[-1]))
4830          {          {
4831          uschar *lastchar = code - 1;          pcre_uchar *lastchar = code - 1;
4832          while((*lastchar & 0xc0) == 0x80) lastchar--;          BACKCHAR(lastchar);
4833          c = code - lastchar;            /* Length of UTF-8 character */          c = (int)(code - lastchar);     /* Length of UTF-8 character */
4834          memcpy(utf8_char, lastchar, c); /* Save the char */          memcpy(utf_chars, lastchar, IN_UCHARS(c)); /* Save the char */
4835          c |= 0x80;                      /* Flag c as a length */          c |= UTF_LENGTH;                /* Flag c as a length */
4836          }          }
4837        else        else
4838  #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. */  
4839    
4840          /* Handle the case of a single charater - either with no UTF support, or
4841          with UTF disabled, or for a single character UTF character. */
4842          {          {
4843          c = code[-1];          c = code[-1];
4844          if (repeat_min > 1) reqbyte = c | req_caseopt | cd->req_varyopt;          if (*previous <= OP_CHARI && repeat_min > 1)
4845              reqchar = c | req_caseopt | cd->req_varyopt;
4846          }          }
4847    
4848        /* If the repetition is unlimited, it pays to see if the next thing on        /* If the repetition is unlimited, it pays to see if the next thing on
# Line 4546  for (;; ptr++) Line 4852  for (;; ptr++)
4852    
4853        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4854            repeat_max < 0 &&            repeat_max < 0 &&
4855            check_auto_possessive(previous, utf8, ptr + 1, options, cd))            check_auto_possessive(previous, utf, ptr + 1, options, cd))
4856          {          {
4857          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4858          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 4555  for (;; ptr++) Line 4861  for (;; ptr++)
4861        goto OUTPUT_SINGLE_REPEAT;   /* Code shared with single character types */        goto OUTPUT_SINGLE_REPEAT;   /* Code shared with single character types */
4862        }        }
4863    
     /* If previous was a single negated character ([^a] or similar), we use  
     one of the special opcodes, replacing it. The code is shared with single-  
     character repeats by setting opt_type to add a suitable offset into  
     repeat_type. We can also test for auto-possessification. OP_NOT and OP_NOTI  
     are currently used only for single-byte chars. */  
   
     else if (*previous == OP_NOT || *previous == OP_NOTI)  
       {  
       op_type = ((*previous == OP_NOT)? OP_NOTSTAR : OP_NOTSTARI) - OP_STAR;  
       c = previous[1];  
       if (!possessive_quantifier &&  
           repeat_max < 0 &&  
           check_auto_possessive(previous, utf8, ptr + 1, options, cd))  
         {  
         repeat_type = 0;    /* Force greedy */  
         possessive_quantifier = TRUE;  
         }  
       goto OUTPUT_SINGLE_REPEAT;  
       }  
   
4864      /* If previous was a character type match (\d or similar), abolish it and      /* If previous was a character type match (\d or similar), abolish it and
4865      create a suitable repeat item. The code is shared with single-character      create a suitable repeat item. The code is shared with single-character
4866      repeats by setting op_type to add a suitable offset into repeat_type. Note      repeats by setting op_type to add a suitable offset into repeat_type. Note
# Line 4584  for (;; ptr++) Line 4870  for (;; ptr++)
4870    
4871      else if (*previous < OP_EODN)      else if (*previous < OP_EODN)
4872        {        {
4873        uschar *oldcode;        pcre_uchar *oldcode;
4874        int prop_type, prop_value;        int prop_type, prop_value;
4875        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */
4876        c = *previous;        c = *previous;
4877    
4878        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4879            repeat_max < 0 &&            repeat_max < 0 &&
4880            check_auto_possessive(previous, utf8, ptr + 1, options, cd))            check_auto_possessive(previous, utf, ptr + 1, options, cd))
4881          {          {
4882          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4883          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 4671  for (;; ptr++) Line 4957  for (;; ptr++)
4957          we have to insert the character for the previous code. For a repeated          we have to insert the character for the previous code. For a repeated
4958          Unicode property match, there are two extra bytes that define the          Unicode property match, there are two extra bytes that define the
4959          required property. In UTF-8 mode, long characters have their length in          required property. In UTF-8 mode, long characters have their length in
4960          c, with the 0x80 bit as a flag. */          c, with the UTF_LENGTH bit as a flag. */
4961    
4962          if (repeat_max < 0)          if (repeat_max < 0)
4963            {            {
4964  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4965            if (utf8 && c >= 128)            if (utf && (c & UTF_LENGTH) != 0)
4966              {              {
4967              memcpy(code, utf8_char, c & 7);              memcpy(code, utf_chars, IN_UCHARS(c & 7));
4968              code += c & 7;              code += c & 7;
4969              }              }
4970            else            else
# Line 4700  for (;; ptr++) Line 4986  for (;; ptr++)
4986    
4987          else if (repeat_max != repeat_min)          else if (repeat_max != repeat_min)
4988            {            {
4989  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4990            if (utf8 && c >= 128)            if (utf && (c & UTF_LENGTH) != 0)
4991              {              {
4992              memcpy(code, utf8_char, c & 7);              memcpy(code, utf_chars, IN_UCHARS(c & 7));
4993              code += c & 7;              code += c & 7;
4994              }              }
4995            else            else
# Line 4730  for (;; ptr++) Line 5016  for (;; ptr++)
5016    
5017        /* The character or character type itself comes last in all cases. */        /* The character or character type itself comes last in all cases. */
5018    
5019  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
5020        if (utf8 && c >= 128)        if (utf && (c & UTF_LENGTH) != 0)
5021          {          {
5022          memcpy(code, utf8_char, c & 7);          memcpy(code, utf_chars, IN_UCHARS(c & 7));
5023          code += c & 7;          code += c & 7;
5024          }          }
5025        else        else
# Line 4757  for (;; ptr++) Line 5043  for (;; ptr++)
5043    
5044      else if (*previous == OP_CLASS ||      else if (*previous == OP_CLASS ||
5045               *previous == OP_NCLASS ||               *previous == OP_NCLASS ||
5046  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
5047               *previous == OP_XCLASS ||               *previous == OP_XCLASS ||
5048  #endif  #endif
5049               *previous == OP_REF ||               *previous == OP_REF ||
# Line 4806  for (;; ptr++) Line 5092  for (;; ptr++)
5092        {        {
5093        register int i;        register int i;
5094        int len = (int)(code - previous);        int len = (int)(code - previous);
5095        uschar *bralink = NULL;        pcre_uchar *bralink = NULL;
5096        uschar *brazeroptr = NULL;        pcre_uchar *brazeroptr = NULL;
5097    
5098        /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so        /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so
5099        we just ignore the repeat. */        we just ignore the repeat. */
# Line 4860  for (;; ptr++) Line 5146  for (;; ptr++)
5146          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
5147            {            {
5148            *code = OP_END;            *code = OP_END;
5149            adjust_recurse(previous, 1, utf8, cd, save_hwm);            adjust_recurse(previous, 1, utf, cd, save_hwm);
5150            memmove(previous+1, previous, len);            memmove(previous + 1, previous, IN_UCHARS(len));
5151            code++;            code++;
5152            if (repeat_max == 0)            if (repeat_max == 0)
5153              {              {
# Line 4884  for (;; ptr++) Line 5170  for (;; ptr++)
5170            {            {
5171            int offset;            int offset;
5172            *code = OP_END;            *code = OP_END;
5173            adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd, save_hwm);            adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, save_hwm);
5174            memmove(previous + 2 + LINK_SIZE, previous, len);            memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len));
5175            code += 2 + LINK_SIZE;            code += 2 + LINK_SIZE;
5176            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
5177            *previous++ = OP_BRA;            *previous++ = OP_BRA;
# Line 4932  for (;; ptr++) Line 5218  for (;; ptr++)
5218              }              }
5219    
5220            /* This is compiling for real. If there is a set first byte for            /* This is compiling for real. If there is a set first byte for
5221            the group, and we have not yet set a "required byte", set it. Make            the group, and we have not yet set a "required byte", set it. Make
5222            sure there is enough workspace for copying forward references before            sure there is enough workspace for copying forward references before
5223            doing the copy. */            doing the copy. */
5224    
5225            else            else
5226              {              {
5227              if (groupsetfirstbyte && reqbyte < 0) reqbyte = firstbyte;              if (groupsetfirstchar && reqchar < 0) reqchar = firstchar;
5228    
5229              for (i = 1; i < repeat_min; i++)              for (i = 1; i < repeat_min; i++)
5230                {                {
5231                uschar *hc;                pcre_uchar *hc;
5232                uschar *this_hwm = cd->hwm;                pcre_uchar *this_hwm = cd->hwm;
5233                memcpy(code, previous, len);                memcpy(code, previous, IN_UCHARS(len));
5234    
5235                while (cd->hwm > cd->start_workspace + cd->workspace_size -                while (cd->hwm > cd->start_workspace + cd->workspace_size -
5236                       WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))                       WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))
5237                  {                  {
# Line 4953  for (;; ptr++) Line 5239  for (;; ptr++)
5239                  int this_offset = this_hwm - cd->start_workspace;                  int this_offset = this_hwm - cd->start_workspace;
5240                  *errorcodeptr = expand_workspace(cd);                  *errorcodeptr = expand_workspace(cd);
5241                  if (*errorcodeptr != 0) goto FAILED;                  if (*errorcodeptr != 0) goto FAILED;
5242                  save_hwm = (uschar *)cd->start_workspace + save_offset;                  save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;
5243                  this_hwm = (uschar *)cd->start_workspace + this_offset;                  this_hwm = (pcre_uchar *)cd->start_workspace + this_offset;
5244                  }                  }
5245    
5246                for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)                for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
5247                  {                  {
5248                  PUT(cd->hwm, 0, GET(hc, 0) + len);                  PUT(cd->hwm, 0, GET(hc, 0) + len);
# Line 4986  for (;; ptr++) Line 5272  for (;; ptr++)
5272          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
5273          paranoid checks to avoid integer overflow. The INT64_OR_DOUBLE type is          paranoid checks to avoid integer overflow. The INT64_OR_DOUBLE type is
5274          a 64-bit integer type when available, otherwise double. */          a 64-bit integer type when available, otherwise double. */
5275    
5276          if (lengthptr != NULL && repeat_max > 0)          if (lengthptr != NULL && repeat_max > 0)
5277            {            {
5278            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
# Line 5006  for (;; ptr++) Line 5292  for (;; ptr++)
5292    
5293          else for (i = repeat_max - 1; i >= 0; i--)          else for (i = repeat_max - 1; i >= 0; i--)
5294            {            {
5295            uschar *hc;            pcre_uchar *hc;
5296            uschar *this_hwm = cd->hwm;            pcre_uchar *this_hwm = cd->hwm;
5297    
5298            *code++ = OP_BRAZERO + repeat_type;            *code++ = OP_BRAZERO + repeat_type;
5299    
# Line 5023  for (;; ptr++) Line 5309  for (;; ptr++)
5309              PUTINC(code, 0, offset);              PUTINC(code, 0, offset);
5310              }              }
5311    
5312            memcpy(code, previous, len);            memcpy(code, previous, IN_UCHARS(len));
5313    
5314            /* Ensure there is enough workspace for forward references before            /* Ensure there is enough workspace for forward references before
5315            copying them. */            copying them. */
5316    
5317            while (cd->hwm > cd->start_workspace + cd->workspace_size -            while (cd->hwm > cd->start_workspace + cd->workspace_size -
5318                   WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))                   WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))
5319              {              {
# Line 5035  for (;; ptr++) Line 5321  for (;; ptr++)
5321              int this_offset = this_hwm - cd->start_workspace;              int this_offset = this_hwm - cd->start_workspace;
5322              *errorcodeptr = expand_workspace(cd);              *errorcodeptr = expand_workspace(cd);
5323              if (*errorcodeptr != 0) goto FAILED;              if (*errorcodeptr != 0) goto FAILED;
5324              save_hwm = (uschar *)cd->start_workspace + save_offset;              save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;
5325              this_hwm = (uschar *)cd->start_workspace + this_offset;              this_hwm = (pcre_uchar *)cd->start_workspace + this_offset;
5326              }              }
5327    
5328            for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)            for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
5329              {              {
5330              PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));              PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));
# Line 5055  for (;; ptr++) Line 5341  for (;; ptr++)
5341            {            {
5342            int oldlinkoffset;            int oldlinkoffset;
5343            int offset = (int)(code - bralink + 1);            int offset = (int)(code - bralink + 1);
5344            uschar *bra = code - offset;            pcre_uchar *bra = code - offset;
5345            oldlinkoffset = GET(bra, 1);            oldlinkoffset = GET(bra, 1);
5346            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
5347            *code++ = OP_KET;            *code++ = OP_KET;
# Line 5069  for (;; ptr++) Line 5355  for (;; ptr++)
5355        ONCE brackets can be converted into non-capturing brackets, as the        ONCE brackets can be converted into non-capturing brackets, as the
5356        behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to        behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to
5357        deal with possessive ONCEs specially.        deal with possessive ONCEs specially.
5358    
5359        Otherwise, when we are doing the actual compile phase, check to see        Otherwise, when we are doing the actual compile phase, check to see
5360        whether this group is one that could match an empty string. If so,        whether this group is one that could match an empty string. If so,
5361        convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so        convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
5362        that runtime checking can be done. [This check is also applied to ONCE        that runtime checking can be done. [This check is also applied to ONCE
5363        groups at runtime, but in a different way.]        groups at runtime, but in a different way.]
5364    
5365        Then, if the quantifier was possessive and the bracket is not a        Then, if the quantifier was possessive and the bracket is not a
5366        conditional, we convert the BRA code to the POS form, and the KET code to        conditional, we convert the BRA code to the POS form, and the KET code to
5367        KETRPOS. (It turns out to be convenient at runtime to detect this kind of        KETRPOS. (It turns out to be convenient at runtime to detect this kind of
5368        subpattern at both the start and at the end.) The use of special opcodes        subpattern at both the start and at the end.) The use of special opcodes
5369        makes it possible to reduce greatly the stack usage in pcre_exec(). If        makes it possible to reduce greatly the stack usage in pcre_exec(). If
5370        the group is preceded by OP_BRAZERO, convert this to OP_BRAPOSZERO.        the group is preceded by OP_BRAZERO, convert this to OP_BRAPOSZERO.
5371    
5372        Then, if the minimum number of matches is 1 or 0, cancel the possessive        Then, if the minimum number of matches is 1 or 0, cancel the possessive
5373        flag so that the default action below, of wrapping everything inside        flag so that the default action below, of wrapping everything inside
5374        atomic brackets, does not happen. When the minimum is greater than 1,        atomic brackets, does not happen. When the minimum is greater than 1,
5375        there will be earlier copies of the group, and so we still have to wrap        there will be earlier copies of the group, and so we still have to wrap
5376        the whole thing. */        the whole thing. */
5377    
5378        else        else
5379          {          {
5380          uschar *ketcode = code - 1 - LINK_SIZE;          pcre_uchar *ketcode = code - 1 - LINK_SIZE;
5381          uschar *bracode = ketcode - GET(ketcode, 1);          pcre_uchar *bracode = ketcode - GET(ketcode, 1);
5382    
5383          /* Convert possessive ONCE brackets to non-capturing */          /* Convert possessive ONCE brackets to non-capturing */
5384    
5385          if ((*bracode == OP_ONCE || *bracode == OP_ONCE_NC) &&          if ((*bracode == OP_ONCE || *bracode == OP_ONCE_NC) &&
5386              possessive_quantifier) *bracode = OP_BRA;              possessive_quantifier) *bracode = OP_BRA;
5387    
5388          /* For non-possessive ONCE brackets, all we need to do is to          /* For non-possessive ONCE brackets, all we need to do is to
5389          set the KET. */          set the KET. */
5390    
5391          if (*bracode == OP_ONCE || *bracode == OP_ONCE_NC)          if (*bracode == OP_ONCE || *bracode == OP_ONCE_NC)
5392            *ketcode = OP_KETRMAX + repeat_type;            *ketcode = OP_KETRMAX + repeat_type;
5393    
5394          /* Handle non-ONCE brackets and possessive ONCEs (which have been          /* Handle non-ONCE brackets and possessive ONCEs (which have been
5395          converted to non-capturing above). */          converted to non-capturing above). */
5396    
5397          else          else
5398            {            {
5399            /* In the compile phase, check for empty string matching. */            /* In the compile phase, check for empty string matching. */
5400    
5401            if (lengthptr == NULL)            if (lengthptr == NULL)
5402              {              {
5403              uschar *scode = bracode;              pcre_uchar *scode = bracode;
5404              do              do
5405                {                {
5406                if (could_be_empty_branch(scode, ketcode, utf8, cd))                if (could_be_empty_branch(scode, ketcode, utf, cd))
5407                  {                  {
5408                  *bracode += OP_SBRA - OP_BRA;                  *bracode += OP_SBRA - OP_BRA;
5409                  break;                  break;
# Line 5126  for (;; ptr++) Line 5412  for (;; ptr++)
5412                }                }
5413              while (*scode == OP_ALT);              while (*scode == OP_ALT);
5414              }              }
5415    
5416            /* Handle possessive quantifiers. */            /* Handle possessive quantifiers. */
5417    
5418            if (possessive_quantifier)            if (possessive_quantifier)
# Line 5135  for (;; ptr++) Line 5421  for (;; ptr++)
5421              repeated non-capturing bracket, because we have not invented POS              repeated non-capturing bracket, because we have not invented POS
5422              versions of the COND opcodes. Because we are moving code along, we              versions of the COND opcodes. Because we are moving code along, we
5423              must ensure that any pending recursive references are updated. */              must ensure that any pending recursive references are updated. */
5424    
5425              if (*bracode == OP_COND || *bracode == OP_SCOND)              if (*bracode == OP_COND || *bracode == OP_SCOND)
5426                {                {
5427                int nlen = (int)(code - bracode);                int nlen = (int)(code - bracode);
5428                *code = OP_END;                *code = OP_END;
5429                adjust_recurse(bracode, 1 + LINK_SIZE, utf8, cd, save_hwm);                adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, save_hwm);
5430                memmove(bracode + 1+LINK_SIZE, bracode, nlen);                memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen));
5431                code += 1 + LINK_SIZE;                code += 1 + LINK_SIZE;
5432                nlen += 1 + LINK_SIZE;                nlen += 1 + LINK_SIZE;
5433                *bracode = OP_BRAPOS;                *bracode = OP_BRAPOS;
5434                *code++ = OP_KETRPOS;                *code++ = OP_KETRPOS;
5435                PUTINC(code, 0, nlen);                PUTINC(code, 0, nlen);
5436                PUT(bracode, 1, nlen);                PUT(bracode, 1, nlen);
5437                }                }
5438    
5439              /* For non-COND brackets, we modify the BRA code and use KETRPOS. */              /* For non-COND brackets, we modify the BRA code and use KETRPOS. */
5440    
5441              else              else
5442                {                {
5443                *bracode += 1;              /* Switch to xxxPOS opcodes */                *bracode += 1;              /* Switch to xxxPOS opcodes */
5444                *ketcode = OP_KETRPOS;                *ketcode = OP_KETRPOS;
5445                }                }
5446    
5447              /* If the minimum is zero, mark it as possessive, then unset the              /* If the minimum is zero, mark it as possessive, then unset the
5448              possessive flag when the minimum is 0 or 1. */              possessive flag when the minimum is 0 or 1. */
5449    
5450              if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;              if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
5451              if (repeat_min < 2) possessive_quantifier = FALSE;              if (repeat_min < 2) possessive_quantifier = FALSE;
5452              }              }
5453    
5454            /* Non-possessive quantifier */            /* Non-possessive quantifier */
5455    
5456            else *ketcode = OP_KETRMAX + repeat_type;            else *ketcode = OP_KETRMAX + repeat_type;
5457            }            }
5458          }          }
# Line 5210  for (;; ptr++) Line 5496  for (;; ptr++)
5496        int len;        int len;
5497    
5498        if (*tempcode == OP_TYPEEXACT)        if (*tempcode == OP_TYPEEXACT)
5499          tempcode += _pcre_OP_lengths[*tempcode] +          tempcode += PRIV(OP_lengths)[*tempcode] +
5500            ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);            ((tempcode[1 + IMM2_SIZE] == OP_PROP
5501              || tempcode[1 + IMM2_SIZE] == OP_NOTPROP)? 2 : 0);
5502    
5503        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
5504          {          {
5505          tempcode += _pcre_OP_lengths[*tempcode];          tempcode += PRIV(OP_lengths)[*tempcode];
5506  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
5507          if (utf8 && tempcode[-1] >= 0xc0)          if (utf && HAS_EXTRALEN(tempcode[-1]))
5508            tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];            tempcode += GET_EXTRALEN(tempcode[-1]);
5509  #endif  #endif
5510          }          }
5511    
# Line 5255  for (;; ptr++) Line 5542  for (;; ptr++)
5542    
5543          default:          default:
5544          *code = OP_END;          *code = OP_END;
5545          adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);          adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm);
5546          memmove(tempcode + 1+LINK_SIZE, tempcode, len);          memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
5547          code += 1 + LINK_SIZE;          code += 1 + LINK_SIZE;
5548          len += 1 + LINK_SIZE;          len += 1 + LINK_SIZE;
5549          tempcode[0] = OP_ONCE;          tempcode[0] = OP_ONCE;
# Line 5268  for (;; ptr++) Line 5555  for (;; ptr++)
5555        }        }
5556    
5557      /* In all case we no longer have a previous item. We also set the      /* In all case we no longer have a previous item. We also set the
5558      "follows varying string" flag for subsequently encountered reqbytes if      "follows varying string" flag for subsequently encountered reqchars if
5559      it isn't already set and we have just passed a varying length item. */      it isn't already set and we have just passed a varying length item. */
5560    
5561      END_REPEAT:      END_REPEAT:
# Line 5291  for (;; ptr++) Line 5578  for (;; ptr++)
5578    
5579      /* First deal with various "verbs" that can be introduced by '*'. */      /* First deal with various "verbs" that can be introduced by '*'. */
5580    
5581      if (*(++ptr) == CHAR_ASTERISK &&      ptr++;
5582           ((cd->ctypes[ptr[1]] & ctype_letter) != 0 || ptr[1] == ':'))      if (ptr[0] == CHAR_ASTERISK && (ptr[1] == ':'
5583             || (MAX_255(ptr[1]) && ((cd->ctypes[ptr[1]] & ctype_letter) != 0))))
5584        {        {
5585        int i, namelen;        int i, namelen;
5586        int arglen = 0;        int arglen = 0;
5587        const char *vn = verbnames;        const char *vn = verbnames;
5588        const uschar *name = ptr + 1;        const pcre_uchar *name = ptr + 1;
5589        const uschar *arg = NULL;        const pcre_uchar *arg = NULL;
5590        previous = NULL;        previous = NULL;
5591        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};        ptr++;
5592          while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;
5593        namelen = (int)(ptr - name);        namelen = (int)(ptr - name);
5594    
5595        /* It appears that Perl allows any characters whatsoever, other than        /* It appears that Perl allows any characters whatsoever, other than
# Line 5325  for (;; ptr++) Line 5614  for (;; ptr++)
5614        for (i = 0; i < verbcount; i++)        for (i = 0; i < verbcount; i++)
5615          {          {
5616          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
5617              strncmp((char *)name, vn, namelen) == 0)              STRNCMP_UC_C8(name, vn, namelen) == 0)
5618            {            {
5619            /* Check for open captures before ACCEPT and convert it to            /* Check for open captures before ACCEPT and convert it to
5620            ASSERT_ACCEPT if in an assertion. */            ASSERT_ACCEPT if in an assertion. */
# Line 5346  for (;; ptr++) Line 5635  for (;; ptr++)
5635                }                }
5636              *code++ = (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;              *code++ = (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
5637    
5638              /* Do not set firstbyte after *ACCEPT */              /* Do not set firstchar after *ACCEPT */
5639              if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;              if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
5640              }              }
5641    
5642            /* Handle other cases with/without an argument */            /* Handle other cases with/without an argument */
# Line 5373  for (;; ptr++) Line 5662  for (;; ptr++)
5662              *code = verbs[i].op_arg;              *code = verbs[i].op_arg;
5663              if (*code++ == OP_THEN_ARG) cd->external_flags |= PCRE_HASTHEN;              if (*code++ == OP_THEN_ARG) cd->external_flags |= PCRE_HASTHEN;
5664              *code++ = arglen;              *code++ = arglen;
5665              memcpy(code, arg, arglen);              memcpy(code, arg, IN_UCHARS(arglen));
5666              code += arglen;              code += arglen;
5667              *code++ = 0;              *code++ = 0;
5668              }              }
# Line 5396  for (;; ptr++) Line 5685  for (;; ptr++)
5685        {        {
5686        int i, set, unset, namelen;        int i, set, unset, namelen;
5687        int *optset;        int *optset;
5688        const uschar *name;        const pcre_uchar *name;
5689        uschar *slot;        pcre_uchar *slot;
5690    
5691        switch (*(++ptr))        switch (*(++ptr))
5692          {          {
# Line 5450  for (;; ptr++) Line 5739  for (;; ptr++)
5739            break;            break;
5740    
5741          /* Most other conditions use OP_CREF (a couple change to OP_RREF          /* Most other conditions use OP_CREF (a couple change to OP_RREF
5742          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. */
5743    
5744          code[1+LINK_SIZE] = OP_CREF;          code[1+LINK_SIZE] = OP_CREF;
5745          skipbytes = 3;          skipbytes = 1+IMM2_SIZE;
5746          refsign = -1;          refsign = -1;
5747    
5748          /* Check for a test for recursion in a named group. */          /* Check for a test for recursion in a named group. */
# Line 5486  for (;; ptr++) Line 5775  for (;; ptr++)
5775    
5776          /* We now expect to read a name; any thing else is an error */          /* We now expect to read a name; any thing else is an error */
5777    
5778          if ((cd->ctypes[ptr[1]] & ctype_word) == 0)          if (!MAX_255(ptr[1]) || (cd->ctypes[ptr[1]] & ctype_word) == 0)
5779            {            {
5780            ptr += 1;  /* To get the right offset */            ptr += 1;  /* To get the right offset */
5781            *errorcodeptr = ERR28;            *errorcodeptr = ERR28;
# Line 5497  for (;; ptr++) Line 5786  for (;; ptr++)
5786    
5787          recno = 0;          recno = 0;
5788          name = ++ptr;          name = ++ptr;
5789          while ((cd->ctypes[*ptr] & ctype_word) != 0)          while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0)
5790            {            {
5791            if (recno >= 0)            if (recno >= 0)
5792              recno = ((digitab[*ptr] & ctype_digit) != 0)?              recno = (IS_DIGIT(*ptr))? recno * 10 + *ptr - CHAR_0 : -1;
               recno * 10 + *ptr - CHAR_0 : -1;  
5793            ptr++;            ptr++;
5794            }            }
5795          namelen = (int)(ptr - name);          namelen = (int)(ptr - name);
# Line 5549  for (;; ptr++) Line 5837  for (;; ptr++)
5837          slot = cd->name_table;          slot = cd->name_table;
5838          for (i = 0; i < cd->names_found; i++)          for (i = 0; i < cd->names_found; i++)
5839            {            {
5840            if (strncmp((char *)name, (char *)slot+2, namelen) == 0) break;            if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) == 0) break;
5841            slot += cd->name_entry_size;            slot += cd->name_entry_size;
5842            }            }
5843    
# Line 5565  for (;; ptr++) Line 5853  for (;; ptr++)
5853          /* Search the pattern for a forward reference */          /* Search the pattern for a forward reference */
5854    
5855          else if ((i = find_parens(cd, name, namelen,          else if ((i = find_parens(cd, name, namelen,
5856                          (options & PCRE_EXTENDED) != 0, utf8)) > 0)                          (options & PCRE_EXTENDED) != 0, utf)) > 0)
5857            {            {
5858            PUT2(code, 2+LINK_SIZE, i);            PUT2(code, 2+LINK_SIZE, i);
5859            code[1+LINK_SIZE]++;            code[1+LINK_SIZE]++;
# Line 5591  for (;; ptr++) Line 5879  for (;; ptr++)
5879            recno = 0;            recno = 0;
5880            for (i = 1; i < namelen; i++)            for (i = 1; i < namelen; i++)
5881              {              {
5882              if ((digitab[name[i]] & ctype_digit) == 0)              if (!IS_DIGIT(name[i]))
5883                {                {
5884                *errorcodeptr = ERR15;                *errorcodeptr = ERR15;
5885                goto FAILED;                goto FAILED;
# Line 5606  for (;; ptr++) Line 5894  for (;; ptr++)
5894          /* Similarly, check for the (?(DEFINE) "condition", which is always          /* Similarly, check for the (?(DEFINE) "condition", which is always
5895          false. */          false. */
5896    
5897          else if (namelen == 6 && strncmp((char *)name, STRING_DEFINE, 6) == 0)          else if (namelen == 6 && STRNCMP_UC_C8(name, STRING_DEFINE, 6) == 0)
5898            {            {
5899            code[1+LINK_SIZE] = OP_DEF;            code[1+LINK_SIZE] = OP_DEF;
5900            skipbytes = 1;            skipbytes = 1;
# Line 5669  for (;; ptr++) Line 5957  for (;; ptr++)
5957            break;            break;
5958    
5959            default:                /* Could be name define, else bad */            default:                /* Could be name define, else bad */
5960            if ((cd->ctypes[ptr[1]] & ctype_word) != 0) goto DEFINE_NAME;            if (MAX_255(ptr[1]) && (cd->ctypes[ptr[1]] & ctype_word) != 0)
5961                goto DEFINE_NAME;
5962            ptr++;                  /* Correct offset for error */            ptr++;                  /* Correct offset for error */
5963            *errorcodeptr = ERR24;            *errorcodeptr = ERR24;
5964            goto FAILED;            goto FAILED;
# Line 5691  for (;; ptr++) Line 5980  for (;; ptr++)
5980          *code++ = OP_CALLOUT;          *code++ = OP_CALLOUT;
5981            {            {
5982            int n = 0;            int n = 0;
5983            while ((digitab[*(++ptr)] & ctype_digit) != 0)            ptr++;
5984              n = n * 10 + *ptr - CHAR_0;            while(IS_DIGIT(*ptr))
5985                n = n * 10 + *ptr++ - CHAR_0;
5986            if (*ptr != CHAR_RIGHT_PARENTHESIS)            if (*ptr != CHAR_RIGHT_PARENTHESIS)
5987              {              {
5988              *errorcodeptr = ERR39;              *errorcodeptr = ERR39;
# Line 5737  for (;; ptr++) Line 6027  for (;; ptr++)
6027              CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;              CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
6028            name = ++ptr;            name = ++ptr;
6029    
6030            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;            while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
6031            namelen = (int)(ptr - name);            namelen = (int)(ptr - name);
6032    
6033            /* In the pre-compile phase, just do a syntax check. */            /* In the pre-compile phase, just do a syntax check. */
# Line 5754  for (;; ptr++) Line 6044  for (;; ptr++)
6044                *errorcodeptr = ERR49;                *errorcodeptr = ERR49;
6045                goto FAILED;                goto FAILED;
6046                }                }
6047              if (namelen + 3 > cd->name_entry_size)              if (namelen + IMM2_SIZE + 1 > cd->name_entry_size)
6048                {                {
6049                cd->name_entry_size = namelen + 3;                cd->name_entry_size = namelen + IMM2_SIZE + 1;
6050                if (namelen > MAX_NAME_SIZE)                if (namelen > MAX_NAME_SIZE)
6051                  {                  {
6052                  *errorcodeptr = ERR48;                  *errorcodeptr = ERR48;
# Line 5785  for (;; ptr++) Line 6075  for (;; ptr++)
6075    
6076              for (i = 0; i < cd->names_found; i++)              for (i = 0; i < cd->names_found; i++)
6077                {                {
6078                int crc = memcmp(name, slot+2, namelen);                int crc = memcmp(name, slot+IMM2_SIZE, IN_UCHARS(namelen));
6079                if (crc == 0)                if (crc == 0)
6080                  {                  {
6081                  if (slot[2+namelen] == 0)                  if (slot[IMM2_SIZE+namelen] == 0)
6082                    {                    {
6083                    if (GET2(slot, 0) != cd->bracount + 1 &&                    if (GET2(slot, 0) != cd->bracount + 1 &&
6084                        (options & PCRE_DUPNAMES) == 0)                        (options & PCRE_DUPNAMES) == 0)
# Line 5809  for (;; ptr++) Line 6099  for (;; ptr++)
6099                if (crc < 0)                if (crc < 0)
6100                  {                  {
6101                  memmove(slot + cd->name_entry_size, slot,                  memmove(slot + cd->name_entry_size, slot,
6102                    (cd->names_found - i) * cd->name_entry_size);                    IN_UCHARS((cd->names_found - i) * cd->name_entry_size));
6103                  break;                  break;
6104                  }                  }
6105    
# Line 5823  for (;; ptr++) Line 6113  for (;; ptr++)
6113    
6114              if (!dupname)              if (!dupname)
6115                {                {
6116                uschar *cslot = cd->name_table;                pcre_uchar *cslot = cd->name_table;
6117                for (i = 0; i < cd->names_found; i++)                for (i = 0; i < cd->names_found; i++)
6118                  {                  {
6119                  if (cslot != slot)                  if (cslot != slot)
# Line 5840  for (;; ptr++) Line 6130  for (;; ptr++)
6130                }                }
6131    
6132              PUT2(slot, 0, cd->bracount + 1);              PUT2(slot, 0, cd->bracount + 1);
6133              memcpy(slot + 2, name, namelen);              memcpy(slot + IMM2_SIZE, name, IN_UCHARS(namelen));
6134              slot[2+namelen] = 0;              slot[IMM2_SIZE + namelen] = 0;
6135              }              }
6136            }            }
6137    
# Line 5867  for (;; ptr++) Line 6157  for (;; ptr++)
6157    
6158          NAMED_REF_OR_RECURSE:          NAMED_REF_OR_RECURSE:
6159          name = ++ptr;          name = ++ptr;
6160          while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;          while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
6161          namelen = (int)(ptr - name);          namelen = (int)(ptr - name);
6162    
6163          /* In the pre-compile phase, do a syntax check. We used to just set          /* In the pre-compile phase, do a syntax check. We used to just set
# Line 5879  for (;; ptr++) Line 6169  for (;; ptr++)
6169    
6170          if (lengthptr != NULL)          if (lengthptr != NULL)
6171            {            {
6172            const uschar *temp;            const pcre_uchar *temp;
6173    
6174            if (namelen == 0)            if (namelen == 0)
6175              {              {
# Line 5909  for (;; ptr++) Line 6199  for (;; ptr++)
6199            temp = cd->end_pattern;            temp = cd->end_pattern;
6200            cd->end_pattern = ptr;            cd->end_pattern = ptr;
6201            recno = find_parens(cd, name, namelen,            recno = find_parens(cd, name, namelen,
6202              (options & PCRE_EXTENDED) != 0, utf8);              (options & PCRE_EXTENDED) != 0, utf);
6203            cd->end_pattern = temp;            cd->end_pattern = temp;
6204            if (recno < 0) recno = 0;    /* Forward ref; set dummy number */            if (recno < 0) recno = 0;    /* Forward ref; set dummy number */
6205            }            }
# Line 5924  for (;; ptr++) Line 6214  for (;; ptr++)
6214            slot = cd->name_table;            slot = cd->name_table;
6215            for (i = 0; i < cd->names_found; i++)            for (i = 0; i < cd->names_found; i++)
6216              {              {
6217              if (strncmp((char *)name, (char *)slot+2, namelen) == 0 &&              if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) == 0 &&
6218                  slot[2+namelen] == 0)                  slot[IMM2_SIZE+namelen] == 0)
6219                break;                break;
6220              slot += cd->name_entry_size;              slot += cd->name_entry_size;
6221              }              }
# Line 5936  for (;; ptr++) Line 6226  for (;; ptr++)
6226              }              }
6227            else if ((recno =                /* Forward back reference */            else if ((recno =                /* Forward back reference */
6228                      find_parens(cd, name, namelen,                      find_parens(cd, name, namelen,
6229                        (options & PCRE_EXTENDED) != 0, utf8)) <= 0)                        (options & PCRE_EXTENDED) != 0, utf)) <= 0)
6230              {              {
6231              *errorcodeptr = ERR15;              *errorcodeptr = ERR15;
6232              goto FAILED;              goto FAILED;
# Line 5961  for (;; ptr++) Line 6251  for (;; ptr++)
6251          case CHAR_0: case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4:          case CHAR_0: case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4:
6252          case CHAR_5: case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:          case CHAR_5: case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
6253            {            {
6254            const uschar *called;            const pcre_uchar *called;
6255            terminator = CHAR_RIGHT_PARENTHESIS;            terminator = CHAR_RIGHT_PARENTHESIS;
6256    
6257            /* Come here from the \g<...> and \g'...' code (Oniguruma            /* Come here from the \g<...> and \g'...' code (Oniguruma
# Line 5975  for (;; ptr++) Line 6265  for (;; ptr++)
6265            if ((refsign = *ptr) == CHAR_PLUS)            if ((refsign = *ptr) == CHAR_PLUS)
6266              {              {
6267              ptr++;              ptr++;
6268              if ((digitab[*ptr] & ctype_digit) == 0)              if (!IS_DIGIT(*ptr))
6269                {                {
6270                *errorcodeptr = ERR63;                *errorcodeptr = ERR63;
6271                goto FAILED;                goto FAILED;
# Line 5983  for (;; ptr++) Line 6273  for (;; ptr++)
6273              }              }
6274            else if (refsign == CHAR_MINUS)            else if (refsign == CHAR_MINUS)
6275              {              {
6276              if ((digitab[ptr[1]] & ctype_digit) == 0)              if (!IS_DIGIT(ptr[1]))
6277                goto OTHER_CHAR_AFTER_QUERY;                goto OTHER_CHAR_AFTER_QUERY;
6278              ptr++;              ptr++;
6279              }              }
6280    
6281            recno = 0;            recno = 0;
6282            while((digitab[*ptr] & ctype_digit) != 0)            while(IS_DIGIT(*ptr))
6283              recno = recno * 10 + *ptr++ - CHAR_0;              recno = recno * 10 + *ptr++ - CHAR_0;
6284    
6285            if (*ptr != terminator)            if (*ptr != terminator)
# Line 6040  for (;; ptr++) Line 6330  for (;; ptr++)
6330              {              {
6331              *code = OP_END;              *code = OP_END;
6332              if (recno != 0)              if (recno != 0)
6333                called = _pcre_find_bracket(cd->start_code, utf8, recno);                called = PRIV(find_bracket)(cd->start_code, utf, recno);
6334    
6335              /* Forward reference */              /* Forward reference */
6336    
6337              if (called == NULL)              if (called == NULL)
6338                {                {
6339                if (find_parens(cd, NULL, recno,                if (find_parens(cd, NULL, recno,
6340                      (options & PCRE_EXTENDED) != 0, utf8) < 0)                      (options & PCRE_EXTENDED) != 0, utf) < 0)
6341                  {                  {
6342                  *errorcodeptr = ERR15;                  *errorcodeptr = ERR15;
6343                  goto FAILED;                  goto FAILED;
# Line 6056  for (;; ptr++) Line 6346  for (;; ptr++)
6346                /* Fudge the value of "called" so that when it is inserted as an                /* Fudge the value of "called" so that when it is inserted as an
6347                offset below, what it actually inserted is the reference number                offset below, what it actually inserted is the reference number
6348                of the group. Then remember the forward reference. */                of the group. Then remember the forward reference. */
6349    
6350                called = cd->start_code + recno;                called = cd->start_code + recno;
6351                if (cd->hwm >= cd->start_workspace + cd->workspace_size -                if (cd->hwm >= cd->start_workspace + cd->workspace_size -
6352                    WORK_SIZE_SAFETY_MARGIN)                    WORK_SIZE_SAFETY_MARGIN)
6353                  {                  {
6354                  *errorcodeptr = expand_workspace(cd);                  *errorcodeptr = expand_workspace(cd);
6355                  if (*errorcodeptr != 0) goto FAILED;                  if (*errorcodeptr != 0) goto FAILED;
6356                  }                  }
6357                PUTINC(cd->hwm, 0, (int)(code + 1 - cd->start_code));                PUTINC(cd->hwm, 0, (int)(code + 1 - cd->start_code));
6358                }                }
6359    
# Line 6077  for (;; ptr++) Line 6367  for (;; ptr++)
6367              conditional subpatterns will be picked up then. */              conditional subpatterns will be picked up then. */
6368    
6369              else if (GET(called, 1) == 0 && cond_depth <= 0 &&              else if (GET(called, 1) == 0 && cond_depth <= 0 &&
6370                       could_be_empty(called, code, bcptr, utf8, cd))                       could_be_empty(called, code, bcptr, utf, cd))
6371                {                {
6372                *errorcodeptr = ERR40;                *errorcodeptr = ERR40;
6373                goto FAILED;                goto FAILED;
# Line 6085  for (;; ptr++) Line 6375  for (;; ptr++)
6375              }              }
6376    
6377            /* Insert the recursion/subroutine item. It does not have a set first            /* Insert the recursion/subroutine item. It does not have a set first
6378            byte (relevant if it is repeated, because it will then be wrapped            character (relevant if it is repeated, because it will then be
6379            with ONCE brackets). */            wrapped with ONCE brackets). */
6380    
6381            *code = OP_RECURSE;            *code = OP_RECURSE;
6382            PUT(code, 1, (int)(called - cd->start_code));            PUT(code, 1, (int)(called - cd->start_code));
6383            code += 1 + LINK_SIZE;            code += 1 + LINK_SIZE;
6384            groupsetfirstbyte = FALSE;            groupsetfirstchar = FALSE;
6385            }            }
6386    
6387          /* Can't determine a first byte now */          /* Can't determine a first byte now */
6388    
6389          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;          if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
6390          continue;          continue;
6391    
6392    
# Line 6153  for (;; ptr++) Line 6443  for (;; ptr++)
6443          both phases.          both phases.
6444    
6445          If we are not at the pattern start, reset the greedy defaults and the          If we are not at the pattern start, reset the greedy defaults and the
6446          case value for firstbyte and reqbyte. */          case value for firstchar and reqchar. */
6447    
6448          if (*ptr == CHAR_RIGHT_PARENTHESIS)          if (*ptr == CHAR_RIGHT_PARENTHESIS)
6449            {            {
# Line 6166  for (;; ptr++) Line 6456  for (;; ptr++)
6456              {              {
6457              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
6458              greedy_non_default = greedy_default ^ 1;              greedy_non_default = greedy_default ^ 1;
6459              req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;              req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
6460              }              }
6461    
6462            /* Change options at this level, and pass them back for use            /* Change options at this level, and pass them back for use
# Line 6203  for (;; ptr++) Line 6493  for (;; ptr++)
6493        NUMBERED_GROUP:        NUMBERED_GROUP:
6494        cd->bracount += 1;        cd->bracount += 1;
6495        PUT2(code, 1+LINK_SIZE, cd->bracount);        PUT2(code, 1+LINK_SIZE, cd->bracount);
6496        skipbytes = 2;        skipbytes = IMM2_SIZE;
6497        }        }
6498    
6499      /* Process nested bracketed regex. Assertions used not to be repeatable,      /* Process nested bracketed regex. Assertions used not to be repeatable,
# Line 6229  for (;; ptr++) Line 6519  for (;; ptr++)
6519           skipbytes,                       /* Skip over bracket number */           skipbytes,                       /* Skip over bracket number */
6520           cond_depth +           cond_depth +
6521             ((bravalue == OP_COND)?1:0),   /* Depth of condition subpatterns */             ((bravalue == OP_COND)?1:0),   /* Depth of condition subpatterns */
6522           &subfirstbyte,                   /* For possible first char */           &subfirstchar,                   /* For possible first char */
6523           &subreqbyte,                     /* For possible last char */           &subreqchar,                     /* For possible last char */
6524           bcptr,                           /* Current branch chain */           bcptr,                           /* Current branch chain */
6525           cd,                              /* Tables block */           cd,                              /* Tables block */
6526           (lengthptr == NULL)? NULL :      /* Actual compile phase */           (lengthptr == NULL)? NULL :      /* Actual compile phase */
# Line 6258  for (;; ptr++) Line 6548  for (;; ptr++)
6548    
6549      if (bravalue == OP_COND && lengthptr == NULL)      if (bravalue == OP_COND && lengthptr == NULL)
6550        {        {
6551        uschar *tc = code;        pcre_uchar *tc = code;
6552        int condcount = 0;        int condcount = 0;
6553    
6554        do {        do {
# Line 6281  for (;; ptr++) Line 6571  for (;; ptr++)
6571          }          }
6572    
6573        /* A "normal" conditional group. If there is just one branch, we must not        /* A "normal" conditional group. If there is just one branch, we must not
6574        make use of its firstbyte or reqbyte, because this is equivalent to an        make use of its firstchar or reqchar, because this is equivalent to an
6575        empty second branch. */        empty second branch. */
6576    
6577        else        else
# Line 6291  for (;; ptr++) Line 6581  for (;; ptr++)
6581            *errorcodeptr = ERR27;            *errorcodeptr = ERR27;
6582            goto FAILED;            goto FAILED;
6583            }            }
6584          if (condcount == 1) subfirstbyte = subreqbyte = REQ_NONE;          if (condcount == 1) subfirstchar = subreqchar = REQ_NONE;
6585          }          }
6586        }        }
6587    
# Line 6335  for (;; ptr++) Line 6625  for (;; ptr++)
6625      /* Handle updating of the required and first characters for other types of      /* Handle updating of the required and first characters for other types of
6626      group. Update for normal brackets of all kinds, and conditions with two      group. Update for normal brackets of all kinds, and conditions with two
6627      branches (see code above). If the bracket is followed by a quantifier with      branches (see code above). If the bracket is followed by a quantifier with
6628      zero repeat, we have to back off. Hence the definition of zeroreqbyte and      zero repeat, we have to back off. Hence the definition of zeroreqchar and
6629      zerofirstbyte outside the main loop so that they can be accessed for the      zerofirstchar outside the main loop so that they can be accessed for the
6630      back off. */      back off. */
6631    
6632      zeroreqbyte = reqbyte;      zeroreqchar = reqchar;
6633      zerofirstbyte = firstbyte;      zerofirstchar = firstchar;
6634      groupsetfirstbyte = FALSE;      groupsetfirstchar = FALSE;
6635    
6636      if (bravalue >= OP_ONCE)      if (bravalue >= OP_ONCE)
6637        {        {
6638        /* If we have not yet set a firstbyte in this branch, take it from the        /* If we have not yet set a firstchar in this branch, take it from the
6639        subpattern, remembering that it was set here so that a repeat of more        subpattern, remembering that it was set here so that a repeat of more
6640        than one can replicate it as reqbyte if necessary. If the subpattern has        than one can replicate it as reqchar if necessary. If the subpattern has
6641        no firstbyte, set "none" for the whole branch. In both cases, a zero        no firstchar, set "none" for the whole branch. In both cases, a zero
6642        repeat forces firstbyte to "none". */        repeat forces firstchar to "none". */
6643    
6644        if (firstbyte == REQ_UNSET)        if (firstchar == REQ_UNSET)
6645          {          {
6646          if (subfirstbyte >= 0)          if (subfirstchar >= 0)
6647            {            {
6648            firstbyte = subfirstbyte;            firstchar = subfirstchar;
6649            groupsetfirstbyte = TRUE;            groupsetfirstchar = TRUE;
6650            }            }
6651          else firstbyte = REQ_NONE;          else firstchar = REQ_NONE;
6652          zerofirstbyte = REQ_NONE;          zerofirstchar = REQ_NONE;
6653          }          }
6654    
6655        /* If firstbyte was previously set, convert the subpattern's firstbyte        /* If firstchar was previously set, convert the subpattern's firstchar
6656        into reqbyte if there wasn't one, using the vary flag that was in        into reqchar if there wasn't one, using the vary flag that was in
6657        existence beforehand. */        existence beforehand. */
6658    
6659        else if (subfirstbyte >= 0 && subreqbyte < 0)        else if (subfirstchar >= 0 && subreqchar < 0)
6660          subreqbyte = subfirstbyte | tempreqvary;          subreqchar = subfirstchar | tempreqvary;
6661    
6662        /* If the subpattern set a required byte (or set a first byte that isn't        /* If the subpattern set a required byte (or set a first byte that isn't
6663        really the first byte - see above), set it. */        really the first byte - see above), set it. */
6664    
6665        if (subreqbyte >= 0) reqbyte = subreqbyte;        if (subreqchar >= 0) reqchar = subreqchar;
6666        }        }
6667    
6668      /* For a forward assertion, we take the reqbyte, if set. This can be      /* For a forward assertion, we take the reqchar, if set. This can be
6669      helpful if the pattern that follows the assertion doesn't set a different      helpful if the pattern that follows the assertion doesn't set a different
6670      char. For example, it's useful for /(?=abcde).+/. We can't set firstbyte      char. For example, it's useful for /(?=abcde).+/. We can't set firstchar
6671      for an assertion, however because it leads to incorrect effect for patterns      for an assertion, however because it leads to incorrect effect for patterns
6672      such as /(?=a)a.+/ when the "real" "a" would then become a reqbyte instead      such as /(?=a)a.+/ when the "real" "a" would then become a reqchar instead
6673      of a firstbyte. This is overcome by a scan at the end if there's no      of a firstchar. This is overcome by a scan at the end if there's no
6674      firstbyte, looking for an asserted first char. */      firstchar, looking for an asserted first char. */
6675    
6676      else if (bravalue == OP_ASSERT && subreqbyte >= 0) reqbyte = subreqbyte;      else if (bravalue == OP_ASSERT && subreqchar >= 0) reqchar = subreqchar;
6677      break;     /* End of processing '(' */      break;     /* End of processing '(' */
6678    
6679    
# Line 6416  for (;; ptr++) Line 6706  for (;; ptr++)
6706        /* For metasequences that actually match a character, we disable the        /* For metasequences that actually match a character, we disable the
6707        setting of a first character if it hasn't already been set. */        setting of a first character if it hasn't already been set. */
6708