/[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 574 by ph10, Sat Nov 20 17:47:27 2010 UTC revision 1360 by ph10, Tue Sep 3 10:25:39 2013 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2010 University of Cambridge             Copyright (c) 1997-2013 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, int, int,
88        pcre_uint32 *, pcre_int32 *, pcre_uint32 *, pcre_int32 *, branch_chain *,
89        compile_data *, int *);
90    
91    
92    
93  /*************************************************  /*************************************************
94  *      Code parameters and static tables         *  *      Code parameters and static tables         *
# Line 88  so this number is very generous. Line 104  so this number is very generous.
104  The same workspace is used during the second, actual compile phase for  The same workspace is used during the second, actual compile phase for
105  remembering forward references to groups so that they can be filled in at the  remembering forward references to groups so that they can be filled in at the
106  end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE  end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE
107  is 4 there is plenty of room. */  is 4 there is plenty of room for most patterns. However, the memory can get
108    filled up by repetitions of forward references, for example patterns like
109    /(?1){0,1999}(b)/, and one user did hit the limit. The code has been changed so
110    that the workspace is expanded using malloc() in this situation. The value
111    below is therefore a minimum, and we put a maximum on it for safety. The
112    minimum is now also defined in terms of LINK_SIZE so that the use of malloc()
113    kicks in at the same number of forward references in all cases. */
114    
115    #define COMPILE_WORK_SIZE (2048*LINK_SIZE)
116    #define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)
117    
118    /* This value determines the size of the initial vector that is used for
119    remembering named groups during the pre-compile. It is allocated on the stack,
120    but if it is too small, it is expanded using malloc(), in a similar way to the
121    workspace. The value is the number of slots in the list. */
122    
123  #define COMPILE_WORK_SIZE (4096)  #define NAMED_GROUP_LIST_SIZE  20
124    
125  /* The overrun tests check for a slightly smaller size so that they detect the  /* The overrun tests check for a slightly smaller size so that they detect the
126  overrun before it actually does run off the end of the data block. */  overrun before it actually does run off the end of the data block. */
127    
128  #define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100)  #define WORK_SIZE_SAFETY_MARGIN (100)
129    
130    /* Private flags added to firstchar and reqchar. */
131    
132    #define REQ_CASELESS    (1 << 0)        /* Indicates caselessness */
133    #define REQ_VARY        (1 << 1)        /* Reqchar followed non-literal item */
134    /* Negative values for the firstchar and reqchar flags */
135    #define REQ_UNSET       (-2)
136    #define REQ_NONE        (-1)
137    
138    /* Repeated character flags. */
139    
140    #define UTF_LENGTH     0x10000000l      /* The char contains its length. */
141    
142  /* Table for handling escaped characters in the range '0'-'z'. Positive returns  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
143  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 231  static const char posix_names[] = Line 272  static const char posix_names[] =
272    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
273    STRING_word0  STRING_xdigit;    STRING_word0  STRING_xdigit;
274    
275  static const uschar posix_name_lengths[] = {  static const pcre_uint8 posix_name_lengths[] = {
276    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 };
277    
278  /* Table of class bit maps for each POSIX class. Each class is formed from a  /* Table of class bit maps for each POSIX class. Each class is formed from a
# Line 266  substitutes must be in the order of the Line 307  substitutes must be in the order of the
307  both positive and negative cases. NULL means no substitute. */  both positive and negative cases. NULL means no substitute. */
308    
309  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
310  static const uschar *substitutes[] = {  static const pcre_uchar string_PNd[]  = {
311    (uschar *)"\\P{Nd}",    /* \D */    CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
312    (uschar *)"\\p{Nd}",    /* \d */    CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
313    (uschar *)"\\P{Xsp}",   /* \S */       /* NOTE: Xsp is Perl space */  static const pcre_uchar string_pNd[]  = {
314    (uschar *)"\\p{Xsp}",   /* \s */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
315    (uschar *)"\\P{Xwd}",   /* \W */    CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
316    (uschar *)"\\p{Xwd}"    /* \w */  static const pcre_uchar string_PXsp[] = {
317      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
318      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
319    static const pcre_uchar string_pXsp[] = {
320      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
321      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
322    static const pcre_uchar string_PXwd[] = {
323      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
324      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
325    static const pcre_uchar string_pXwd[] = {
326      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
327      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
328    
329    static const pcre_uchar *substitutes[] = {
330      string_PNd,           /* \D */
331      string_pNd,           /* \d */
332      string_PXsp,          /* \S */       /* NOTE: Xsp is Perl space */
333      string_pXsp,          /* \s */
334      string_PXwd,          /* \W */
335      string_pXwd           /* \w */
336  };  };
337    
338  static const uschar *posix_substitutes[] = {  static const pcre_uchar string_pL[] =   {
339    (uschar *)"\\p{L}",     /* alpha */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
340    (uschar *)"\\p{Ll}",    /* lower */    CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
341    (uschar *)"\\p{Lu}",    /* upper */  static const pcre_uchar string_pLl[] =  {
342    (uschar *)"\\p{Xan}",   /* alnum */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
343    NULL,                   /* ascii */    CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
344    (uschar *)"\\h",        /* blank */  static const pcre_uchar string_pLu[] =  {
345    NULL,                   /* cntrl */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
346    (uschar *)"\\p{Nd}",    /* digit */    CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
347    NULL,                   /* graph */  static const pcre_uchar string_pXan[] = {
348    NULL,                   /* print */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
349    NULL,                   /* punct */    CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
350    (uschar *)"\\p{Xps}",   /* space */    /* NOTE: Xps is POSIX space */  static const pcre_uchar string_h[] =    {
351    (uschar *)"\\p{Xwd}",   /* word */    CHAR_BACKSLASH, CHAR_h, '\0' };
352    NULL,                   /* xdigit */  static const pcre_uchar string_pXps[] = {
353      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
354      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
355    static const pcre_uchar string_PL[] =   {
356      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
357      CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
358    static const pcre_uchar string_PLl[] =  {
359      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
360      CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
361    static const pcre_uchar string_PLu[] =  {
362      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
363      CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
364    static const pcre_uchar string_PXan[] = {
365      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
366      CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
367    static const pcre_uchar string_H[] =    {
368      CHAR_BACKSLASH, CHAR_H, '\0' };
369    static const pcre_uchar string_PXps[] = {
370      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
371      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
372    
373    static const pcre_uchar *posix_substitutes[] = {
374      string_pL,            /* alpha */
375      string_pLl,           /* lower */
376      string_pLu,           /* upper */
377      string_pXan,          /* alnum */
378      NULL,                 /* ascii */
379      string_h,             /* blank */
380      NULL,                 /* cntrl */
381      string_pNd,           /* digit */
382      NULL,                 /* graph */
383      NULL,                 /* print */
384      NULL,                 /* punct */
385      string_pXps,          /* space */    /* NOTE: Xps is POSIX space */
386      string_pXwd,          /* word */
387      NULL,                 /* xdigit */
388    /* Negated cases */    /* Negated cases */
389    (uschar *)"\\P{L}",     /* ^alpha */    string_PL,            /* ^alpha */
390    (uschar *)"\\P{Ll}",    /* ^lower */    string_PLl,           /* ^lower */
391    (uschar *)"\\P{Lu}",    /* ^upper */    string_PLu,           /* ^upper */
392    (uschar *)"\\P{Xan}",   /* ^alnum */    string_PXan,          /* ^alnum */
393    NULL,                   /* ^ascii */    NULL,                 /* ^ascii */
394    (uschar *)"\\H",        /* ^blank */    string_H,             /* ^blank */
395    NULL,                   /* ^cntrl */    NULL,                 /* ^cntrl */
396    (uschar *)"\\P{Nd}",    /* ^digit */    string_PNd,           /* ^digit */
397    NULL,                   /* ^graph */    NULL,                 /* ^graph */
398    NULL,                   /* ^print */    NULL,                 /* ^print */
399    NULL,                   /* ^punct */    NULL,                 /* ^punct */
400    (uschar *)"\\P{Xps}",   /* ^space */   /* NOTE: Xps is POSIX space */    string_PXps,          /* ^space */   /* NOTE: Xps is POSIX space */
401    (uschar *)"\\P{Xwd}",   /* ^word */    string_PXwd,          /* ^word */
402    NULL                    /* ^xdigit */    NULL                  /* ^xdigit */
403  };  };
404  #define POSIX_SUBSIZE (sizeof(posix_substitutes)/sizeof(uschar *))  #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
405  #endif  #endif
406    
407  #define STRING(a)  # a  #define STRING(a)  # a
# Line 365  static const char error_texts[] = Line 460  static const char error_texts[] =
460    /* 30 */    /* 30 */
461    "unknown POSIX class name\0"    "unknown POSIX class name\0"
462    "POSIX collating elements are not supported\0"    "POSIX collating elements are not supported\0"
463    "this version of PCRE is not compiled with PCRE_UTF8 support\0"    "this version of PCRE is compiled without UTF support\0"
464    "spare error\0"  /** DEAD **/    "spare error\0"  /** DEAD **/
465    "character value in \\x{...} sequence is too large\0"    "character value in \\x{...} sequence is too large\0"
466    /* 35 */    /* 35 */
# Line 388  static const char error_texts[] = Line 483  static const char error_texts[] =
483    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
484    /* 50 */    /* 50 */
485    "repeated subpattern is too long\0"    /** DEAD **/    "repeated subpattern is too long\0"    /** DEAD **/
486    "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"
487    "internal error: overran compiling workspace\0"    "internal error: overran compiling workspace\0"
488    "internal error: previously-checked referenced subpattern not found\0"    "internal error: previously-checked referenced subpattern not found\0"
489    "DEFINE group contains more than one branch\0"    "DEFINE group contains more than one branch\0"
490    /* 55 */    /* 55 */
491    "repeating a DEFINE group is not allowed\0"    "repeating a DEFINE group is not allowed\0"  /** DEAD **/
492    "inconsistent NEWLINE options\0"    "inconsistent NEWLINE options\0"
493    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
494    "a numbered reference must not be zero\0"    "a numbered reference must not be zero\0"
495    "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"    "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
496    /* 60 */    /* 60 */
497    "(*VERB) not recognized\0"    "(*VERB) not recognized or malformed\0"
498    "number is too big\0"    "number is too big\0"
499    "subpattern name expected\0"    "subpattern name expected\0"
500    "digit expected after (?+\0"    "digit expected after (?+\0"
# Line 407  static const char error_texts[] = Line 502  static const char error_texts[] =
502    /* 65 */    /* 65 */
503    "different names for subpatterns of the same number are not allowed\0"    "different names for subpatterns of the same number are not allowed\0"
504    "(*MARK) must have an argument\0"    "(*MARK) must have an argument\0"
505    "this version of PCRE is not compiled with PCRE_UCP support\0"    "this version of PCRE is not compiled with Unicode property support\0"
506    "\\c must be followed by an ASCII character\0"    "\\c must be followed by an ASCII character\0"
507      "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
508      /* 70 */
509      "internal error: unknown opcode in find_fixedlength()\0"
510      "\\N is not supported in a class\0"
511      "too many forward references\0"
512      "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
513      "invalid UTF-16 string\0"
514      /* 75 */
515      "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0"
516      "character value in \\u.... sequence is too large\0"
517      "invalid UTF-32 string\0"
518      "setting UTF is disabled by the application\0"
519    ;    ;
520    
521  /* 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 427  For convenience, we use the same bit def Line 534  For convenience, we use the same bit def
534    
535  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
536    
537    /* Using a simple comparison for decimal numbers rather than a memory read
538    is much faster, and the resulting code is simpler (the compiler turns it
539    into a subtraction and unsigned comparison). */
540    
541    #define IS_DIGIT(x) ((x) >= CHAR_0 && (x) <= CHAR_9)
542    
543  #ifndef EBCDIC  #ifndef EBCDIC
544    
545  /* 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
546  UTF-8 mode. */  UTF-8 mode. */
547    
548  static const unsigned char digitab[] =  static const pcre_uint8 digitab[] =
549    {    {
550    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
551    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */
# Line 471  static const unsigned char digitab[] = Line 584  static const unsigned char digitab[] =
584    
585  /* 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. */
586    
587  static const unsigned char digitab[] =  static const pcre_uint8 digitab[] =
588    {    {
589    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
590    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */
# Line 506  static const unsigned char digitab[] = Line 619  static const unsigned char digitab[] =
619    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */
620    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */
621    
622  static const unsigned char ebcdic_chartab[] = { /* chartable partial dup */  static const pcre_uint8 ebcdic_chartab[] = { /* chartable partial dup */
623    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */
624    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
625    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */
# Line 542  static const unsigned char ebcdic_charta Line 655  static const unsigned char ebcdic_charta
655  #endif  #endif
656    
657    
 /* Definition to allow mutual recursion */  
   
 static BOOL  
   compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,  
     int *, int *, branch_chain *, compile_data *, int *);  
   
   
658    
659  /*************************************************  /*************************************************
660  *            Find an error text                  *  *            Find an error text                  *
# Line 569  find_error_text(int n) Line 675  find_error_text(int n)
675  const char *s = error_texts;  const char *s = error_texts;
676  for (; n > 0; n--)  for (; n > 0; n--)
677    {    {
678    while (*s++ != 0) {};    while (*s++ != CHAR_NULL) {};
679    if (*s == 0) return "Error text not found (please report)";    if (*s == CHAR_NULL) return "Error text not found (please report)";
680    }    }
681  return s;  return s;
682  }  }
683    
684    
685  /*************************************************  /*************************************************
686    *           Expand the workspace                 *
687    *************************************************/
688    
689    /* This function is called during the second compiling phase, if the number of
690    forward references fills the existing workspace, which is originally a block on
691    the stack. A larger block is obtained from malloc() unless the ultimate limit
692    has been reached or the increase will be rather small.
693    
694    Argument: pointer to the compile data block
695    Returns:  0 if all went well, else an error number
696    */
697    
698    static int
699    expand_workspace(compile_data *cd)
700    {
701    pcre_uchar *newspace;
702    int newsize = cd->workspace_size * 2;
703    
704    if (newsize > COMPILE_WORK_SIZE_MAX) newsize = COMPILE_WORK_SIZE_MAX;
705    if (cd->workspace_size >= COMPILE_WORK_SIZE_MAX ||
706        newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)
707     return ERR72;
708    
709    newspace = (PUBL(malloc))(IN_UCHARS(newsize));
710    if (newspace == NULL) return ERR21;
711    memcpy(newspace, cd->start_workspace, cd->workspace_size * sizeof(pcre_uchar));
712    cd->hwm = (pcre_uchar *)newspace + (cd->hwm - cd->start_workspace);
713    if (cd->workspace_size > COMPILE_WORK_SIZE)
714      (PUBL(free))((void *)cd->start_workspace);
715    cd->start_workspace = newspace;
716    cd->workspace_size = newsize;
717    return 0;
718    }
719    
720    
721    
722    /*************************************************
723    *            Check for counted repeat            *
724    *************************************************/
725    
726    /* This function is called when a '{' is encountered in a place where it might
727    start a quantifier. It looks ahead to see if it really is a quantifier or not.
728    It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
729    where the ddds are digits.
730    
731    Arguments:
732      p         pointer to the first char after '{'
733    
734    Returns:    TRUE or FALSE
735    */
736    
737    static BOOL
738    is_counted_repeat(const pcre_uchar *p)
739    {
740    if (!IS_DIGIT(*p)) return FALSE;
741    p++;
742    while (IS_DIGIT(*p)) p++;
743    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
744    
745    if (*p++ != CHAR_COMMA) return FALSE;
746    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
747    
748    if (!IS_DIGIT(*p)) return FALSE;
749    p++;
750    while (IS_DIGIT(*p)) p++;
751    
752    return (*p == CHAR_RIGHT_CURLY_BRACKET);
753    }
754    
755    
756    
757    /*************************************************
758  *            Handle escapes                      *  *            Handle escapes                      *
759  *************************************************/  *************************************************/
760    
761  /* 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
762  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
763  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
764  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
765  UTF-8 is enabled, a positive value greater than 255 may be returned. On entry,  be returned in chptr.
766  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
767  sequence.  escape sequence.
768    
769  Arguments:  Arguments:
770    ptrptr         points to the pattern position pointer    ptrptr         points to the pattern position pointer
771      chptr          points to the data character
772    errorcodeptr   points to the errorcode variable    errorcodeptr   points to the errorcode variable
773    bracount       number of previous extracting brackets    bracount       number of previous extracting brackets
774    options        the options bits    options        the options bits
775    isclass        TRUE if inside a character class    isclass        TRUE if inside a character class
776    
777  Returns:         zero or positive => a data character  Returns:         zero => a data character
778                   negative => a special escape sequence                   positive => a special escape sequence
779                     negative => a back reference
780                   on error, errorcodeptr is set                   on error, errorcodeptr is set
781  */  */
782    
783  static int  static int
784  check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,  check_escape(const pcre_uchar **ptrptr, pcre_uint32 *chptr, int *errorcodeptr,
785    int options, BOOL isclass)    int bracount, int options, BOOL isclass)
786  {  {
787  BOOL utf8 = (options & PCRE_UTF8) != 0;  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
788  const uschar *ptr = *ptrptr + 1;  BOOL utf = (options & PCRE_UTF8) != 0;
789  int c, i;  const pcre_uchar *ptr = *ptrptr + 1;
790    pcre_uint32 c;
791    int escape = 0;
792    int i;
793    
794  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
795  ptr--;                            /* Set pointer back to the last byte */  ptr--;                            /* Set pointer back to the last byte */
796    
797  /* If backslash is at the end of the pattern, it's an error. */  /* If backslash is at the end of the pattern, it's an error. */
798    
799  if (c == 0) *errorcodeptr = ERR1;  if (c == CHAR_NULL) *errorcodeptr = ERR1;
800    
801  /* Non-alphanumerics are literals. For digits or letters, do an initial lookup  /* Non-alphanumerics are literals. For digits or letters, do an initial lookup
802  in a table. A non-zero result is something that can be returned immediately.  in a table. A non-zero result is something that can be returned immediately.
803  Otherwise further processing may be required. */  Otherwise further processing may be required. */
804    
805  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
806  else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */  /* Not alphanumeric */
807  else if ((i = escapes[c - CHAR_0]) != 0) c = i;  else if (c < CHAR_0 || c > CHAR_z) {}
808    else if ((i = escapes[c - CHAR_0]) != 0)
809      { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
810    
811  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
812  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */  /* Not alphanumeric */
813  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if (c < CHAR_a || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}
814    else if ((i = escapes[c - 0x48]) != 0)  { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
815  #endif  #endif
816    
817  /* Escapes that need further processing, or are illegal. */  /* Escapes that need further processing, or are illegal. */
818    
819  else  else
820    {    {
821    const uschar *oldptr;    const pcre_uchar *oldptr;
822    BOOL braced, negated;    BOOL braced, negated, overflow;
823      int s;
824    
825    switch (c)    switch (c)
826      {      {
# Line 642  else Line 829  else
829    
830      case CHAR_l:      case CHAR_l:
831      case CHAR_L:      case CHAR_L:
832        *errorcodeptr = ERR37;
833        break;
834    
835      case CHAR_u:      case CHAR_u:
836        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
837          {
838          /* In JavaScript, \u must be followed by four hexadecimal numbers.
839          Otherwise it is a lowercase u letter. */
840          if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
841            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0
842            && MAX_255(ptr[3]) && (digitab[ptr[3]] & ctype_xdigit) != 0
843            && MAX_255(ptr[4]) && (digitab[ptr[4]] & ctype_xdigit) != 0)
844            {
845            c = 0;
846            for (i = 0; i < 4; ++i)
847              {
848              register pcre_uint32 cc = *(++ptr);
849    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
850              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
851              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
852    #else           /* EBCDIC coding */
853              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
854              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
855    #endif
856              }
857    
858    #if defined COMPILE_PCRE8
859            if (c > (utf ? 0x10ffffU : 0xffU))
860    #elif defined COMPILE_PCRE16
861            if (c > (utf ? 0x10ffffU : 0xffffU))
862    #elif defined COMPILE_PCRE32
863            if (utf && c > 0x10ffffU)
864    #endif
865              {
866              *errorcodeptr = ERR76;
867              }
868            else if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
869            }
870          }
871        else
872          *errorcodeptr = ERR37;
873        break;
874    
875      case CHAR_U:      case CHAR_U:
876      *errorcodeptr = ERR37;      /* In JavaScript, \U is an uppercase U letter. */
877        if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
878      break;      break;
879    
880      /* \g must be followed by one of a number of specific things:      /* In a character class, \g is just a literal "g". Outside a character
881        class, \g must be followed by one of a number of specific things:
882    
883      (1) A number, either plain or braced. If positive, it is an absolute      (1) A number, either plain or braced. If positive, it is an absolute
884      backreference. If negative, it is a relative backreference. This is a Perl      backreference. If negative, it is a relative backreference. This is a Perl
# Line 661  else Line 892  else
892      (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
893      number either in angle brackets or in single quotes. However, these are      number either in angle brackets or in single quotes. However, these are
894      (possibly recursive) subroutine calls, _not_ backreferences. Just return      (possibly recursive) subroutine calls, _not_ backreferences. Just return
895      the -ESC_g code (cf \k). */      the ESC_g code (cf \k). */
896    
897      case CHAR_g:      case CHAR_g:
898        if (isclass) break;
899      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
900        {        {
901        c = -ESC_g;        escape = ESC_g;
902        break;        break;
903        }        }
904    
# Line 674  else Line 906  else
906    
907      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
908        {        {
909        const uschar *p;        const pcre_uchar *p;
910        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)        for (p = ptr+2; *p != CHAR_NULL && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
911          if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;          if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
912        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)        if (*p != CHAR_NULL && *p != CHAR_RIGHT_CURLY_BRACKET)
913          {          {
914          c = -ESC_k;          escape = ESC_k;
915          break;          break;
916          }          }
917        braced = TRUE;        braced = TRUE;
# Line 694  else Line 926  else
926        }        }
927      else negated = FALSE;      else negated = FALSE;
928    
929      c = 0;      /* The integer range is limited by the machine's int representation. */
930      while ((digitab[ptr[1]] & ctype_digit) != 0)      s = 0;
931        c = c * 10 + *(++ptr) - CHAR_0;      overflow = FALSE;
932        while (IS_DIGIT(ptr[1]))
933      if (c < 0)   /* Integer overflow */        {
934          if (s > INT_MAX / 10 - 1) /* Integer overflow */
935            {
936            overflow = TRUE;
937            break;
938            }
939          s = s * 10 + (int)(*(++ptr) - CHAR_0);
940          }
941        if (overflow) /* Integer overflow */
942        {        {
943          while (IS_DIGIT(ptr[1]))
944            ptr++;
945        *errorcodeptr = ERR61;        *errorcodeptr = ERR61;
946        break;        break;
947        }        }
# Line 710  else Line 952  else
952        break;        break;
953        }        }
954    
955      if (c == 0)      if (s == 0)
956        {        {
957        *errorcodeptr = ERR58;        *errorcodeptr = ERR58;
958        break;        break;
# Line 718  else Line 960  else
960    
961      if (negated)      if (negated)
962        {        {
963        if (c > bracount)        if (s > bracount)
964          {          {
965          *errorcodeptr = ERR15;          *errorcodeptr = ERR15;
966          break;          break;
967          }          }
968        c = bracount - (c - 1);        s = bracount - (s - 1);
969        }        }
970    
971      c = -(ESC_REF + c);      escape = -s;
972      break;      break;
973    
974      /* The handling of escape sequences consisting of a string of digits      /* The handling of escape sequences consisting of a string of digits
# Line 747  else Line 989  else
989      if (!isclass)      if (!isclass)
990        {        {
991        oldptr = ptr;        oldptr = ptr;
992        c -= CHAR_0;        /* The integer range is limited by the machine's int representation. */
993        while ((digitab[ptr[1]] & ctype_digit) != 0)        s = (int)(c -CHAR_0);
994          c = c * 10 + *(++ptr) - CHAR_0;        overflow = FALSE;
995        if (c < 0)    /* Integer overflow */        while (IS_DIGIT(ptr[1]))
996            {
997            if (s > INT_MAX / 10 - 1) /* Integer overflow */
998              {
999              overflow = TRUE;
1000              break;
1001              }
1002            s = s * 10 + (int)(*(++ptr) - CHAR_0);
1003            }
1004          if (overflow) /* Integer overflow */
1005          {          {
1006            while (IS_DIGIT(ptr[1]))
1007              ptr++;
1008          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
1009          break;          break;
1010          }          }
1011        if (c < 10 || c <= bracount)        if (s < 10 || s <= bracount)
1012          {          {
1013          c = -(ESC_REF + c);          escape = -s;
1014          break;          break;
1015          }          }
1016        ptr = oldptr;      /* Put the pointer back and fall through */        ptr = oldptr;      /* Put the pointer back and fall through */
# Line 777  else Line 1030  else
1030      /* \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
1031      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
1032      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
1033      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,
1034      than 3 octal digits. */      but no more than 3 octal digits. */
1035    
1036      case CHAR_0:      case CHAR_0:
1037      c -= CHAR_0;      c -= CHAR_0;
1038      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
1039          c = c * 8 + *(++ptr) - CHAR_0;          c = c * 8 + *(++ptr) - CHAR_0;
1040      if (!utf8 && c > 255) *errorcodeptr = ERR51;  #ifdef COMPILE_PCRE8
1041        if (!utf && c > 0xff) *errorcodeptr = ERR51;
1042    #endif
1043      break;      break;
1044    
1045      /* \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
1046      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.
1047      treated as a data character. */      If not, { is treated as a data character. */
1048    
1049      case CHAR_x:      case CHAR_x:
1050        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
1051          {
1052          /* In JavaScript, \x must be followed by two hexadecimal numbers.
1053          Otherwise it is a lowercase x letter. */
1054          if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
1055            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)
1056            {
1057            c = 0;
1058            for (i = 0; i < 2; ++i)
1059              {
1060              register pcre_uint32 cc = *(++ptr);
1061    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1062              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
1063              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
1064    #else           /* EBCDIC coding */
1065              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
1066              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1067    #endif
1068              }
1069            }
1070          break;
1071          }
1072    
1073      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
1074        {        {
1075        const uschar *pt = ptr + 2;        const pcre_uchar *pt = ptr + 2;
       int count = 0;  
1076    
1077        c = 0;        c = 0;
1078        while ((digitab[*pt] & ctype_xdigit) != 0)        overflow = FALSE;
1079          while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0)
1080          {          {
1081          register int cc = *pt++;          register pcre_uint32 cc = *pt++;
1082          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
1083          count++;  
1084    #ifdef COMPILE_PCRE32
1085            if (c >= 0x10000000l) { overflow = TRUE; break; }
1086    #endif
1087    
1088  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1089          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
# Line 811  else Line 1092  else
1092          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 */
1093          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1094  #endif  #endif
1095    
1096    #if defined COMPILE_PCRE8
1097            if (c > (utf ? 0x10ffffU : 0xffU)) { overflow = TRUE; break; }
1098    #elif defined COMPILE_PCRE16
1099            if (c > (utf ? 0x10ffffU : 0xffffU)) { overflow = TRUE; break; }
1100    #elif defined COMPILE_PCRE32
1101            if (utf && c > 0x10ffffU) { overflow = TRUE; break; }
1102    #endif
1103            }
1104    
1105          if (overflow)
1106            {
1107            while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0) pt++;
1108            *errorcodeptr = ERR34;
1109          }          }
1110    
1111        if (*pt == CHAR_RIGHT_CURLY_BRACKET)        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
1112          {          {
1113          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
1114          ptr = pt;          ptr = pt;
1115          break;          break;
1116          }          }
# Line 827  else Line 1122  else
1122      /* Read just a single-byte hex-defined char */      /* Read just a single-byte hex-defined char */
1123    
1124      c = 0;      c = 0;
1125      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)
1126        {        {
1127        int cc;                                  /* Some compilers don't like */        pcre_uint32 cc;                          /* Some compilers don't like */
1128        cc = *(++ptr);                           /* ++ in initializers */        cc = *(++ptr);                           /* ++ in initializers */
1129  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1130        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
# Line 848  else Line 1143  else
1143    
1144      case CHAR_c:      case CHAR_c:
1145      c = *(++ptr);      c = *(++ptr);
1146      if (c == 0)      if (c == CHAR_NULL)
1147        {        {
1148        *errorcodeptr = ERR2;        *errorcodeptr = ERR2;
1149        break;        break;
# Line 857  else Line 1152  else
1152      if (c > 127)  /* Excludes all non-ASCII in either mode */      if (c > 127)  /* Excludes all non-ASCII in either mode */
1153        {        {
1154        *errorcodeptr = ERR68;        *errorcodeptr = ERR68;
1155        break;        break;
1156        }        }
1157      if (c >= CHAR_a && c <= CHAR_z) c -= 32;      if (c >= CHAR_a && c <= CHAR_z) c -= 32;
1158      c ^= 0x40;      c ^= 0x40;
1159  #else             /* EBCDIC coding */  #else             /* EBCDIC coding */
# Line 885  else Line 1180  else
1180    }    }
1181    
1182  /* Perl supports \N{name} for character names, as well as plain \N for "not  /* Perl supports \N{name} for character names, as well as plain \N for "not
1183  newline". PCRE does not support \N{name}. */  newline". PCRE does not support \N{name}. However, it does support
1184    quantification such as \N{2,3}. */
1185    
1186  if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET)  if (escape == ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
1187         !is_counted_repeat(ptr+2))
1188    *errorcodeptr = ERR37;    *errorcodeptr = ERR37;
1189    
1190  /* If PCRE_UCP is set, we change the values for \d etc. */  /* If PCRE_UCP is set, we change the values for \d etc. */
1191    
1192  if ((options & PCRE_UCP) != 0 && c <= -ESC_D && c >= -ESC_w)  if ((options & PCRE_UCP) != 0 && escape >= ESC_D && escape <= ESC_w)
1193    c -= (ESC_DU - ESC_D);    escape += (ESC_DU - ESC_D);
1194    
1195  /* Set the pointer to the final character before returning. */  /* Set the pointer to the final character before returning. */
1196    
1197  *ptrptr = ptr;  *ptrptr = ptr;
1198  return c;  *chptr = c;
1199    return escape;
1200  }  }
1201    
   
   
1202  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
1203  /*************************************************  /*************************************************
1204  *               Handle \P and \p                 *  *               Handle \P and \p                 *
# Line 916  escape sequence. Line 1212  escape sequence.
1212  Argument:  Argument:
1213    ptrptr         points to the pattern position pointer    ptrptr         points to the pattern position pointer
1214    negptr         points to a boolean that is set TRUE for negation else FALSE    negptr         points to a boolean that is set TRUE for negation else FALSE
1215    dptr           points to an int that is set to the detailed property value    ptypeptr       points to an unsigned int that is set to the type value
1216      pdataptr       points to an unsigned int that is set to the detailed property value
1217    errorcodeptr   points to the error code variable    errorcodeptr   points to the error code variable
1218    
1219  Returns:         type value from ucp_type_table, or -1 for an invalid type  Returns:         TRUE if the type value was found, or FALSE for an invalid type
1220  */  */
1221    
1222  static int  static BOOL
1223  get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, unsigned int *ptypeptr,
1224      unsigned int *pdataptr, int *errorcodeptr)
1225  {  {
1226  int c, i, bot, top;  pcre_uchar c;
1227  const uschar *ptr = *ptrptr;  int i, bot, top;
1228  char name[32];  const pcre_uchar *ptr = *ptrptr;
1229    pcre_uchar name[32];
1230    
1231  c = *(++ptr);  c = *(++ptr);
1232  if (c == 0) goto ERROR_RETURN;  if (c == CHAR_NULL) goto ERROR_RETURN;
1233    
1234  *negptr = FALSE;  *negptr = FALSE;
1235    
# Line 944  if (c == CHAR_LEFT_CURLY_BRACKET) Line 1243  if (c == CHAR_LEFT_CURLY_BRACKET)
1243      *negptr = TRUE;      *negptr = TRUE;
1244      ptr++;      ptr++;
1245      }      }
1246    for (i = 0; i < (int)sizeof(name) - 1; i++)    for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
1247      {      {
1248      c = *(++ptr);      c = *(++ptr);
1249      if (c == 0) goto ERROR_RETURN;      if (c == CHAR_NULL) goto ERROR_RETURN;
1250      if (c == CHAR_RIGHT_CURLY_BRACKET) break;      if (c == CHAR_RIGHT_CURLY_BRACKET) break;
1251      name[i] = c;      name[i] = c;
1252      }      }
# Line 968  else Line 1267  else
1267  /* Search for a recognized property name using binary chop */  /* Search for a recognized property name using binary chop */
1268    
1269  bot = 0;  bot = 0;
1270  top = _pcre_utt_size;  top = PRIV(utt_size);
1271    
1272  while (bot < top)  while (bot < top)
1273    {    {
1274      int r;
1275    i = (bot + top) >> 1;    i = (bot + top) >> 1;
1276    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);    r = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
1277    if (c == 0)    if (r == 0)
1278      {      {
1279      *dptr = _pcre_utt[i].value;      *ptypeptr = PRIV(utt)[i].type;
1280      return _pcre_utt[i].type;      *pdataptr = PRIV(utt)[i].value;
1281        return TRUE;
1282      }      }
1283    if (c > 0) bot = i + 1; else top = i;    if (r > 0) bot = i + 1; else top = i;
1284    }    }
1285    
1286  *errorcodeptr = ERR47;  *errorcodeptr = ERR47;
1287  *ptrptr = ptr;  *ptrptr = ptr;
1288  return -1;  return FALSE;
1289    
1290  ERROR_RETURN:  ERROR_RETURN:
1291  *errorcodeptr = ERR46;  *errorcodeptr = ERR46;
1292  *ptrptr = ptr;  *ptrptr = ptr;
1293  return -1;  return FALSE;
1294  }  }
1295  #endif  #endif
1296    
# Line 997  return -1; Line 1298  return -1;
1298    
1299    
1300  /*************************************************  /*************************************************
 *            Check for counted repeat            *  
 *************************************************/  
   
 /* This function is called when a '{' is encountered in a place where it might  
 start a quantifier. It looks ahead to see if it really is a quantifier or not.  
 It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}  
 where the ddds are digits.  
   
 Arguments:  
   p         pointer to the first char after '{'  
   
 Returns:    TRUE or FALSE  
 */  
   
 static BOOL  
 is_counted_repeat(const uschar *p)  
 {  
 if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  
 while ((digitab[*p] & ctype_digit) != 0) p++;  
 if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  
   
 if (*p++ != CHAR_COMMA) return FALSE;  
 if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  
   
 if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  
 while ((digitab[*p] & ctype_digit) != 0) p++;  
   
 return (*p == CHAR_RIGHT_CURLY_BRACKET);  
 }  
   
   
   
 /*************************************************  
1301  *         Read repeat counts                     *  *         Read repeat counts                     *
1302  *************************************************/  *************************************************/
1303    
# Line 1048  Returns:         pointer to '}' on succe Line 1316  Returns:         pointer to '}' on succe
1316                   current ptr on error, with errorcodeptr set non-zero                   current ptr on error, with errorcodeptr set non-zero
1317  */  */
1318    
1319  static const uschar *  static const pcre_uchar *
1320  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)
1321  {  {
1322  int min = 0;  int min = 0;
1323  int max = -1;  int max = -1;
# Line 1057  int max = -1; Line 1325  int max = -1;
1325  /* 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
1326  an integer overflow. */  an integer overflow. */
1327    
1328  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;  while (IS_DIGIT(*p)) min = min * 10 + (int)(*p++ - CHAR_0);
1329  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
1330    {    {
1331    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 1072  if (*p == CHAR_RIGHT_CURLY_BRACKET) max Line 1340  if (*p == CHAR_RIGHT_CURLY_BRACKET) max
1340    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
1341      {      {
1342      max = 0;      max = 0;
1343      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;      while(IS_DIGIT(*p)) max = max * 10 + (int)(*p++ - CHAR_0);
1344      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
1345        {        {
1346        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 1097  return p; Line 1365  return p;
1365    
1366    
1367  /*************************************************  /*************************************************
1368  *  Subroutine for finding forward reference      *  *      Find first significant op code            *
1369  *************************************************/  *************************************************/
1370    
1371  /* This recursive function is called only from find_parens() below. The  /* This is called by several functions that scan a compiled expression looking
1372  top-level call starts at the beginning of the pattern. All other calls must  for a fixed first character, or an anchoring op code etc. It skips over things
1373  start at a parenthesis. It scans along a pattern's text looking for capturing  that do not influence this. For some calls, it makes sense to skip negative
1374  subpatterns, and counting them. If it finds a named pattern that matches the  forward and all backward assertions, and also the \b assertion; for others it
1375  name it is given, it returns its number. Alternatively, if the name is NULL, it  does not.
 returns when it reaches a given numbered subpattern. We know that if (?P< is  
 encountered, the name will be terminated by '>' because that is checked in the  
 first pass. Recursion is used to keep track of subpatterns that reset the  
 capturing group numbers - the (?| feature.  
1376    
1377  Arguments:  Arguments:
1378    ptrptr       address of the current character pointer (updated)    code         pointer to the start of the group
1379    cd           compile background data    skipassert   TRUE if certain assertions are to be skipped
   name         name to seek, or NULL if seeking a numbered subpattern  
   lorn         name length, or subpattern number if name is NULL  
   xmode        TRUE if we are in /x mode  
   utf8         TRUE if we are in UTF-8 mode  
   count        pointer to the current capturing subpattern number (updated)  
1380    
1381  Returns:       the number of the named subpattern, or -1 if not found  Returns:       pointer to the first significant opcode
1382  */  */
1383    
1384  static int  static const pcre_uchar*
1385  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,  first_significant_code(const pcre_uchar *code, BOOL skipassert)
   BOOL xmode, BOOL utf8, int *count)  
1386  {  {
1387  uschar *ptr = *ptrptr;  for (;;)
 int start_count = *count;  
 int hwm_count = start_count;  
 BOOL dup_parens = FALSE;  
   
 /* If the first character is a parenthesis, check on the type of group we are  
 dealing with. The very first call may not start with a parenthesis. */  
   
 if (ptr[0] == CHAR_LEFT_PARENTHESIS)  
1388    {    {
1389    /* Handle specials such as (*SKIP) or (*UTF8) etc. */    switch ((int)*code)
1390        {
1391        case OP_ASSERT_NOT:
1392        case OP_ASSERTBACK:
1393        case OP_ASSERTBACK_NOT:
1394        if (!skipassert) return code;
1395        do code += GET(code, 1); while (*code == OP_ALT);
1396        code += PRIV(OP_lengths)[*code];
1397        break;
1398    
1399    if (ptr[1] == CHAR_ASTERISK) ptr += 2;      case OP_WORD_BOUNDARY:
1400        case OP_NOT_WORD_BOUNDARY:
1401        if (!skipassert) return code;
1402        /* Fall through */
1403    
1404    /* Handle a normal, unnamed capturing parenthesis. */      case OP_CALLOUT:
1405        case OP_CREF:
1406        case OP_NCREF:
1407        case OP_RREF:
1408        case OP_NRREF:
1409        case OP_DEF:
1410        code += PRIV(OP_lengths)[*code];
1411        break;
1412    
1413    else if (ptr[1] != CHAR_QUESTION_MARK)      default:
1414      {      return code;
     *count += 1;  
     if (name == NULL && *count == lorn) return *count;  
     ptr++;  
1415      }      }
1416      }
1417    /* Control never reaches here */
1418    }
1419    
   /* All cases now have (? at the start. Remember when we are in a group  
   where the parenthesis numbers are duplicated. */  
1420    
   else if (ptr[2] == CHAR_VERTICAL_LINE)  
     {  
     ptr += 3;  
     dup_parens = TRUE;  
     }  
1421    
   /* Handle comments; all characters are allowed until a ket is reached. */  
1422    
1423    else if (ptr[2] == CHAR_NUMBER_SIGN)  /*************************************************
1424      {  *        Find the fixed length of a branch       *
1425      for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;  *************************************************/
     goto FAIL_EXIT;  
     }  
1426    
1427    /* Handle a condition. If it is an assertion, just carry on so that it  /* Scan a branch and compute the fixed length of subject that will match it,
1428    is processed as normal. If not, skip to the closing parenthesis of the  if the length is fixed. This is needed for dealing with backward assertions.
1429    condition (there can't be any nested parens). */  In UTF8 mode, the result is in characters rather than bytes. The branch is
1430    temporarily terminated with OP_END when this function is called.
1431    
1432    else if (ptr[2] == CHAR_LEFT_PARENTHESIS)  This function is called when a backward assertion is encountered, so that if it
1433      {  fails, the error message can point to the correct place in the pattern.
1434      ptr += 2;  However, we cannot do this when the assertion contains subroutine calls,
1435      if (ptr[1] != CHAR_QUESTION_MARK)  because they can be forward references. We solve this by remembering this case
1436        {  and doing the check at the end; a flag specifies which mode we are running in.
       while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;  
       if (*ptr != 0) ptr++;  
       }  
     }  
1437    
1438    /* Start with (? but not a condition. */  Arguments:
1439      code     points to the start of the pattern (the bracket)
1440      utf      TRUE in UTF-8 / UTF-16 / UTF-32 mode
1441      atend    TRUE if called when the pattern is complete
1442      cd       the "compile data" structure
1443    
1444    else  Returns:   the fixed length,
1445      {               or -1 if there is no fixed length,
1446      ptr += 2;               or -2 if \C was encountered (in UTF-8 mode only)
1447      if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */               or -3 if an OP_RECURSE item was encountered and atend is FALSE
1448                 or -4 if an unknown opcode was encountered (internal error)
1449    */
1450    
1451      /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */  static int
1452    find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd)
1453    {
1454    int length = -1;
1455    
1456      if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&  register int branchlength = 0;
1457          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)  register pcre_uchar *cc = code + 1 + LINK_SIZE;
       {  
       int term;  
       const uschar *thisname;  
       *count += 1;  
       if (name == NULL && *count == lorn) return *count;  
       term = *ptr++;  
       if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;  
       thisname = ptr;  
       while (*ptr != term) ptr++;  
       if (name != NULL && lorn == ptr - thisname &&  
           strncmp((const char *)name, (const char *)thisname, lorn) == 0)  
         return *count;  
       term++;  
       }  
     }  
   }  
1458    
1459  /* Past any initial parenthesis handling, scan for parentheses or vertical  /* Scan along the opcodes for this branch. If we get to the end of the
1460  bars. */  branch, check the length against that of the other branches. */
1461    
1462  for (; *ptr != 0; ptr++)  for (;;)
1463    {    {
1464    /* Skip over backslashed characters and also entire \Q...\E */    int d;
1465      pcre_uchar *ce, *cs;
1466      register pcre_uchar op = *cc;
1467    
1468    if (*ptr == CHAR_BACKSLASH)    switch (op)
1469      {      {
1470      if (*(++ptr) == 0) goto FAIL_EXIT;      /* We only need to continue for OP_CBRA (normal capturing bracket) and
1471      if (*ptr == CHAR_Q) for (;;)      OP_BRA (normal non-capturing bracket) because the other variants of these
1472        {      opcodes are all concerned with unlimited repeated groups, which of course
1473        while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};      are not of fixed length. */
       if (*ptr == 0) goto FAIL_EXIT;  
       if (*(++ptr) == CHAR_E) break;  
       }  
     continue;  
     }  
   
   /* Skip over character classes; this logic must be similar to the way they  
   are handled for real. If the first character is '^', skip it. Also, if the  
   first few characters (either before or after ^) are \Q\E or \E we skip them  
   too. This makes for compatibility with Perl. Note the use of STR macros to  
   encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */  
1474    
1475    if (*ptr == CHAR_LEFT_SQUARE_BRACKET)      case OP_CBRA:
1476      {      case OP_BRA:
1477      BOOL negate_class = FALSE;      case OP_ONCE:
1478      for (;;)      case OP_ONCE_NC:
1479        {      case OP_COND:
1480        if (ptr[1] == CHAR_BACKSLASH)      d = find_fixedlength(cc + ((op == OP_CBRA)? IMM2_SIZE : 0), utf, atend, cd);
1481          {      if (d < 0) return d;
1482          if (ptr[2] == CHAR_E)      branchlength += d;
1483            ptr+= 2;      do cc += GET(cc, 1); while (*cc == OP_ALT);
1484          else if (strncmp((const char *)ptr+2,      cc += 1 + LINK_SIZE;
1485                   STR_Q STR_BACKSLASH STR_E, 3) == 0)      break;
           ptr += 4;  
         else  
           break;  
         }  
       else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)  
         {  
         negate_class = TRUE;  
         ptr++;  
         }  
       else break;  
       }  
1486    
1487      /* If the next character is ']', it is a data character that must be      /* Reached end of a branch; if it's a ket it is the end of a nested call.
1488      skipped, except in JavaScript compatibility mode. */      If it's ALT it is an alternation in a nested call. An ACCEPT is effectively
1489        an ALT. If it is END it's the end of the outer call. All can be handled by
1490      if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&      the same code. Note that we must not include the OP_KETRxxx opcodes here,
1491          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)      because they all imply an unlimited repeat. */
       ptr++;  
   
     while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)  
       {  
       if (*ptr == 0) return -1;  
       if (*ptr == CHAR_BACKSLASH)  
         {  
         if (*(++ptr) == 0) goto FAIL_EXIT;  
         if (*ptr == CHAR_Q) for (;;)  
           {  
           while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};  
           if (*ptr == 0) goto FAIL_EXIT;  
           if (*(++ptr) == CHAR_E) break;  
           }  
         continue;  
         }  
       }  
     continue;  
     }  
   
   /* Skip comments in /x mode */  
   
   if (xmode && *ptr == CHAR_NUMBER_SIGN)  
     {  
     ptr++;  
     while (*ptr != 0)  
       {  
       if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }  
       ptr++;  
 #ifdef SUPPORT_UTF8  
       if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;  
 #endif  
       }  
     if (*ptr == 0) goto FAIL_EXIT;  
     continue;  
     }  
   
   /* Check for the special metacharacters */  
   
   if (*ptr == CHAR_LEFT_PARENTHESIS)  
     {  
     int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, count);  
     if (rc > 0) return rc;  
     if (*ptr == 0) goto FAIL_EXIT;  
     }  
   
   else if (*ptr == CHAR_RIGHT_PARENTHESIS)  
     {  
     if (dup_parens && *count < hwm_count) *count = hwm_count;  
     goto FAIL_EXIT;  
     }  
   
   else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)  
     {  
     if (*count > hwm_count) hwm_count = *count;  
     *count = start_count;  
     }  
   }  
   
 FAIL_EXIT:  
 *ptrptr = ptr;  
 return -1;  
 }  
   
   
   
   
 /*************************************************  
 *       Find forward referenced subpattern       *  
 *************************************************/  
   
 /* This function scans along a pattern's text looking for capturing  
 subpatterns, and counting them. If it finds a named pattern that matches the  
 name it is given, it returns its number. Alternatively, if the name is NULL, it  
 returns when it reaches a given numbered subpattern. This is used for forward  
 references to subpatterns. We used to be able to start this scan from the  
 current compiling point, using the current count value from cd->bracount, and  
 do it all in a single loop, but the addition of the possibility of duplicate  
 subpattern numbers means that we have to scan from the very start, in order to  
 take account of such duplicates, and to use a recursive function to keep track  
 of the different types of group.  
   
 Arguments:  
   cd           compile background data  
   name         name to seek, or NULL if seeking a numbered subpattern  
   lorn         name length, or subpattern number if name is NULL  
   xmode        TRUE if we are in /x mode  
   utf8         TRUE if we are in UTF-8 mode  
   
 Returns:       the number of the found subpattern, or -1 if not found  
 */  
   
 static int  
 find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode,  
   BOOL utf8)  
 {  
 uschar *ptr = (uschar *)cd->start_pattern;  
 int count = 0;  
 int rc;  
   
 /* If the pattern does not start with an opening parenthesis, the first call  
 to find_parens_sub() will scan right to the end (if necessary). However, if it  
 does start with a parenthesis, find_parens_sub() will return when it hits the  
 matching closing parens. That is why we have to have a loop. */  
   
 for (;;)  
   {  
   rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, &count);  
   if (rc > 0 || *ptr++ == 0) break;  
   }  
   
 return rc;  
 }  
   
   
   
   
 /*************************************************  
 *      Find first significant op code            *  
 *************************************************/  
   
 /* This is called by several functions that scan a compiled expression looking  
 for a fixed first character, or an anchoring op code etc. It skips over things  
 that do not influence this. For some calls, a change of option is important.  
 For some calls, it makes sense to skip negative forward and all backward  
 assertions, and also the \b assertion; for others it does not.  
   
 Arguments:  
   code         pointer to the start of the group  
   options      pointer to external options  
   optbit       the option bit whose changing is significant, or  
                  zero if none are  
   skipassert   TRUE if certain assertions are to be skipped  
   
 Returns:       pointer to the first significant opcode  
 */  
   
 static const uschar*  
 first_significant_code(const uschar *code, int *options, int optbit,  
   BOOL skipassert)  
 {  
 for (;;)  
   {  
   switch ((int)*code)  
     {  
     case OP_OPT:  
     if (optbit > 0 && ((int)code[1] & optbit) != (*options & optbit))  
       *options = (int)code[1];  
     code += 2;  
     break;  
   
     case OP_ASSERT_NOT:  
     case OP_ASSERTBACK:  
     case OP_ASSERTBACK_NOT:  
     if (!skipassert) return code;  
     do code += GET(code, 1); while (*code == OP_ALT);  
     code += _pcre_OP_lengths[*code];  
     break;  
   
     case OP_WORD_BOUNDARY:  
     case OP_NOT_WORD_BOUNDARY:  
     if (!skipassert) return code;  
     /* Fall through */  
   
     case OP_CALLOUT:  
     case OP_CREF:  
     case OP_NCREF:  
     case OP_RREF:  
     case OP_NRREF:  
     case OP_DEF:  
     code += _pcre_OP_lengths[*code];  
     break;  
   
     default:  
     return code;  
     }  
   }  
 /* Control never reaches here */  
 }  
   
   
   
   
 /*************************************************  
 *        Find the fixed length of a branch       *  
 *************************************************/  
   
 /* Scan a branch and compute the fixed length of subject that will match it,  
 if the length is fixed. This is needed for dealing with backward assertions.  
 In UTF8 mode, the result is in characters rather than bytes. The branch is  
 temporarily terminated with OP_END when this function is called.  
   
 This function is called when a backward assertion is encountered, so that if it  
 fails, the error message can point to the correct place in the pattern.  
 However, we cannot do this when the assertion contains subroutine calls,  
 because they can be forward references. We solve this by remembering this case  
 and doing the check at the end; a flag specifies which mode we are running in.  
   
 Arguments:  
   code     points to the start of the pattern (the bracket)  
   options  the compiling options  
   atend    TRUE if called when the pattern is complete  
   cd       the "compile data" structure  
   
 Returns:   the fixed length,  
              or -1 if there is no fixed length,  
              or -2 if \C was encountered  
              or -3 if an OP_RECURSE item was encountered and atend is FALSE  
 */  
   
 static int  
 find_fixedlength(uschar *code, int options, BOOL atend, compile_data *cd)  
 {  
 int length = -1;  
   
 register int branchlength = 0;  
 register uschar *cc = code + 1 + LINK_SIZE;  
   
 /* Scan along the opcodes for this branch. If we get to the end of the  
 branch, check the length against that of the other branches. */  
   
 for (;;)  
   {  
   int d;  
   uschar *ce, *cs;  
   register int op = *cc;  
   switch (op)  
     {  
     case OP_CBRA:  
     case OP_BRA:  
     case OP_ONCE:  
     case OP_COND:  
     d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options, atend, cd);  
     if (d < 0) return d;  
     branchlength += d;  
     do cc += GET(cc, 1); while (*cc == OP_ALT);  
     cc += 1 + LINK_SIZE;  
     break;  
   
     /* Reached end of a branch; if it's a ket it is the end of a nested  
     call. If it's ALT it is an alternation in a nested call. If it is  
     END it's the end of the outer call. All can be handled by the same code. */  
1492    
1493      case OP_ALT:      case OP_ALT:
1494      case OP_KET:      case OP_KET:
     case OP_KETRMAX:  
     case OP_KETRMIN:  
1495      case OP_END:      case OP_END:
1496        case OP_ACCEPT:
1497        case OP_ASSERT_ACCEPT:
1498      if (length < 0) length = branchlength;      if (length < 0) length = branchlength;
1499        else if (length != branchlength) return -1;        else if (length != branchlength) return -1;
1500      if (*cc != OP_ALT) return length;      if (*cc != OP_ALT) return length;
# Line 1522  for (;;) Line 1508  for (;;)
1508    
1509      case OP_RECURSE:      case OP_RECURSE:
1510      if (!atend) return -3;      if (!atend) return -3;
1511      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */      cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1512      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */      do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
1513      if (cc > cs && cc < ce) return -1;                /* Recursion */      if (cc > cs && cc < ce) return -1;                    /* Recursion */
1514      d = find_fixedlength(cs + 2, options, atend, cd);      d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd);
1515      if (d < 0) return d;      if (d < 0) return d;
1516      branchlength += d;      branchlength += d;
1517      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
# Line 1538  for (;;) Line 1524  for (;;)
1524      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1525      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1526      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1527      /* Fall through */      cc += PRIV(OP_lengths)[*cc];
1528        break;
1529    
1530      /* Skip over things that don't match chars */      /* Skip over things that don't match chars */
1531    
1532      case OP_REVERSE:      case OP_MARK:
1533        case OP_PRUNE_ARG:
1534        case OP_SKIP_ARG:
1535        case OP_THEN_ARG:
1536        cc += cc[1] + PRIV(OP_lengths)[*cc];
1537        break;
1538    
1539        case OP_CALLOUT:
1540        case OP_CIRC:
1541        case OP_CIRCM:
1542        case OP_CLOSE:
1543        case OP_COMMIT:
1544      case OP_CREF:      case OP_CREF:
     case OP_NCREF:  
     case OP_RREF:  
     case OP_NRREF:  
1545      case OP_DEF:      case OP_DEF:
1546      case OP_OPT:      case OP_DOLL:
1547      case OP_CALLOUT:      case OP_DOLLM:
     case OP_SOD:  
     case OP_SOM:  
     case OP_SET_SOM:  
1548      case OP_EOD:      case OP_EOD:
1549      case OP_EODN:      case OP_EODN:
1550      case OP_CIRC:      case OP_FAIL:
1551      case OP_DOLL:      case OP_NCREF:
1552        case OP_NRREF:
1553      case OP_NOT_WORD_BOUNDARY:      case OP_NOT_WORD_BOUNDARY:
1554        case OP_PRUNE:
1555        case OP_REVERSE:
1556        case OP_RREF:
1557        case OP_SET_SOM:
1558        case OP_SKIP:
1559        case OP_SOD:
1560        case OP_SOM:
1561        case OP_THEN:
1562      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
1563      cc += _pcre_OP_lengths[*cc];      cc += PRIV(OP_lengths)[*cc];
1564      break;      break;
1565    
1566      /* Handle literal characters */      /* Handle literal characters */
1567    
1568      case OP_CHAR:      case OP_CHAR:
1569      case OP_CHARNC:      case OP_CHARI:
1570      case OP_NOT:      case OP_NOT:
1571        case OP_NOTI:
1572      branchlength++;      branchlength++;
1573      cc += 2;      cc += 2;
1574  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1575      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
       cc += _pcre_utf8_table4[cc[-1] & 0x3f];  
1576  #endif  #endif
1577      break;      break;
1578    
# Line 1579  for (;;) Line 1580  for (;;)
1580      need to skip over a multibyte character in UTF8 mode.  */      need to skip over a multibyte character in UTF8 mode.  */
1581    
1582      case OP_EXACT:      case OP_EXACT:
1583      branchlength += GET2(cc,1);      case OP_EXACTI:
1584      cc += 4;      case OP_NOTEXACT:
1585  #ifdef SUPPORT_UTF8      case OP_NOTEXACTI:
1586      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)      branchlength += (int)GET2(cc,1);
1587        cc += _pcre_utf8_table4[cc[-1] & 0x3f];      cc += 2 + IMM2_SIZE;
1588    #ifdef SUPPORT_UTF
1589        if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1590  #endif  #endif
1591      break;      break;
1592    
1593      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1594      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1595      if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;      if (cc[1 + IMM2_SIZE] == OP_PROP || cc[1 + IMM2_SIZE] == OP_NOTPROP)
1596      cc += 4;        cc += 2;
1597        cc += 1 + IMM2_SIZE + 1;
1598      break;      break;
1599    
1600      /* Handle single-char matchers */      /* Handle single-char matchers */
# Line 1600  for (;;) Line 1604  for (;;)
1604      cc += 2;      cc += 2;
1605      /* Fall through */      /* Fall through */
1606    
1607        case OP_HSPACE:
1608        case OP_VSPACE:
1609        case OP_NOT_HSPACE:
1610        case OP_NOT_VSPACE:
1611      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
1612      case OP_DIGIT:      case OP_DIGIT:
1613      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
# Line 1612  for (;;) Line 1620  for (;;)
1620      cc++;      cc++;
1621      break;      break;
1622    
1623      /* The single-byte matcher isn't allowed */      /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
1624        otherwise \C is coded as OP_ALLANY. */
1625    
1626      case OP_ANYBYTE:      case OP_ANYBYTE:
1627      return -2;      return -2;
1628    
1629      /* Check a class for variable quantification */      /* Check a class for variable quantification */
1630    
 #ifdef SUPPORT_UTF8  
     case OP_XCLASS:  
     cc += GET(cc, 1) - 33;  
     /* Fall through */  
 #endif  
   
1631      case OP_CLASS:      case OP_CLASS:
1632      case OP_NCLASS:      case OP_NCLASS:
1633      cc += 33;  #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1634        case OP_XCLASS:
1635        /* The original code caused an unsigned overflow in 64 bit systems,
1636        so now we use a conditional statement. */
1637        if (op == OP_XCLASS)
1638          cc += GET(cc, 1);
1639        else
1640          cc += PRIV(OP_lengths)[OP_CLASS];
1641    #else
1642        cc += PRIV(OP_lengths)[OP_CLASS];
1643    #endif
1644    
1645      switch (*cc)      switch (*cc)
1646        {        {
1647          case OP_CRPLUS:
1648          case OP_CRMINPLUS:
1649        case OP_CRSTAR:        case OP_CRSTAR:
1650        case OP_CRMINSTAR:        case OP_CRMINSTAR:
1651        case OP_CRQUERY:        case OP_CRQUERY:
# Line 1639  for (;;) Line 1654  for (;;)
1654    
1655        case OP_CRRANGE:        case OP_CRRANGE:
1656        case OP_CRMINRANGE:        case OP_CRMINRANGE:
1657        if (GET2(cc,1) != GET2(cc,3)) return -1;        if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
1658        branchlength += GET2(cc,1);        branchlength += (int)GET2(cc,1);
1659        cc += 5;        cc += 1 + 2 * IMM2_SIZE;
1660        break;        break;
1661    
1662        default:        default:
# Line 1651  for (;;) Line 1666  for (;;)
1666    
1667      /* Anything else is variable length */      /* Anything else is variable length */
1668    
1669      default:      case OP_ANYNL:
1670        case OP_BRAMINZERO:
1671        case OP_BRAPOS:
1672        case OP_BRAPOSZERO:
1673        case OP_BRAZERO:
1674        case OP_CBRAPOS:
1675        case OP_EXTUNI:
1676        case OP_KETRMAX:
1677        case OP_KETRMIN:
1678        case OP_KETRPOS:
1679        case OP_MINPLUS:
1680        case OP_MINPLUSI:
1681        case OP_MINQUERY:
1682        case OP_MINQUERYI:
1683        case OP_MINSTAR:
1684        case OP_MINSTARI:
1685        case OP_MINUPTO:
1686        case OP_MINUPTOI:
1687        case OP_NOTMINPLUS:
1688        case OP_NOTMINPLUSI:
1689        case OP_NOTMINQUERY:
1690        case OP_NOTMINQUERYI:
1691        case OP_NOTMINSTAR:
1692        case OP_NOTMINSTARI:
1693        case OP_NOTMINUPTO:
1694        case OP_NOTMINUPTOI:
1695        case OP_NOTPLUS:
1696        case OP_NOTPLUSI:
1697        case OP_NOTPOSPLUS:
1698        case OP_NOTPOSPLUSI:
1699        case OP_NOTPOSQUERY:
1700        case OP_NOTPOSQUERYI:
1701        case OP_NOTPOSSTAR:
1702        case OP_NOTPOSSTARI:
1703        case OP_NOTPOSUPTO:
1704        case OP_NOTPOSUPTOI:
1705        case OP_NOTQUERY:
1706        case OP_NOTQUERYI:
1707        case OP_NOTSTAR:
1708        case OP_NOTSTARI:
1709        case OP_NOTUPTO:
1710        case OP_NOTUPTOI:
1711        case OP_PLUS:
1712        case OP_PLUSI:
1713        case OP_POSPLUS:
1714        case OP_POSPLUSI:
1715        case OP_POSQUERY:
1716        case OP_POSQUERYI:
1717        case OP_POSSTAR:
1718        case OP_POSSTARI:
1719        case OP_POSUPTO:
1720        case OP_POSUPTOI:
1721        case OP_QUERY:
1722        case OP_QUERYI:
1723        case OP_REF:
1724        case OP_REFI:
1725        case OP_SBRA:
1726        case OP_SBRAPOS:
1727        case OP_SCBRA:
1728        case OP_SCBRAPOS:
1729        case OP_SCOND:
1730        case OP_SKIPZERO:
1731        case OP_STAR:
1732        case OP_STARI:
1733        case OP_TYPEMINPLUS:
1734        case OP_TYPEMINQUERY:
1735        case OP_TYPEMINSTAR:
1736        case OP_TYPEMINUPTO:
1737        case OP_TYPEPLUS:
1738        case OP_TYPEPOSPLUS:
1739        case OP_TYPEPOSQUERY:
1740        case OP_TYPEPOSSTAR:
1741        case OP_TYPEPOSUPTO:
1742        case OP_TYPEQUERY:
1743        case OP_TYPESTAR:
1744        case OP_TYPEUPTO:
1745        case OP_UPTO:
1746        case OP_UPTOI:
1747      return -1;      return -1;
1748    
1749        /* Catch unrecognized opcodes so that when new ones are added they
1750        are not forgotten, as has happened in the past. */
1751    
1752        default:
1753        return -4;
1754      }      }
1755    }    }
1756  /* Control never gets here */  /* Control never gets here */
# Line 1673  length. Line 1771  length.
1771    
1772  Arguments:  Arguments:
1773    code        points to start of expression    code        points to start of expression
1774    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
1775    number      the required bracket number or negative to find a lookbehind    number      the required bracket number or negative to find a lookbehind
1776    
1777  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
1778  */  */
1779    
1780  const uschar *  const pcre_uchar *
1781  _pcre_find_bracket(const uschar *code, BOOL utf8, int number)  PRIV(find_bracket)(const pcre_uchar *code, BOOL utf, int number)
1782  {  {
1783  for (;;)  for (;;)
1784    {    {
1785    register int c = *code;    register pcre_uchar c = *code;
1786    
1787    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
1788    
1789    /* XCLASS is used for classes that cannot be represented just by a bit    /* XCLASS is used for classes that cannot be represented just by a bit
# Line 1697  for (;;) Line 1796  for (;;)
1796    
1797    else if (c == OP_REVERSE)    else if (c == OP_REVERSE)
1798      {      {
1799      if (number < 0) return (uschar *)code;      if (number < 0) return (pcre_uchar *)code;
1800      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
1801      }      }
1802    
1803    /* Handle capturing bracket */    /* Handle capturing bracket */
1804    
1805    else if (c == OP_CBRA)    else if (c == OP_CBRA || c == OP_SCBRA ||
1806               c == OP_CBRAPOS || c == OP_SCBRAPOS)
1807      {      {
1808      int n = GET2(code, 1+LINK_SIZE);      int n = (int)GET2(code, 1+LINK_SIZE);
1809      if (n == number) return (uschar *)code;      if (n == number) return (pcre_uchar *)code;
1810      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
1811      }      }
1812    
1813    /* 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 1735  for (;;) Line 1835  for (;;)
1835        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
1836        case OP_TYPEEXACT:        case OP_TYPEEXACT:
1837        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
1838        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
1839            code += 2;
1840        break;        break;
1841    
1842        case OP_MARK:        case OP_MARK:
1843        case OP_PRUNE_ARG:        case OP_PRUNE_ARG:
1844        case OP_SKIP_ARG:        case OP_SKIP_ARG:
       code += code[1];  
       break;  
   
1845        case OP_THEN_ARG:        case OP_THEN_ARG:
1846        code += code[1+LINK_SIZE];        code += code[1];
1847        break;        break;
1848        }        }
1849    
1850      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
1851    
1852      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
1853    
1854    /* 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
1855    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
1856    arrange to skip the extra bytes. */    arrange to skip the extra bytes. */
1857    
1858  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
1859      if (utf8) switch(c)      if (utf) switch(c)
1860        {        {
1861        case OP_CHAR:        case OP_CHAR:
1862        case OP_CHARNC:        case OP_CHARI:
1863        case OP_EXACT:        case OP_EXACT:
1864          case OP_EXACTI:
1865        case OP_UPTO:        case OP_UPTO:
1866          case OP_UPTOI:
1867        case OP_MINUPTO:        case OP_MINUPTO:
1868          case OP_MINUPTOI:
1869        case OP_POSUPTO:        case OP_POSUPTO:
1870          case OP_POSUPTOI:
1871        case OP_STAR:        case OP_STAR:
1872          case OP_STARI:
1873        case OP_MINSTAR:        case OP_MINSTAR:
1874          case OP_MINSTARI:
1875        case OP_POSSTAR:        case OP_POSSTAR:
1876          case OP_POSSTARI:
1877        case OP_PLUS:        case OP_PLUS:
1878          case OP_PLUSI:
1879        case OP_MINPLUS:        case OP_MINPLUS:
1880          case OP_MINPLUSI:
1881        case OP_POSPLUS:        case OP_POSPLUS:
1882          case OP_POSPLUSI:
1883        case OP_QUERY:        case OP_QUERY:
1884          case OP_QUERYI:
1885        case OP_MINQUERY:        case OP_MINQUERY:
1886          case OP_MINQUERYI:
1887        case OP_POSQUERY:        case OP_POSQUERY:
1888        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_POSQUERYI:
1889          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
1890        break;        break;
1891        }        }
1892  #else  #else
1893      (void)(utf8);  /* Keep compiler happy by referencing function argument */      (void)(utf);  /* Keep compiler happy by referencing function argument */
1894  #endif  #endif
1895      }      }
1896    }    }
# Line 1796  instance of OP_RECURSE. Line 1907  instance of OP_RECURSE.
1907    
1908  Arguments:  Arguments:
1909    code        points to start of expression    code        points to start of expression
1910    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
1911    
1912  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
1913  */  */
1914    
1915  static const uschar *  static const pcre_uchar *
1916  find_recurse(const uschar *code, BOOL utf8)  find_recurse(const pcre_uchar *code, BOOL utf)
1917  {  {
1918  for (;;)  for (;;)
1919    {    {
1920    register int c = *code;    register pcre_uchar c = *code;
1921    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
1922    if (c == OP_RECURSE) return code;    if (c == OP_RECURSE) return code;
1923    
# Line 1841  for (;;) Line 1952  for (;;)
1952        case OP_TYPEUPTO:        case OP_TYPEUPTO:
1953        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
1954        case OP_TYPEEXACT:        case OP_TYPEEXACT:
1955        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
1956            code += 2;
1957        break;        break;
1958    
1959        case OP_MARK:        case OP_MARK:
1960        case OP_PRUNE_ARG:        case OP_PRUNE_ARG:
1961        case OP_SKIP_ARG:        case OP_SKIP_ARG:
       code += code[1];  
       break;  
   
1962        case OP_THEN_ARG:        case OP_THEN_ARG:
1963        code += code[1+LINK_SIZE];        code += code[1];
1964        break;        break;
1965        }        }
1966    
1967      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
1968    
1969      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
1970    
1971      /* 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
1972      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
1973      to arrange to skip the extra bytes. */      to arrange to skip the extra bytes. */
1974    
1975  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
1976      if (utf8) switch(c)      if (utf) switch(c)
1977        {        {
1978        case OP_CHAR:        case OP_CHAR:
1979        case OP_CHARNC:        case OP_CHARI:
1980          case OP_NOT:
1981          case OP_NOTI:
1982        case OP_EXACT:        case OP_EXACT:
1983          case OP_EXACTI:
1984          case OP_NOTEXACT:
1985          case OP_NOTEXACTI:
1986        case OP_UPTO:        case OP_UPTO:
1987          case OP_UPTOI:
1988          case OP_NOTUPTO:
1989          case OP_NOTUPTOI:
1990        case OP_MINUPTO:        case OP_MINUPTO:
1991          case OP_MINUPTOI:
1992          case OP_NOTMINUPTO:
1993          case OP_NOTMINUPTOI:
1994        case OP_POSUPTO:        case OP_POSUPTO:
1995          case OP_POSUPTOI:
1996          case OP_NOTPOSUPTO:
1997          case OP_NOTPOSUPTOI:
1998        case OP_STAR:        case OP_STAR:
1999          case OP_STARI:
2000          case OP_NOTSTAR:
2001          case OP_NOTSTARI:
2002        case OP_MINSTAR:        case OP_MINSTAR:
2003          case OP_MINSTARI:
2004          case OP_NOTMINSTAR:
2005          case OP_NOTMINSTARI:
2006        case OP_POSSTAR:        case OP_POSSTAR:
2007          case OP_POSSTARI:
2008          case OP_NOTPOSSTAR:
2009          case OP_NOTPOSSTARI:
2010        case OP_PLUS:        case OP_PLUS:
2011          case OP_PLUSI:
2012          case OP_NOTPLUS:
2013          case OP_NOTPLUSI:
2014        case OP_MINPLUS:        case OP_MINPLUS:
2015          case OP_MINPLUSI:
2016          case OP_NOTMINPLUS:
2017          case OP_NOTMINPLUSI:
2018        case OP_POSPLUS:        case OP_POSPLUS:
2019          case OP_POSPLUSI:
2020          case OP_NOTPOSPLUS:
2021          case OP_NOTPOSPLUSI:
2022        case OP_QUERY:        case OP_QUERY:
2023          case OP_QUERYI:
2024          case OP_NOTQUERY:
2025          case OP_NOTQUERYI:
2026        case OP_MINQUERY:        case OP_MINQUERY:
2027          case OP_MINQUERYI:
2028          case OP_NOTMINQUERY:
2029          case OP_NOTMINQUERYI:
2030        case OP_POSQUERY:        case OP_POSQUERY:
2031        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_POSQUERYI:
2032          case OP_NOTPOSQUERY:
2033          case OP_NOTPOSQUERYI:
2034          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2035        break;        break;
2036        }        }
2037  #else  #else
2038      (void)(utf8);  /* Keep compiler happy by referencing function argument */      (void)(utf);  /* Keep compiler happy by referencing function argument */
2039  #endif  #endif
2040      }      }
2041    }    }
# Line 1908  bracket whose current branch will alread Line 2058  bracket whose current branch will alread
2058  Arguments:  Arguments:
2059    code        points to start of search    code        points to start of search
2060    endcode     points to where to stop    endcode     points to where to stop
2061    utf8        TRUE if in UTF8 mode    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
2062    cd          contains pointers to tables etc.    cd          contains pointers to tables etc.
2063      recurses    chain of recurse_check to catch mutual recursion
2064    
2065  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2066  */  */
2067    
2068    typedef struct recurse_check {
2069      struct recurse_check *prev;
2070      const pcre_uchar *group;
2071    } recurse_check;
2072    
2073  static BOOL  static BOOL
2074  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8,  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
2075    compile_data *cd)    BOOL utf, compile_data *cd, recurse_check *recurses)
2076  {  {
2077  register int c;  register pcre_uchar c;
2078  for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);  recurse_check this_recurse;
2079    
2080    for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
2081       code < endcode;       code < endcode;
2082       code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
2083    {    {
2084    const uschar *ccode;    const pcre_uchar *ccode;
2085    
2086    c = *code;    c = *code;
2087    
# Line 1937  for (code = first_significant_code(code Line 2095  for (code = first_significant_code(code
2095      continue;      continue;
2096      }      }
2097    
   /* Groups with zero repeats can of course be empty; skip them. */  
   
   if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)  
     {  
     code += _pcre_OP_lengths[c];  
     do code += GET(code, 1); while (*code == OP_ALT);  
     c = *code;  
     continue;  
     }  
   
2098    /* For a recursion/subroutine call, if its end has been reached, which    /* For a recursion/subroutine call, if its end has been reached, which
2099    implies a subroutine call, we can scan it. */    implies a backward reference subroutine call, we can scan it. If it's a
2100      forward reference subroutine call, we can't. To detect forward reference
2101      we have to scan up the list that is kept in the workspace. This function is
2102      called only when doing the real compile, not during the pre-compile that
2103      measures the size of the compiled pattern. */
2104    
2105    if (c == OP_RECURSE)    if (c == OP_RECURSE)
2106      {      {
2107      BOOL empty_branch = FALSE;      const pcre_uchar *scode = cd->start_code + GET(code, 1);
2108      const uschar *scode = cd->start_code + GET(code, 1);      BOOL empty_branch;
2109      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */  
2110        /* Test for forward reference or uncompleted reference. This is disabled
2111        when called to scan a completed pattern by setting cd->start_workspace to
2112        NULL. */
2113    
2114        if (cd->start_workspace != NULL)
2115          {
2116          const pcre_uchar *tcode;
2117          for (tcode = cd->start_workspace; tcode < cd->hwm; tcode += LINK_SIZE)
2118            if ((int)GET(tcode, 0) == (int)(code + 1 - cd->start_code)) return TRUE;
2119          if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
2120          }
2121    
2122        /* If we are scanning a completed pattern, there are no forward references
2123        and all groups are complete. We need to detect whether this is a recursive
2124        call, as otherwise there will be an infinite loop. If it is a recursion,
2125        just skip over it. Simple recursions are easily detected. For mutual
2126        recursions we keep a chain on the stack. */
2127    
2128        else
2129          {
2130          recurse_check *r = recurses;
2131          const pcre_uchar *endgroup = scode;
2132    
2133          do endgroup += GET(endgroup, 1); while (*endgroup == OP_ALT);
2134          if (code >= scode && code <= endgroup) continue;  /* Simple recursion */
2135    
2136          for (r = recurses; r != NULL; r = r->prev)
2137            if (r->group == scode) break;
2138          if (r != NULL) continue;   /* Mutual recursion */
2139          }
2140    
2141        /* Completed reference; scan the referenced group, remembering it on the
2142        stack chain to detect mutual recursions. */
2143    
2144        empty_branch = FALSE;
2145        this_recurse.prev = recurses;
2146        this_recurse.group = scode;
2147    
2148      do      do
2149        {        {
2150        if (could_be_empty_branch(scode, endcode, utf8, cd))        if (could_be_empty_branch(scode, endcode, utf, cd, &this_recurse))
2151          {          {
2152          empty_branch = TRUE;          empty_branch = TRUE;
2153          break;          break;
# Line 1965  for (code = first_significant_code(code Line 2155  for (code = first_significant_code(code
2155        scode += GET(scode, 1);        scode += GET(scode, 1);
2156        }        }
2157      while (*scode == OP_ALT);      while (*scode == OP_ALT);
2158    
2159      if (!empty_branch) return FALSE;  /* All branches are non-empty */      if (!empty_branch) return FALSE;  /* All branches are non-empty */
2160      continue;      continue;
2161      }      }
2162    
2163      /* Groups with zero repeats can of course be empty; skip them. */
2164    
2165      if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2166          c == OP_BRAPOSZERO)
2167        {
2168        code += PRIV(OP_lengths)[c];
2169        do code += GET(code, 1); while (*code == OP_ALT);
2170        c = *code;
2171        continue;
2172        }
2173    
2174      /* A nested group that is already marked as "could be empty" can just be
2175      skipped. */
2176    
2177      if (c == OP_SBRA  || c == OP_SBRAPOS ||
2178          c == OP_SCBRA || c == OP_SCBRAPOS)
2179        {
2180        do code += GET(code, 1); while (*code == OP_ALT);
2181        c = *code;
2182        continue;
2183        }
2184    
2185    /* For other groups, scan the branches. */    /* For other groups, scan the branches. */
2186    
2187    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)    if (c == OP_BRA  || c == OP_BRAPOS ||
2188          c == OP_CBRA || c == OP_CBRAPOS ||
2189          c == OP_ONCE || c == OP_ONCE_NC ||
2190          c == OP_COND)
2191      {      {
2192      BOOL empty_branch;      BOOL empty_branch;
2193      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
# Line 1987  for (code = first_significant_code(code Line 2203  for (code = first_significant_code(code
2203        empty_branch = FALSE;        empty_branch = FALSE;
2204        do        do
2205          {          {
2206          if (!empty_branch && could_be_empty_branch(code, endcode, utf8, cd))          if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd, NULL))
2207            empty_branch = TRUE;            empty_branch = TRUE;
2208          code += GET(code, 1);          code += GET(code, 1);
2209          }          }
# Line 2005  for (code = first_significant_code(code Line 2221  for (code = first_significant_code(code
2221      {      {
2222      /* Check for quantifiers after a class. XCLASS is used for classes that      /* Check for quantifiers after a class. XCLASS is used for classes that
2223      cannot be represented just by a bit map. This includes negated single      cannot be represented just by a bit map. This includes negated single
2224      high-valued characters. The length in _pcre_OP_lengths[] is zero; the      high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
2225      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"
2226      here. */      here. */
2227    
2228  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2229      case OP_XCLASS:      case OP_XCLASS:
2230      ccode = code += GET(code, 1);      ccode = code += GET(code, 1);
2231      goto CHECK_CLASS_REPEAT;      goto CHECK_CLASS_REPEAT;
# Line 2017  for (code = first_significant_code(code Line 2233  for (code = first_significant_code(code
2233    
2234      case OP_CLASS:      case OP_CLASS:
2235      case OP_NCLASS:      case OP_NCLASS:
2236      ccode = code + 33;      ccode = code + PRIV(OP_lengths)[OP_CLASS];
2237    
2238  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2239      CHECK_CLASS_REPEAT:      CHECK_CLASS_REPEAT:
2240  #endif  #endif
2241    
# Line 2045  for (code = first_significant_code(code Line 2261  for (code = first_significant_code(code
2261    
2262      /* Opcodes that must match a character */      /* Opcodes that must match a character */
2263    
2264        case OP_ANY:
2265        case OP_ALLANY:
2266        case OP_ANYBYTE:
2267    
2268      case OP_PROP:      case OP_PROP:
2269      case OP_NOTPROP:      case OP_NOTPROP:
2270        case OP_ANYNL:
2271    
2272        case OP_NOT_HSPACE:
2273        case OP_HSPACE:
2274        case OP_NOT_VSPACE:
2275        case OP_VSPACE:
2276      case OP_EXTUNI:      case OP_EXTUNI:
2277    
2278      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
2279      case OP_DIGIT:      case OP_DIGIT:
2280      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
2281      case OP_WHITESPACE:      case OP_WHITESPACE:
2282      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
2283      case OP_WORDCHAR:      case OP_WORDCHAR:
2284      case OP_ANY:  
     case OP_ALLANY:  
     case OP_ANYBYTE:  
2285      case OP_CHAR:      case OP_CHAR:
2286      case OP_CHARNC:      case OP_CHARI:
2287      case OP_NOT:      case OP_NOT:
2288        case OP_NOTI:
2289    
2290      case OP_PLUS:      case OP_PLUS:
2291        case OP_PLUSI:
2292      case OP_MINPLUS:      case OP_MINPLUS:
2293      case OP_POSPLUS:      case OP_MINPLUSI:
2294      case OP_EXACT:  
2295      case OP_NOTPLUS:      case OP_NOTPLUS:
2296        case OP_NOTPLUSI:
2297      case OP_NOTMINPLUS:      case OP_NOTMINPLUS:
2298        case OP_NOTMINPLUSI:
2299    
2300        case OP_POSPLUS:
2301        case OP_POSPLUSI:
2302      case OP_NOTPOSPLUS:      case OP_NOTPOSPLUS:
2303        case OP_NOTPOSPLUSI:
2304    
2305        case OP_EXACT:
2306        case OP_EXACTI:
2307      case OP_NOTEXACT:      case OP_NOTEXACT:
2308        case OP_NOTEXACTI:
2309    
2310      case OP_TYPEPLUS:      case OP_TYPEPLUS:
2311      case OP_TYPEMINPLUS:      case OP_TYPEMINPLUS:
2312      case OP_TYPEPOSPLUS:      case OP_TYPEPOSPLUS:
2313      case OP_TYPEEXACT:      case OP_TYPEEXACT:
2314    
2315      return FALSE;      return FALSE;
2316    
2317      /* These are going to continue, as they may be empty, but we have to      /* These are going to continue, as they may be empty, but we have to
# Line 2091  for (code = first_significant_code(code Line 2331  for (code = first_significant_code(code
2331      case OP_TYPEUPTO:      case OP_TYPEUPTO:
2332      case OP_TYPEMINUPTO:      case OP_TYPEMINUPTO:
2333      case OP_TYPEPOSUPTO:      case OP_TYPEPOSUPTO:
2334      if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;      if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
2335          code += 2;
2336      break;      break;
2337    
2338      /* End of branch */      /* End of branch */
# Line 2099  for (code = first_significant_code(code Line 2340  for (code = first_significant_code(code
2340      case OP_KET:      case OP_KET:
2341      case OP_KETRMAX:      case OP_KETRMAX:
2342      case OP_KETRMIN:      case OP_KETRMIN:
2343        case OP_KETRPOS:
2344      case OP_ALT:      case OP_ALT:
2345      return TRUE;      return TRUE;
2346    
2347      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
2348      MINUPTO, and POSUPTO may be followed by a multibyte character */      MINUPTO, and POSUPTO and their caseless and negative versions may be
2349        followed by a multibyte character. */
2350    
2351  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2352      case OP_STAR:      case OP_STAR:
2353        case OP_STARI:
2354        case OP_NOTSTAR:
2355        case OP_NOTSTARI:
2356    
2357      case OP_MINSTAR:      case OP_MINSTAR:
2358        case OP_MINSTARI:
2359        case OP_NOTMINSTAR:
2360        case OP_NOTMINSTARI:
2361    
2362      case OP_POSSTAR:      case OP_POSSTAR:
2363        case OP_POSSTARI:
2364        case OP_NOTPOSSTAR:
2365        case OP_NOTPOSSTARI:
2366    
2367      case OP_QUERY:      case OP_QUERY:
2368        case OP_QUERYI:
2369        case OP_NOTQUERY:
2370        case OP_NOTQUERYI:
2371    
2372      case OP_MINQUERY:      case OP_MINQUERY:
2373        case OP_MINQUERYI:
2374        case OP_NOTMINQUERY:
2375        case OP_NOTMINQUERYI:
2376    
2377      case OP_POSQUERY:      case OP_POSQUERY:
2378      if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];      case OP_POSQUERYI:
2379        case OP_NOTPOSQUERY:
2380        case OP_NOTPOSQUERYI:
2381    
2382        if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
2383      break;      break;
2384    
2385      case OP_UPTO:      case OP_UPTO:
2386        case OP_UPTOI:
2387        case OP_NOTUPTO:
2388        case OP_NOTUPTOI:
2389    
2390      case OP_MINUPTO:      case OP_MINUPTO:
2391        case OP_MINUPTOI:
2392        case OP_NOTMINUPTO:
2393        case OP_NOTMINUPTOI:
2394    
2395      case OP_POSUPTO:      case OP_POSUPTO:
2396      if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];      case OP_POSUPTOI:
2397        case OP_NOTPOSUPTO:
2398        case OP_NOTPOSUPTOI:
2399    
2400        if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);
2401      break;      break;
2402  #endif  #endif
2403    
# Line 2128  for (code = first_significant_code(code Line 2407  for (code = first_significant_code(code
2407      case OP_MARK:      case OP_MARK:
2408      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
2409      case OP_SKIP_ARG:      case OP_SKIP_ARG:
     code += code[1];  
     break;  
   
2410      case OP_THEN_ARG:      case OP_THEN_ARG:
2411      code += code[1+LINK_SIZE];      code += code[1];
2412      break;      break;
2413    
2414      /* None of the remaining opcodes are required to match a character. */      /* None of the remaining opcodes are required to match a character. */
# Line 2155  return TRUE; Line 2431  return TRUE;
2431  the current branch of the current pattern to see if it could match the empty  the current branch of the current pattern to see if it could match the empty
2432  string. If it could, we must look outwards for branches at other levels,  string. If it could, we must look outwards for branches at other levels,
2433  stopping when we pass beyond the bracket which is the subject of the recursion.  stopping when we pass beyond the bracket which is the subject of the recursion.
2434    This function is called only during the real compile, not during the
2435    pre-compile.
2436    
2437  Arguments:  Arguments:
2438    code        points to start of the recursion    code        points to start of the recursion
2439    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2440    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2441    utf8        TRUE if in UTF-8 mode    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
2442    cd          pointers to tables etc    cd          pointers to tables etc
2443    
2444  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2445  */  */
2446    
2447  static BOOL  static BOOL
2448  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
2449    BOOL utf8, compile_data *cd)    branch_chain *bcptr, BOOL utf, compile_data *cd)
2450  {  {
2451  while (bcptr != NULL && bcptr->current_branch >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2452    {    {
2453    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8, cd))    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd, NULL))
2454      return FALSE;      return FALSE;
2455    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2456    }    }
# Line 2205  where Perl recognizes it as the POSIX cl Line 2483  where Perl recognizes it as the POSIX cl
2483  "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,  "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
2484  I think.  I think.
2485    
2486    A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
2487    It seems that the appearance of a nested POSIX class supersedes an apparent
2488    external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
2489    a digit.
2490    
2491    In Perl, unescaped square brackets may also appear as part of class names. For
2492    example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
2493    [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
2494    seem right at all. PCRE does not allow closing square brackets in POSIX class
2495    names.
2496    
2497  Arguments:  Arguments:
2498    ptr      pointer to the initial [    ptr      pointer to the initial [
2499    endptr   where to return the end pointer    endptr   where to return the end pointer
# Line 2213  Returns:   TRUE or FALSE Line 2502  Returns:   TRUE or FALSE
2502  */  */
2503    
2504  static BOOL  static BOOL
2505  check_posix_syntax(const uschar *ptr, const uschar **endptr)  check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
2506  {  {
2507  int terminator;          /* Don't combine these lines; the Solaris cc */  pcre_uchar terminator;          /* Don't combine these lines; the Solaris cc */
2508  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2509  for (++ptr; *ptr != 0; ptr++)  for (++ptr; *ptr != CHAR_NULL; ptr++)
2510    {    {
2511    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2512        ptr++;
2513      else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2514      else
2515      {      {
     if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;  
2516      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2517        {        {
2518        *endptr = ptr;        *endptr = ptr;
2519        return TRUE;        return TRUE;
2520        }        }
2521        if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&
2522             (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
2523              ptr[1] == CHAR_EQUALS_SIGN) &&
2524            check_posix_syntax(ptr, endptr))
2525          return FALSE;
2526      }      }
2527    }    }
2528  return FALSE;  return FALSE;
# Line 2250  Returns:     a value representing the na Line 2546  Returns:     a value representing the na
2546  */  */
2547    
2548  static int  static int
2549  check_posix_name(const uschar *ptr, int len)  check_posix_name(const pcre_uchar *ptr, int len)
2550  {  {
2551  const char *pn = posix_names;  const char *pn = posix_names;
2552  register int yield = 0;  register int yield = 0;
2553  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
2554    {    {
2555    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
2556      strncmp((const char *)ptr, pn, len) == 0) return yield;      STRNCMP_UC_C8(ptr, pn, (unsigned int)len) == 0) return yield;
2557    pn += posix_name_lengths[yield] + 1;    pn += posix_name_lengths[yield] + 1;
2558    yield++;    yield++;
2559    }    }
# Line 2289  value in the reference (which is a group Line 2585  value in the reference (which is a group
2585  Arguments:  Arguments:
2586    group      points to the start of the group    group      points to the start of the group
2587    adjust     the amount by which the group is to be moved    adjust     the amount by which the group is to be moved
2588    utf8       TRUE in UTF-8 mode    utf        TRUE in UTF-8 / UTF-16 / UTF-32 mode
2589    cd         contains pointers to tables etc.    cd         contains pointers to tables etc.
2590    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
2591    
# Line 2297  Returns:     nothing Line 2593  Returns:     nothing
2593  */  */
2594    
2595  static void  static void
2596  adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,  adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
2597    uschar *save_hwm)    pcre_uchar *save_hwm)
2598  {  {
2599  uschar *ptr = group;  pcre_uchar *ptr = group;
2600    
2601  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
2602    {    {
2603    int offset;    int offset;
2604    uschar *hc;    pcre_uchar *hc;
2605    
2606    /* 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
2607    reference. */    reference. */
2608    
2609    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
2610      {      {
2611      offset = GET(hc, 0);      offset = (int)GET(hc, 0);
2612      if (cd->start_code + offset == ptr + 1)      if (cd->start_code + offset == ptr + 1)
2613        {        {
2614        PUT(hc, 0, offset + adjust);        PUT(hc, 0, offset + adjust);
# Line 2325  while ((ptr = (uschar *)find_recurse(ptr Line 2621  while ((ptr = (uschar *)find_recurse(ptr
2621    
2622    if (hc >= cd->hwm)    if (hc >= cd->hwm)
2623      {      {
2624      offset = GET(ptr, 1);      offset = (int)GET(ptr, 1);
2625      if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);      if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
2626      }      }
2627    
# Line 2350  Arguments: Line 2646  Arguments:
2646  Returns:         new code pointer  Returns:         new code pointer
2647  */  */
2648    
2649  static uschar *  static pcre_uchar *
2650  auto_callout(uschar *code, const uschar *ptr, compile_data *cd)  auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
2651  {  {
2652  *code++ = OP_CALLOUT;  *code++ = OP_CALLOUT;
2653  *code++ = 255;  *code++ = 255;
2654  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
2655  PUT(code, LINK_SIZE, 0);                       /* Default length */  PUT(code, LINK_SIZE, 0);                       /* Default length */
2656  return code + 2*LINK_SIZE;  return code + 2 * LINK_SIZE;
2657  }  }
2658    
2659    
# Line 2379  Returns:             nothing Line 2675  Returns:             nothing
2675  */  */
2676    
2677  static void  static void
2678  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)  complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
2679  {  {
2680  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
2681  PUT(previous_callout, 2 + LINK_SIZE, length);  PUT(previous_callout, 2 + LINK_SIZE, length);
# Line 2393  PUT(previous_callout, 2 + LINK_SIZE, len Line 2689  PUT(previous_callout, 2 + LINK_SIZE, len
2689  *************************************************/  *************************************************/
2690    
2691  /* 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
2692  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
2693  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
2694  start address.  start address. A character with multiple other cases is returned on its own
2695    with a special return value.
2696    
2697  Arguments:  Arguments:
2698    cptr        points to starting character value; updated    cptr        points to starting character value; updated
# Line 2403  Arguments: Line 2700  Arguments:
2700    ocptr       where to put start of othercase range    ocptr       where to put start of othercase range
2701    odptr       where to put end of othercase range    odptr       where to put end of othercase range
2702    
2703  Yield:        TRUE when range returned; FALSE when no more  Yield:        -1 when no more
2704                   0 when a range is returned
2705                  >0 the CASESET offset for char with multiple other cases
2706                    in this case, ocptr contains the original
2707  */  */
2708    
2709  static BOOL  static int
2710  get_othercase_range(unsigned int *cptr, unsigned int d, unsigned int *ocptr,  get_othercase_range(pcre_uint32 *cptr, pcre_uint32 d, pcre_uint32 *ocptr,
2711    unsigned int *odptr)    pcre_uint32 *odptr)
2712  {  {
2713  unsigned int c, othercase, next;  pcre_uint32 c, othercase, next;
2714    unsigned int co;
2715    
2716    /* Find the first character that has an other case. If it has multiple other
2717    cases, return its case offset value. */
2718    
2719  for (c = *cptr; c <= d; c++)  for (c = *cptr; c <= d; c++)
2720    { if ((othercase = UCD_OTHERCASE(c)) != c) break; }    {
2721      if ((co = UCD_CASESET(c)) != 0)
2722        {
2723        *ocptr = c++;   /* Character that has the set */
2724        *cptr = c;      /* Rest of input range */
2725        return (int)co;
2726        }
2727      if ((othercase = UCD_OTHERCASE(c)) != c) break;
2728      }
2729    
2730  if (c > d) return FALSE;  if (c > d) return -1;  /* Reached end of range */
2731    
2732  *ocptr = othercase;  *ocptr = othercase;
2733  next = othercase + 1;  next = othercase + 1;
# Line 2426  for (++c; c <= d; c++) Line 2738  for (++c; c <= d; c++)
2738    next++;    next++;
2739    }    }
2740    
2741  *odptr = next - 1;  *odptr = next - 1;     /* End of othercase range */
2742  *cptr = c;  *cptr = c;             /* Rest of input range */
2743    return 0;
 return TRUE;  
2744  }  }
2745    
2746    
# Line 2451  Returns:       TRUE if auto-possessifyin Line 2762  Returns:       TRUE if auto-possessifyin
2762  */  */
2763    
2764  static BOOL  static BOOL
2765  check_char_prop(int c, int ptype, int pdata, BOOL negated)  check_char_prop(pcre_uint32 c, unsigned int ptype, unsigned int pdata, BOOL negated)
2766  {  {
2767    #ifdef SUPPORT_UCP
2768    const pcre_uint32 *p;
2769    #endif
2770    
2771  const ucd_record *prop = GET_UCD(c);  const ucd_record *prop = GET_UCD(c);
2772    
2773  switch(ptype)  switch(ptype)
2774    {    {
2775    case PT_LAMP:    case PT_LAMP:
# Line 2462  switch(ptype) Line 2778  switch(ptype)
2778            prop->chartype == ucp_Lt) == negated;            prop->chartype == ucp_Lt) == negated;
2779    
2780    case PT_GC:    case PT_GC:
2781    return (pdata == _pcre_ucp_gentype[prop->chartype]) == negated;    return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
2782    
2783    case PT_PC:    case PT_PC:
2784    return (pdata == prop->chartype) == negated;    return (pdata == prop->chartype) == negated;
# Line 2473  switch(ptype) Line 2789  switch(ptype)
2789    /* These are specials */    /* These are specials */
2790    
2791    case PT_ALNUM:    case PT_ALNUM:
2792    return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2793            _pcre_ucp_gentype[prop->chartype] == ucp_N) == negated;            PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
2794    
2795    case PT_SPACE:    /* Perl space */    case PT_SPACE:    /* Perl space */
2796    return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2797            c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)            c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2798            == negated;            == negated;
2799    
2800    case PT_PXSPACE:  /* POSIX space */    case PT_PXSPACE:  /* POSIX space */
2801    return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2802            c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||            c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2803            c == CHAR_FF || c == CHAR_CR)            c == CHAR_FF || c == CHAR_CR)
2804            == negated;            == negated;
2805    
2806    case PT_WORD:    case PT_WORD:
2807    return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2808            _pcre_ucp_gentype[prop->chartype] == ucp_N ||            PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2809            c == CHAR_UNDERSCORE) == negated;            c == CHAR_UNDERSCORE) == negated;
2810    
2811    #ifdef SUPPORT_UCP
2812      case PT_CLIST:
2813      p = PRIV(ucd_caseless_sets) + prop->caseset;
2814      for (;;)
2815        {
2816        if (c < *p) return !negated;
2817        if (c == *p++) return negated;
2818        }
2819      break;  /* Control never reaches here */
2820    #endif
2821    }    }
2822    
2823  return FALSE;  return FALSE;
2824  }  }
2825  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
# Line 2508  sense to automatically possessify the re Line 2836  sense to automatically possessify the re
2836    
2837  Arguments:  Arguments:
2838    previous      pointer to the repeated opcode    previous      pointer to the repeated opcode
2839    utf8          TRUE in UTF-8 mode    utf           TRUE in UTF-8 / UTF-16 / UTF-32 mode
2840    ptr           next character in pattern    ptr           next character in pattern
2841    options       options bits    options       options bits
2842    cd            contains pointers to tables etc.    cd            contains pointers to tables etc.
# Line 2517  Returns:        TRUE if possessifying is Line 2845  Returns:        TRUE if possessifying is
2845  */  */
2846    
2847  static BOOL  static BOOL
2848  check_auto_possessive(const uschar *previous, BOOL utf8, const uschar *ptr,  check_auto_possessive(const pcre_uchar *previous, BOOL utf,
2849    int options, compile_data *cd)    const pcre_uchar *ptr, int options, compile_data *cd)
2850  {  {
2851  int c, next;  pcre_uint32 c = NOTACHAR;
2852  int op_code = *previous++;  pcre_uint32 next;
2853    int escape;
2854    pcre_uchar op_code = *previous++;
2855    
2856  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
2857    
# Line 2529  if ((options & PCRE_EXTENDED) != 0) Line 2859  if ((options & PCRE_EXTENDED) != 0)
2859    {    {
2860    for (;;)    for (;;)
2861      {      {
2862      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2863      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
2864        {        {
2865        ptr++;        ptr++;
2866        while (*ptr != 0)        while (*ptr != CHAR_NULL)
2867          {          {
2868          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
2869          ptr++;          ptr++;
2870  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2871          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
2872  #endif  #endif
2873          }          }
2874        }        }
# Line 2552  value is a character, a negative value i Line 2882  value is a character, a negative value i
2882  if (*ptr == CHAR_BACKSLASH)  if (*ptr == CHAR_BACKSLASH)
2883    {    {
2884    int temperrorcode = 0;    int temperrorcode = 0;
2885    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);    escape = check_escape(&ptr, &next, &temperrorcode, cd->bracount, options,
2886        FALSE);
2887    if (temperrorcode != 0) return FALSE;    if (temperrorcode != 0) return FALSE;
2888    ptr++;    /* Point after the escape sequence */    ptr++;    /* Point after the escape sequence */
2889    }    }
2890    else if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_meta) == 0)
 else if ((cd->ctypes[*ptr] & ctype_meta) == 0)  
2891    {    {
2892  #ifdef SUPPORT_UTF8    escape = 0;
2893    if (utf8) { GETCHARINC(next, ptr); } else  #ifdef SUPPORT_UTF
2894      if (utf) { GETCHARINC(next, ptr); } else
2895  #endif  #endif
2896    next = *ptr++;    next = *ptr++;
2897    }    }
   
2898  else return FALSE;  else return FALSE;
2899    
2900  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
# Line 2573  if ((options & PCRE_EXTENDED) != 0) Line 2903  if ((options & PCRE_EXTENDED) != 0)
2903    {    {
2904    for (;;)    for (;;)
2905      {      {
2906      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2907      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
2908        {        {
2909        ptr++;        ptr++;
2910        while (*ptr != 0)        while (*ptr != CHAR_NULL)
2911          {          {
2912          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
2913          ptr++;          ptr++;
2914  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2915          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
2916  #endif  #endif
2917          }          }
2918        }        }
# Line 2593  if ((options & PCRE_EXTENDED) != 0) Line 2923  if ((options & PCRE_EXTENDED) != 0)
2923  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
2924    
2925  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
2926    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)
2927      return FALSE;      return FALSE;
2928    
2929  /* 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. */  
2930    
2931  if (next >= 0) switch(op_code)  if (op_code == OP_CHAR || op_code == OP_CHARI ||
2932        op_code == OP_NOT || op_code == OP_NOTI)
2933    {    {
2934    case OP_CHAR:  #ifdef SUPPORT_UTF
 #ifdef SUPPORT_UTF8  
2935    GETCHARTEST(c, previous);    GETCHARTEST(c, previous);
2936  #else  #else
2937    c = *previous;    c = *previous;
2938  #endif  #endif
2939    return c != next;    }
2940    
2941    /* For CHARNC (caseless character) we must check the other case. If we have  /* Now compare the next item with the previous opcode. First, handle cases when
2942    Unicode property support, we can use it to test the other case of  the next item is a character. */
   high-valued characters. */  
2943    
2944    case OP_CHARNC:  if (escape == 0)
2945  #ifdef SUPPORT_UTF8    {
2946    GETCHARTEST(c, previous);    /* For a caseless UTF match, the next character may have more than one other
2947  #else    case, which maps to the special PT_CLIST property. Check this first. */
2948    c = *previous;  
2949    #ifdef SUPPORT_UCP
2950      if (utf && c != NOTACHAR && (options & PCRE_CASELESS) != 0)
2951        {
2952        unsigned int ocs = UCD_CASESET(next);
2953        if (ocs > 0) return check_char_prop(c, PT_CLIST, ocs, op_code >= OP_NOT);
2954        }
2955  #endif  #endif
2956    if (c == next) return FALSE;  
2957  #ifdef SUPPORT_UTF8    switch(op_code)
   if (utf8)  
2958      {      {
2959      unsigned int othercase;      case OP_CHAR:
2960      if (next < 128) othercase = cd->fcc[next]; else      return c != next;
2961    
2962        /* For CHARI (caseless character) we must check the other case. If we have
2963        Unicode property support, we can use it to test the other case of
2964        high-valued characters. We know that next can have only one other case,
2965        because multi-other-case characters are dealt with above. */
2966    
2967        case OP_CHARI:
2968        if (c == next) return FALSE;
2969    #ifdef SUPPORT_UTF
2970        if (utf)
2971          {
2972          pcre_uint32 othercase;
2973          if (next < 128) othercase = cd->fcc[next]; else
2974  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2975      othercase = UCD_OTHERCASE((unsigned int)next);        othercase = UCD_OTHERCASE(next);
2976  #else  #else
2977      othercase = NOTACHAR;        othercase = NOTACHAR;
2978  #endif  #endif
2979      return (unsigned int)c != othercase;        return c != othercase;
2980      }        }
2981    else      else
2982  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2983    return (c != cd->fcc[next]);  /* Non-UTF-8 mode */      return (c != TABLE_GET(next, cd->fcc, next));  /* Not UTF */
2984    
2985    /* For OP_NOT, its data is always a single-byte character. */      case OP_NOT:
2986        return c == next;
2987    
2988    case OP_NOT:      case OP_NOTI:
2989    if ((c = *previous) == next) return TRUE;      if (c == next) return TRUE;
2990    if ((options & PCRE_CASELESS) == 0) return FALSE;  #ifdef SUPPORT_UTF
2991  #ifdef SUPPORT_UTF8      if (utf)
2992    if (utf8)        {
2993      {        pcre_uint32 othercase;
2994      unsigned int othercase;        if (next < 128) othercase = cd->fcc[next]; else
     if (next < 128) othercase = cd->fcc[next]; else  
2995  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2996      othercase = UCD_OTHERCASE(next);        othercase = UCD_OTHERCASE(next);
2997  #else  #else
2998      othercase = NOTACHAR;        othercase = NOTACHAR;
2999  #endif  #endif
3000      return (unsigned int)c == othercase;        return c == othercase;
3001      }        }
3002    else      else
3003  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3004    return (c == cd->fcc[next]);  /* Non-UTF-8 mode */      return (c == TABLE_GET(next, cd->fcc, next));  /* Not UTF */
3005    
3006    /* 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.
3007    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. */
3008    
3009    case OP_DIGIT:      case OP_DIGIT:
3010    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;      return next > 255 || (cd->ctypes[next] & ctype_digit) == 0;
3011    
3012    case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
3013    return next <= 127 && (cd->ctypes[next] & ctype_digit) != 0;      return next <= 255 && (cd->ctypes[next] & ctype_digit) != 0;
3014    
3015    case OP_WHITESPACE:      case OP_WHITESPACE:
3016    return next > 127 || (cd->ctypes[next] & ctype_space) == 0;      return next > 255 || (cd->ctypes[next] & ctype_space) == 0;
3017    
3018    case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
3019    return next <= 127 && (cd->ctypes[next] & ctype_space) != 0;      return next <= 255 && (cd->ctypes[next] & ctype_space) != 0;
3020    
3021    case OP_WORDCHAR:      case OP_WORDCHAR:
3022    return next > 127 || (cd->ctypes[next] & ctype_word) == 0;      return next > 255 || (cd->ctypes[next] & ctype_word) == 0;
3023    
3024    case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
3025    return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;      return next <= 255 && (cd->ctypes[next] & ctype_word) != 0;
3026    
3027    case OP_HSPACE:      case OP_HSPACE:
3028    case OP_NOT_HSPACE:      case OP_NOT_HSPACE:
3029    switch(next)      switch(next)
3030      {        {
3031      case 0x09:        HSPACE_CASES:
3032      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;  
     }  
3033    
3034    case OP_ANYNL:        default:
3035    case OP_VSPACE:        return op_code != OP_NOT_HSPACE;
3036    case OP_NOT_VSPACE:        }
3037    switch(next)  
3038      {      case OP_ANYNL:
3039      case 0x0a:      case OP_VSPACE:
3040      case 0x0b:      case OP_NOT_VSPACE:
3041      case 0x0c:      switch(next)
3042      case 0x0d:        {
3043      case 0x85:        VSPACE_CASES:
3044      case 0x2028:        return op_code == OP_NOT_VSPACE;
3045      case 0x2029:  
3046      return op_code == OP_NOT_VSPACE;        default:
3047      default:        return op_code != OP_NOT_VSPACE;
3048      return op_code != OP_NOT_VSPACE;        }
     }  
3049    
3050  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3051    case OP_PROP:      case OP_PROP:
3052    return check_char_prop(next, previous[0], previous[1], FALSE);      return check_char_prop(next, previous[0], previous[1], FALSE);
3053    
3054    case OP_NOTPROP:      case OP_NOTPROP:
3055    return check_char_prop(next, previous[0], previous[1], TRUE);      return check_char_prop(next, previous[0], previous[1], TRUE);
3056  #endif  #endif
3057    
3058    default:      default:
3059    return FALSE;      return FALSE;
3060        }
3061    }    }
3062    
   
3063  /* 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
3064  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
3065  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 2745  replaced by OP_PROP codes when PCRE_UCP Line 3069  replaced by OP_PROP codes when PCRE_UCP
3069  switch(op_code)  switch(op_code)
3070    {    {
3071    case OP_CHAR:    case OP_CHAR:
3072    case OP_CHARNC:    case OP_CHARI:
3073  #ifdef SUPPORT_UTF8    switch(escape)
   GETCHARTEST(c, previous);  
 #else  
   c = *previous;  
 #endif  
   switch(-next)  
3074      {      {
3075      case ESC_d:      case ESC_d:
3076      return c > 127 || (cd->ctypes[c] & ctype_digit) == 0;      return c > 255 || (cd->ctypes[c] & ctype_digit) == 0;
3077    
3078      case ESC_D:      case ESC_D:
3079      return c <= 127 && (cd->ctypes[c] & ctype_digit) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_digit) != 0;
3080    
3081      case ESC_s:      case ESC_s:
3082      return c > 127 || (cd->ctypes[c] & ctype_space) == 0;      return c > 255 || (cd->ctypes[c] & ctype_space) == 0;
3083    
3084      case ESC_S:      case ESC_S:
3085      return c <= 127 && (cd->ctypes[c] & ctype_space) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_space) != 0;
3086    
3087      case ESC_w:      case ESC_w:
3088      return c > 127 || (cd->ctypes[c] & ctype_word) == 0;      return c > 255 || (cd->ctypes[c] & ctype_word) == 0;
3089    
3090      case ESC_W:      case ESC_W:
3091      return c <= 127 && (cd->ctypes[c] & ctype_word) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_word) != 0;
3092    
3093      case ESC_h:      case ESC_h:
3094      case ESC_H:      case ESC_H:
3095      switch(c)      switch(c)
3096        {        {
3097        case 0x09:        HSPACE_CASES:
3098        case 0x20:        return escape != ESC_h;
3099        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;  
3100        default:        default:
3101        return -next == ESC_h;        return escape == ESC_h;
3102        }        }
3103    
3104      case ESC_v:      case ESC_v:
3105      case ESC_V:      case ESC_V:
3106      switch(c)      switch(c)
3107        {        {
3108        case 0x0a:        VSPACE_CASES:
3109        case 0x0b:        return escape != ESC_v;
3110        case 0x0c:  
       case 0x0d:  
       case 0x85:  
       case 0x2028:  
       case 0x2029:  
       return -next != ESC_v;  
3111        default:        default:
3112        return -next == ESC_v;        return escape == ESC_v;
3113        }        }
3114    
3115      /* 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
3116      their substitutions and process them. The result will always be either      their substitutions and process them. The result will always be either
3117      -ESC_p or -ESC_P. Then fall through to process those values. */      ESC_p or ESC_P. Then fall through to process those values. */
3118    
3119  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3120      case ESC_du:      case ESC_du:
# Line 2828  switch(op_code) Line 3125  switch(op_code)
3125      case ESC_SU:      case ESC_SU:
3126        {        {
3127        int temperrorcode = 0;        int temperrorcode = 0;
3128        ptr = substitutes[-next - ESC_DU];        ptr = substitutes[escape - ESC_DU];
3129        next = check_escape(&ptr, &temperrorcode, 0, options, FALSE);        escape = check_escape(&ptr, &next, &temperrorcode, 0, options, FALSE);
3130        if (temperrorcode != 0) return FALSE;        if (temperrorcode != 0) return FALSE;
3131        ptr++;    /* For compatibility */        ptr++;    /* For compatibility */
3132        }        }
# Line 2838  switch(op_code) Line 3135  switch(op_code)
3135      case ESC_p:      case ESC_p:
3136      case ESC_P:      case ESC_P:
3137        {        {
3138        int ptype, pdata, errorcodeptr;        unsigned int ptype = 0, pdata = 0;
3139          int errorcodeptr;
3140        BOOL negated;        BOOL negated;
3141    
3142        ptr--;      /* Make ptr point at the p or P */        ptr--;      /* Make ptr point at the p or P */
3143        ptype = get_ucp(&ptr, &negated, &pdata, &errorcodeptr);        if (!get_ucp(&ptr, &negated, &ptype, &pdata, &errorcodeptr))
3144        if (ptype < 0) return FALSE;          return FALSE;
3145        ptr++;      /* Point past the final curly ket */        ptr++;      /* Point past the final curly ket */
3146    
3147        /* If the property item is optional, we have to give up. (When generated        /* If the property item is optional, we have to give up. (When generated
# Line 2851  switch(op_code) Line 3149  switch(op_code)
3149        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. */
3150    
3151        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3152          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)
3153            return FALSE;            return FALSE;
3154    
3155        /* Do the property check. */        /* Do the property check. */
3156    
3157        return check_char_prop(c, ptype, pdata, (next == -ESC_P) != negated);        return check_char_prop(c, ptype, pdata, (escape == ESC_P) != negated);
3158        }        }
3159  #endif  #endif
3160    
# Line 2871  switch(op_code) Line 3169  switch(op_code)
3169    these op-codes are never generated.) */    these op-codes are never generated.) */
3170    
3171    case OP_DIGIT:    case OP_DIGIT:
3172    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||    return escape == ESC_D || escape == ESC_s || escape == ESC_W ||
3173           next == -ESC_h || next == -ESC_v || next == -ESC_R;           escape == ESC_h || escape == ESC_v || escape == ESC_R;
3174    
3175    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
3176    return next == -ESC_d;    return escape == ESC_d;
3177    
3178    case OP_WHITESPACE:    case OP_WHITESPACE:
3179    return next == -ESC_S || next == -ESC_d || next == -ESC_w || next == -ESC_R;    return escape == ESC_S || escape == ESC_d || escape == ESC_w;
3180    
3181    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
3182    return next == -ESC_s || next == -ESC_h || next == -ESC_v;    return escape == ESC_s || escape == ESC_h || escape == ESC_v || escape == ESC_R;
3183    
3184      case OP_HSPACE:
3185      return escape == ESC_S || escape == ESC_H || escape == ESC_d ||
3186             escape == ESC_w || escape == ESC_v || escape == ESC_R;
3187    
3188      case OP_NOT_HSPACE:
3189      return escape == ESC_h;
3190    
3191      /* Can't have \S in here because VT matches \S (Perl anomaly) */
3192      case OP_ANYNL:
3193      case OP_VSPACE:
3194      return escape == ESC_V || escape == ESC_d || escape == ESC_w;
3195    
3196      case OP_NOT_VSPACE:
3197      return escape == ESC_v || escape == ESC_R;
3198    
3199      case OP_WORDCHAR:
3200      return escape == ESC_W || escape == ESC_s || escape == ESC_h ||
3201             escape == ESC_v || escape == ESC_R;
3202    
3203      case OP_NOT_WORDCHAR:
3204      return escape == ESC_w || escape == ESC_d;
3205    
3206      default:
3207      return FALSE;
3208      }
3209    
3210    /* Control does not reach here */
3211    }
3212    
3213    
3214    
3215    /*************************************************
3216    *        Add a character or range to a class     *
3217    *************************************************/
3218    
3219    /* This function packages up the logic of adding a character or range of
3220    characters to a class. The character values in the arguments will be within the
3221    valid values for the current mode (8-bit, 16-bit, UTF, etc). This function is
3222    mutually recursive with the function immediately below.
3223    
3224    Arguments:
3225      classbits     the bit map for characters < 256
3226      uchardptr     points to the pointer for extra data
3227      options       the options word
3228      cd            contains pointers to tables etc.
3229      start         start of range character
3230      end           end of range character
3231    
3232    Returns:        the number of < 256 characters added
3233                    the pointer to extra data is updated
3234    */
3235    
3236    static int
3237    add_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
3238      compile_data *cd, pcre_uint32 start, pcre_uint32 end)
3239    {
3240    pcre_uint32 c;
3241    int n8 = 0;
3242    
3243    /* If caseless matching is required, scan the range and process alternate
3244    cases. In Unicode, there are 8-bit characters that have alternate cases that
3245    are greater than 255 and vice-versa. Sometimes we can just extend the original
3246    range. */
3247    
3248    if ((options & PCRE_CASELESS) != 0)
3249      {
3250    #ifdef SUPPORT_UCP
3251      if ((options & PCRE_UTF8) != 0)
3252        {
3253        int rc;
3254        pcre_uint32 oc, od;
3255    
3256        options &= ~PCRE_CASELESS;   /* Remove for recursive calls */
3257        c = start;
3258    
3259        while ((rc = get_othercase_range(&c, end, &oc, &od)) >= 0)
3260          {
3261          /* Handle a single character that has more than one other case. */
3262    
3263          if (rc > 0) n8 += add_list_to_class(classbits, uchardptr, options, cd,
3264            PRIV(ucd_caseless_sets) + rc, oc);
3265    
3266          /* Do nothing if the other case range is within the original range. */
3267    
3268          else if (oc >= start && od <= end) continue;
3269    
3270          /* Extend the original range if there is overlap, noting that if oc < c, we
3271          can't have od > end because a subrange is always shorter than the basic
3272          range. Otherwise, use a recursive call to add the additional range. */
3273    
3274          else if (oc < start && od >= start - 1) start = oc; /* Extend downwards */
3275          else if (od > end && oc <= end + 1) end = od;       /* Extend upwards */
3276          else n8 += add_to_class(classbits, uchardptr, options, cd, oc, od);
3277          }
3278        }
3279      else
3280    #endif  /* SUPPORT_UCP */
3281    
3282      /* Not UTF-mode, or no UCP */
3283    
3284      for (c = start; c <= end && c < 256; c++)
3285        {
3286        SETBIT(classbits, cd->fcc[c]);
3287        n8++;
3288        }
3289      }
3290    
3291    /* Now handle the original range. Adjust the final value according to the bit
3292    length - this means that the same lists of (e.g.) horizontal spaces can be used
3293    in all cases. */
3294    
3295    #if defined COMPILE_PCRE8
3296    #ifdef SUPPORT_UTF
3297      if ((options & PCRE_UTF8) == 0)
3298    #endif
3299      if (end > 0xff) end = 0xff;
3300    
3301    #elif defined COMPILE_PCRE16
3302    #ifdef SUPPORT_UTF
3303      if ((options & PCRE_UTF16) == 0)
3304    #endif
3305      if (end > 0xffff) end = 0xffff;
3306    
3307    #endif /* COMPILE_PCRE[8|16] */
3308    
3309    /* If all characters are less than 256, use the bit map. Otherwise use extra
3310    data. */
3311    
3312    if (end < 0x100)
3313      {
3314      for (c = start; c <= end; c++)
3315        {
3316        n8++;
3317        SETBIT(classbits, c);
3318        }
3319      }
3320    
3321    else
3322      {
3323      pcre_uchar *uchardata = *uchardptr;
3324    
3325    #ifdef SUPPORT_UTF
3326      if ((options & PCRE_UTF8) != 0)  /* All UTFs use the same flag bit */
3327        {
3328        if (start < end)
3329          {
3330          *uchardata++ = XCL_RANGE;
3331          uchardata += PRIV(ord2utf)(start, uchardata);
3332          uchardata += PRIV(ord2utf)(end, uchardata);
3333          }
3334        else if (start == end)
3335          {
3336          *uchardata++ = XCL_SINGLE;
3337          uchardata += PRIV(ord2utf)(start, uchardata);
3338          }
3339        }
3340      else
3341    #endif  /* SUPPORT_UTF */
3342    
3343      /* Without UTF support, character values are constrained by the bit length,
3344      and can only be > 256 for 16-bit and 32-bit libraries. */
3345    
3346    #ifdef COMPILE_PCRE8
3347        {}
3348    #else
3349      if (start < end)
3350        {
3351        *uchardata++ = XCL_RANGE;
3352        *uchardata++ = start;
3353        *uchardata++ = end;
3354        }
3355      else if (start == end)
3356        {
3357        *uchardata++ = XCL_SINGLE;
3358        *uchardata++ = start;
3359        }
3360    #endif
3361    
3362      *uchardptr = uchardata;   /* Updata extra data pointer */
3363      }
3364    
3365    return n8;    /* Number of 8-bit characters */
3366    }
3367    
3368    
3369    
3370    
3371    /*************************************************
3372    *        Add a list of characters to a class     *
3373    *************************************************/
3374    
3375    /* This function is used for adding a list of case-equivalent characters to a
3376    class, and also for adding a list of horizontal or vertical whitespace. If the
3377    list is in order (which it should be), ranges of characters are detected and
3378    handled appropriately. This function is mutually recursive with the function
3379    above.
3380    
3381    Arguments:
3382      classbits     the bit map for characters < 256
3383      uchardptr     points to the pointer for extra data
3384      options       the options word
3385      cd            contains pointers to tables etc.
3386      p             points to row of 32-bit values, terminated by NOTACHAR
3387      except        character to omit; this is used when adding lists of
3388                      case-equivalent characters to avoid including the one we
3389                      already know about
3390    
3391    Returns:        the number of < 256 characters added
3392                    the pointer to extra data is updated
3393    */
3394    
3395    static int
3396    add_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
3397      compile_data *cd, const pcre_uint32 *p, unsigned int except)
3398    {
3399    int n8 = 0;
3400    while (p[0] < NOTACHAR)
3401      {
3402      int n = 0;
3403      if (p[0] != except)
3404        {
3405        while(p[n+1] == p[0] + n + 1) n++;
3406        n8 += add_to_class(classbits, uchardptr, options, cd, p[0], p[n]);
3407        }
3408      p += n + 1;
3409      }
3410    return n8;
3411    }
3412    
   case OP_HSPACE:  
   return next == -ESC_S || next == -ESC_H || next == -ESC_d ||  
          next == -ESC_w || next == -ESC_v || next == -ESC_R;  
3413    
   case OP_NOT_HSPACE:  
   return next == -ESC_h;  
3414    
3415    /* Can't have \S in here because VT matches \S (Perl anomaly) */  /*************************************************
3416    case OP_ANYNL:  *    Add characters not in a list to a class     *
3417    case OP_VSPACE:  *************************************************/
   return next == -ESC_V || next == -ESC_d || next == -ESC_w;  
3418    
3419    case OP_NOT_VSPACE:  /* This function is used for adding the complement of a list of horizontal or
3420    return next == -ESC_v || next == -ESC_R;  vertical whitespace to a class. The list must be in order.
3421    
3422    case OP_WORDCHAR:  Arguments:
3423    return next == -ESC_W || next == -ESC_s || next == -ESC_h ||    classbits     the bit map for characters < 256
3424           next == -ESC_v || next == -ESC_R;    uchardptr     points to the pointer for extra data
3425      options       the options word
3426      cd            contains pointers to tables etc.
3427      p             points to row of 32-bit values, terminated by NOTACHAR
3428    
3429    case OP_NOT_WORDCHAR:  Returns:        the number of < 256 characters added
3430    return next == -ESC_w || next == -ESC_d;                  the pointer to extra data is updated
3431    */
3432    
3433    default:  static int
3434    return FALSE;  add_not_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr,
3435      int options, compile_data *cd, const pcre_uint32 *p)
3436    {
3437    BOOL utf = (options & PCRE_UTF8) != 0;
3438    int n8 = 0;
3439    if (p[0] > 0)
3440      n8 += add_to_class(classbits, uchardptr, options, cd, 0, p[0] - 1);
3441    while (p[0] < NOTACHAR)
3442      {
3443      while (p[1] == p[0] + 1) p++;
3444      n8 += add_to_class(classbits, uchardptr, options, cd, p[0] + 1,
3445        (p[1] == NOTACHAR) ? (utf ? 0x10ffffu : 0xffffffffu) : p[1] - 1);
3446      p++;
3447    }    }
3448    return n8;
 /* Control does not reach here */  
3449  }  }
3450    
3451    
# Line 2925  to find out the amount of memory needed, Line 3461  to find out the amount of memory needed,
3461  phase. The value of lengthptr distinguishes the two phases.  phase. The value of lengthptr distinguishes the two phases.
3462    
3463  Arguments:  Arguments:
3464    optionsptr     pointer to the option bits    optionsptr        pointer to the option bits
3465    codeptr        points to the pointer to the current code point    codeptr           points to the pointer to the current code point
3466    ptrptr         points to the current pattern pointer    ptrptr            points to the current pattern pointer
3467    errorcodeptr   points to error code variable    errorcodeptr      points to error code variable
3468    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)    firstcharptr      place to put the first required character
3469    reqbyteptr     set to the last literal character required, else < 0    firstcharflagsptr place to put the first character flags, or a negative number
3470    bcptr          points to current branch chain    reqcharptr        place to put the last required character
3471    cd             contains pointers to tables etc.    reqcharflagsptr   place to put the last required character flags, or a negative number
3472    lengthptr      NULL during the real compile phase    bcptr             points to current branch chain
3473                   points to length accumulator during pre-compile phase    cond_depth        conditional nesting depth
3474      cd                contains pointers to tables etc.
3475      lengthptr         NULL during the real compile phase
3476                        points to length accumulator during pre-compile phase
3477    
3478  Returns:         TRUE on success  Returns:            TRUE on success
3479                   FALSE, with *errorcodeptr set non-zero on error                      FALSE, with *errorcodeptr set non-zero on error
3480  */  */
3481    
3482  static BOOL  static BOOL
3483  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,  compile_branch(int *optionsptr, pcre_uchar **codeptr,
3484    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,    const pcre_uchar **ptrptr, int *errorcodeptr,
3485      pcre_uint32 *firstcharptr, pcre_int32 *firstcharflagsptr,
3486      pcre_uint32 *reqcharptr, pcre_int32 *reqcharflagsptr,
3487      branch_chain *bcptr, int cond_depth,
3488    compile_data *cd, int *lengthptr)    compile_data *cd, int *lengthptr)
3489  {  {
3490  int repeat_type, op_type;  int repeat_type, op_type;
3491  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
3492  int bravalue = 0;  int bravalue = 0;
3493  int greedy_default, greedy_non_default;  int greedy_default, greedy_non_default;
3494  int firstbyte, reqbyte;  pcre_uint32 firstchar, reqchar;
3495  int zeroreqbyte, zerofirstbyte;  pcre_int32 firstcharflags, reqcharflags;
3496  int req_caseopt, reqvary, tempreqvary;  pcre_uint32 zeroreqchar, zerofirstchar;
3497  int options = *optionsptr;  pcre_int32 zeroreqcharflags, zerofirstcharflags;
3498    pcre_int32 req_caseopt, reqvary, tempreqvary;
3499    int options = *optionsptr;               /* May change dynamically */
3500  int after_manual_callout = 0;  int after_manual_callout = 0;
3501  int length_prevgroup = 0;  int length_prevgroup = 0;
3502  register int c;  register pcre_uint32 c;
3503  register uschar *code = *codeptr;  int escape;
3504  uschar *last_code = code;  register pcre_uchar *code = *codeptr;
3505  uschar *orig_code = code;  pcre_uchar *last_code = code;
3506  uschar *tempcode;  pcre_uchar *orig_code = code;
3507    pcre_uchar *tempcode;
3508  BOOL inescq = FALSE;  BOOL inescq = FALSE;
3509  BOOL groupsetfirstbyte = FALSE;  BOOL groupsetfirstchar = FALSE;
3510  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
3511  const uschar *tempptr;  const pcre_uchar *tempptr;
3512  const uschar *nestptr = NULL;  const pcre_uchar *nestptr = NULL;
3513  uschar *previous = NULL;  pcre_uchar *previous = NULL;
3514  uschar *previous_callout = NULL;  pcre_uchar *previous_callout = NULL;
3515  uschar *save_hwm = NULL;  pcre_uchar *save_hwm = NULL;
3516  uschar classbits[32];  pcre_uint8 classbits[32];
3517    
3518  #ifdef SUPPORT_UTF8  /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
3519  BOOL class_utf8;  must not do this for other options (e.g. PCRE_EXTENDED) because they may change
3520  BOOL utf8 = (options & PCRE_UTF8) != 0;  dynamically as we process the pattern. */
3521  uschar *class_utf8data;  
3522  uschar *class_utf8data_base;  #ifdef SUPPORT_UTF
3523  uschar utf8_char[6];  /* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */
3524    BOOL utf = (options & PCRE_UTF8) != 0;
3525    #ifndef COMPILE_PCRE32
3526    pcre_uchar utf_chars[6];
3527    #endif
3528  #else  #else
3529  BOOL utf8 = FALSE;  BOOL utf = FALSE;
3530  uschar *utf8_char = NULL;  #endif
3531    
3532    /* Helper variables for OP_XCLASS opcode (for characters > 255). We define
3533    class_uchardata always so that it can be passed to add_to_class() always,
3534    though it will not be used in non-UTF 8-bit cases. This avoids having to supply
3535    alternative calls for the different cases. */
3536    
3537    pcre_uchar *class_uchardata;
3538    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3539    BOOL xclass;
3540    pcre_uchar *class_uchardata_base;
3541  #endif  #endif
3542    
3543  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 2992  greedy_non_default = greedy_default ^ 1; Line 3551  greedy_non_default = greedy_default ^ 1;
3551    
3552  /* Initialize no first byte, no required byte. REQ_UNSET means "no char  /* Initialize no first byte, no required byte. REQ_UNSET means "no char
3553  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
3554  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
3555  find one.  find one.
3556    
3557  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
3558  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
3559  zerofirstbyte and zeroreqbyte when such a repeat is encountered. The individual  zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual
3560  item types that can be repeated set these backoff variables appropriately. */  item types that can be repeated set these backoff variables appropriately. */
3561    
3562  firstbyte = reqbyte = zerofirstbyte = zeroreqbyte = REQ_UNSET;  firstchar = reqchar = zerofirstchar = zeroreqchar = 0;
3563    firstcharflags = reqcharflags = zerofirstcharflags = zeroreqcharflags = REQ_UNSET;
3564    
3565  /* The variable req_caseopt contains either the REQ_CASELESS value or zero,  /* The variable req_caseopt contains either the REQ_CASELESS value
3566  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
3567  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
3568  case status of the value. This is used only for ASCII characters. */  firstchar or reqchar variables to record the case status of the
3569    value. This is used only for ASCII characters. */
3570    
3571  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
3572    
3573  /* Switch on next character until the end of the branch */  /* Switch on next character until the end of the branch */
3574    
# Line 3019  for (;; ptr++) Line 3580  for (;; ptr++)
3580    BOOL is_quantifier;    BOOL is_quantifier;
3581    BOOL is_recurse;    BOOL is_recurse;
3582    BOOL reset_bracount;    BOOL reset_bracount;
3583    int class_charcount;    int class_has_8bitchar;
3584    int class_lastchar;    int class_one_char;
3585    int newoptions;    int newoptions;
3586    int recno;    int recno;
3587    int refsign;    int refsign;
3588    int skipbytes;    int skipbytes;
3589    int subreqbyte;    pcre_uint32 subreqchar, subfirstchar;
3590    int subfirstbyte;    pcre_int32 subreqcharflags, subfirstcharflags;
3591    int terminator;    int terminator;
3592    int mclength;    unsigned int mclength;
3593    uschar mcbuffer[8];    unsigned int tempbracount;
3594      pcre_uint32 ec;
3595      pcre_uchar mcbuffer[8];
3596    
3597    /* Get next byte in the pattern */    /* Get next character in the pattern */
3598    
3599    c = *ptr;    c = *ptr;
3600    
3601    /* If we are at the end of a nested substitution, revert to the outer level    /* If we are at the end of a nested substitution, revert to the outer level
3602    string. Nesting only happens one level deep. */    string. Nesting only happens one level deep. */
3603    
3604    if (c == 0 && nestptr != NULL)    if (c == CHAR_NULL && nestptr != NULL)
3605      {      {
3606      ptr = nestptr;      ptr = nestptr;
3607      nestptr = NULL;      nestptr = NULL;
# Line 3053  for (;; ptr++) Line 3616  for (;; ptr++)
3616  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
3617      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
3618  #endif  #endif
3619      if (code > cd->start_workspace + WORK_SIZE_CHECK)   /* Check for overrun */      if (code > cd->start_workspace + cd->workspace_size -
3620            WORK_SIZE_SAFETY_MARGIN)                       /* Check for overrun */
3621        {        {
3622        *errorcodeptr = ERR52;        *errorcodeptr = ERR52;
3623        goto FAILED;        goto FAILED;
# Line 3076  for (;; ptr++) Line 3640  for (;; ptr++)
3640        }        }
3641    
3642      *lengthptr += (int)(code - last_code);      *lengthptr += (int)(code - last_code);
3643      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));      DPRINTF(("length=%d added %d c=%c (0x%x)\n", *lengthptr,
3644          (int)(code - last_code), c, c));
3645    
3646      /* 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
3647      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 3086  for (;; ptr++) Line 3651  for (;; ptr++)
3651        {        {
3652        if (previous > orig_code)        if (previous > orig_code)
3653          {          {
3654          memmove(orig_code, previous, code - previous);          memmove(orig_code, previous, IN_UCHARS(code - previous));
3655          code -= previous - orig_code;          code -= previous - orig_code;
3656          previous = orig_code;          previous = orig_code;
3657          }          }
# Line 3102  for (;; ptr++) Line 3667  for (;; ptr++)
3667    /* In the real compile phase, just check the workspace used by the forward    /* In the real compile phase, just check the workspace used by the forward
3668    reference list. */    reference list. */
3669    
3670    else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK)    else if (cd->hwm > cd->start_workspace + cd->workspace_size -
3671               WORK_SIZE_SAFETY_MARGIN)
3672      {      {
3673      *errorcodeptr = ERR52;      *errorcodeptr = ERR52;
3674      goto FAILED;      goto FAILED;
# Line 3110  for (;; ptr++) Line 3676  for (;; ptr++)
3676    
3677    /* If in \Q...\E, check for the end; if not, we have a literal */    /* If in \Q...\E, check for the end; if not, we have a literal */
3678    
3679    if (inescq && c != 0)    if (inescq && c != CHAR_NULL)
3680      {      {
3681      if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)      if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
3682        {        {
# Line 3150  for (;; ptr++) Line 3716  for (;; ptr++)
3716      previous_callout = NULL;      previous_callout = NULL;
3717      }      }
3718    
3719    /* In extended mode, skip white space and comments */    /* In extended mode, skip white space and comments. */
3720    
3721    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
3722      {      {
3723      if ((cd->ctypes[c] & ctype_space) != 0) continue;      if (MAX_255(*ptr) && (cd->ctypes[c] & ctype_space) != 0) continue;
3724      if (c == CHAR_NUMBER_SIGN)      if (c == CHAR_NUMBER_SIGN)
3725        {        {
3726        ptr++;        ptr++;
3727        while (*ptr != 0)        while (*ptr != CHAR_NULL)
3728          {          {
3729          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
3730          ptr++;          ptr++;
3731  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3732          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
3733  #endif  #endif
3734          }          }
3735        if (*ptr != 0) continue;        if (*ptr != CHAR_NULL) continue;
3736    
3737        /* Else fall through to handle end of string */        /* Else fall through to handle end of string */
3738        c = 0;        c = 0;
# Line 3187  for (;; ptr++) Line 3753  for (;; ptr++)
3753      case 0:                        /* The branch terminates at string end */      case 0:                        /* The branch terminates at string end */
3754      case CHAR_VERTICAL_LINE:       /* or | or ) */      case CHAR_VERTICAL_LINE:       /* or | or ) */
3755      case CHAR_RIGHT_PARENTHESIS:      case CHAR_RIGHT_PARENTHESIS:
3756      *firstbyteptr = firstbyte;      *firstcharptr = firstchar;
3757      *reqbyteptr = reqbyte;      *firstcharflagsptr = firstcharflags;
3758        *reqcharptr = reqchar;
3759        *reqcharflagsptr = reqcharflags;
3760      *codeptr = code;      *codeptr = code;
3761      *ptrptr = ptr;      *ptrptr = ptr;
3762      if (lengthptr != NULL)      if (lengthptr != NULL)
# Line 3209  for (;; ptr++) Line 3777  for (;; ptr++)
3777      the setting of any following char as a first character. */      the setting of any following char as a first character. */
3778    
3779      case CHAR_CIRCUMFLEX_ACCENT:      case CHAR_CIRCUMFLEX_ACCENT:
3780        previous = NULL;
3781      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
3782        {        {
3783        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
3784          *code++ = OP_CIRCM;
3785        }        }
3786      previous = NULL;      else *code++ = OP_CIRC;
     *code++ = OP_CIRC;  
3787      break;      break;
3788    
3789      case CHAR_DOLLAR_SIGN:      case CHAR_DOLLAR_SIGN:
3790      previous = NULL;      previous = NULL;
3791      *code++ = OP_DOLL;      *code++ = ((options & PCRE_MULTILINE) != 0)? OP_DOLLM : OP_DOLL;
3792      break;      break;
3793    
3794      /* 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
3795      repeats. The value of reqbyte doesn't change either. */      repeats. The value of reqchar doesn't change either. */
3796    
3797      case CHAR_DOT:      case CHAR_DOT:
3798      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;      if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
3799      zerofirstbyte = firstbyte;      zerofirstchar = firstchar;
3800      zeroreqbyte = reqbyte;      zerofirstcharflags = firstcharflags;
3801        zeroreqchar = reqchar;
3802        zeroreqcharflags = reqcharflags;
3803      previous = code;      previous = code;
3804      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
3805      break;      break;
# Line 3283  for (;; ptr++) Line 3854  for (;; ptr++)
3854          {          {
3855          if (ptr[1] == CHAR_E)          if (ptr[1] == CHAR_E)
3856            ptr++;            ptr++;
3857          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)  
3858            ptr += 3;            ptr += 3;
3859          else          else
3860            break;            break;
# Line 3303  for (;; ptr++) Line 3873  for (;; ptr++)
3873          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
3874        {        {
3875        *code++ = negate_class? OP_ALLANY : OP_FAIL;        *code++ = negate_class? OP_ALLANY : OP_FAIL;
3876        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
3877        zerofirstbyte = firstbyte;        zerofirstchar = firstchar;
3878          zerofirstcharflags = firstcharflags;
3879        break;        break;
3880        }        }
3881    
# Line 3314  for (;; ptr++) Line 3885  for (;; ptr++)
3885    
3886      should_flip_negation = FALSE;      should_flip_negation = FALSE;
3887    
3888      /* 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:
3889      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 <
3890      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
3891        character. */
3892    
3893      class_charcount = 0;      class_has_8bitchar = 0;
3894      class_lastchar = -1;      class_one_char = 0;
3895    
3896      /* 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
3897      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
3898      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
3899      */      map. */
3900    
3901      memset(classbits, 0, 32 * sizeof(uschar));      memset(classbits, 0, 32 * sizeof(pcre_uint8));
3902    
3903  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3904      class_utf8 = FALSE;                       /* No chars >= 256 */      xclass = FALSE;
3905      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */      class_uchardata = code + LINK_SIZE + 2;   /* For XCLASS items */
3906      class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */      class_uchardata_base = class_uchardata;   /* Save the start */
3907  #endif  #endif
3908    
3909      /* Process characters until ] is reached. By writing this as a "do" it      /* Process characters until ] is reached. By writing this as a "do" it
3910      means that an initial ] is taken as a data character. At the start of the      means that an initial ] is taken as a data character. At the start of the
3911      loop, c contains the first byte of the character. */      loop, c contains the first byte of the character. */
3912    
3913      if (c != 0) do      if (c != CHAR_NULL) do
3914        {        {
3915        const uschar *oldptr;        const pcre_uchar *oldptr;
3916    
3917  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3918        if (utf8 && c > 127)        if (utf && HAS_EXTRALEN(c))
3919          {                           /* Braces are required because the */          {                           /* Braces are required because the */
3920          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
3921          }          }
3922    #endif
3923    
3924        /* In the pre-compile phase, accumulate the length of any UTF-8 extra  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3925          /* In the pre-compile phase, accumulate the length of any extra
3926        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
3927        contain a zillion UTF-8 characters no longer overwrite the work space        contain a zillion > 255 characters no longer overwrite the work space
3928        (which is on the stack). */        (which is on the stack). We have to remember that there was XCLASS data,
3929          however. */
3930        if (lengthptr != NULL)  
3931          {        if (lengthptr != NULL && class_uchardata > class_uchardata_base)
3932          *lengthptr += class_utf8data - class_utf8data_base;          {
3933          class_utf8data = class_utf8data_base;          xclass = TRUE;
3934            *lengthptr += class_uchardata - class_uchardata_base;
3935            class_uchardata = class_uchardata_base;
3936          }          }
   
3937  #endif  #endif
3938    
3939        /* Inside \Q...\E everything is literal except \E */        /* Inside \Q...\E everything is literal except \E */
# Line 3386  for (;; ptr++) Line 3961  for (;; ptr++)
3961          {          {
3962          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
3963          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
3964          register const uschar *cbits = cd->cbits;          register const pcre_uint8 *cbits = cd->cbits;
3965          uschar pbits[32];          pcre_uint8 pbits[32];
3966    
3967          if (ptr[1] != CHAR_COLON)          if (ptr[1] != CHAR_COLON)
3968            {            {
# Line 3442  for (;; ptr++) Line 4017  for (;; ptr++)
4017          /* Copy in the first table (always present) */          /* Copy in the first table (always present) */
4018    
4019          memcpy(pbits, cbits + posix_class_maps[posix_class],          memcpy(pbits, cbits + posix_class_maps[posix_class],
4020            32 * sizeof(uschar));            32 * sizeof(pcre_uint8));
4021    
4022          /* If there is a second table, add or remove it as required. */          /* If there is a second table, add or remove it as required. */
4023    
# Line 3457  for (;; ptr++) Line 4032  for (;; ptr++)
4032              for (c = 0; c < 32; c++) pbits[c] &= ~cbits[c + taboffset];              for (c = 0; c < 32; c++) pbits[c] &= ~cbits[c + taboffset];
4033            }            }
4034    
4035          /* Not see if we need to remove any special characters. An option          /* Now see if we need to remove any special characters. An option
4036          value of 1 removes vertical space and 2 removes underscore. */          value of 1 removes vertical space and 2 removes underscore. */
4037    
4038          if (tabopt < 0) tabopt = -tabopt;          if (tabopt < 0) tabopt = -tabopt;
# Line 3473  for (;; ptr++) Line 4048  for (;; ptr++)
4048            for (c = 0; c < 32; c++) classbits[c] |= pbits[c];            for (c = 0; c < 32; c++) classbits[c] |= pbits[c];
4049    
4050          ptr = tempptr + 1;          ptr = tempptr + 1;
4051          class_charcount = 10;  /* Set > 1; assumes more than 1 per class */          /* Every class contains at least one < 256 character. */
4052            class_has_8bitchar = 1;
4053            /* Every class contains at least two characters. */
4054            class_one_char = 2;
4055          continue;    /* End of POSIX syntax handling */          continue;    /* End of POSIX syntax handling */
4056          }          }
4057    
4058        /* Backslash may introduce a single character, or it may introduce one        /* Backslash may introduce a single character, or it may introduce one
4059        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
4060        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
4061        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
4062        class_charcount bigger than one. Unrecognized escapes fall through and        speculatively set both class_has_8bitchar and class_one_char bigger
4063        are either treated as literal characters (by default), or are faulted if        than one. Unrecognized escapes fall through and are either treated
4064          as literal characters (by default), or are faulted if
4065        PCRE_EXTRA is set. */        PCRE_EXTRA is set. */
4066    
4067        if (c == CHAR_BACKSLASH)        if (c == CHAR_BACKSLASH)
4068          {          {
4069          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          escape = check_escape(&ptr, &ec, errorcodeptr, cd->bracount, options,
4070              TRUE);
4071          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
4072            if (escape == 0) c = ec;
4073          if (-c == ESC_b) c = CHAR_BS;    /* \b is backspace in a class */          else if (escape == ESC_b) c = CHAR_BS; /* \b is backspace in a class */
4074          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (escape == ESC_N)          /* \N is not supported in a class */
4075              {
4076              *errorcodeptr = ERR71;
4077              goto FAILED;
4078              }
4079            else if (escape == ESC_Q)            /* Handle start of quoted string */
4080            {            {
4081            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
4082              {              {
# Line 3500  for (;; ptr++) Line 4085  for (;; ptr++)
4085            else inescq = TRUE;            else inescq = TRUE;
4086            continue;            continue;
4087            }            }
4088          else if (-c == ESC_E) continue;  /* Ignore orphan \E */          else if (escape == ESC_E) continue;  /* Ignore orphan \E */
4089    
4090          if (c < 0)          else
4091            {            {
4092            register const uschar *cbits = cd->cbits;            register const pcre_uint8 *cbits = cd->cbits;
4093            class_charcount += 2;     /* Greater than 1 is what matters */            /* Every class contains at least two < 256 characters. */
4094              class_has_8bitchar++;
4095              /* Every class contains at least two characters. */
4096              class_one_char += 2;
4097    
4098            switch (-c)            switch (escape)
4099              {              {
4100  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4101              case ESC_du:     /* These are the values given for \d etc */              case ESC_du:     /* These are the values given for \d etc */
# Line 3517  for (;; ptr++) Line 4105  for (;; ptr++)
4105              case ESC_su:     /* of the default ASCII testing. */              case ESC_su:     /* of the default ASCII testing. */
4106              case ESC_SU:              case ESC_SU:
4107              nestptr = ptr;              nestptr = ptr;
4108              ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */              ptr = substitutes[escape - ESC_DU] - 1;  /* Just before substitute */
4109              class_charcount -= 2;                /* Undo! */              class_has_8bitchar--;                /* Undo! */
4110              continue;              continue;
4111  #endif  #endif
4112              case ESC_d:              case ESC_d:
# Line 3540  for (;; ptr++) Line 4128  for (;; ptr++)
4128              continue;              continue;
4129    
4130              /* 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
4131              if it was previously set by something earlier in the character              if it was previously set by something earlier in the character
4132              class. */              class. Luckily, the value of CHAR_VT is 0x0b in both ASCII and
4133                EBCDIC, so we lazily just adjust the appropriate bit. */
4134    
4135              case ESC_s:              case ESC_s:
4136              classbits[0] |= cbits[cbit_space];              classbits[0] |= cbits[cbit_space];
4137              classbits[1] |= cbits[cbit_space+1] & ~0x08;              classbits[1] |= cbits[cbit_space+1] & ~0x08;
4138              for (c = 2; c < 32; c++) classbits[c] |= cbits[c+cbit_space];              for (c = 2; c < 32; c++) classbits[c] |= cbits[c+cbit_space];
4139              continue;              continue;
4140    
# Line 3555  for (;; ptr++) Line 4144  for (;; ptr++)
4144              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
4145              continue;              continue;
4146    
4147                /* The rest apply in both UCP and non-UCP cases. */
4148    
4149              case ESC_h:              case ESC_h:
4150              SETBIT(classbits, 0x09); /* VT */              (void)add_list_to_class(classbits, &class_uchardata, options, cd,
4151              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  
4152              continue;              continue;
4153    
4154              case ESC_H:              case ESC_H:
4155              for (c = 0; c < 32; c++)