/[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 788 by ph10, Tue Dec 6 15:38:01 2011 UTC revision 1065 by chpe, Tue Oct 16 15:54:16 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|32)_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    
69  /* Macro for setting individual bits in class bitmaps. */  /* Macro for setting individual bits in class bitmaps. */
70    
71  #define SETBIT(a,b) a[b/8] |= (1 << (b%8))  #define SETBIT(a,b) a[(b)/8] |= (1 << ((b)&7))
72    
73  /* Maximum length value to check against when making sure that the integer that  /* Maximum length value to check against when making sure that the integer that
74  holds the compiled pattern length does not overflow. We make it a bit less than  holds the compiled pattern length does not overflow. We make it a bit less than
# Line 73  to check them every time. */ Line 77  to check them every time. */
77    
78  #define OFLOW_MAX (INT_MAX - 20)  #define OFLOW_MAX (INT_MAX - 20)
79    
80    /* Definitions to allow mutual recursion */
81    
82    static int
83      add_list_to_class(pcre_uint8 *, pcre_uchar **, int, compile_data *,
84        const pcre_uint32 *, unsigned int);
85    
86    static BOOL
87      compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL,
88        int, int, int *, int *, branch_chain *, compile_data *, int *);
89    
90    
91    
92  /*************************************************  /*************************************************
93  *      Code parameters and static tables         *  *      Code parameters and static tables         *
# Line 104  overrun before it actually does run off Line 119  overrun before it actually does run off
119    
120  #define WORK_SIZE_SAFETY_MARGIN (100)  #define WORK_SIZE_SAFETY_MARGIN (100)
121    
122    /* Private flags added to firstchar and reqchar. */
123    
124    #define REQ_CASELESS   0x10000000l      /* Indicates caselessness */
125    #define REQ_VARY       0x20000000l      /* Reqchar followed non-literal item */
126    #define REQ_MASK       (REQ_CASELESS | REQ_VARY)
127    
128    /* Repeated character flags. */
129    
130    #define UTF_LENGTH     0x10000000l      /* The char contains its length. */
131    
132  /* Table for handling escaped characters in the range '0'-'z'. Positive returns  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
133  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 262  static const char posix_names[] =
262    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
263    STRING_word0  STRING_xdigit;    STRING_word0  STRING_xdigit;
264    
265  static const uschar posix_name_lengths[] = {  static const pcre_uint8 posix_name_lengths[] = {
266    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 };
267    
268  /* 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 297  substitutes must be in the order of the
297  both positive and negative cases. NULL means no substitute. */  both positive and negative cases. NULL means no substitute. */
298    
299  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
300  static const uschar *substitutes[] = {  static const pcre_uchar string_PNd[]  = {
301    (uschar *)"\\P{Nd}",    /* \D */    CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
302    (uschar *)"\\p{Nd}",    /* \d */    CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
303    (uschar *)"\\P{Xsp}",   /* \S */       /* NOTE: Xsp is Perl space */  static const pcre_uchar string_pNd[]  = {
304    (uschar *)"\\p{Xsp}",   /* \s */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
305    (uschar *)"\\P{Xwd}",   /* \W */    CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
306    (uschar *)"\\p{Xwd}"    /* \w */  static const pcre_uchar string_PXsp[] = {
307      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
308      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
309    static const pcre_uchar string_pXsp[] = {
310      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
311      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
312    static const pcre_uchar string_PXwd[] = {
313      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
314      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
315    static const pcre_uchar string_pXwd[] = {
316      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
317      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
318    
319    static const pcre_uchar *substitutes[] = {
320      string_PNd,           /* \D */
321      string_pNd,           /* \d */
322      string_PXsp,          /* \S */       /* NOTE: Xsp is Perl space */
323      string_pXsp,          /* \s */
324      string_PXwd,          /* \W */
325      string_pXwd           /* \w */
326  };  };
327    
328  static const uschar *posix_substitutes[] = {  static const pcre_uchar string_pL[] =   {
329    (uschar *)"\\p{L}",     /* alpha */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
330    (uschar *)"\\p{Ll}",    /* lower */    CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
331    (uschar *)"\\p{Lu}",    /* upper */  static const pcre_uchar string_pLl[] =  {
332    (uschar *)"\\p{Xan}",   /* alnum */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
333    NULL,                   /* ascii */    CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
334    (uschar *)"\\h",        /* blank */  static const pcre_uchar string_pLu[] =  {
335    NULL,                   /* cntrl */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
336    (uschar *)"\\p{Nd}",    /* digit */    CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
337    NULL,                   /* graph */  static const pcre_uchar string_pXan[] = {
338    NULL,                   /* print */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
339    NULL,                   /* punct */    CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
340    (uschar *)"\\p{Xps}",   /* space */    /* NOTE: Xps is POSIX space */  static const pcre_uchar string_h[] =    {
341    (uschar *)"\\p{Xwd}",   /* word */    CHAR_BACKSLASH, CHAR_h, '\0' };
342    NULL,                   /* xdigit */  static const pcre_uchar string_pXps[] = {
343      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
344      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
345    static const pcre_uchar string_PL[] =   {
346      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
347      CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
348    static const pcre_uchar string_PLl[] =  {
349      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
350      CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
351    static const pcre_uchar string_PLu[] =  {
352      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
353      CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
354    static const pcre_uchar string_PXan[] = {
355      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
356      CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
357    static const pcre_uchar string_H[] =    {
358      CHAR_BACKSLASH, CHAR_H, '\0' };
359    static const pcre_uchar string_PXps[] = {
360      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
361      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
362    
363    static const pcre_uchar *posix_substitutes[] = {
364      string_pL,            /* alpha */
365      string_pLl,           /* lower */
366      string_pLu,           /* upper */
367      string_pXan,          /* alnum */
368      NULL,                 /* ascii */
369      string_h,             /* blank */
370      NULL,                 /* cntrl */
371      string_pNd,           /* digit */
372      NULL,                 /* graph */
373      NULL,                 /* print */
374      NULL,                 /* punct */
375      string_pXps,          /* space */    /* NOTE: Xps is POSIX space */
376      string_pXwd,          /* word */
377      NULL,                 /* xdigit */
378    /* Negated cases */    /* Negated cases */
379    (uschar *)"\\P{L}",     /* ^alpha */    string_PL,            /* ^alpha */
380    (uschar *)"\\P{Ll}",    /* ^lower */    string_PLl,           /* ^lower */
381    (uschar *)"\\P{Lu}",    /* ^upper */    string_PLu,           /* ^upper */
382    (uschar *)"\\P{Xan}",   /* ^alnum */    string_PXan,          /* ^alnum */
383    NULL,                   /* ^ascii */    NULL,                 /* ^ascii */
384    (uschar *)"\\H",        /* ^blank */    string_H,             /* ^blank */
385    NULL,                   /* ^cntrl */    NULL,                 /* ^cntrl */
386    (uschar *)"\\P{Nd}",    /* ^digit */    string_PNd,           /* ^digit */
387    NULL,                   /* ^graph */    NULL,                 /* ^graph */
388    NULL,                   /* ^print */    NULL,                 /* ^print */
389    NULL,                   /* ^punct */    NULL,                 /* ^punct */
390    (uschar *)"\\P{Xps}",   /* ^space */   /* NOTE: Xps is POSIX space */    string_PXps,          /* ^space */   /* NOTE: Xps is POSIX space */
391    (uschar *)"\\P{Xwd}",   /* ^word */    string_PXwd,          /* ^word */
392    NULL                    /* ^xdigit */    NULL                  /* ^xdigit */
393  };  };
394  #define POSIX_SUBSIZE (sizeof(posix_substitutes)/sizeof(uschar *))  #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
395  #endif  #endif
396    
397  #define STRING(a)  # a  #define STRING(a)  # a
# Line 372  static const char error_texts[] = Line 450  static const char error_texts[] =
450    /* 30 */    /* 30 */
451    "unknown POSIX class name\0"    "unknown POSIX class name\0"
452    "POSIX collating elements are not supported\0"    "POSIX collating elements are not supported\0"
453    "this version of PCRE is not compiled with PCRE_UTF8 support\0"    "this version of PCRE is compiled without UTF support\0"
454    "spare error\0"  /** DEAD **/    "spare error\0"  /** DEAD **/
455    "character value in \\x{...} sequence is too large\0"    "character value in \\x{...} sequence is too large\0"
456    /* 35 */    /* 35 */
# Line 395  static const char error_texts[] = Line 473  static const char error_texts[] =
473    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
474    /* 50 */    /* 50 */
475    "repeated subpattern is too long\0"    /** DEAD **/    "repeated subpattern is too long\0"    /** DEAD **/
476    "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"
477    "internal error: overran compiling workspace\0"    "internal error: overran compiling workspace\0"
478    "internal error: previously-checked referenced subpattern not found\0"    "internal error: previously-checked referenced subpattern not found\0"
479    "DEFINE group contains more than one branch\0"    "DEFINE group contains more than one branch\0"
# Line 414  static const char error_texts[] = Line 492  static const char error_texts[] =
492    /* 65 */    /* 65 */
493    "different names for subpatterns of the same number are not allowed\0"    "different names for subpatterns of the same number are not allowed\0"
494    "(*MARK) must have an argument\0"    "(*MARK) must have an argument\0"
495    "this version of PCRE is not compiled with PCRE_UCP support\0"    "this version of PCRE is not compiled with Unicode property support\0"
496    "\\c must be followed by an ASCII character\0"    "\\c must be followed by an ASCII character\0"
497    "\\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"
498    /* 70 */    /* 70 */
499    "internal error: unknown opcode in find_fixedlength()\0"    "internal error: unknown opcode in find_fixedlength()\0"
500    "\\N is not supported in a class\0"    "\\N is not supported in a class\0"
501    "too many forward references\0"    "too many forward references\0"
502      "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
503      "invalid UTF-16 string\0"
504      /* 75 */
505      "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0"
506      "character value in \\u.... sequence is too large\0"
507      "invalid UTF-32 string\0"
508    ;    ;
509    
510  /* 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 523  For convenience, we use the same bit def
523    
524  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
525    
526    /* Using a simple comparison for decimal numbers rather than a memory read
527    is much faster, and the resulting code is simpler (the compiler turns it
528    into a subtraction and unsigned comparison). */
529    
530    #define IS_DIGIT(x) ((x) >= CHAR_0 && (x) <= CHAR_9)
531    
532  #ifndef EBCDIC  #ifndef EBCDIC
533    
534  /* 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
535  UTF-8 mode. */  UTF-8 mode. */
536    
537  static const unsigned char digitab[] =  static const pcre_uint8 digitab[] =
538    {    {
539    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
540    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 573  static const unsigned char digitab[] =
573    
574  /* 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. */
575    
576  static const unsigned char digitab[] =  static const pcre_uint8 digitab[] =
577    {    {
578    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
579    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 608  static const unsigned char digitab[] =
608    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */
609    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */
610    
611  static const unsigned char ebcdic_chartab[] = { /* chartable partial dup */  static const pcre_uint8 ebcdic_chartab[] = { /* chartable partial dup */
612    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */
613    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
614    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */
# Line 554  static const unsigned char ebcdic_charta Line 644  static const unsigned char ebcdic_charta
644  #endif  #endif
645    
646    
 /* Definition to allow mutual recursion */  
   
 static BOOL  
   compile_regex(int, uschar **, const uschar **, int *, BOOL, BOOL, int, int,  
     int *, int *, branch_chain *, compile_data *, int *);  
   
647    
648    
649  /*************************************************  /*************************************************
# Line 604  Returns:  0 if all went well, else an er Line 688  Returns:  0 if all went well, else an er
688  static int  static int
689  expand_workspace(compile_data *cd)  expand_workspace(compile_data *cd)
690  {  {
691  uschar *newspace;  pcre_uchar *newspace;
692  int newsize = cd->workspace_size * 2;  int newsize = cd->workspace_size * 2;
693    
694  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 696  if (cd->workspace_size >= COMPILE_WORK_S
696      newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)      newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)
697   return ERR72;   return ERR72;
698    
699  newspace = (pcre_malloc)(newsize);  newspace = (PUBL(malloc))(IN_UCHARS(newsize));
700  if (newspace == NULL) return ERR21;  if (newspace == NULL) return ERR21;
701    memcpy(newspace, cd->start_workspace, cd->workspace_size * sizeof(pcre_uchar));
702  memcpy(newspace, cd->start_workspace, cd->workspace_size);  cd->hwm = (pcre_uchar *)newspace + (cd->hwm - cd->start_workspace);
 cd->hwm = (uschar *)newspace + (cd->hwm - cd->start_workspace);  
703  if (cd->workspace_size > COMPILE_WORK_SIZE)  if (cd->workspace_size > COMPILE_WORK_SIZE)
704    (pcre_free)((void *)cd->start_workspace);    (PUBL(free))((void *)cd->start_workspace);
705  cd->start_workspace = newspace;  cd->start_workspace = newspace;
706  cd->workspace_size = newsize;  cd->workspace_size = newsize;
707  return 0;  return 0;
# Line 642  Returns:    TRUE or FALSE Line 725  Returns:    TRUE or FALSE
725  */  */
726    
727  static BOOL  static BOOL
728  is_counted_repeat(const uschar *p)  is_counted_repeat(const pcre_uchar *p)
729  {  {
730  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if (!IS_DIGIT(*p)) return FALSE;
731  while ((digitab[*p] & ctype_digit) != 0) p++;  p++;
732    while (IS_DIGIT(*p)) p++;
733  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
734    
735  if (*p++ != CHAR_COMMA) return FALSE;  if (*p++ != CHAR_COMMA) return FALSE;
736  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
737    
738  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if (!IS_DIGIT(*p)) return FALSE;
739  while ((digitab[*p] & ctype_digit) != 0) p++;  p++;
740    while (IS_DIGIT(*p)) p++;
741    
742  return (*p == CHAR_RIGHT_CURLY_BRACKET);  return (*p == CHAR_RIGHT_CURLY_BRACKET);
743  }  }
# Line 664  return (*p == CHAR_RIGHT_CURLY_BRACKET); Line 749  return (*p == CHAR_RIGHT_CURLY_BRACKET);
749  *************************************************/  *************************************************/
750    
751  /* This function is called when a \ has been encountered. It either returns a  /* This function is called when a \ has been encountered. It either returns a
752  positive value for a simple escape such as \n, or a negative value which  positive value for a simple escape such as \n, or 0 for a data character
753  encodes one of the more complicated things such as \d. A backreference to group  which will be placed in chptr. A backreference to group n is returned as
754  n is returned as -(ESC_REF + n); ESC_REF is the highest ESC_xxx macro. When  negative n. When UTF-8 is enabled, a positive value greater than 255 may
755  UTF-8 is enabled, a positive value greater than 255 may be returned. On entry,  be returned in chptr.
756  ptr is pointing at the \. On exit, it is on the final character of the escape  On entry,ptr is pointing at the \. On exit, it is on the final character of the
757  sequence.  escape sequence.
758    
759  Arguments:  Arguments:
760    ptrptr         points to the pattern position pointer    ptrptr         points to the pattern position pointer
761      chptr          points to the data character
762    errorcodeptr   points to the errorcode variable    errorcodeptr   points to the errorcode variable
763    bracount       number of previous extracting brackets    bracount       number of previous extracting brackets
764    options        the options bits    options        the options bits
765    isclass        TRUE if inside a character class    isclass        TRUE if inside a character class
766    
767  Returns:         zero or positive => a data character  Returns:         zero => a data character
768                   negative => a special escape sequence                   positive => a special escape sequence
769                     negative => a back reference
770                   on error, errorcodeptr is set                   on error, errorcodeptr is set
771  */  */
772    
773  static int  static int
774  check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,  check_escape(const pcre_uchar **ptrptr, pcre_uint32 *chptr, int *errorcodeptr,
775    int options, BOOL isclass)    int bracount, int options, BOOL isclass)
776  {  {
777  BOOL utf8 = (options & PCRE_UTF8) != 0;  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
778  const uschar *ptr = *ptrptr + 1;  BOOL utf = (options & PCRE_UTF8) != 0;
779  int c, i;  const pcre_uchar *ptr = *ptrptr + 1;
780    pcre_uint32 c;
781    int escape = 0;
782    int i;
783    
784  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
785  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 793  in a table. A non-zero result is somethi
793  Otherwise further processing may be required. */  Otherwise further processing may be required. */
794    
795  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
796  else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */  /* Not alphanumeric */
797  else if ((i = escapes[c - CHAR_0]) != 0) c = i;  else if (c < CHAR_0 || c > CHAR_z) {}
798    else if ((i = escapes[c - CHAR_0]) != 0) { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
799    
800  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
801  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */  /* Not alphanumeric */
802  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if (c < CHAR_a || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}
803    else if ((i = escapes[c - 0x48]) != 0)  { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
804  #endif  #endif
805    
806  /* Escapes that need further processing, or are illegal. */  /* Escapes that need further processing, or are illegal. */
807    
808  else  else
809    {    {
810    const uschar *oldptr;    const pcre_uchar *oldptr;
811    BOOL braced, negated;    BOOL braced, negated, overflow;
812      int s;
813    
814    switch (c)    switch (c)
815      {      {
# Line 733  else Line 826  else
826        {        {
827        /* In JavaScript, \u must be followed by four hexadecimal numbers.        /* In JavaScript, \u must be followed by four hexadecimal numbers.
828        Otherwise it is a lowercase u letter. */        Otherwise it is a lowercase u letter. */
829        if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0        if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
830             && (digitab[ptr[3]] & ctype_xdigit) != 0 && (digitab[ptr[4]] & ctype_xdigit) != 0)          && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0
831            && MAX_255(ptr[3]) && (digitab[ptr[3]] & ctype_xdigit) != 0
832            && MAX_255(ptr[4]) && (digitab[ptr[4]] & ctype_xdigit) != 0)
833          {          {
834          c = 0;          c = 0;
835          for (i = 0; i < 4; ++i)          for (i = 0; i < 4; ++i)
836            {            {
837            register int cc = *(++ptr);            register pcre_uint32 cc = *(++ptr);
838  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
839            if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */            if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
840            c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));            c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
# Line 748  else Line 843  else
843            c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));            c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
844  #endif  #endif
845            }            }
846    
847    #if defined COMPILE_PCRE8
848            if (c > (utf ? 0x10ffff : 0xff))
849    #elif defined COMPILE_PCRE16
850            if (c > (utf ? 0x10ffff : 0xffff))
851    #elif defined COMPILE_PCRE32
852            if (utf && c > 0x10ffff)
853    #endif
854              {
855              *errorcodeptr = ERR76;
856              }
857            else if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
858          }          }
859        }        }
860      else      else
# Line 774  else Line 881  else
881      (3) For Oniguruma compatibility we also support \g followed by a name or a      (3) For Oniguruma compatibility we also support \g followed by a name or a
882      number either in angle brackets or in single quotes. However, these are      number either in angle brackets or in single quotes. However, these are
883      (possibly recursive) subroutine calls, _not_ backreferences. Just return      (possibly recursive) subroutine calls, _not_ backreferences. Just return
884      the -ESC_g code (cf \k). */      the ESC_g code (cf \k). */
885    
886      case CHAR_g:      case CHAR_g:
887      if (isclass) break;      if (isclass) break;
888      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
889        {        {
890        c = -ESC_g;        escape = ESC_g;
891        break;        break;
892        }        }
893    
# Line 788  else Line 895  else
895    
896      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
897        {        {
898        const uschar *p;        const pcre_uchar *p;
899        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
900          if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;          if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
901        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
902          {          {
903          c = -ESC_k;          escape = ESC_k;
904          break;          break;
905          }          }
906        braced = TRUE;        braced = TRUE;
# Line 808  else Line 915  else
915        }        }
916      else negated = FALSE;      else negated = FALSE;
917    
918      c = 0;      /* The integer range is limited by the machine's int representation. */
919      while ((digitab[ptr[1]] & ctype_digit) != 0)      s = 0;
920        c = c * 10 + *(++ptr) - CHAR_0;      overflow = FALSE;
921        while (IS_DIGIT(ptr[1]))
     if (c < 0)   /* Integer overflow */  
922        {        {
923          if (s > INT_MAX / 10 - 1) /* Integer overflow */
924            {
925            overflow = TRUE;
926            break;
927            }
928          s = s * 10 + (int)(*(++ptr) - CHAR_0);
929          }
930        if (overflow) /* Integer overflow */
931          {
932          while (IS_DIGIT(ptr[1]))
933            ptr++;
934        *errorcodeptr = ERR61;        *errorcodeptr = ERR61;
935        break;        break;
936        }        }
# Line 824  else Line 941  else
941        break;        break;
942        }        }
943    
944      if (c == 0)      if (s == 0)
945        {        {
946        *errorcodeptr = ERR58;        *errorcodeptr = ERR58;
947        break;        break;
# Line 832  else Line 949  else
949    
950      if (negated)      if (negated)
951        {        {
952        if (c > bracount)        if (s > bracount)
953          {          {
954          *errorcodeptr = ERR15;          *errorcodeptr = ERR15;
955          break;          break;
956          }          }
957        c = bracount - (c - 1);        s = bracount - (s - 1);
958        }        }
959    
960      c = -(ESC_REF + c);      escape = -s;
961      break;      break;
962    
963      /* The handling of escape sequences consisting of a string of digits      /* The handling of escape sequences consisting of a string of digits
# Line 861  else Line 978  else
978      if (!isclass)      if (!isclass)
979        {        {
980        oldptr = ptr;        oldptr = ptr;
981        c -= CHAR_0;        /* The integer range is limited by the machine's int representation. */
982        while ((digitab[ptr[1]] & ctype_digit) != 0)        s = (int)(c -CHAR_0);
983          c = c * 10 + *(++ptr) - CHAR_0;        overflow = FALSE;
984        if (c < 0)    /* Integer overflow */        while (IS_DIGIT(ptr[1]))
985          {          {
986            if (s > INT_MAX / 10 - 1) /* Integer overflow */
987              {
988              overflow = TRUE;
989              break;
990              }
991            s = s * 10 + (int)(*(++ptr) - CHAR_0);
992            }
993          if (overflow) /* Integer overflow */
994            {
995            while (IS_DIGIT(ptr[1]))
996              ptr++;
997          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
998          break;          break;
999          }          }
1000        if (c < 10 || c <= bracount)        if (s < 10 || s <= bracount)
1001          {          {
1002          c = -(ESC_REF + c);          escape = -s;
1003          break;          break;
1004          }          }
1005        ptr = oldptr;      /* Put the pointer back and fall through */        ptr = oldptr;      /* Put the pointer back and fall through */
# Line 891  else Line 1019  else
1019      /* \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
1020      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
1021      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
1022      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,
1023      than 3 octal digits. */      but no more than 3 octal digits. */
1024    
1025      case CHAR_0:      case CHAR_0:
1026      c -= CHAR_0;      c -= CHAR_0;
1027      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
1028          c = c * 8 + *(++ptr) - CHAR_0;          c = c * 8 + *(++ptr) - CHAR_0;
1029      if (!utf8 && c > 255) *errorcodeptr = ERR51;  #ifdef COMPILE_PCRE8
1030        if (!utf && c > 0xff) *errorcodeptr = ERR51;
1031    #endif
1032      break;      break;
1033    
1034      /* \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
1035      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.
1036      treated as a data character. */      If not, { is treated as a data character. */
1037    
1038      case CHAR_x:      case CHAR_x:
1039      if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)      if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
1040        {        {
1041        /* In JavaScript, \x must be followed by two hexadecimal numbers.        /* In JavaScript, \x must be followed by two hexadecimal numbers.
1042        Otherwise it is a lowercase x letter. */        Otherwise it is a lowercase x letter. */
1043        if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0)        if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
1044            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)
1045          {          {
1046          c = 0;          c = 0;
1047          for (i = 0; i < 2; ++i)          for (i = 0; i < 2; ++i)
1048            {            {
1049            register int cc = *(++ptr);            register pcre_uint32 cc = *(++ptr);
1050  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1051            if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */            if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
1052            c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));            c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
# Line 930  else Line 1061  else
1061    
1062      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
1063        {        {
1064        const uschar *pt = ptr + 2;        const pcre_uchar *pt = ptr + 2;
       int count = 0;  
1065    
1066        c = 0;        c = 0;
1067        while ((digitab[*pt] & ctype_xdigit) != 0)        overflow = FALSE;
1068          while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0)
1069          {          {
1070          register int cc = *pt++;          register pcre_uint32 cc = *pt++;
1071          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
1072          count++;  
1073    #ifdef COMPILE_PCRE32
1074            if (c >= 0x10000000l) { overflow = TRUE; break; }
1075    #endif
1076    
1077  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1078          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
# Line 947  else Line 1081  else
1081          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 */
1082          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1083  #endif  #endif
1084    
1085    #if defined COMPILE_PCRE8
1086            if (c > (utf ? 0x10ffff : 0xff)) { overflow = TRUE; break; }
1087    #elif defined COMPILE_PCRE16
1088            if (c > (utf ? 0x10ffff : 0xffff)) { overflow = TRUE; break; }
1089    #elif defined COMPILE_PCRE32
1090            if (utf && c > 0x10ffff) { overflow = TRUE; break; }
1091    #endif
1092            }
1093    
1094          if (overflow)
1095            {
1096            while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0) pt++;
1097            *errorcodeptr = ERR34;
1098          }          }
1099    
1100        if (*pt == CHAR_RIGHT_CURLY_BRACKET)        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
1101          {          {
1102          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
1103          ptr = pt;          ptr = pt;
1104          break;          break;
1105          }          }
# Line 963  else Line 1111  else
1111      /* Read just a single-byte hex-defined char */      /* Read just a single-byte hex-defined char */
1112    
1113      c = 0;      c = 0;
1114      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)
1115        {        {
1116        int cc;                                  /* Some compilers don't like */        pcre_uint32 cc;                          /* Some compilers don't like */
1117        cc = *(++ptr);                           /* ++ in initializers */        cc = *(++ptr);                           /* ++ in initializers */
1118  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1119        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
# Line 1024  else Line 1172  else
1172  newline". PCRE does not support \N{name}. However, it does support  newline". PCRE does not support \N{name}. However, it does support
1173  quantification such as \N{2,3}. */  quantification such as \N{2,3}. */
1174    
1175  if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&  if (escape == ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
1176       !is_counted_repeat(ptr+2))       !is_counted_repeat(ptr+2))
1177    *errorcodeptr = ERR37;    *errorcodeptr = ERR37;
1178    
1179  /* If PCRE_UCP is set, we change the values for \d etc. */  /* If PCRE_UCP is set, we change the values for \d etc. */
1180    
1181  if ((options & PCRE_UCP) != 0 && c <= -ESC_D && c >= -ESC_w)  if ((options & PCRE_UCP) != 0 && escape >= ESC_D && escape <= ESC_w)
1182    c -= (ESC_DU - ESC_D);    escape += (ESC_DU - ESC_D);
1183    
1184  /* Set the pointer to the final character before returning. */  /* Set the pointer to the final character before returning. */
1185    
1186  *ptrptr = ptr;  *ptrptr = ptr;
1187  return c;  *chptr = c;
1188    return escape;
1189  }  }
1190    
   
   
1191  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
1192  /*************************************************  /*************************************************
1193  *               Handle \P and \p                 *  *               Handle \P and \p                 *
# Line 1061  Returns:         type value from ucp_typ Line 1208  Returns:         type value from ucp_typ
1208  */  */
1209    
1210  static int  static int
1211  get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
1212  {  {
1213  int c, i, bot, top;  pcre_uchar c;
1214  const uschar *ptr = *ptrptr;  int i, bot, top;
1215  char name[32];  const pcre_uchar *ptr = *ptrptr;
1216    pcre_uchar name[32];
1217    
1218  c = *(++ptr);  c = *(++ptr);
1219  if (c == 0) goto ERROR_RETURN;  if (c == 0) goto ERROR_RETURN;
# Line 1082  if (c == CHAR_LEFT_CURLY_BRACKET) Line 1230  if (c == CHAR_LEFT_CURLY_BRACKET)
1230      *negptr = TRUE;      *negptr = TRUE;
1231      ptr++;      ptr++;
1232      }      }
1233    for (i = 0; i < (int)sizeof(name) - 1; i++)    for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
1234      {      {
1235      c = *(++ptr);      c = *(++ptr);
1236      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
# Line 1106  else Line 1254  else
1254  /* Search for a recognized property name using binary chop */  /* Search for a recognized property name using binary chop */
1255    
1256  bot = 0;  bot = 0;
1257  top = _pcre_utt_size;  top = PRIV(utt_size);
1258    
1259  while (bot < top)  while (bot < top)
1260    {    {
1261      int r;
1262    i = (bot + top) >> 1;    i = (bot + top) >> 1;
1263    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);    r = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
1264    if (c == 0)    if (r == 0)
1265      {      {
1266      *dptr = _pcre_utt[i].value;      *dptr = PRIV(utt)[i].value;
1267      return _pcre_utt[i].type;      return PRIV(utt)[i].type;
1268      }      }
1269    if (c > 0) bot = i + 1; else top = i;    if (r > 0) bot = i + 1; else top = i;
1270    }    }
1271    
1272  *errorcodeptr = ERR47;  *errorcodeptr = ERR47;
# Line 1153  Returns:         pointer to '}' on succe Line 1302  Returns:         pointer to '}' on succe
1302                   current ptr on error, with errorcodeptr set non-zero                   current ptr on error, with errorcodeptr set non-zero
1303  */  */
1304    
1305  static const uschar *  static const pcre_uchar *
1306  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)
1307  {  {
1308  int min = 0;  int min = 0;
1309  int max = -1;  int max = -1;
# Line 1162  int max = -1; Line 1311  int max = -1;
1311  /* 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
1312  an integer overflow. */  an integer overflow. */
1313    
1314  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;  while (IS_DIGIT(*p)) min = min * 10 + *p++ - CHAR_0;
1315  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
1316    {    {
1317    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 1177  if (*p == CHAR_RIGHT_CURLY_BRACKET) max Line 1326  if (*p == CHAR_RIGHT_CURLY_BRACKET) max
1326    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
1327      {      {
1328      max = 0;      max = 0;
1329      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;      while(IS_DIGIT(*p)) max = max * 10 + *p++ - CHAR_0;
1330      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
1331        {        {
1332        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 1232  Arguments: Line 1381  Arguments:
1381    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1382    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1383    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1384    utf8         TRUE if we are in UTF-8 mode    utf          TRUE if we are in UTF-8 / UTF-16 / UTF-32 mode
1385    count        pointer to the current capturing subpattern number (updated)    count        pointer to the current capturing subpattern number (updated)
1386    
1387  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1388  */  */
1389    
1390  static int  static int
1391  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,
1392    BOOL xmode, BOOL utf8, int *count)    BOOL xmode, BOOL utf, int *count)
1393  {  {
1394  uschar *ptr = *ptrptr;  pcre_uchar *ptr = *ptrptr;
1395  int start_count = *count;  int start_count = *count;
1396  int hwm_count = start_count;  int hwm_count = start_count;
1397  BOOL dup_parens = FALSE;  BOOL dup_parens = FALSE;
# Line 1309  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1458  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1458          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1459        {        {
1460        int term;        int term;
1461        const uschar *thisname;        const pcre_uchar *thisname;
1462        *count += 1;        *count += 1;
1463        if (name == NULL && *count == lorn) return *count;        if (name == NULL && *count == lorn) return *count;
1464        term = *ptr++;        term = *ptr++;
# Line 1317  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1466  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1466        thisname = ptr;        thisname = ptr;
1467        while (*ptr != term) ptr++;        while (*ptr != term) ptr++;
1468        if (name != NULL && lorn == ptr - thisname &&        if (name != NULL && lorn == ptr - thisname &&
1469            strncmp((const char *)name, (const char *)thisname, lorn) == 0)            STRNCMP_UC_UC(name, thisname, lorn) == 0)
1470          return *count;          return *count;
1471        term++;        term++;
1472        }        }
# Line 1360  for (; ptr < cd->end_pattern; ptr++) Line 1509  for (; ptr < cd->end_pattern; ptr++)
1509          {          {
1510          if (ptr[2] == CHAR_E)          if (ptr[2] == CHAR_E)
1511            ptr+= 2;            ptr+= 2;
1512          else if (strncmp((const char *)ptr+2,          else if (STRNCMP_UC_C8(ptr + 2,
1513                   STR_Q STR_BACKSLASH STR_E, 3) == 0)                   STR_Q STR_BACKSLASH STR_E, 3) == 0)
1514            ptr += 4;            ptr += 4;
1515          else          else
# Line 1408  for (; ptr < cd->end_pattern; ptr++) Line 1557  for (; ptr < cd->end_pattern; ptr++)
1557        {        {
1558        if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }        if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
1559        ptr++;        ptr++;
1560  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1561        if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;        if (utf) FORWARDCHAR(ptr);
1562  #endif  #endif
1563        }        }
1564      if (*ptr == 0) goto FAIL_EXIT;      if (*ptr == 0) goto FAIL_EXIT;
# Line 1420  for (; ptr < cd->end_pattern; ptr++) Line 1569  for (; ptr < cd->end_pattern; ptr++)
1569    
1570    if (*ptr == CHAR_LEFT_PARENTHESIS)    if (*ptr == CHAR_LEFT_PARENTHESIS)
1571      {      {
1572      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, count);      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, count);
1573      if (rc > 0) return rc;      if (rc > 0) return rc;
1574      if (*ptr == 0) goto FAIL_EXIT;      if (*ptr == 0) goto FAIL_EXIT;
1575      }      }
# Line 1466  Arguments: Line 1615  Arguments:
1615    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1616    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1617    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1618    utf8         TRUE if we are in UTF-8 mode    utf          TRUE if we are in UTF-8 / UTF-16 / UTF-32 mode
1619    
1620  Returns:       the number of the found subpattern, or -1 if not found  Returns:       the number of the found subpattern, or -1 if not found
1621  */  */
1622    
1623  static int  static int
1624  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,
1625    BOOL utf8)    BOOL utf)
1626  {  {
1627  uschar *ptr = (uschar *)cd->start_pattern;  pcre_uchar *ptr = (pcre_uchar *)cd->start_pattern;
1628  int count = 0;  int count = 0;
1629  int rc;  int rc;
1630    
# Line 1486  matching closing parens. That is why we Line 1635  matching closing parens. That is why we
1635    
1636  for (;;)  for (;;)
1637    {    {
1638    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, &count);    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, &count);
1639    if (rc > 0 || *ptr++ == 0) break;    if (rc > 0 || *ptr++ == 0) break;
1640    }    }
1641    
# Line 1513  Arguments: Line 1662  Arguments:
1662  Returns:       pointer to the first significant opcode  Returns:       pointer to the first significant opcode
1663  */  */
1664    
1665  static const uschar*  static const pcre_uchar*
1666  first_significant_code(const uschar *code, BOOL skipassert)  first_significant_code(const pcre_uchar *code, BOOL skipassert)
1667  {  {
1668  for (;;)  for (;;)
1669    {    {
# Line 1525  for (;;) Line 1674  for (;;)
1674      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1675      if (!skipassert) return code;      if (!skipassert) return code;
1676      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
1677      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1678      break;      break;
1679    
1680      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
# Line 1539  for (;;) Line 1688  for (;;)
1688      case OP_RREF:      case OP_RREF:
1689      case OP_NRREF:      case OP_NRREF:
1690      case OP_DEF:      case OP_DEF:
1691      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1692      break;      break;
1693    
1694      default:      default:
# Line 1569  and doing the check at the end; a flag s Line 1718  and doing the check at the end; a flag s
1718    
1719  Arguments:  Arguments:
1720    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1721    utf8     TRUE in UTF-8 mode    utf      TRUE in UTF-8 / UTF-16 / UTF-32 mode
1722    atend    TRUE if called when the pattern is complete    atend    TRUE if called when the pattern is complete
1723    cd       the "compile data" structure    cd       the "compile data" structure
1724    
# Line 1581  Returns:   the fixed length, Line 1730  Returns:   the fixed length,
1730  */  */
1731    
1732  static int  static int
1733  find_fixedlength(uschar *code, BOOL utf8, BOOL atend, compile_data *cd)  find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd)
1734  {  {
1735  int length = -1;  int length = -1;
1736    
1737  register int branchlength = 0;  register int branchlength = 0;
1738  register uschar *cc = code + 1 + LINK_SIZE;  register pcre_uchar *cc = code + 1 + LINK_SIZE;
1739    
1740  /* 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
1741  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 1743  branch, check the length against that of
1743  for (;;)  for (;;)
1744    {    {
1745    int d;    int d;
1746    uschar *ce, *cs;    pcre_uchar *ce, *cs;
1747    register int op = *cc;    register int op = *cc;
1748    
1749    switch (op)    switch (op)
1750      {      {
1751      /* 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 1758  for (;;)
1758      case OP_ONCE:      case OP_ONCE:
1759      case OP_ONCE_NC:      case OP_ONCE_NC:
1760      case OP_COND:      case OP_COND:
1761      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);
1762      if (d < 0) return d;      if (d < 0) return d;
1763      branchlength += d;      branchlength += d;
1764      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
# Line 1639  for (;;) Line 1789  for (;;)
1789    
1790      case OP_RECURSE:      case OP_RECURSE:
1791      if (!atend) return -3;      if (!atend) return -3;
1792      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */      cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1793      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */      do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
1794      if (cc > cs && cc < ce) return -1;                /* Recursion */      if (cc > cs && cc < ce) return -1;                    /* Recursion */
1795      d = find_fixedlength(cs + 2, utf8, atend, cd);      d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd);
1796      if (d < 0) return d;      if (d < 0) return d;
1797      branchlength += d;      branchlength += d;
1798      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
# Line 1655  for (;;) Line 1805  for (;;)
1805      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1806      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1807      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1808      /* Fall through */      cc += PRIV(OP_lengths)[*cc];
1809        break;
1810    
1811      /* Skip over things that don't match chars */      /* Skip over things that don't match chars */
1812    
# Line 1663  for (;;) Line 1814  for (;;)
1814      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
1815      case OP_SKIP_ARG:      case OP_SKIP_ARG:
1816      case OP_THEN_ARG:      case OP_THEN_ARG:
1817      cc += cc[1] + _pcre_OP_lengths[*cc];      cc += cc[1] + PRIV(OP_lengths)[*cc];
1818      break;      break;
1819    
1820      case OP_CALLOUT:      case OP_CALLOUT:
# Line 1690  for (;;) Line 1841  for (;;)
1841      case OP_SOM:      case OP_SOM:
1842      case OP_THEN:      case OP_THEN:
1843      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
1844      cc += _pcre_OP_lengths[*cc];      cc += PRIV(OP_lengths)[*cc];
1845      break;      break;
1846    
1847      /* Handle literal characters */      /* Handle literal characters */
# Line 1701  for (;;) Line 1852  for (;;)
1852      case OP_NOTI:      case OP_NOTI:
1853      branchlength++;      branchlength++;
1854      cc += 2;      cc += 2;
1855  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
1856      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1857  #endif  #endif
1858      break;      break;
1859    
# Line 1714  for (;;) Line 1865  for (;;)
1865      case OP_NOTEXACT:      case OP_NOTEXACT:
1866      case OP_NOTEXACTI:      case OP_NOTEXACTI:
1867      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1868      cc += 4;      cc += 2 + IMM2_SIZE;
1869  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
1870      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1871  #endif  #endif
1872      break;      break;
1873    
1874      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1875      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1876      if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;      if (cc[1 + IMM2_SIZE] == OP_PROP || cc[1 + IMM2_SIZE] == OP_NOTPROP)
1877      cc += 4;        cc += 2;
1878        cc += 1 + IMM2_SIZE + 1;
1879      break;      break;
1880    
1881      /* Handle single-char matchers */      /* Handle single-char matchers */
# Line 1757  for (;;) Line 1909  for (;;)
1909    
1910      /* Check a class for variable quantification */      /* Check a class for variable quantification */
1911    
1912  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1913      case OP_XCLASS:      case OP_XCLASS:
1914      cc += GET(cc, 1) - 33;      cc += GET(cc, 1) - PRIV(OP_lengths)[OP_CLASS];
1915      /* Fall through */      /* Fall through */
1916  #endif  #endif
1917    
1918      case OP_CLASS:      case OP_CLASS:
1919      case OP_NCLASS:      case OP_NCLASS:
1920      cc += 33;      cc += PRIV(OP_lengths)[OP_CLASS];
1921    
1922      switch (*cc)      switch (*cc)
1923        {        {
# Line 1779  for (;;) Line 1931  for (;;)
1931    
1932        case OP_CRRANGE:        case OP_CRRANGE:
1933        case OP_CRMINRANGE:        case OP_CRMINRANGE:
1934        if (GET2(cc,1) != GET2(cc,3)) return -1;        if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
1935        branchlength += GET2(cc,1);        branchlength += GET2(cc,1);
1936        cc += 5;        cc += 1 + 2 * IMM2_SIZE;
1937        break;        break;
1938    
1939        default:        default:
# Line 1896  length. Line 2048  length.
2048    
2049  Arguments:  Arguments:
2050    code        points to start of expression    code        points to start of expression
2051    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
2052    number      the required bracket number or negative to find a lookbehind    number      the required bracket number or negative to find a lookbehind
2053    
2054  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
2055  */  */
2056    
2057  const uschar *  const pcre_uchar *
2058  _pcre_find_bracket(const uschar *code, BOOL utf8, int number)  PRIV(find_bracket)(const pcre_uchar *code, BOOL utf, int number)
2059  {  {
2060  for (;;)  for (;;)
2061    {    {
# Line 1921  for (;;) Line 2073  for (;;)
2073    
2074    else if (c == OP_REVERSE)    else if (c == OP_REVERSE)
2075      {      {
2076      if (number < 0) return (uschar *)code;      if (number < 0) return (pcre_uchar *)code;
2077      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2078      }      }
2079    
2080    /* Handle capturing bracket */    /* Handle capturing bracket */
# Line 1931  for (;;) Line 2083  for (;;)
2083             c == OP_CBRAPOS || c == OP_SCBRAPOS)             c == OP_CBRAPOS || c == OP_SCBRAPOS)
2084      {      {
2085      int n = GET2(code, 1+LINK_SIZE);      int n = GET2(code, 1+LINK_SIZE);
2086      if (n == number) return (uschar *)code;      if (n == number) return (pcre_uchar *)code;
2087      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2088      }      }
2089    
2090    /* 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 2112  for (;;)
2112        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2113        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2114        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
2115        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
2116            code += 2;
2117        break;        break;
2118    
2119        case OP_MARK:        case OP_MARK:
# Line 1976  for (;;) Line 2129  for (;;)
2129    
2130      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
2131    
2132      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2133    
2134    /* 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
2135    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
2136    arrange to skip the extra bytes. */    arrange to skip the extra bytes. */
2137    
2138  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2139      if (utf8) switch(c)      if (utf) switch(c)
2140        {        {
2141        case OP_CHAR:        case OP_CHAR:
2142        case OP_CHARI:        case OP_CHARI:
# Line 2013  for (;;) Line 2166  for (;;)
2166        case OP_MINQUERYI:        case OP_MINQUERYI:
2167        case OP_POSQUERY:        case OP_POSQUERY:
2168        case OP_POSQUERYI:        case OP_POSQUERYI:
2169        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2170        break;        break;
2171        }        }
2172  #else  #else
2173      (void)(utf8);  /* Keep compiler happy by referencing function argument */      (void)(utf);  /* Keep compiler happy by referencing function argument */
2174  #endif  #endif
2175      }      }
2176    }    }
# Line 2034  instance of OP_RECURSE. Line 2187  instance of OP_RECURSE.
2187    
2188  Arguments:  Arguments:
2189    code        points to start of expression    code        points to start of expression
2190    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
2191    
2192  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
2193  */  */
2194    
2195  static const uschar *  static const pcre_uchar *
2196  find_recurse(const uschar *code, BOOL utf8)  find_recurse(const pcre_uchar *code, BOOL utf)
2197  {  {
2198  for (;;)  for (;;)
2199    {    {
# Line 2079  for (;;) Line 2232  for (;;)
2232        case OP_TYPEUPTO:        case OP_TYPEUPTO:
2233        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2234        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2235        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
2236            code += 2;
2237        break;        break;
2238    
2239        case OP_MARK:        case OP_MARK:
# Line 2095  for (;;) Line 2249  for (;;)
2249    
2250      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
2251    
2252      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2253    
2254      /* 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
2255      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
2256      to arrange to skip the extra bytes. */      to arrange to skip the extra bytes. */
2257    
2258  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2259      if (utf8) switch(c)      if (utf) switch(c)
2260        {        {
2261        case OP_CHAR:        case OP_CHAR:
2262        case OP_CHARI:        case OP_CHARI:
2263          case OP_NOT:
2264          case OP_NOTI:
2265        case OP_EXACT:        case OP_EXACT:
2266        case OP_EXACTI:        case OP_EXACTI:
2267          case OP_NOTEXACT:
2268          case OP_NOTEXACTI:
2269        case OP_UPTO:        case OP_UPTO:
2270        case OP_UPTOI:        case OP_UPTOI:
2271          case OP_NOTUPTO:
2272          case OP_NOTUPTOI:
2273        case OP_MINUPTO:        case OP_MINUPTO:
2274        case OP_MINUPTOI:        case OP_MINUPTOI:
2275          case OP_NOTMINUPTO:
2276          case OP_NOTMINUPTOI:
2277        case OP_POSUPTO:        case OP_POSUPTO:
2278        case OP_POSUPTOI:        case OP_POSUPTOI:
2279          case OP_NOTPOSUPTO:
2280          case OP_NOTPOSUPTOI:
2281        case OP_STAR:        case OP_STAR:
2282        case OP_STARI:        case OP_STARI:
2283          case OP_NOTSTAR:
2284          case OP_NOTSTARI:
2285        case OP_MINSTAR:        case OP_MINSTAR:
2286        case OP_MINSTARI:        case OP_MINSTARI:
2287          case OP_NOTMINSTAR:
2288          case OP_NOTMINSTARI:
2289        case OP_POSSTAR:        case OP_POSSTAR:
2290        case OP_POSSTARI:        case OP_POSSTARI:
2291          case OP_NOTPOSSTAR:
2292          case OP_NOTPOSSTARI:
2293        case OP_PLUS:        case OP_PLUS:
2294        case OP_PLUSI:        case OP_PLUSI:
2295          case OP_NOTPLUS:
2296          case OP_NOTPLUSI:
2297        case OP_MINPLUS:        case OP_MINPLUS:
2298        case OP_MINPLUSI:        case OP_MINPLUSI:
2299          case OP_NOTMINPLUS:
2300          case OP_NOTMINPLUSI:
2301        case OP_POSPLUS:        case OP_POSPLUS:
2302        case OP_POSPLUSI:        case OP_POSPLUSI:
2303          case OP_NOTPOSPLUS:
2304          case OP_NOTPOSPLUSI:
2305        case OP_QUERY:        case OP_QUERY:
2306        case OP_QUERYI:        case OP_QUERYI:
2307          case OP_NOTQUERY:
2308          case OP_NOTQUERYI:
2309        case OP_MINQUERY:        case OP_MINQUERY:
2310        case OP_MINQUERYI:        case OP_MINQUERYI:
2311          case OP_NOTMINQUERY:
2312          case OP_NOTMINQUERYI:
2313        case OP_POSQUERY:        case OP_POSQUERY:
2314        case OP_POSQUERYI:        case OP_POSQUERYI:
2315        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_NOTPOSQUERY:
2316          case OP_NOTPOSQUERYI:
2317          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2318        break;        break;
2319        }        }
2320  #else  #else
2321      (void)(utf8);  /* Keep compiler happy by referencing function argument */      (void)(utf);  /* Keep compiler happy by referencing function argument */
2322  #endif  #endif
2323      }      }
2324    }    }
# Line 2159  bracket whose current branch will alread Line 2341  bracket whose current branch will alread
2341  Arguments:  Arguments:
2342    code        points to start of search    code        points to start of search
2343    endcode     points to where to stop    endcode     points to where to stop
2344    utf8        TRUE if in UTF8 mode    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
2345    cd          contains pointers to tables etc.    cd          contains pointers to tables etc.
2346    
2347  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2348  */  */
2349    
2350  static BOOL  static BOOL
2351  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8,  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
2352    compile_data *cd)    BOOL utf, compile_data *cd)
2353  {  {
2354  register int c;  register int c;
2355  for (code = first_significant_code(code + _pcre_OP_lengths[*code], TRUE);  for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
2356       code < endcode;       code < endcode;
2357       code = first_significant_code(code + _pcre_OP_lengths[c], TRUE))       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
2358    {    {
2359    const uschar *ccode;    const pcre_uchar *ccode;
2360    
2361    c = *code;    c = *code;
2362    
# Line 2197  for (code = first_significant_code(code Line 2379  for (code = first_significant_code(code
2379    
2380    if (c == OP_RECURSE)    if (c == OP_RECURSE)
2381      {      {
2382      const uschar *scode;      const pcre_uchar *scode;
2383      BOOL empty_branch;      BOOL empty_branch;
2384    
2385      /* Test for forward reference */      /* Test for forward reference */
# Line 2215  for (code = first_significant_code(code Line 2397  for (code = first_significant_code(code
2397    
2398      do      do
2399        {        {
2400        if (could_be_empty_branch(scode, endcode, utf8, cd))        if (could_be_empty_branch(scode, endcode, utf, cd))
2401          {          {
2402          empty_branch = TRUE;          empty_branch = TRUE;
2403          break;          break;
# Line 2233  for (code = first_significant_code(code Line 2415  for (code = first_significant_code(code
2415    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2416        c == OP_BRAPOSZERO)        c == OP_BRAPOSZERO)
2417      {      {
2418      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2419      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
2420      c = *code;      c = *code;
2421      continue;      continue;
# Line 2271  for (code = first_significant_code(code Line 2453  for (code = first_significant_code(code
2453        empty_branch = FALSE;        empty_branch = FALSE;
2454        do        do
2455          {          {
2456          if (!empty_branch && could_be_empty_branch(code, endcode, utf8, cd))          if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd))
2457            empty_branch = TRUE;            empty_branch = TRUE;
2458          code += GET(code, 1);          code += GET(code, 1);
2459          }          }
# Line 2289  for (code = first_significant_code(code Line 2471  for (code = first_significant_code(code
2471      {      {
2472      /* Check for quantifiers after a class. XCLASS is used for classes that      /* Check for quantifiers after a class. XCLASS is used for classes that
2473      cannot be represented just by a bit map. This includes negated single      cannot be represented just by a bit map. This includes negated single
2474      high-valued characters. The length in _pcre_OP_lengths[] is zero; the      high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
2475      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"
2476      here. */      here. */
2477    
2478  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2479      case OP_XCLASS:      case OP_XCLASS:
2480      ccode = code += GET(code, 1);      ccode = code += GET(code, 1);
2481      goto CHECK_CLASS_REPEAT;      goto CHECK_CLASS_REPEAT;
# Line 2301  for (code = first_significant_code(code Line 2483  for (code = first_significant_code(code
2483    
2484      case OP_CLASS:      case OP_CLASS:
2485      case OP_NCLASS:      case OP_NCLASS:
2486      ccode = code + 33;      ccode = code + PRIV(OP_lengths)[OP_CLASS];
2487    
2488  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2489      CHECK_CLASS_REPEAT:      CHECK_CLASS_REPEAT:
2490  #endif  #endif
2491    
# Line 2376  for (code = first_significant_code(code Line 2558  for (code = first_significant_code(code
2558      case OP_TYPEUPTO:      case OP_TYPEUPTO:
2559      case OP_TYPEMINUPTO:      case OP_TYPEMINUPTO:
2560      case OP_TYPEPOSUPTO:      case OP_TYPEPOSUPTO:
2561      if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;      if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
2562          code += 2;
2563      break;      break;
2564    
2565      /* End of branch */      /* End of branch */
# Line 2391  for (code = first_significant_code(code Line 2574  for (code = first_significant_code(code
2574      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
2575      MINUPTO, and POSUPTO may be followed by a multibyte character */      MINUPTO, and POSUPTO may be followed by a multibyte character */
2576    
2577  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2578      case OP_STAR:      case OP_STAR:
2579      case OP_STARI:      case OP_STARI:
2580      case OP_MINSTAR:      case OP_MINSTAR:
# Line 2404  for (code = first_significant_code(code Line 2587  for (code = first_significant_code(code
2587      case OP_MINQUERYI:      case OP_MINQUERYI:
2588      case OP_POSQUERY:      case OP_POSQUERY:
2589      case OP_POSQUERYI:      case OP_POSQUERYI:
2590      if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];      if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
2591      break;      break;
2592    
2593      case OP_UPTO:      case OP_UPTO:
# Line 2413  for (code = first_significant_code(code Line 2596  for (code = first_significant_code(code
2596      case OP_MINUPTOI:      case OP_MINUPTOI:
2597      case OP_POSUPTO:      case OP_POSUPTO:
2598      case OP_POSUPTOI:      case OP_POSUPTOI:
2599      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]);
2600      break;      break;
2601  #endif  #endif
2602    
# Line 2457  Arguments: Line 2640  Arguments:
2640    code        points to start of the recursion    code        points to start of the recursion
2641    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2642    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2643    utf8        TRUE if in UTF-8 mode    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
2644    cd          pointers to tables etc    cd          pointers to tables etc
2645    
2646  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2647  */  */
2648    
2649  static BOOL  static BOOL
2650  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
2651    BOOL utf8, compile_data *cd)    branch_chain *bcptr, BOOL utf, compile_data *cd)
2652  {  {
2653  while (bcptr != NULL && bcptr->current_branch >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2654    {    {
2655    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8, cd))    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd))
2656      return FALSE;      return FALSE;
2657    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2658    }    }
# Line 2521  Returns:   TRUE or FALSE Line 2704  Returns:   TRUE or FALSE
2704  */  */
2705    
2706  static BOOL  static BOOL
2707  check_posix_syntax(const uschar *ptr, const uschar **endptr)  check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
2708  {  {
2709  int terminator;          /* Don't combine these lines; the Solaris cc */  int terminator;          /* Don't combine these lines; the Solaris cc */
2710  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 2748  Returns:     a value representing the na
2748  */  */
2749    
2750  static int  static int
2751  check_posix_name(const uschar *ptr, int len)  check_posix_name(const pcre_uchar *ptr, int len)
2752  {  {
2753  const char *pn = posix_names;  const char *pn = posix_names;
2754  register int yield = 0;  register int yield = 0;
2755  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
2756    {    {
2757    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
2758      strncmp((const char *)ptr, pn, len) == 0) return yield;      STRNCMP_UC_C8(ptr, pn, len) == 0) return yield;
2759    pn += posix_name_lengths[yield] + 1;    pn += posix_name_lengths[yield] + 1;
2760    yield++;    yield++;
2761    }    }
# Line 2604  value in the reference (which is a group Line 2787  value in the reference (which is a group
2787  Arguments:  Arguments:
2788    group      points to the start of the group    group      points to the start of the group
2789    adjust     the amount by which the group is to be moved    adjust     the amount by which the group is to be moved
2790    utf8       TRUE in UTF-8 mode    utf        TRUE in UTF-8 / UTF-16 / UTF-32 mode
2791    cd         contains pointers to tables etc.    cd         contains pointers to tables etc.
2792    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
2793    
# Line 2612  Returns:     nothing Line 2795  Returns:     nothing
2795  */  */
2796    
2797  static void  static void
2798  adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,  adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
2799    uschar *save_hwm)    pcre_uchar *save_hwm)
2800  {  {
2801  uschar *ptr = group;  pcre_uchar *ptr = group;
2802    
2803  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
2804    {    {
2805    int offset;    int offset;
2806    uschar *hc;    pcre_uchar *hc;
2807    
2808    /* 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
2809    reference. */    reference. */
# Line 2665  Arguments: Line 2848  Arguments:
2848  Returns:         new code pointer  Returns:         new code pointer
2849  */  */
2850    
2851  static uschar *  static pcre_uchar *
2852  auto_callout(uschar *code, const uschar *ptr, compile_data *cd)  auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
2853  {  {
2854  *code++ = OP_CALLOUT;  *code++ = OP_CALLOUT;
2855  *code++ = 255;  *code++ = 255;
2856  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
2857  PUT(code, LINK_SIZE, 0);                       /* Default length */  PUT(code, LINK_SIZE, 0);                       /* Default length */
2858  return code + 2*LINK_SIZE;  return code + 2 * LINK_SIZE;
2859  }  }
2860    
2861    
# Line 2694  Returns:             nothing Line 2877  Returns:             nothing
2877  */  */
2878    
2879  static void  static void
2880  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)  complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
2881  {  {
2882  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
2883  PUT(previous_callout, 2 + LINK_SIZE, length);  PUT(previous_callout, 2 + LINK_SIZE, length);
# Line 2708  PUT(previous_callout, 2 + LINK_SIZE, len Line 2891  PUT(previous_callout, 2 + LINK_SIZE, len
2891  *************************************************/  *************************************************/
2892    
2893  /* This function is passed the start and end of a class range, in UTF-8 mode  /* This function is passed the start and end of a class range, in UTF-8 mode
2894  with UCP support. It searches up the characters, looking for internal ranges of  with UCP support. It searches up the characters, looking for ranges of
2895  characters in the "other" case. Each call returns the next one, updating the  characters in the "other" case. Each call returns the next one, updating the
2896  start address.  start address. A character with multiple other cases is returned on its own
2897    with a special return value.
2898    
2899  Arguments:  Arguments:
2900    cptr        points to starting character value; updated    cptr        points to starting character value; updated
# Line 2718  Arguments: Line 2902  Arguments:
2902    ocptr       where to put start of othercase range    ocptr       where to put start of othercase range
2903    odptr       where to put end of othercase range    odptr       where to put end of othercase range
2904    
2905  Yield:        TRUE when range returned; FALSE when no more  Yield:        -1 when no more
2906                   0 when a range is returned
2907                  >0 the CASESET offset for char with multiple other cases
2908                    in this case, ocptr contains the original
2909  */  */
2910    
2911  static BOOL  static int
2912  get_othercase_range(unsigned int *cptr, unsigned int d, unsigned int *ocptr,  get_othercase_range(pcre_uint32 *cptr, pcre_uint32 d, pcre_uint32 *ocptr,
2913    unsigned int *odptr)    pcre_uint32 *odptr)
2914  {  {
2915  unsigned int c, othercase, next;  pcre_uint32 c, othercase, next;
2916    int co;
2917    
2918    /* Find the first character that has an other case. If it has multiple other
2919    cases, return its case offset value. */
2920    
2921  for (c = *cptr; c <= d; c++)  for (c = *cptr; c <= d; c++)
2922    { if ((othercase = UCD_OTHERCASE(c)) != c) break; }    {
2923      if ((co = UCD_CASESET(c)) != 0)
2924        {
2925        *ocptr = c++;   /* Character that has the set */
2926        *cptr = c;      /* Rest of input range */
2927        return co;
2928        }
2929      if ((othercase = UCD_OTHERCASE(c)) != c) break;
2930      }
2931    
2932  if (c > d) return FALSE;  if (c > d) return -1;  /* Reached end of range */
2933    
2934  *ocptr = othercase;  *ocptr = othercase;
2935  next = othercase + 1;  next = othercase + 1;
# Line 2741  for (++c; c <= d; c++) Line 2940  for (++c; c <= d; c++)
2940    next++;    next++;
2941    }    }
2942    
2943  *odptr = next - 1;  *odptr = next - 1;     /* End of othercase range */
2944  *cptr = c;  *cptr = c;             /* Rest of input range */
2945    return 0;
 return TRUE;  
2946  }  }
2947    
2948    
# Line 2766  Returns:       TRUE if auto-possessifyin Line 2964  Returns:       TRUE if auto-possessifyin
2964  */  */
2965    
2966  static BOOL  static BOOL
2967  check_char_prop(int c, int ptype, int pdata, BOOL negated)  check_char_prop(pcre_uint32 c, int ptype, int pdata, BOOL negated)
2968  {  {
2969    #ifdef SUPPORT_UCP
2970    const pcre_uint32 *p;
2971    #endif
2972    
2973  const ucd_record *prop = GET_UCD(c);  const ucd_record *prop = GET_UCD(c);
2974    
2975  switch(ptype)  switch(ptype)
2976    {    {
2977    case PT_LAMP:    case PT_LAMP:
# Line 2777  switch(ptype) Line 2980  switch(ptype)
2980            prop->chartype == ucp_Lt) == negated;            prop->chartype == ucp_Lt) == negated;
2981    
2982    case PT_GC:    case PT_GC:
2983    return (pdata == _pcre_ucp_gentype[prop->chartype]) == negated;    return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
2984    
2985    case PT_PC:    case PT_PC:
2986    return (pdata == prop->chartype) == negated;    return (pdata == prop->chartype) == negated;
# Line 2788  switch(ptype) Line 2991  switch(ptype)
2991    /* These are specials */    /* These are specials */
2992    
2993    case PT_ALNUM:    case PT_ALNUM:
2994    return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2995            _pcre_ucp_gentype[prop->chartype] == ucp_N) == negated;            PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
2996    
2997    case PT_SPACE:    /* Perl space */    case PT_SPACE:    /* Perl space */
2998    return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2999            c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)            c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
3000            == negated;            == negated;
3001    
3002    case PT_PXSPACE:  /* POSIX space */    case PT_PXSPACE:  /* POSIX space */
3003    return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
3004            c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||            c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
3005            c == CHAR_FF || c == CHAR_CR)            c == CHAR_FF || c == CHAR_CR)
3006            == negated;            == negated;
3007    
3008    case PT_WORD:    case PT_WORD:
3009    return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
3010            _pcre_ucp_gentype[prop->chartype] == ucp_N ||            PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
3011            c == CHAR_UNDERSCORE) == negated;            c == CHAR_UNDERSCORE) == negated;
3012    
3013    #ifdef SUPPORT_UCP
3014      case PT_CLIST:
3015      p = PRIV(ucd_caseless_sets) + prop->caseset;
3016      for (;;)
3017        {
3018        if ((unsigned int)c < *p) return !negated;
3019        if ((unsigned int)c == *p++) return negated;
3020        }
3021      break;  /* Control never reaches here */
3022    #endif
3023    }    }
3024    
3025  return FALSE;  return FALSE;
3026  }  }
3027  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
# Line 2823  sense to automatically possessify the re Line 3038  sense to automatically possessify the re
3038    
3039  Arguments:  Arguments:
3040    previous      pointer to the repeated opcode    previous      pointer to the repeated opcode
3041    utf8          TRUE in UTF-8 mode    utf           TRUE in UTF-8 / UTF-16 / UTF-32 mode
3042    ptr           next character in pattern    ptr           next character in pattern
3043    options       options bits    options       options bits
3044    cd            contains pointers to tables etc.    cd            contains pointers to tables etc.
# Line 2832  Returns:        TRUE if possessifying is Line 3047  Returns:        TRUE if possessifying is
3047  */  */
3048    
3049  static BOOL  static BOOL
3050  check_auto_possessive(const uschar *previous, BOOL utf8, const uschar *ptr,  check_auto_possessive(const pcre_uchar *previous, BOOL utf,
3051    int options, compile_data *cd)    const pcre_uchar *ptr, int options, compile_data *cd)
3052  {  {
3053  int c, next;  pcre_uint32 c = NOTACHAR;
3054    pcre_uint32 next;
3055    int escape;
3056  int op_code = *previous++;  int op_code = *previous++;
3057    
3058  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
# Line 2844  if ((options & PCRE_EXTENDED) != 0) Line 3061  if ((options & PCRE_EXTENDED) != 0)
3061    {    {
3062    for (;;)    for (;;)
3063      {      {
3064      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
3065      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
3066        {        {
3067        ptr++;        ptr++;
# Line 2852  if ((options & PCRE_EXTENDED) != 0) Line 3069  if ((options & PCRE_EXTENDED) != 0)
3069          {          {
3070          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3071          ptr++;          ptr++;
3072  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3073          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
3074  #endif  #endif
3075          }          }
3076        }        }
# Line 2867  value is a character, a negative value i Line 3084  value is a character, a negative value i
3084  if (*ptr == CHAR_BACKSLASH)  if (*ptr == CHAR_BACKSLASH)
3085    {    {
3086    int temperrorcode = 0;    int temperrorcode = 0;
3087    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);    escape = check_escape(&ptr, &next, &temperrorcode, cd->bracount, options, FALSE);
3088    if (temperrorcode != 0) return FALSE;    if (temperrorcode != 0) return FALSE;
3089    ptr++;    /* Point after the escape sequence */    ptr++;    /* Point after the escape sequence */
3090    }    }
3091    else if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_meta) == 0)
 else if ((cd->ctypes[*ptr] & ctype_meta) == 0)  
3092    {    {
3093  #ifdef SUPPORT_UTF8    escape = 0;
3094    if (utf8) { GETCHARINC(next, ptr); } else  #ifdef SUPPORT_UTF
3095      if (utf) { GETCHARINC(next, ptr); } else
3096  #endif  #endif
3097    next = *ptr++;    next = *ptr++;
3098    }    }
   
3099  else return FALSE;  else return FALSE;
3100    
3101  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
# Line 2888  if ((options & PCRE_EXTENDED) != 0) Line 3104  if ((options & PCRE_EXTENDED) != 0)
3104    {    {
3105    for (;;)    for (;;)
3106      {      {
3107      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
3108      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
3109        {        {
3110        ptr++;        ptr++;
# Line 2896  if ((options & PCRE_EXTENDED) != 0) Line 3112  if ((options & PCRE_EXTENDED) != 0)
3112          {          {
3113          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3114          ptr++;          ptr++;
3115  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3116          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
3117  #endif  #endif
3118          }          }
3119        }        }
# Line 2908  if ((options & PCRE_EXTENDED) != 0) Line 3124  if ((options & PCRE_EXTENDED) != 0)
3124  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
3125    
3126  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3127    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)
3128      return FALSE;      return FALSE;
3129    
3130  /* Now compare the next item with the previous opcode. First, handle cases when  /* If the previous item is a character, get its value. */
 the next item is a character. */  
3131    
3132  if (next >= 0) switch(op_code)  if (op_code == OP_CHAR || op_code == OP_CHARI ||
3133        op_code == OP_NOT || op_code == OP_NOTI)
3134      //if (escape == 0) switch(op_code)
3135    {    {
3136    case OP_CHAR:  #ifdef SUPPORT_UTF
 #ifdef SUPPORT_UTF8  
3137    GETCHARTEST(c, previous);    GETCHARTEST(c, previous);
3138  #else  #else
3139    c = *previous;    c = *previous;
3140  #endif  #endif
3141    return c != next;    }
3142    
3143    /* For CHARI (caseless character) we must check the other case. If we have  /* Now compare the next item with the previous opcode. First, handle cases when
3144    Unicode property support, we can use it to test the other case of  the next item is a character. */
   high-valued characters. */  
3145    
3146    case OP_CHARI:  if (escape == 0)
3147  #ifdef SUPPORT_UTF8    {
3148    GETCHARTEST(c, previous);    /* For a caseless UTF match, the next character may have more than one other
3149  #else    case, which maps to the special PT_CLIST property. Check this first. */
3150    c = *previous;  
3151    #ifdef SUPPORT_UCP
3152      if (utf && c != NOTACHAR && (options & PCRE_CASELESS) != 0)
3153        {
3154        int ocs = UCD_CASESET(next);
3155        if (ocs > 0) return check_char_prop(c, PT_CLIST, ocs, op_code >= OP_NOT);
3156        }
3157  #endif  #endif
3158    if (c == next) return FALSE;  
3159  #ifdef SUPPORT_UTF8    switch(op_code)
   if (utf8)  
3160      {      {
3161      unsigned int othercase;      case OP_CHAR:
3162      if (next < 128) othercase = cd->fcc[next]; else      return c != next;
3163    
3164        /* For CHARI (caseless character) we must check the other case. If we have
3165        Unicode property support, we can use it to test the other case of
3166        high-valued characters. We know that next can have only one other case,
3167        because multi-other-case characters are dealt with above. */
3168    
3169        case OP_CHARI:
3170        if (c == next) return FALSE;
3171    #ifdef SUPPORT_UTF
3172        if (utf)
3173          {
3174          pcre_uint32 othercase;
3175          if (next < 128) othercase = cd->fcc[next]; else
3176  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3177      othercase = UCD_OTHERCASE((unsigned int)next);        othercase = UCD_OTHERCASE(next);
3178  #else  #else
3179      othercase = NOTACHAR;        othercase = NOTACHAR;
3180  #endif  #endif
3181      return (unsigned int)c != othercase;        return c != othercase;
3182      }        }
3183    else      else
3184  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3185    return (c != cd->fcc[next]);  /* Non-UTF-8 mode */      return (c != TABLE_GET(next, cd->fcc, next));  /* Not UTF */
3186    
3187    /* For OP_NOT and OP_NOTI, the data is always a single-byte character. These      case OP_NOT:
3188    opcodes are not used for multi-byte characters, because they are coded using      return c == next;
3189    an XCLASS instead. */  
3190        case OP_NOTI:
3191    case OP_NOT:      if (c == next) return TRUE;
3192    return (c = *previous) == next;  #ifdef SUPPORT_UTF
3193        if (utf)
3194    case OP_NOTI:        {
3195    if ((c = *previous) == next) return TRUE;        pcre_uint32 othercase;
3196  #ifdef SUPPORT_UTF8        if (next < 128) othercase = cd->fcc[next]; else
   if (utf8)  
     {  
     unsigned int othercase;  
     if (next < 128) othercase = cd->fcc[next]; else  
3197  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3198      othercase = UCD_OTHERCASE(next);        othercase = UCD_OTHERCASE(next);
3199  #else  #else
3200      othercase = NOTACHAR;        othercase = NOTACHAR;
3201  #endif  #endif
3202      return (unsigned int)c == othercase;        return c == othercase;
3203      }        }
3204    else      else
3205  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3206    return (c == cd->fcc[next]);  /* Non-UTF-8 mode */      return (c == TABLE_GET(next, cd->fcc, next));  /* Not UTF */
3207    
3208    /* 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.
3209    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. */
3210    
3211    case OP_DIGIT:      case OP_DIGIT:
3212    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;      return next > 255 || (cd->ctypes[next] & ctype_digit) == 0;
3213    
3214    case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
3215    return next <= 127 && (cd->ctypes[next] & ctype_digit) != 0;      return next <= 255 && (cd->ctypes[next] & ctype_digit) != 0;
3216    
3217    case OP_WHITESPACE:      case OP_WHITESPACE:
3218    return next > 127 || (cd->ctypes[next] & ctype_space) == 0;      return next > 255 || (cd->ctypes[next] & ctype_space) == 0;
3219    
3220    case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
3221    return next <= 127 && (cd->ctypes[next] & ctype_space) != 0;      return next <= 255 && (cd->ctypes[next] & ctype_space) != 0;
3222    
3223    case OP_WORDCHAR:      case OP_WORDCHAR:
3224    return next > 127 || (cd->ctypes[next] & ctype_word) == 0;      return next > 255 || (cd->ctypes[next] & ctype_word) == 0;
3225    
3226    case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
3227    return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;      return next <= 255 && (cd->ctypes[next] & ctype_word) != 0;
3228    
3229    case OP_HSPACE:      case OP_HSPACE:
3230    case OP_NOT_HSPACE:      case OP_NOT_HSPACE:
3231    switch(next)      switch(next)
3232      {        {
3233      case 0x09:        HSPACE_CASES:
3234      case 0x20:        return op_code == OP_NOT_HSPACE;
     case 0xa0:  
     case 0x1680:  
     case 0x180e:  
     case 0x2000:  
     case 0x2001:  
     case 0x2002:  
     case 0x2003:  
     case 0x2004:  
     case 0x2005:  
     case 0x2006:  
     case 0x2007:  
     case 0x2008:  
     case 0x2009:  
     case 0x200A:  
     case 0x202f:  
     case 0x205f:  
     case 0x3000:  
     return op_code == OP_NOT_HSPACE;  
     default:  
     return op_code != OP_NOT_HSPACE;  
     }  
3235    
3236    case OP_ANYNL:        default:
3237    case OP_VSPACE:        return op_code != OP_NOT_HSPACE;
3238    case OP_NOT_VSPACE:        }
3239    switch(next)  
3240      {      case OP_ANYNL:
3241      case 0x0a:      case OP_VSPACE:
3242      case 0x0b:      case OP_NOT_VSPACE:
3243      case 0x0c:      switch(next)
3244      case 0x0d:        {
3245      case 0x85:        VSPACE_CASES:
3246      case 0x2028:        return op_code == OP_NOT_VSPACE;
3247      case 0x2029:  
3248      return op_code == OP_NOT_VSPACE;        default:
3249      default:        return op_code != OP_NOT_VSPACE;
3250      return op_code != OP_NOT_VSPACE;        }
     }  
3251    
3252  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3253    case OP_PROP:      case OP_PROP:
3254    return check_char_prop(next, previous[0], previous[1], FALSE);      return check_char_prop(next, previous[0], previous[1], FALSE);
3255    
3256    case OP_NOTPROP:      case OP_NOTPROP:
3257    return check_char_prop(next, previous[0], previous[1], TRUE);      return check_char_prop(next, previous[0], previous[1], TRUE);
3258  #endif  #endif
3259    
3260    default:      default:
3261    return FALSE;      return FALSE;
3262        }
3263    }    }
3264    
   
3265  /* Handle the case when the next item is \d, \s, etc. Note that when PCRE_UCP  /* Handle the case when the next item is \d, \s, etc. Note that when PCRE_UCP
3266  is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are  is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are
3267  generated only when PCRE_UCP is *not* set, that is, when only ASCII  generated only when PCRE_UCP is *not* set, that is, when only ASCII
# Line 3065  switch(op_code) Line 3272  switch(op_code)
3272    {    {
3273    case OP_CHAR:    case OP_CHAR:
3274    case OP_CHARI:    case OP_CHARI:
3275  #ifdef SUPPORT_UTF8    switch(escape)
   GETCHARTEST(c, previous);  
 #else  
   c = *previous;  
 #endif  
   switch(-next)  
3276      {      {
3277      case ESC_d:      case ESC_d:
3278      return c > 127 || (cd->ctypes[c] & ctype_digit) == 0;      return c > 255 || (cd->ctypes[c] & ctype_digit) == 0;
3279    
3280      case ESC_D:      case ESC_D:
3281      return c <= 127 && (cd->ctypes[c] & ctype_digit) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_digit) != 0;
3282    
3283      case ESC_s:      case ESC_s:
3284      return c > 127 || (cd->ctypes[c] & ctype_space) == 0;      return c > 255 || (cd->ctypes[c] & ctype_space) == 0;
3285    
3286      case ESC_S:      case ESC_S:
3287      return c <= 127 && (cd->ctypes[c] & ctype_space) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_space) != 0;
3288    
3289      case ESC_w:      case ESC_w:
3290      return c > 127 || (cd->ctypes[c] & ctype_word) == 0;      return c > 255 || (cd->ctypes[c] & ctype_word) == 0;
3291    
3292      case ESC_W:      case ESC_W:
3293      return c <= 127 && (cd->ctypes[c] & ctype_word) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_word) != 0;
3294    
3295      case ESC_h:      case ESC_h:
3296      case ESC_H:      case ESC_H:
3297      switch(c)      switch(c)
3298        {        {
3299        case 0x09:        HSPACE_CASES:
3300        case 0x20:        return escape != ESC_h;
3301        case 0xa0:  
       case 0x1680:  
       case 0x180e:  
       case 0x2000:  
       case 0x2001:  
       case 0x2002:  
       case 0x2003:  
       case 0x2004:  
       case 0x2005:  
       case 0x2006:  
       case 0x2007:  
       case 0x2008:  
       case 0x2009:  
       case 0x200A:  
       case 0x202f:  
       case 0x205f:  
       case 0x3000:  
       return -next != ESC_h;  
3302        default:        default:
3303        return -next == ESC_h;        return escape == ESC_h;
3304        }        }
3305    
3306      case ESC_v:      case ESC_v:
3307      case ESC_V:      case ESC_V:
3308      switch(c)      switch(c)
3309        {        {
3310        case 0x0a:        VSPACE_CASES:
3311        case 0x0b:        return escape != ESC_v;
3312        case 0x0c:  
       case 0x0d:  
       case 0x85:  
       case 0x2028:  
       case 0x2029:  
       return -next != ESC_v;  
3313        default:        default:
3314        return -next == ESC_v;        return escape == ESC_v;
3315        }        }
3316    
3317      /* When PCRE_UCP is set, these values get generated for \d etc. Find      /* When PCRE_UCP is set, these values get generated for \d etc. Find
3318      their substitutions and process them. The result will always be either      their substitutions and process them. The result will always be either
3319      -ESC_p or -ESC_P. Then fall through to process those values. */      ESC_p or ESC_P. Then fall through to process those values. */
3320    
3321  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3322      case ESC_du:      case ESC_du:
# Line 3147  switch(op_code) Line 3327  switch(op_code)
3327      case ESC_SU:      case ESC_SU:
3328        {        {
3329        int temperrorcode = 0;        int temperrorcode = 0;
3330        ptr = substitutes[-next - ESC_DU];        ptr = substitutes[escape - ESC_DU];
3331        next = check_escape(&ptr, &temperrorcode, 0, options, FALSE);        escape = check_escape(&ptr, &next, &temperrorcode, 0, options, FALSE);
3332        if (temperrorcode != 0) return FALSE;        if (temperrorcode != 0) return FALSE;
3333        ptr++;    /* For compatibility */        ptr++;    /* For compatibility */
3334        }        }
# Line 3170  switch(op_code) Line 3350  switch(op_code)
3350        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. */
3351    
3352        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3353          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)
3354            return FALSE;            return FALSE;
3355    
3356        /* Do the property check. */        /* Do the property check. */
3357    
3358        return check_char_prop(c, ptype, pdata, (next == -ESC_P) != negated);        return check_char_prop(c, ptype, pdata, (escape == ESC_P) != negated);
3359        }        }
3360  #endif  #endif
3361    
# Line 3190  switch(op_code) Line 3370  switch(op_code)
3370    these op-codes are never generated.) */    these op-codes are never generated.) */
3371    
3372    case OP_DIGIT:    case OP_DIGIT:
3373    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||    return escape == ESC_D || escape == ESC_s || escape == ESC_W ||
3374           next == -ESC_h || next == -ESC_v || next == -ESC_R;           escape == ESC_h || escape == ESC_v || escape == ESC_R;
3375    
3376    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
3377    return next == -ESC_d;    return escape == ESC_d;
3378    
3379    case OP_WHITESPACE:    case OP_WHITESPACE:
3380    return next == -ESC_S || next == -ESC_d || next == -ESC_w || next == -ESC_R;    return escape == ESC_S || escape == ESC_d || escape == ESC_w;
3381    
3382    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
3383    return next == -ESC_s || next == -ESC_h || next == -ESC_v;    return escape == ESC_s || escape == ESC_h || escape == ESC_v || escape == ESC_R;
3384    
3385    case OP_HSPACE:    case OP_HSPACE:
3386    return next == -ESC_S || next == -ESC_H || next == -ESC_d ||    return escape == ESC_S || escape == ESC_H || escape == ESC_d ||
3387           next == -ESC_w || next == -ESC_v || next == -ESC_R;           escape == ESC_w || escape == ESC_v || escape == ESC_R;
3388    
3389    case OP_NOT_HSPACE:    case OP_NOT_HSPACE:
3390    return next == -ESC_h;    return escape == ESC_h;
3391    
3392    /* Can't have \S in here because VT matches \S (Perl anomaly) */    /* Can't have \S in here because VT matches \S (Perl anomaly) */
3393    case OP_ANYNL:    case OP_ANYNL:
3394    case OP_VSPACE:    case OP_VSPACE:
3395    return next == -ESC_V || next == -ESC_d || next == -ESC_w;    return escape == ESC_V || escape == ESC_d || escape == ESC_w;
3396    
3397    case OP_NOT_VSPACE:    case OP_NOT_VSPACE:
3398    return next == -ESC_v || next == -ESC_R;    return escape == ESC_v || escape == ESC_R;
3399    
3400    case OP_WORDCHAR:    case OP_WORDCHAR:
3401    return next == -ESC_W || next == -ESC_s || next == -ESC_h ||    return escape == ESC_W || escape == ESC_s || escape == ESC_h ||
3402           next == -ESC_v || next == -ESC_R;           escape == ESC_v || escape == ESC_R;
3403    
3404    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
3405    return next == -ESC_w || next == -ESC_d;    return escape == ESC_w || escape == ESC_d;
3406    
3407    default:    default:
3408    return FALSE;    return FALSE;
# Line 3234  switch(op_code) Line 3414  switch(op_code)
3414    
3415    
3416  /*************************************************  /*************************************************
3417    *        Add a character or range to a class     *
3418    *************************************************/
3419    
3420    /* This function packages up the logic of adding a character or range of
3421    characters to a class. The character values in the arguments will be within the
3422    valid values for the current mode (8-bit, 16-bit, UTF, etc). This function is
3423    mutually recursive with the function immediately below.
3424    
3425    Arguments:
3426      classbits     the bit map for characters < 256
3427      uchardptr     points to the pointer for extra data
3428      options       the options word
3429      cd            contains pointers to tables etc.
3430      start         start of range character
3431      end           end of range character
3432    
3433    Returns:        the number of < 256 characters added
3434                    the pointer to extra data is updated
3435    */
3436    
3437    static int
3438    add_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
3439      compile_data *cd, pcre_uint32 start, pcre_uint32 end)
3440    {
3441    pcre_uint32 c;
3442    int n8 = 0;
3443    
3444    /* If caseless matching is required, scan the range and process alternate
3445    cases. In Unicode, there are 8-bit characters that have alternate cases that
3446    are greater than 255 and vice-versa. Sometimes we can just extend the original
3447    range. */
3448    
3449    if ((options & PCRE_CASELESS) != 0)
3450      {
3451    #ifdef SUPPORT_UCP
3452      if ((options & PCRE_UTF8) != 0)
3453        {
3454        int rc;
3455        pcre_uint32 oc, od;
3456    
3457        options &= ~PCRE_CASELESS;   /* Remove for recursive calls */
3458        c = start;
3459    
3460        while ((rc = get_othercase_range(&c, end, &oc, &od)) >= 0)
3461          {
3462          /* Handle a single character that has more than one other case. */
3463    
3464          if (rc > 0) n8 += add_list_to_class(classbits, uchardptr, options, cd,
3465            PRIV(ucd_caseless_sets) + rc, oc);
3466    
3467          /* Do nothing if the other case range is within the original range. */
3468    
3469          else if (oc >= start && od <= end) continue;
3470    
3471          /* Extend the original range if there is overlap, noting that if oc < c, we
3472          can't have od > end because a subrange is always shorter than the basic
3473          range. Otherwise, use a recursive call to add the additional range. */
3474    
3475          else if (oc < start && od >= start - 1) start = oc; /* Extend downwards */
3476          else if (od > end && oc <= end + 1) end = od;       /* Extend upwards */
3477          else n8 += add_to_class(classbits, uchardptr, options, cd, oc, od);
3478          }
3479        }
3480      else
3481    #endif  /* SUPPORT_UCP */
3482    
3483      /* Not UTF-mode, or no UCP */
3484    
3485      for (c = start; c <= end && c < 256; c++)
3486        {
3487        SETBIT(classbits, cd->fcc[c]);
3488        n8++;
3489        }
3490      }
3491    
3492    /* Now handle the original range. Adjust the final value according to the bit
3493    length - this means that the same lists of (e.g.) horizontal spaces can be used
3494    in all cases. */
3495    
3496    #if defined COMPILE_PCRE8
3497    #ifdef SUPPORT_UTF
3498      if ((options & PCRE_UTF8) == 0)
3499    #endif
3500      if (end > 0xff) end = 0xff;
3501    
3502    #elif defined COMPILE_PCRE16
3503    #ifdef SUPPORT_UTF
3504      if ((options & PCRE_UTF16) == 0)
3505    #endif
3506      if (end > 0xffff) end = 0xffff;
3507    
3508    #endif /* COMPILE_PCRE[8|16] */
3509    
3510    /* If all characters are less than 256, use the bit map. Otherwise use extra
3511    data. */
3512    
3513    if (end < 0x100)
3514      {
3515      for (c = start; c <= end; c++)
3516        {
3517        n8++;
3518        SETBIT(classbits, c);
3519        }
3520      }
3521    
3522    else
3523      {
3524      pcre_uchar *uchardata = *uchardptr;
3525    
3526    #ifdef SUPPORT_UTF
3527      if ((options & PCRE_UTF8) != 0)  /* All UTFs use the same flag bit */
3528        {
3529        if (start < end)
3530          {
3531          *uchardata++ = XCL_RANGE;
3532          uchardata += PRIV(ord2utf)(start, uchardata);
3533          uchardata += PRIV(ord2utf)(end, uchardata);
3534          }
3535        else if (start == end)
3536          {
3537          *uchardata++ = XCL_SINGLE;
3538          uchardata += PRIV(ord2utf)(start, uchardata);
3539          }
3540        }
3541      else
3542    #endif  /* SUPPORT_UTF */
3543    
3544      /* Without UTF support, character values are constrained by the bit length,
3545      and can only be > 256 for 16-bit and 32-bit libraries. */
3546    
3547    #ifdef COMPILE_PCRE8
3548        {}
3549    #else
3550      if (start < end)
3551        {
3552        *uchardata++ = XCL_RANGE;
3553        *uchardata++ = start;
3554        *uchardata++ = end;
3555        }
3556      else if (start == end)
3557        {
3558        *uchardata++ = XCL_SINGLE;
3559        *uchardata++ = start;
3560        }
3561    #endif
3562    
3563      *uchardptr = uchardata;   /* Updata extra data pointer */
3564      }
3565    
3566    return n8;    /* Number of 8-bit characters */
3567    }
3568    
3569    
3570    
3571    
3572    /*************************************************
3573    *        Add a list of characters to a class     *
3574    *************************************************/
3575    
3576    /* This function is used for adding a list of case-equivalent characters to a
3577    class, and also for adding a list of horizontal or vertical whitespace. If the
3578    list is in order (which it should be), ranges of characters are detected and
3579    handled appropriately. This function is mutually recursive with the function
3580    above.
3581    
3582    Arguments:
3583      classbits     the bit map for characters < 256
3584      uchardptr     points to the pointer for extra data
3585      options       the options word
3586      cd            contains pointers to tables etc.
3587      p             points to row of 32-bit values, terminated by NOTACHAR
3588      except        character to omit; this is used when adding lists of
3589                      case-equivalent characters to avoid including the one we
3590                      already know about
3591    
3592    Returns:        the number of < 256 characters added
3593                    the pointer to extra data is updated
3594    */
3595    
3596    static int
3597    add_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
3598      compile_data *cd, const pcre_uint32 *p, unsigned int except)
3599    {
3600    int n8 = 0;
3601    while (p[0] < NOTACHAR)
3602      {
3603      int n = 0;
3604      if (p[0] != except)
3605        {
3606        while(p[n+1] == p[0] + n + 1) n++;
3607        n8 += add_to_class(classbits, uchardptr, options, cd, p[0], p[n]);
3608        }
3609      p += n + 1;
3610      }
3611    return n8;
3612    }
3613    
3614    
3615    
3616    /*************************************************
3617    *    Add characters not in a list to a class     *
3618    *************************************************/
3619    
3620    /* This function is used for adding the complement of a list of horizontal or
3621    vertical whitespace to a class. The list must be in order.
3622    
3623    Arguments:
3624      classbits     the bit map for characters < 256
3625      uchardptr     points to the pointer for extra data
3626      options       the options word
3627      cd            contains pointers to tables etc.
3628      p             points to row of 32-bit values, terminated by NOTACHAR
3629    
3630    Returns:        the number of < 256 characters added
3631                    the pointer to extra data is updated
3632    */
3633    
3634    static int
3635    add_not_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr,
3636      int options, compile_data *cd, const pcre_uint32 *p)
3637    {
3638    BOOL utf = (options & PCRE_UTF8) != 0;
3639    int n8 = 0;
3640    if (p[0] > 0)
3641      n8 += add_to_class(classbits, uchardptr, options, cd, 0, p[0] - 1);
3642    while (p[0] < NOTACHAR)
3643      {
3644      while (p[1] == p[0] + 1) p++;
3645      n8 += add_to_class(classbits, uchardptr, options, cd, p[0] + 1,
3646        (p[1] == NOTACHAR) ? (utf ? 0x10ffffu : 0xffffffffu) : p[1] - 1);
3647      p++;
3648      }
3649    return n8;
3650    }
3651    
3652    
3653    
3654    /*************************************************
3655  *           Compile one branch                   *  *           Compile one branch                   *
3656  *************************************************/  *************************************************/
3657    
# Line 3248  Arguments: Line 3666  Arguments:
3666    codeptr        points to the pointer to the current code point    codeptr        points to the pointer to the current code point
3667    ptrptr         points to the current pattern pointer    ptrptr         points to the current pattern pointer
3668    errorcodeptr   points to error code variable    errorcodeptr   points to error code variable
3669    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)    firstcharptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)
3670    reqbyteptr     set to the last literal character required, else < 0    reqcharptr     set to the last literal character required, else < 0
3671    bcptr          points to current branch chain    bcptr          points to current branch chain
3672    cond_depth     conditional nesting depth    cond_depth     conditional nesting depth
3673    cd             contains pointers to tables etc.    cd             contains pointers to tables etc.
# Line 3261  Returns:         TRUE on success Line 3679  Returns:         TRUE on success
3679  */  */
3680    
3681  static BOOL  static BOOL
3682  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,  compile_branch(int *optionsptr, pcre_uchar **codeptr,
3683    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,    const pcre_uchar **ptrptr, int *errorcodeptr, pcre_int32 *firstcharptr,
3684    int cond_depth, compile_data *cd, int *lengthptr)    pcre_int32 *reqcharptr, branch_chain *bcptr, int cond_depth,
3685      compile_data *cd, int *lengthptr)
3686  {  {
3687  int repeat_type, op_type;  int repeat_type, op_type;
3688  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
3689  int bravalue = 0;  int bravalue = 0;
3690  int greedy_default, greedy_non_default;  int greedy_default, greedy_non_default;
3691  int firstbyte, reqbyte;  pcre_int32 firstchar, reqchar;
3692  int zeroreqbyte, zerofirstbyte;  pcre_int32 zeroreqchar, zerofirstchar;
3693  int req_caseopt, reqvary, tempreqvary;  pcre_int32 req_caseopt, reqvary, tempreqvary;
3694  int options = *optionsptr;               /* May change dynamically */  int options = *optionsptr;               /* May change dynamically */
3695  int after_manual_callout = 0;  int after_manual_callout = 0;
3696  int length_prevgroup = 0;  int length_prevgroup = 0;
3697  register int c;  register pcre_uint32 c;
3698  register uschar *code = *codeptr;  int escape;
3699  uschar *last_code = code;  register pcre_uchar *code = *codeptr;
3700  uschar *orig_code = code;  pcre_uchar *last_code = code;
3701  uschar *tempcode;  pcre_uchar *orig_code = code;
3702    pcre_uchar *tempcode;
3703  BOOL inescq = FALSE;  BOOL inescq = FALSE;
3704  BOOL groupsetfirstbyte = FALSE;  BOOL groupsetfirstchar = FALSE;
3705  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
3706  const uschar *tempptr;  const pcre_uchar *tempptr;
3707  const uschar *nestptr = NULL;  const pcre_uchar *nestptr = NULL;
3708  uschar *previous = NULL;  pcre_uchar *previous = NULL;
3709  uschar *previous_callout = NULL;  pcre_uchar *previous_callout = NULL;
3710  uschar *save_hwm = NULL;  pcre_uchar *save_hwm = NULL;
3711  uschar classbits[32];  pcre_uint8 classbits[32];
3712    
3713  /* 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
3714  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
3715  dynamically as we process the pattern. */  dynamically as we process the pattern. */
3716    
3717  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3718  BOOL class_utf8;  /* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */
3719  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf = (options & PCRE_UTF8) != 0;
3720  uschar *class_utf8data;  pcre_uchar utf_chars[6];
 uschar *class_utf8data_base;  
 uschar utf8_char[6];  
3721  #else  #else
3722  BOOL utf8 = FALSE;  BOOL utf = FALSE;
3723    #endif
3724    
3725    /* Helper variables for OP_XCLASS opcode (for characters > 255). We define
3726    class_uchardata always so that it can be passed to add_to_class() always,
3727    though it will not be used in non-UTF 8-bit cases. This avoids having to supply
3728    alternative calls for the different cases. */
3729    
3730    pcre_uchar *class_uchardata;
3731    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3732    BOOL xclass;
3733    pcre_uchar *class_uchardata_base;
3734  #endif  #endif
3735    
3736  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 3315  greedy_non_default = greedy_default ^ 1; Line 3744  greedy_non_default = greedy_default ^ 1;
3744    
3745  /* Initialize no first byte, no required byte. REQ_UNSET means "no char  /* Initialize no first byte, no required byte. REQ_UNSET means "no char
3746  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
3747  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
3748  find one.  find one.
3749    
3750  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
3751  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
3752  zerofirstbyte and zeroreqbyte when such a repeat is encountered. The individual  zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual
3753  item types that can be repeated set these backoff variables appropriately. */  item types that can be repeated set these backoff variables appropriately. */
3754    
3755  firstbyte = reqbyte = zerofirstbyte = zeroreqbyte = REQ_UNSET;  firstchar = reqchar = zerofirstchar = zeroreqchar = REQ_UNSET;
3756    
3757  /* The variable req_caseopt contains either the REQ_CASELESS value or zero,  /* The variable req_caseopt contains either the REQ_CASELESS value
3758  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
3759  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
3760  case status of the value. This is used only for ASCII characters. */  firstchar or reqchar variables to record the case status of the
3761    value. This is used only for ASCII characters. */
3762    
3763  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
3764    
3765  /* Switch on next character until the end of the branch */  /* Switch on next character until the end of the branch */
3766    
# Line 3342  for (;; ptr++) Line 3772  for (;; ptr++)
3772    BOOL is_quantifier;    BOOL is_quantifier;
3773    BOOL is_recurse;    BOOL is_recurse;
3774    BOOL reset_bracount;    BOOL reset_bracount;
3775    int class_charcount;    int class_has_8bitchar;
3776    int class_lastchar;    int class_one_char;
3777    int newoptions;    int newoptions;
3778    int recno;    int recno;
3779    int refsign;    int refsign;
3780    int skipbytes;    int skipbytes;
3781    int subreqbyte;    int subreqchar;
3782    int subfirstbyte;    int subfirstchar;
3783    int terminator;    int terminator;
3784    int mclength;    int mclength;
3785    int tempbracount;    int tempbracount;
3786    uschar mcbuffer[8];    int ec; // FIXMEchpe pcre_uint32
3787      pcre_uchar mcbuffer[8];
3788    
3789    /* Get next byte in the pattern */    /* Get next character in the pattern */
3790    
3791    c = *ptr;    c = *ptr;
3792    
# Line 3401  for (;; ptr++) Line 3832  for (;; ptr++)
3832        }        }
3833    
3834      *lengthptr += (int)(code - last_code);      *lengthptr += (int)(code - last_code);
3835      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, (int)(code - last_code),      DPRINTF(("length=%d added %d c=%c (0x%x)\n", *lengthptr,
3836        c));        (int)(code - last_code), c, c));
3837    
3838      /* 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
3839      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 3843  for (;; ptr++)
3843        {        {
3844        if (previous > orig_code)        if (previous > orig_code)
3845          {          {
3846          memmove(orig_code, previous, code - previous);          memmove(orig_code, previous, IN_UCHARS(code - previous));
3847          code -= previous - orig_code;          code -= previous - orig_code;
3848          previous = orig_code;          previous = orig_code;
3849          }          }
# Line 3481  for (;; ptr++) Line 3912  for (;; ptr++)
3912    
3913    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
3914      {      {
3915      if ((cd->ctypes[c] & ctype_space) != 0) continue;      if (MAX_255(*ptr) && (cd->ctypes[c] & ctype_space) != 0) continue;
3916      if (c == CHAR_NUMBER_SIGN)      if (c == CHAR_NUMBER_SIGN)
3917        {        {
3918        ptr++;        ptr++;
# Line 3489  for (;; ptr++) Line 3920  for (;; ptr++)
3920          {          {
3921          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
3922          ptr++;          ptr++;
3923  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3924          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
3925  #endif  #endif
3926          }          }
3927        if (*ptr != 0) continue;        if (*ptr != 0) continue;
# Line 3514  for (;; ptr++) Line 3945  for (;; ptr++)
3945      case 0:                        /* The branch terminates at string end */      case 0:                        /* The branch terminates at string end */
3946      case CHAR_VERTICAL_LINE:       /* or | or ) */      case CHAR_VERTICAL_LINE:       /* or | or ) */
3947      case CHAR_RIGHT_PARENTHESIS:      case CHAR_RIGHT_PARENTHESIS:
3948      *firstbyteptr = firstbyte;      *firstcharptr = firstchar;
3949      *reqbyteptr = reqbyte;      *reqcharptr = reqchar;
3950      *codeptr = code;      *codeptr = code;
3951      *ptrptr = ptr;      *ptrptr = ptr;
3952      if (lengthptr != NULL)      if (lengthptr != NULL)
# Line 3539  for (;; ptr++) Line 3970  for (;; ptr++)
3970      previous = NULL;      previous = NULL;
3971      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
3972        {        {
3973        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
3974        *code++ = OP_CIRCM;        *code++ = OP_CIRCM;
3975        }        }
3976      else *code++ = OP_CIRC;      else *code++ = OP_CIRC;
# Line 3551  for (;; ptr++) Line 3982  for (;; ptr++)
3982      break;      break;
3983    
3984      /* 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
3985      repeats. The value of reqbyte doesn't change either. */      repeats. The value of reqchar doesn't change either. */
3986    
3987      case CHAR_DOT:      case CHAR_DOT:
3988      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;      if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
3989      zerofirstbyte = firstbyte;      zerofirstchar = firstchar;
3990      zeroreqbyte = reqbyte;      zeroreqchar = reqchar;
3991      previous = code;      previous = code;
3992      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
3993      break;      break;
# Line 3611  for (;; ptr++) Line 4042  for (;; ptr++)
4042          {          {
4043          if (ptr[1] == CHAR_E)          if (ptr[1] == CHAR_E)
4044            ptr++;            ptr++;
4045          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)  
4046            ptr += 3;            ptr += 3;
4047          else          else
4048            break;            break;
# Line 3631  for (;; ptr++) Line 4061  for (;; ptr++)
4061          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
4062        {        {
4063        *code++ = negate_class? OP_ALLANY : OP_FAIL;        *code++ = negate_class? OP_ALLANY : OP_FAIL;
4064        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
4065        zerofirstbyte = firstbyte;        zerofirstchar = firstchar;
4066        break;        break;
4067        }        }
4068    
# Line 3642  for (;; ptr++) Line 4072  for (;; ptr++)
4072    
4073      should_flip_negation = FALSE;      should_flip_negation = FALSE;
4074    
4075      /* 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:
4076      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 <
4077      valued UTF-8 characters, we don't yet do any optimization. */      256 character; class_one_char will be 1 if the class contains just one
4078        character. */
4079    
4080      class_charcount = 0;      class_has_8bitchar = 0;
4081      class_lastchar = -1;      class_one_char = 0;
4082    
4083      /* 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
4084      temporary bit of memory, in case the class contains only 1 character (less      temporary bit of memory, in case the class contains fewer than two
4085      than 256), because in that case the compiled code doesn't use the bit map.      8-bit characters because in that case the compiled code doesn't use the bit
4086      */      map. */
4087    
4088      memset(classbits, 0, 32 * sizeof(uschar));      memset(classbits, 0, 32 * sizeof(pcre_uint8));
4089    
4090  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
4091      class_utf8 = FALSE;                       /* No chars >= 256 */      xclass = FALSE;
4092      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */      class_uchardata = code + LINK_SIZE + 2;   /* For XCLASS items */
4093      class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */      class_uchardata_base = class_uchardata;   /* Save the start */
4094  #endif  #endif
4095    
4096      /* 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 4099  for (;; ptr++)
4099    
4100      if (c != 0) do      if (c != 0) do
4101        {        {
4102        const uschar *oldptr;        const pcre_uchar *oldptr;
4103    
4104  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
4105        if (utf8 && c > 127)        if (utf && HAS_EXTRALEN(c))
4106          {                           /* Braces are required because the */          {                           /* Braces are required because the */
4107          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
4108          }          }
4109    #endif
4110    
4111        /* In the pre-compile phase, accumulate the length of any UTF-8 extra  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
4112          /* In the pre-compile phase, accumulate the length of any extra
4113        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
4114        contain a zillion UTF-8 characters no longer overwrite the work space        contain a zillion > 255 characters no longer overwrite the work space
4115        (which is on the stack). */        (which is on the stack). We have to remember that there was XCLASS data,
4116          however. */
4117        if (lengthptr != NULL)  
4118          {        if (lengthptr != NULL && class_uchardata > class_uchardata_base)
4119          *lengthptr += (int)(class_utf8data - class_utf8data_base);          {
4120          class_utf8data = class_utf8data_base;          xclass = TRUE;
4121            *lengthptr += class_uchardata - class_uchardata_base;
4122            class_uchardata = class_uchardata_base;
4123          }          }
   
4124  #endif  #endif
4125    
4126        /* Inside \Q...\E everything is literal except \E */        /* Inside \Q...\E everything is literal except \E */
# Line 3714  for (;; ptr++) Line 4148  for (;; ptr++)
4148          {          {
4149          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
4150          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
4151          register const uschar *cbits = cd->cbits;          register const pcre_uint8 *cbits = cd->cbits;
4152          uschar pbits[32];          pcre_uint8 pbits[32];
4153    
4154          if (ptr[1] != CHAR_COLON)          if (ptr[1] != CHAR_COLON)
4155            {            {
# Line 3742  for (;; ptr++) Line 4176  for (;; ptr++)
4176          alpha. This relies on the fact that the class table starts with          alpha. This relies on the fact that the class table starts with
4177          alpha, lower, upper as the first 3 entries. */          alpha, lower, upper as the first 3 entries. */
4178    
4179          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)
4180            posix_class = 0;            posix_class = 0;
4181    
4182          /* When PCRE_UCP is set, some of the POSIX classes are converted to          /* When PCRE_UCP is set, some of the POSIX classes are converted to
# Line 3770  for (;; ptr++) Line 4204  for (;; ptr++)
4204          /* Copy in the first table (always present) */          /* Copy in the first table (always present) */
4205    
4206          memcpy(pbits, cbits + posix_class_maps[posix_class],          memcpy(pbits, cbits + posix_class_maps[posix_class],
4207            32 * sizeof(uschar));            32 * sizeof(pcre_uint8));
4208    
4209          /* If there is a second table, add or remove it as required. */          /* If there is a second table, add or remove it as required. */
4210    
# Line 3785  for (;; ptr++) Line 4219  for (;; ptr++)
4219              for (c = 0; c < 32; c++) pbits[c] &= ~cbits[c + taboffset];              for (c = 0; c < 32; c++) pbits[c] &= ~cbits[c + taboffset];
4220            }            }
4221    
4222          /* Not see if we need to remove any special characters. An option          /* Now see if we need to remove any special characters. An option
4223          value of 1 removes vertical space and 2 removes underscore. */          value of 1 removes vertical space and 2 removes underscore. */
4224    
4225          if (tabopt < 0) tabopt = -tabopt;          if (tabopt < 0) tabopt = -tabopt;
# Line 3801  for (;; ptr++) Line 4235  for (;; ptr++)
4235            for (c = 0; c < 32; c++) classbits[c] |= pbits[c];            for (c = 0; c < 32; c++) classbits[c] |= pbits[c];
4236    
4237          ptr = tempptr + 1;          ptr = tempptr + 1;
4238          class_charcount = 10;  /* Set > 1; assumes more than 1 per class */          /* Every class contains at least one < 256 character. */
4239            class_has_8bitchar = 1;
4240            /* Every class contains at least two characters. */
4241            class_one_char = 2;
4242          continue;    /* End of POSIX syntax handling */          continue;    /* End of POSIX syntax handling */
4243          }          }
4244    
4245        /* Backslash may introduce a single character, or it may introduce one        /* Backslash may introduce a single character, or it may introduce one
4246        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
4247        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
4248        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
4249        class_charcount bigger than one. Unrecognized escapes fall through and        speculatively set both class_has_8bitchar and class_one_char bigger
4250        are either treated as literal characters (by default), or are faulted if        than one. Unrecognized escapes fall through and are either treated
4251          as literal characters (by default), or are faulted if
4252        PCRE_EXTRA is set. */        PCRE_EXTRA is set. */
4253    
4254        if (c == CHAR_BACKSLASH)        if (c == CHAR_BACKSLASH)
4255          {          {
4256          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          escape = check_escape(&ptr, &ec, errorcodeptr, cd->bracount, options, TRUE);
4257    
4258          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
4259    
4260          if (-c == ESC_b) c = CHAR_BS;    /* \b is backspace in a class */          if (escape == 0)
4261          else if (-c == ESC_N)            /* \N is not supported in a class */            c = ec;
4262            else if (escape == ESC_b) c = CHAR_BS; /* \b is backspace in a class */
4263            else if (escape == ESC_N)            /* \N is not supported in a class */
4264            {            {
4265            *errorcodeptr = ERR71;            *errorcodeptr = ERR71;
4266            goto FAILED;            goto FAILED;
4267            }            }
4268          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (escape == ESC_Q)            /* Handle start of quoted string */
4269            {            {
4270            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
4271              {              {
# Line 3833  for (;; ptr++) Line 4274  for (;; ptr++)
4274            else inescq = TRUE;            else inescq = TRUE;
4275            continue;            continue;
4276            }            }
4277          else if (-c == ESC_E) continue;  /* Ignore orphan \E */          else if (escape == ESC_E) continue;  /* Ignore orphan \E */
4278    
4279          if (c < 0)          else
4280            {            {
4281            register const uschar *cbits = cd->cbits;            register const pcre_uint8 *cbits = cd->cbits;
4282            class_charcount += 2;     /* Greater than 1 is what matters */            /* Every class contains at least two < 256 characters. */
4283              class_has_8bitchar++;
4284              /* Every class contains at least two characters. */
4285              class_one_char += 2;
4286    
4287            switch (-c)            switch (escape)
4288              {              {
4289  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4290              case ESC_du:     /* These are the values given for \d etc */              case ESC_du:     /* These are the values given for \d etc */
# Line 3850  for (;; ptr++) Line 4294  for (;; ptr++)
4294              case ESC_su:     /* of the default ASCII testing. */              case ESC_su:     /* of the default ASCII testing. */
4295              case ESC_SU:              case ESC_SU:
4296              nestptr = ptr;              nestptr = ptr;
4297              ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */              ptr = substitutes[escape - ESC_DU] - 1;  /* Just before substitute */
4298              class_charcount -= 2;                /* Undo! */              class_has_8bitchar--;                /* Undo! */
4299              continue;              continue;
4300  #endif  #endif
4301              case ESC_d:              case ESC_d:
# Line 3874  for (;; ptr++) Line 4318  for (;; ptr++)
4318    
4319              /* Perl 5.004 onwards omits VT from \s, but we must preserve it              /* Perl 5.004 onwards omits VT from \s, but we must preserve it
4320              if it was previously set by something earlier in the character              if it was previously set by something earlier in the character
4321              class. */              class. Luckily, the value of CHAR_VT is 0x0b in both ASCII and
4322                EBCDIC, so we lazily just adjust the appropriate bit. */
4323    
4324              case ESC_s:              case ESC_s:
4325              classbits[0] |= cbits[cbit_space];              classbits[0] |= cbits[cbit_space];
# Line 3887  for (;; ptr++) Line 4332  for (;; ptr++)
4332              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
4333              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
4334              continue;              continue;
4335    
4336                /* The rest apply in both UCP and non-UCP cases. */
4337    
4338              case ESC_h:              case ESC_h:
4339              SETBIT(classbits, 0x09); /* VT */              (void)add_list_to_class(classbits, &class_uchardata, options, cd,
4340              SETBIT(classbits, 0x20); /* SPACE */                PRIV(hspace_list), NOTACHAR);
             SETBIT(classbits, 0xa0); /* NSBP */  
 #ifdef SUPPORT_UTF8  
             if (utf8)  
               {  
               class_utf8 = TRUE;  
               *class_utf8data++ = XCL_SINGLE;  
               class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);  
               *class_utf8data++ = XCL_SINGLE;  
               class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);  
               *class_utf8data++ = XCL_RANGE;  
               class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);  
               class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);  
               *class_utf8data++ = XCL_SINGLE;  
               class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);  
               *class_utf8data++ = XCL_SINGLE;  
               class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);  
               *class_utf8data++ = XCL_SINGLE;  
               class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);  
               }  
 #endif  
4341              continue;              continue;
4342    
4343              case ESC_H:              case ESC_H:
4344              for (c = 0; c < 32; c++)              (void)add_not_list_to_class(classbits, &class_uchardata, options,
4345                {                cd, PRIV(hspace_list));
               int x = 0xff;  
               switch (c)  
                 {  
                 case 0x09/8: x ^= 1 << (0x09%8); break;  
                 case 0x20/8: x ^= 1 << (0x20%8); break;  
                 case 0xa0/8: x ^= 1 << (0xa0%8); break;  
                 default: break;  
                 }  
               classbits[c] |= x;  
               }  
   
 #ifdef SUPPORT_UTF8  
             if (utf8)  
               {  
               class_utf8 = TRUE;  
               *class_utf8data++ = XCL_RANGE;  
               class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);  
               class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);  
               *class_utf8data++ = XCL_RANGE;  
               class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);  
               class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);  
               *class_utf8data++ = XCL_RANGE;  
               class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);  
               class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);  
               *class_utf8data++ = XCL_RANGE;  
               class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);  
               class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);  
               *class_utf8data++ = XCL_RANGE;  
               class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);  
               class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);  
               *class_utf8data++ = XCL_RANGE;  
               class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);  
               class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);  
               *class_utf8data++ = XCL_RANGE;  
               class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);  
               class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);  
               }  
 #endif  
4346              continue;              continue;
4347    
4348              case ESC_v:              case ESC_v:
4349              SETBIT(classbits, 0x0a); /* LF */              (void)add_list_to_class(classbits, &class_uchardata, options, cd,
4350              SETBIT(classbits, 0x0b); /* VT */                PRIV(vspace_list), NOTACHAR);
             SETBIT(classbits, 0x0c); /* FF */  
             SETBIT(classbits, 0x0d); /* CR */  
             SETBIT(classbits, 0x85); /* NEL */  
 #ifdef SUPPORT_UTF8  
             if (utf8)  
               {  
               class_utf8 = TRUE;  
               *class_utf8data++ = XCL_RANGE;  
               class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);  
               class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);  
               }  
 #endif  
4351              continue;              continue;
4352    
4353              case ESC_V:              case ESC_V:
4354              for (c = 0; c < 32; c++)              (void)add_not_list_to_class(classbits, &class_uchardata, options,
4355                {                cd, PRIV(vspace_list));
               int x = 0xff;  
               switch (c)  
                 {  
                 case 0x0a/8: x ^= 1 << (0x0a%8);  
                              x ^= 1 << (0x0b%8);  
                              x ^= 1 << (0x0c%8);  
                              x ^= 1 << (0x0d%8);  
                              break;  
                 case 0x85/8: x ^= 1 << (0x85%8); break;  
                 default: break;  
                 }  
               classbits[c] |= x;  
               }  
   
 #ifdef SUPPORT_UTF8  
             if (utf8)  
               {  
               class_utf8 = TRUE;  
               *class_utf8data++ = XCL_RANGE;  
               class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);  
               class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);  
               *class_utf8data++ = XCL_RANGE;  
               class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);  
               class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);  
               }  
 #endif  
4356              continue;              continue;
4357    
4358  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 4012  for (;; ptr++) Line 4363  for (;; ptr++)
4363                int pdata;                int pdata;
4364                int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);                int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
4365                if (ptype < 0) goto FAILED;                if (ptype < 0) goto FAILED;
4366                class_utf8 = TRUE;                *class_uchardata++ = ((escape == ESC_p) != negated)?
               *class_utf8data++ = ((-c == ESC_p) != negated)?  
4367                  XCL_PROP : XCL_NOTPROP;                  XCL_PROP : XCL_NOTPROP;
4368                *class_utf8data++ = ptype;                *class_uchardata++ = ptype;
4369                *class_utf8data++ = pdata;                *class_uchardata++ = pdata;
4370                class_charcount -= 2;   /* Not a < 256 character */                class_has_8bitchar--;                /* Undo! */
4371                continue;                continue;
4372                }                }
4373  #endif  #endif
# Line 4031  for (;; ptr++) Line 4381  for (;; ptr++)
4381                *errorcodeptr = ERR7;                *errorcodeptr = ERR7;
4382                goto FAILED;                goto FAILED;
4383                }                }
4384              class_charcount -= 2;  /* Undo the default count from above */              class_has_8bitchar--;    /* Undo the speculative increase. */
4385              c = *ptr;              /* Get the final character and fall through */              class_one_char -= 2;     /* Undo the speculative increase. */
4386                c = *ptr;                /* Get the final character and fall through */
4387              break;              break;
4388              }              }
4389            }            }
4390    
4391          /* Fall through if we have a single character (c >= 0). This may be          /* Fall through if the escape just defined a single character (c >= 0).
4392          greater than 256 in UTF-8 mode. */          This may be greater than 256. */
4393    
4394            escape = 0;
4395    
4396          }   /* End of backslash handling */          }   /* End of backslash handling */
4397    
4398        /* A single character may be followed by '-' to form a range. However,        /* A character may be followed by '-' to form a range. However, Perl does
4399        Perl does not permit ']' to be the end of the range. A '-' character        not permit ']' to be the end of the range. A '-' character at the end is
4400        at the end is treated as a literal. Perl ignores orphaned \E sequences        treated as a literal. Perl ignores orphaned \E sequences entirely. The
4401        entirely. The code for handling \Q and \E is messy. */        code for handling \Q and \E is messy. */
4402    
4403        CHECK_RANGE:        CHECK_RANGE:
4404        while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)        while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
# Line 4053  for (;; ptr++) Line 4406  for (;; ptr++)
4406          inescq = FALSE;          inescq = FALSE;
4407          ptr += 2;          ptr += 2;
4408          }          }
   
4409        oldptr = ptr;        oldptr = ptr;
4410    
4411        /* Remember \r or \n */        /* Remember if \r or \n were explicitly used */
4412    
4413        if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;        if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
4414    
# Line 4079  for (;; ptr++) Line 4431  for (;; ptr++)
4431            inescq = TRUE;            inescq = TRUE;
4432            break;            break;
4433            }            }
4434    
4435            /* Minus (hyphen) at the end of a class is treated as a literal, so put
4436            back the pointer and jump to handle the character that preceded it. */
4437    
4438          if (*ptr == 0 || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))          if (*ptr == 0 || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
4439            {            {
4440            ptr = oldptr;            ptr = oldptr;
4441            goto LONE_SINGLE_CHARACTER;            goto CLASS_SINGLE_CHARACTER;
4442            }            }
4443    
4444            /* Otherwise, we have a potential range; pick up the next character */
4445    
4446  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4447          if (utf8)          if (utf)
4448            {                           /* Braces are required because the */            {                           /* Braces are required because the */
4449            GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */            GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */
4450            }            }
# Line 4101  for (;; ptr++) Line 4458  for (;; ptr++)
4458    
4459          if (!inescq && d == CHAR_BACKSLASH)          if (!inescq && d == CHAR_BACKSLASH)
4460            {            {
4461            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            int descape;
4462              descape = check_escape(&ptr, &d, errorcodeptr, cd->bracount, options, TRUE);
4463            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
4464    
4465            /* \b is backspace; any other special means the '-' was literal */            /* \b is backspace; any other special means the '-' was literal. */
4466    
4467            if (d < 0)            if (descape != 0)
4468              {              {
4469              if (d == -ESC_b) d = CHAR_BS; else              if (descape == ESC_b) d = CHAR_BS; else
4470                {                {
4471                ptr = oldptr;                ptr = oldptr;
4472                goto LONE_SINGLE_CHARACTER;  /* A few lines below */                goto CLASS_SINGLE_CHARACTER;  /* A few lines below */
4473                }                }
4474              }              }
4475            }            }
4476    
4477          /* Check that the two values are in the correct order. Optimize          /* Check that the two values are in the correct order. Optimize
4478          one-character ranges */          one-character ranges. */
4479    
4480          if (d < c)          if (d < c)
4481            {            {
4482            *errorcodeptr = ERR8;            *errorcodeptr = ERR8;
4483            goto FAILED;            goto FAILED;
4484            }            }
4485            if (d == c) goto CLASS_SINGLE_CHARACTER;  /* A few lines below */
4486    
4487          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */          /* We have found a character range, so single character optimizations
4488            cannot be done anymore. Any value greater than 1 indicates that there
4489            is more than one character. */
4490    
4491            class_one_char = 2;
4492    
4493          /* Remember \r or \n */          /* Remember an explicit \r or \n, and add the range to the class. */
4494    
4495          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
4496    
4497          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless          class_has_8bitchar +=
4498          matching, we have to use an XCLASS with extra data items. Caseless            add_to_class(classbits, &class_uchardata, options, cd, c, d);
4499          matching for characters > 127 is available only if UCP support is  
         available. */  
   
 #ifdef SUPPORT_UTF8  
         if (utf8 && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127)))  
           {  
           class_utf8 = TRUE;  
   
           /* With UCP support, we can find the other case equivalents of  
           the relevant characters. There may be several ranges. Optimize how  
           they fit with the basic range. */  
   
 #ifdef SUPPORT_UCP  
           if ((options & PCRE_CASELESS) != 0)  
             {  
             unsigned int occ, ocd;  
             unsigned int cc = c;  
             unsigned int origd = d;  
             while (get_othercase_range(&cc, origd, &occ, &ocd))  
               {  
               if (occ >= (unsigned int)c &&  
                   ocd <= (unsigned int)d)  
                 continue;                          /* Skip embedded ranges */  
   
               if (occ < (unsigned int)c  &&  
                   ocd >= (unsigned int)c - 1)      /* Extend the basic range */  
                 {                                  /* if there is overlap,   */  
                 c = occ;                           /* noting that if occ < c */  
                 continue;                          /* we can't have ocd > d  */  
                 }                                  /* because a subrange is  */  
               if (ocd > (unsigned int)d &&  
                   occ <= (unsigned int)d + 1)      /* always shorter than    */  
                 {                                  /* the basic range.       */  
                 d = ocd;  
                 continue;  
                 }  
   
               if (occ == ocd)  
                 {  
                 *class_utf8data++ = XCL_SINGLE;  
                 }  
               else  
                 {  
                 *class_utf8data++ = XCL_RANGE;  
                 class_utf8data += _pcre_ord2utf8(occ, class_utf8data);  
                 }  
               class_utf8data += _pcre_ord2utf8(ocd, class_utf8data);  
               }  
             }  
 #endif  /* SUPPORT_UCP */  
   
           /* Now record the original range, possibly modified for UCP caseless  
           overlapping ranges. */  
   
           *class_utf8data++ = XCL_RANGE;  
           class_utf8data += _pcre_ord2utf8(c, class_utf8data);  
           class_utf8data += _pcre_ord2utf8(d, class_utf8data);  
   
           /* With UCP support, we are done. Without UCP support, there is no  
           caseless matching for UTF-8 characters > 127; we can use the bit map  
           for the smaller ones. */  
   
 #ifdef SUPPORT_UCP  
           continue;    /* With next character in the class */  
 #else  
           if ((options & PCRE_CASELESS) == 0 || c > 127) continue;  
   
           /* Adjust upper limit and fall through to set up the map */  
   
           d = 127;  
   
 #endif  /* SUPPORT_UCP */  
           }  
 #endif  /* SUPPORT_UTF8 */  
   
         /* We use the bit map for all cases when not in UTF-8 mode; else  
         ranges that lie entirely within 0-127 when there is UCP support; else  
         for partial ranges without UCP support. */  
   
         class_charcount += d - c + 1;  
         class_lastchar = d;  
   
         /* We can save a bit of time by skipping this in the pre-compile. */  
   
         if (lengthptr == NULL) for (; c <= d; c++)  
           {  
           classbits[c/8] |= (1 << (c&7));  
           if ((options & PCRE_CASELESS) != 0)  
             {  
             int uc = cd->fcc[c];           /* flip case */  
             classbits[uc/8] |= (1 << (uc&7));  
             }  
           }  
   
4500          continue;   /* Go get the next char in the class */          continue;   /* Go get the next char in the class */
4501          }          }
4502    
4503        /* Handle a lone single character - we can get here for a normal        /* Handle a single character - we can get here for a normal non-escape
4504        non-escape char, or after \ that introduces a single character or for an        char, or after \ that introduces a single character or for an apparent
4505        apparent range that isn't. */        range that isn't. Only the value 1 matters for class_one_char, so don't
4506          increase it if it is already 2 or more ... just in case there's a class
4507          with a zillion characters in it. */
4508    
4509          CLASS_SINGLE_CHARACTER:
4510          if (class_one_char < 2) class_one_char++;
4511    
4512          /* If class_one_char is 1, we have the first single character in the
4513          class, and there have been no prior ranges, or XCLASS items generated by
4514          escapes. If this is the final character in the class, we can optimize by
4515          turning the item into a 1-character OP_CHAR[I] if it's positive, or
4516          OP_NOT[I] if it's negative. In the positive case, it can cause firstchar
4517          to be set. Otherwise, there can be no first char if this item is first,
4518          whatever repeat count may follow. In the case of reqchar, save the
4519          previous value for reinstating. */
4520    
4521        LONE_SINGLE_CHARACTER:        if (class_one_char == 1 && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
   
       /* Handle a character that cannot go in the bit map */  
   
 #ifdef SUPPORT_UTF8  
       if (utf8 && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127)))  
4522          {          {
4523          class_utf8 = TRUE;          ptr++;
4524          *class_utf8data++ = XCL_SINGLE;          zeroreqchar = reqchar;
         class_utf8data += _pcre_ord2utf8(c, class_utf8data);  
4525    
4526  #ifdef SUPPORT_UCP          if (negate_class)
         if ((options & PCRE_CASELESS) != 0)  
4527            {            {
4528            unsigned int othercase;  #ifdef SUPPORT_UCP
4529            if ((othercase = UCD_OTHERCASE(c)) != c)              // FIXMEchpe pcreuint32?
4530              int d;
4531    #endif
4532              if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
4533              zerofirstchar = firstchar;
4534    
4535              /* For caseless UTF-8 mode when UCP support is available, check
4536              whether this character has more than one other case. If so, generate
4537              a special OP_NOTPROP item instead of OP_NOTI. */
4538    
4539    #ifdef SUPPORT_UCP
4540              if (utf && (options & PCRE_CASELESS) != 0 &&
4541                  (d = UCD_CASESET(c)) != 0)
4542              {              {
4543              *class_utf8data++ = XCL_SINGLE;              *code++ = OP_NOTPROP;
4544              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);              *code++ = PT_CLIST;
4545                *code++ = d;
4546              }              }
4547              else
4548    #endif
4549              /* Char has only one other case, or UCP not available */
4550    
4551                {
4552                *code++ = ((options & PCRE_CASELESS) != 0)? OP_NOTI: OP_NOT;
4553    #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
4554                if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
4555                  code += PRIV(ord2utf)(c, code);
4556                else
4557    #endif
4558                  *code++ = c;
4559                }
4560    
4561              /* We are finished with this character class */
4562    
4563              goto END_CLASS;
4564            }            }
 #endif  /* SUPPORT_UCP */  
4565    
4566          }          /* For a single, positive character, get the value into mcbuffer, and
4567        else          then we can handle this with the normal one-character code. */
 #endif  /* SUPPORT_UTF8 */  
4568    
4569        /* Handle a single-byte character */  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
4570          {          if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
4571          classbits[c/8] |= (1 << (c&7));            mclength = PRIV(ord2utf)(c, mcbuffer);
4572          if ((options & PCRE_CASELESS) != 0)          else
4573    #endif
4574            {            {
4575            c = cd->fcc[c];   /* flip case */            mcbuffer[0] = c;
4576            classbits[c/8] |= (1 << (c&7));            mclength = 1;
4577            }            }
4578          class_charcount++;          goto ONE_CHAR;
4579          class_lastchar = c;          }       /* End of 1-char optimization */
4580          }  
4581          /* There is more than one character in the class, or an XCLASS item
4582          has been generated. Add this character to the class. */
4583    
4584          class_has_8bitchar +=
4585            add_to_class(classbits, &class_uchardata, options, cd, c, c);
4586        }        }
4587    
4588      /* Loop until ']' reached. This "while" is the end of the "do" far above.      /* Loop until ']' reached. This "while" is the end of the "do" far above.
# Line 4291  for (;; ptr++) Line 4602  for (;; ptr++)
4602        goto FAILED;        goto FAILED;
4603        }        }
4604    
4605      /* If class_charcount is 1, we saw precisely one character whose value is      /* We will need an XCLASS if data has been placed in class_uchardata. In
4606      less than 256. As long as there were no characters >= 128 and there was no      the second phase this is a sufficient test. However, in the pre-compile
4607      use of \p or \P, in other words, no use of any XCLASS features, we can      phase, class_uchardata gets emptied to prevent workspace overflow, so it
4608      optimize.      only if the very last character in the class needs XCLASS will it contain
4609        anything at this point. For this reason, xclass gets set TRUE above when
4610      In UTF-8 mode, we can optimize the negative case only if there were no      uchar_classdata is emptied, and that's why this code is the way it is here
4611      characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR      instead of just doing a test on class_uchardata below. */
4612      operate on single-bytes characters only. This is an historical hangover.  
4613      Maybe one day we can tidy these opcodes to handle multi-byte characters.  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
4614        if (class_uchardata > class_uchardata_base) xclass = TRUE;
4615      The optimization throws away the bit map. We turn the item into a  #endif
4616      1-character OP_CHAR[I] if it's positive, or OP_NOT[I] if it's negative.  
4617      Note that OP_NOT[I] does not support multibyte characters. In the positive      /* If this is the first thing in the branch, there can be no first char
4618      case, it can cause firstbyte to be set. Otherwise, there can be no first      setting, whatever the repeat count. Any reqchar setting must remain
4619      char if this item is first, whatever repeat count may follow. In the case      unchanged after any kind of repeat. */
4620      of reqbyte, save the previous value for reinstating. */  
4621        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
4622  #ifdef SUPPORT_UTF8      zerofirstchar = firstchar;
4623      if (class_charcount == 1 && !class_utf8 &&      zeroreqchar = reqchar;
       (!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;  
4624    
4625      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
4626      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 4630  for (;; ptr++)
4630      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
4631      actual compiled code. */      actual compiled code. */
4632    
4633  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4634      if (class_utf8 && (!should_flip_negation || (options & PCRE_UCP) != 0))      if (xclass && (!should_flip_negation || (options & PCRE_UCP) != 0))
4635    #elif !defined COMPILE_PCRE8
4636        if (xclass && !should_flip_negation)
4637    #endif
4638    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
4639        {        {
4640        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */        *class_uchardata++ = XCL_END;    /* Marks the end of extra data */
4641        *code++ = OP_XCLASS;        *code++ = OP_XCLASS;
4642        code += LINK_SIZE;        code += LINK_SIZE;
4643        *code = negate_class? XCL_NOT : 0;        *code = negate_class? XCL_NOT:0;
4644    
4645        /* 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;
4646        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. */
4647    
4648        if (class_charcount > 0)        if (class_has_8bitchar > 0)
4649          {          {
4650          *code++ |= XCL_MAP;          *code++ |= XCL_MAP;
4651          memmove(code + 32, code, class_utf8data - code);          memmove(code + (32 / sizeof(pcre_uchar)), code,
4652              IN_UCHARS(class_uchardata - code));
4653          memcpy(code, classbits, 32);          memcpy(code, classbits, 32);
4654          code = class_utf8data + 32;          code = class_uchardata + (32 / sizeof(pcre_uchar));
4655          }          }
4656        else code = class_utf8data;        else code = class_uchardata;
4657    
4658        /* Now fill in the complete length of the item */        /* Now fill in the complete length of the item */
4659    
# Line 4394  for (;; ptr++) Line 4669  for (;; ptr++)
4669      negating it if necessary. */      negating it if necessary. */
4670    
4671      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
4672      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  
4673        {        {
4674          if (negate_class)
4675            for (c = 0; c < 32; c++) classbits[c] = ~classbits[c];
4676        memcpy(code, classbits, 32);        memcpy(code, classbits, 32);
4677        }        }
4678      code += 32;      code += 32 / sizeof(pcre_uchar);
4679    
4680        END_CLASS:
4681      break;      break;
4682    
4683    
# Line 4440  for (;; ptr++) Line 4714  for (;; ptr++)
4714    
4715      if (repeat_min == 0)      if (repeat_min == 0)
4716        {        {
4717        firstbyte = zerofirstbyte;    /* Adjust for zero repeat */        firstchar = zerofirstchar;    /* Adjust for zero repeat */
4718        reqbyte = zeroreqbyte;        /* Ditto */        reqchar = zeroreqchar;        /* Ditto */
4719        }        }
4720    
4721      /* Remember whether this is a variable length repeat */      /* Remember whether this is a variable length repeat */
# Line 4483  for (;; ptr++) Line 4757  for (;; ptr++)
4757    
4758      if (*previous == OP_RECURSE)      if (*previous == OP_RECURSE)
4759        {        {
4760        memmove(previous + 1 + LINK_SIZE, previous, 1 + LINK_SIZE);        memmove(previous + 1 + LINK_SIZE, previous, IN_UCHARS(1 + LINK_SIZE));
4761        *previous = OP_ONCE;        *previous = OP_ONCE;
4762        PUT(previous, 1, 2 + 2*LINK_SIZE);        PUT(previous, 1, 2 + 2*LINK_SIZE);
4763        previous[2 + 2*LINK_SIZE] = OP_KET;        previous[2 + 2*LINK_SIZE] = OP_KET;
# Line 4504  for (;; ptr++) Line 4778  for (;; ptr++)
4778    
4779      /* Now handle repetition for the different types of item. */      /* Now handle repetition for the different types of item. */
4780    
4781      /* If previous was a character match, abolish the item and generate a      /* If previous was a character or negated character match, abolish the item
4782      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
4783      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
4784      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
4785      instead.  */      into firstchar instead.  */
4786    
4787      if (*previous == OP_CHAR || *previous == OP_CHARI)      if (*previous == OP_CHAR || *previous == OP_CHARI
4788            || *previous == OP_NOT || *previous == OP_NOTI)
4789        {        {
4790        op_type = (*previous == OP_CHAR)? 0 : OP_STARI - OP_STAR;        switch (*previous)
4791            {
4792            default: /* Make compiler happy. */
4793            case OP_CHAR:  op_type = OP_STAR - OP_STAR; break;
4794            case OP_CHARI: op_type = OP_STARI - OP_STAR; break;
4795            case OP_NOT:   op_type = OP_NOTSTAR - OP_STAR; break;
4796            case OP_NOTI:  op_type = OP_NOTSTARI - OP_STAR; break;
4797            }
4798    
4799        /* 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
4800        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
4801        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
4802        length rather than a small character. */        it's a length rather than a small character. */
4803    
4804  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
4805        if (utf8 && (code[-1] & 0x80) != 0)        if (utf && NOT_FIRSTCHAR(code[-1]))
4806          {          {
4807          uschar *lastchar = code - 1;          pcre_uchar *lastchar = code - 1;
4808          while((*lastchar & 0xc0) == 0x80) lastchar--;          BACKCHAR(lastchar);
4809          c = (int)(code - lastchar);     /* Length of UTF-8 character */          c = (int)(code - lastchar);     /* Length of UTF-8 character */
4810          memcpy(utf8_char, lastchar, c); /* Save the char */          memcpy(utf_chars, lastchar, IN_UCHARS(c)); /* Save the char */
4811          c |= 0x80;                      /* Flag c as a length */          c |= UTF_LENGTH;                /* Flag c as a length */
4812          }          }
4813        else        else
4814  #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. */  
4815    
4816          /* Handle the case of a single charater - either with no UTF support, or
4817          with UTF disabled, or for a single character UTF character. */
4818          {          {
4819          c = code[-1];          c = code[-1];
4820          if (repeat_min > 1) reqbyte = c | req_caseopt | cd->req_varyopt;          if (*previous <= OP_CHARI && repeat_min > 1)
4821              reqchar = c | req_caseopt | cd->req_varyopt;
4822          }          }
4823    
4824        /* 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 4828  for (;; ptr++)
4828    
4829        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4830            repeat_max < 0 &&            repeat_max < 0 &&
4831            check_auto_possessive(previous, utf8, ptr + 1, options, cd))            check_auto_possessive(previous, utf, ptr + 1, options, cd))
4832          {          {
4833          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4834          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 4555  for (;; ptr++) Line 4837  for (;; ptr++)
4837        goto OUTPUT_SINGLE_REPEAT;   /* Code shared with single character types */        goto OUTPUT_SINGLE_REPEAT;   /* Code shared with single character types */
4838        }        }
4839    
     /* 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;  
       }  
   
4840      /* 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
4841      create a suitable repeat item. The code is shared with single-character      create a suitable repeat item. The code is shared with single-character
4842      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 4846  for (;; ptr++)
4846    
4847      else if (*previous < OP_EODN)      else if (*previous < OP_EODN)
4848        {        {
4849        uschar *oldcode;        pcre_uchar *oldcode;
4850        int prop_type, prop_value;        int prop_type, prop_value;
4851        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */
4852        c = *previous;        c = *previous;
4853    
4854        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4855            repeat_max < 0 &&            repeat_max < 0 &&
4856            check_auto_possessive(previous, utf8, ptr + 1, options, cd))            check_auto_possessive(previous, utf, ptr + 1, options, cd))
4857          {          {
4858          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4859          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 4671  for (;; ptr++) Line 4933  for (;; ptr++)
4933          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
4934          Unicode property match, there are two extra bytes that define the          Unicode property match, there are two extra bytes that define the
4935          required property. In UTF-8 mode, long characters have their length in          required property. In UTF-8 mode, long characters have their length in
4936          c, with the 0x80 bit as a flag. */          c, with the UTF_LENGTH bit as a flag. */
4937    
4938          if (repeat_max < 0)          if (repeat_max < 0)
4939            {            {
4940  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
4941            if (utf8 && c >= 128)            if (utf && (c & UTF_LENGTH) != 0)
4942              {              {
4943              memcpy(code, utf8_char, c & 7);              memcpy(code, utf_chars, IN_UCHARS(c & 7));
4944              code += c & 7;              code += c & 7;
4945              }              }
4946            else            else
# Line 4700  for (;; ptr++) Line 4962  for (;; ptr++)
4962    
4963          else if (repeat_max != repeat_min)          else if (repeat_max != repeat_min)
4964            {            {
4965  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
4966            if (utf8 && c >= 128)            if (utf && (c & UTF_LENGTH) != 0)
4967              {              {
4968              memcpy(code, utf8_char, c & 7);              memcpy(code, utf_chars, IN_UCHARS(c & 7));
4969              code += c & 7;              code += c & 7;
4970              }              }
4971            else            else
# Line 4730  for (;; ptr++) Line 4992  for (;; ptr++)
4992    
4993        /* The character or character type itself comes last in all cases. */        /* The character or character type itself comes last in all cases. */
4994    
4995  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
4996        if (utf8 && c >= 128)        if (utf && (c & UTF_LENGTH) != 0)
4997          {          {
4998          memcpy(code, utf8_char, c & 7);          memcpy(code, utf_chars, IN_UCHARS(c & 7));
4999          code += c & 7;          code += c & 7;
5000          }          }
5001        else        else
# Line 4757  for (;; ptr++) Line 5019  for (;; ptr++)
5019    
5020      else if (*previous == OP_CLASS ||      else if (*previous == OP_CLASS ||
5021               *previous == OP_NCLASS ||               *previous == OP_NCLASS ||
5022  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
5023               *previous == OP_XCLASS ||               *previous == OP_XCLASS ||
5024  #endif  #endif
5025               *previous == OP_REF ||               *previous == OP_REF ||
# Line 4806  for (;; ptr++) Line 5068  for (;; ptr++)
5068        {        {
5069        register int i;        register int i;
5070        int len = (int)(code - previous);        int len = (int)(code - previous);
5071        uschar *bralink = NULL;        pcre_uchar *bralink = NULL;
5072        uschar *brazeroptr = NULL;        pcre_uchar *brazeroptr = NULL;
5073    
5074        /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so        /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so
5075        we just ignore the repeat. */        we just ignore the repeat. */
# Line 4860  for (;; ptr++) Line 5122  for (;; ptr++)
5122          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
5123            {            {
5124            *code = OP_END;            *code = OP_END;
5125            adjust_recurse(previous, 1, utf8, cd, save_hwm);            adjust_recurse(previous, 1, utf, cd, save_hwm);
5126            memmove(previous+1, previous, len);            memmove(previous + 1, previous, IN_UCHARS(len));
5127            code++;            code++;
5128            if (repeat_max == 0)            if (repeat_max == 0)
5129              {              {
# Line 4884  for (;; ptr++) Line 5146  for (;; ptr++)
5146            {            {
5147            int offset;            int offset;
5148            *code = OP_END;            *code = OP_END;
5149            adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd, save_hwm);            adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, save_hwm);
5150            memmove(previous + 2 + LINK_SIZE, previous, len);            memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len));
5151            code += 2 + LINK_SIZE;            code += 2 + LINK_SIZE;
5152            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
5153            *previous++ = OP_BRA;            *previous++ = OP_BRA;
# Line 4938  for (;; ptr++) Line 5200  for (;; ptr++)
5200    
5201            else            else
5202              {              {
5203              if (groupsetfirstbyte && reqbyte < 0) reqbyte = firstbyte;              if (groupsetfirstchar && reqchar < 0) reqchar = firstchar;
5204    
5205              for (i = 1; i < repeat_min; i++)              for (i = 1; i < repeat_min; i++)
5206                {                {
5207                uschar *hc;                pcre_uchar *hc;
5208                uschar *this_hwm = cd->hwm;                pcre_uchar *this_hwm = cd->hwm;
5209                memcpy(code, previous, len);                memcpy(code, previous, IN_UCHARS(len));
5210    
5211                while (cd->hwm > cd->start_workspace + cd->workspace_size -                while (cd->hwm > cd->start_workspace + cd->workspace_size -
5212                       WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))                       WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))
# Line 4953  for (;; ptr++) Line 5215  for (;; ptr++)
5215                  int this_offset = this_hwm - cd->start_workspace;                  int this_offset = this_hwm - cd->start_workspace;
5216                  *errorcodeptr = expand_workspace(cd);                  *errorcodeptr = expand_workspace(cd);
5217                  if (*errorcodeptr != 0) goto FAILED;                  if (*errorcodeptr != 0) goto FAILED;
5218                  save_hwm = (uschar *)cd->start_workspace + save_offset;                  save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;
5219                  this_hwm = (uschar *)cd->start_workspace + this_offset;                  this_hwm = (pcre_uchar *)cd->start_workspace + this_offset;
5220                  }                  }
5221    
5222                for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)                for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
# Line 5006  for (;; ptr++) Line 5268  for (;; ptr++)
5268    
5269          else for (i = repeat_max - 1; i >= 0; i--)          else for (i = repeat_max - 1; i >= 0; i--)
5270            {            {
5271            uschar *hc;            pcre_uchar *hc;
5272            uschar *this_hwm = cd->hwm;            pcre_uchar *this_hwm = cd->hwm;
5273    
5274            *code++ = OP_BRAZERO + repeat_type;            *code++ = OP_BRAZERO + repeat_type;
5275    
# Line 5023  for (;; ptr++) Line 5285  for (;; ptr++)
5285              PUTINC(code, 0, offset);              PUTINC(code, 0, offset);
5286              }              }
5287    
5288            memcpy(code, previous, len);            memcpy(code, previous, IN_UCHARS(len));
5289    
5290            /* Ensure there is enough workspace for forward references before            /* Ensure there is enough workspace for forward references before
5291            copying them. */            copying them. */
# Line 5035  for (;; ptr++) Line 5297  for (;; ptr++)
5297              int this_offset = this_hwm - cd->start_workspace;              int this_offset = this_hwm - cd->start_workspace;
5298              *errorcodeptr = expand_workspace(cd);              *errorcodeptr = expand_workspace(cd);
5299              if (*errorcodeptr != 0) goto FAILED;              if (*errorcodeptr != 0) goto FAILED;
5300              save_hwm = (uschar *)cd->start_workspace + save_offset;              save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;
5301              this_hwm = (uschar *)cd->start_workspace + this_offset;              this_hwm = (pcre_uchar *)cd->start_workspace + this_offset;
5302              }              }
5303    
5304            for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)            for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
# Line 5055  for (;; ptr++) Line 5317  for (;; ptr++)
5317            {            {
5318            int oldlinkoffset;            int oldlinkoffset;
5319            int offset = (int)(code - bralink + 1);            int offset = (int)(code - bralink + 1);
5320            uschar *bra = code - offset;            pcre_uchar *bra = code - offset;
5321            oldlinkoffset = GET(bra, 1);            oldlinkoffset = GET(bra, 1);
5322            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
5323            *code++ = OP_KET;            *code++ = OP_KET;
# Line 5091  for (;; ptr++) Line 5353  for (;; ptr++)
5353    
5354        else        else
5355          {          {
5356          uschar *ketcode = code - 1 - LINK_SIZE;          pcre_uchar *ketcode = code - 1 - LINK_SIZE;
5357          uschar *bracode = ketcode - GET(ketcode, 1);          pcre_uchar *bracode = ketcode - GET(ketcode, 1);
5358    
5359          /* Convert possessive ONCE brackets to non-capturing */          /* Convert possessive ONCE brackets to non-capturing */
5360    
# Line 5114  for (;; ptr++) Line 5376  for (;; ptr++)
5376    
5377            if (lengthptr == NULL)            if (lengthptr == NULL)
5378              {              {
5379              uschar *scode = bracode;              pcre_uchar *scode = bracode;
5380              do              do
5381                {                {
5382                if (could_be_empty_branch(scode, ketcode, utf8, cd))                if (could_be_empty_branch(scode, ketcode, utf, cd))
5383                  {                  {
5384                  *bracode += OP_SBRA - OP_BRA;                  *bracode += OP_SBRA - OP_BRA;
5385                  break;                  break;
# Line 5140  for (;; ptr++) Line 5402  for (;; ptr++)
5402                {                {
5403                int nlen = (int)(code - bracode);                int nlen = (int)(code - bracode);
5404                *code = OP_END;                *code = OP_END;
5405                adjust_recurse(bracode, 1 + LINK_SIZE, utf8, cd, save_hwm);                adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, save_hwm);
5406                memmove(bracode + 1+LINK_SIZE, bracode, nlen);                memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen));
5407                code += 1 + LINK_SIZE;                code += 1 + LINK_SIZE;
5408                nlen += 1 + LINK_SIZE;                nlen += 1 + LINK_SIZE;
5409                *bracode = OP_BRAPOS;                *bracode = OP_BRAPOS;
# Line 5210  for (;; ptr++) Line 5472  for (;; ptr++)
5472        int len;        int len;
5473    
5474        if (*tempcode == OP_TYPEEXACT)        if (*tempcode == OP_TYPEEXACT)
5475          tempcode += _pcre_OP_lengths[*tempcode] +          tempcode += PRIV(OP_lengths)[*tempcode] +
5476            ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);            ((tempcode[1 + IMM2_SIZE] == OP_PROP
5477              || tempcode[1 + IMM2_SIZE] == OP_NOTPROP)? 2 : 0);
5478    
5479        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
5480          {          {
5481          tempcode += _pcre_OP_lengths[*tempcode];          tempcode += PRIV(OP_lengths)[*tempcode];
5482  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
5483          if (utf8 && tempcode[-1] >= 0xc0)          if (utf && HAS_EXTRALEN(tempcode[-1]))
5484            tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];            tempcode += GET_EXTRALEN(tempcode[-1]);
5485  #endif  #endif
5486          }          }
5487    
# Line 5255  for (;; ptr++) Line 5518  for (;; ptr++)
5518    
5519          default:          default:
5520          *code = OP_END;          *code = OP_END;
5521          adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);          adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm);
5522          memmove(tempcode + 1+LINK_SIZE, tempcode, len);          memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
5523          code += 1 + LINK_SIZE;          code += 1 + LINK_SIZE;
5524          len += 1 + LINK_SIZE;          len += 1 + LINK_SIZE;
5525          tempcode[0] = OP_ONCE;          tempcode[0] = OP_ONCE;
# Line 5268  for (;; ptr++) Line 5531  for (;; ptr++)
5531        }        }
5532    
5533      /* 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
5534      "follows varying string" flag for subsequently encountered reqbytes if      "follows varying string" flag for subsequently encountered reqchars if
5535      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. */
5536    
5537      END_REPEAT:      END_REPEAT:
# Line 5291  for (;; ptr++) Line 5554  for (;; ptr++)
5554    
5555      /* First deal with various "verbs" that can be introduced by '*'. */      /* First deal with various "verbs" that can be introduced by '*'. */
5556    
5557      if (*(++ptr) == CHAR_ASTERISK &&      ptr++;
5558           ((cd->ctypes[ptr[1]] & ctype_letter) != 0 || ptr[1] == ':'))      if (ptr[0] == CHAR_ASTERISK && (ptr[1] == ':'
5559             || (MAX_255(ptr[1]) && ((cd->ctypes[ptr[1]] & ctype_letter) != 0))))
5560        {        {
5561        int i, namelen;        int i, namelen;
5562        int arglen = 0;        int arglen = 0;
5563        const char *vn = verbnames;        const char *vn = verbnames;
5564        const uschar *name = ptr + 1;        const pcre_uchar *name = ptr + 1;
5565        const uschar *arg = NULL;        const pcre_uchar *arg = NULL;
5566        previous = NULL;        previous = NULL;
5567        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};        ptr++;
5568          while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;
5569        namelen = (int)(ptr - name);        namelen = (int)(ptr - name);
5570    
5571        /* It appears that Perl allows any characters whatsoever, other than        /* It appears that Perl allows any characters whatsoever, other than
# Line 5312  for (;; ptr++) Line 5577  for (;; ptr++)
5577          arg = ++ptr;          arg = ++ptr;
5578          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
5579          arglen = (int)(ptr - arg);          arglen = (int)(ptr - arg);
5580            if ((unsigned int)arglen > MAX_MARK)
5581              {
5582              *errorcodeptr = ERR75;
5583              goto FAILED;
5584              }
5585          }          }
5586    
5587        if (*ptr != CHAR_RIGHT_PARENTHESIS)        if (*ptr != CHAR_RIGHT_PARENTHESIS)
# Line 5325  for (;; ptr++) Line 5595  for (;; ptr++)
5595        for (i = 0; i < verbcount; i++)        for (i = 0; i < verbcount; i++)
5596          {          {
5597          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
5598              strncmp((char *)name, vn, namelen) == 0)              STRNCMP_UC_C8(name, vn, namelen) == 0)
5599            {            {
5600              int setverb;
5601    
5602            /* Check for open captures before ACCEPT and convert it to            /* Check for open captures before ACCEPT and convert it to
5603            ASSERT_ACCEPT if in an assertion. */            ASSERT_ACCEPT if in an assertion. */
5604    
# Line 5344  for (;; ptr++) Line 5616  for (;; ptr++)
5616                *code++ = OP_CLOSE;                *code++ = OP_CLOSE;
5617                PUT2INC(code, 0, oc->number);                PUT2INC(code, 0, oc->number);
5618                }                }
5619              *code++ = (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;              setverb = *code++ =