/[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 500 by ph10, Sat Mar 6 19:00:29 2010 UTC revision 1033 by ph10, Mon Sep 10 11:02:48 2012 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2010 University of Cambridge             Copyright (c) 1997-2012 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 53  supporting internal functions that are n Line 53  supporting internal functions that are n
53  #include "pcre_internal.h"  #include "pcre_internal.h"
54    
55    
56  /* When PCRE_DEBUG is defined, we need the pcre_printint() function, which is  /* When PCRE_DEBUG is defined, we need the pcre(16)_printint() function, which
57  also used by pcretest. PCRE_DEBUG is not defined when building a production  is also used by pcretest. PCRE_DEBUG is not defined when building a production
58  library. */  library. We do not need to select pcre16_printint.c specially, because the
59    COMPILE_PCREx macro will already be appropriately set. */
60    
61  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
62  #include "pcre_printint.src"  /* pcre_printint.c should not include any headers */
63    #define PCRE_INCLUDED
64    #include "pcre_printint.c"
65    #undef PCRE_INCLUDED
66  #endif  #endif
67    
68    
# Line 88  so this number is very generous. Line 92  so this number is very generous.
92  The same workspace is used during the second, actual compile phase for  The same workspace is used during the second, actual compile phase for
93  remembering forward references to groups so that they can be filled in at the  remembering forward references to groups so that they can be filled in at the
94  end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE  end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE
95  is 4 there is plenty of room. */  is 4 there is plenty of room for most patterns. However, the memory can get
96    filled up by repetitions of forward references, for example patterns like
97    /(?1){0,1999}(b)/, and one user did hit the limit. The code has been changed so
98    that the workspace is expanded using malloc() in this situation. The value
99    below is therefore a minimum, and we put a maximum on it for safety. The
100    minimum is now also defined in terms of LINK_SIZE so that the use of malloc()
101    kicks in at the same number of forward references in all cases. */
102    
103  #define COMPILE_WORK_SIZE (4096)  #define COMPILE_WORK_SIZE (2048*LINK_SIZE)
104    #define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)
105    
106    /* The overrun tests check for a slightly smaller size so that they detect the
107    overrun before it actually does run off the end of the data block. */
108    
109    #define WORK_SIZE_SAFETY_MARGIN (100)
110    
111    /* Private flags added to firstchar and reqchar. */
112    
113    #define REQ_CASELESS   0x10000000l      /* Indicates caselessness */
114    #define REQ_VARY       0x20000000l      /* Reqchar followed non-literal item */
115    
116    /* Repeated character flags. */
117    
118    #define UTF_LENGTH     0x10000000l      /* The char contains its length. */
119    
120  /* Table for handling escaped characters in the range '0'-'z'. Positive returns  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
121  are simple data values; negative values are for special things like \d and so  are simple data values; negative values are for special things like \d and so
# Line 119  static const short int escapes[] = { Line 143  static const short int escapes[] = {
143       -ESC_H,                  0,       -ESC_H,                  0,
144       0,                       -ESC_K,       0,                       -ESC_K,
145       0,                       0,       0,                       0,
146       0,                       0,       -ESC_N,                  0,
147       -ESC_P,                  -ESC_Q,       -ESC_P,                  -ESC_Q,
148       -ESC_R,                  -ESC_S,       -ESC_R,                  -ESC_S,
149       0,                       0,       0,                       0,
# Line 166  static const short int escapes[] = { Line 190  static const short int escapes[] = {
190  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
191  /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,  /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,
192  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
193  /*  D0 */   '}',     0, -ESC_K,       0,      0,     0,      0, -ESC_P,  /*  D0 */   '}',     0, -ESC_K,       0,      0,-ESC_N,      0, -ESC_P,
194  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
195  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
196  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
# Line 183  string is built from string macros so th Line 207  string is built from string macros so th
207  platforms. */  platforms. */
208    
209  typedef struct verbitem {  typedef struct verbitem {
210    int   len;    int   len;                 /* Length of verb name */
211    int   op;    int   op;                  /* Op when no arg, or -1 if arg mandatory */
212      int   op_arg;              /* Op when arg present, or -1 if not allowed */
213  } verbitem;  } verbitem;
214    
215  static const char verbnames[] =  static const char verbnames[] =
216      "\0"                       /* Empty name is a shorthand for MARK */
217      STRING_MARK0
218    STRING_ACCEPT0    STRING_ACCEPT0
219    STRING_COMMIT0    STRING_COMMIT0
220    STRING_F0    STRING_F0
# Line 197  static const char verbnames[] = Line 224  static const char verbnames[] =
224    STRING_THEN;    STRING_THEN;
225    
226  static const verbitem verbs[] = {  static const verbitem verbs[] = {
227    { 6, OP_ACCEPT },    { 0, -1,        OP_MARK },
228    { 6, OP_COMMIT },    { 4, -1,        OP_MARK },
229    { 1, OP_FAIL },    { 6, OP_ACCEPT, -1 },
230    { 4, OP_FAIL },    { 6, OP_COMMIT, -1 },
231    { 5, OP_PRUNE },    { 1, OP_FAIL,   -1 },
232    { 4, OP_SKIP  },    { 4, OP_FAIL,   -1 },
233    { 4, OP_THEN  }    { 5, OP_PRUNE,  OP_PRUNE_ARG },
234      { 4, OP_SKIP,   OP_SKIP_ARG  },
235      { 4, OP_THEN,   OP_THEN_ARG  }
236  };  };
237    
238  static const int verbcount = sizeof(verbs)/sizeof(verbitem);  static const int verbcount = sizeof(verbs)/sizeof(verbitem);
# Line 221  static const char posix_names[] = Line 250  static const char posix_names[] =
250    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
251    STRING_word0  STRING_xdigit;    STRING_word0  STRING_xdigit;
252    
253  static const uschar posix_name_lengths[] = {  static const pcre_uint8 posix_name_lengths[] = {
254    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
255    
256  /* Table of class bit maps for each POSIX class. Each class is formed from a  /* Table of class bit maps for each POSIX class. Each class is formed from a
# Line 251  static const int posix_class_maps[] = { Line 280  static const int posix_class_maps[] = {
280    cbit_xdigit,-1,          0              /* xdigit */    cbit_xdigit,-1,          0              /* xdigit */
281  };  };
282    
283    /* Table of substitutes for \d etc when PCRE_UCP is set. The POSIX class
284    substitutes must be in the order of the names, defined above, and there are
285    both positive and negative cases. NULL means no substitute. */
286    
287    #ifdef SUPPORT_UCP
288    static const pcre_uchar string_PNd[]  = {
289      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
290      CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
291    static const pcre_uchar string_pNd[]  = {
292      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
293      CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
294    static const pcre_uchar string_PXsp[] = {
295      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
296      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
297    static const pcre_uchar string_pXsp[] = {
298      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
299      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
300    static const pcre_uchar string_PXwd[] = {
301      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
302      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
303    static const pcre_uchar string_pXwd[] = {
304      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
305      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
306    
307    static const pcre_uchar *substitutes[] = {
308      string_PNd,           /* \D */
309      string_pNd,           /* \d */
310      string_PXsp,          /* \S */       /* NOTE: Xsp is Perl space */
311      string_pXsp,          /* \s */
312      string_PXwd,          /* \W */
313      string_pXwd           /* \w */
314    };
315    
316    static const pcre_uchar string_pL[] =   {
317      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
318      CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
319    static const pcre_uchar string_pLl[] =  {
320      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
321      CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
322    static const pcre_uchar string_pLu[] =  {
323      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
324      CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
325    static const pcre_uchar string_pXan[] = {
326      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
327      CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
328    static const pcre_uchar string_h[] =    {
329      CHAR_BACKSLASH, CHAR_h, '\0' };
330    static const pcre_uchar string_pXps[] = {
331      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
332      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
333    static const pcre_uchar string_PL[] =   {
334      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
335      CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
336    static const pcre_uchar string_PLl[] =  {
337      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
338      CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
339    static const pcre_uchar string_PLu[] =  {
340      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
341      CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
342    static const pcre_uchar string_PXan[] = {
343      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
344      CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
345    static const pcre_uchar string_H[] =    {
346      CHAR_BACKSLASH, CHAR_H, '\0' };
347    static const pcre_uchar string_PXps[] = {
348      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
349      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
350    
351    static const pcre_uchar *posix_substitutes[] = {
352      string_pL,            /* alpha */
353      string_pLl,           /* lower */
354      string_pLu,           /* upper */
355      string_pXan,          /* alnum */
356      NULL,                 /* ascii */
357      string_h,             /* blank */
358      NULL,                 /* cntrl */
359      string_pNd,           /* digit */
360      NULL,                 /* graph */
361      NULL,                 /* print */
362      NULL,                 /* punct */
363      string_pXps,          /* space */    /* NOTE: Xps is POSIX space */
364      string_pXwd,          /* word */
365      NULL,                 /* xdigit */
366      /* Negated cases */
367      string_PL,            /* ^alpha */
368      string_PLl,           /* ^lower */
369      string_PLu,           /* ^upper */
370      string_PXan,          /* ^alnum */
371      NULL,                 /* ^ascii */
372      string_H,             /* ^blank */
373      NULL,                 /* ^cntrl */
374      string_PNd,           /* ^digit */
375      NULL,                 /* ^graph */
376      NULL,                 /* ^print */
377      NULL,                 /* ^punct */
378      string_PXps,          /* ^space */   /* NOTE: Xps is POSIX space */
379      string_PXwd,          /* ^word */
380      NULL                  /* ^xdigit */
381    };
382    #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
383    #endif
384    
385  #define STRING(a)  # a  #define STRING(a)  # a
386  #define XSTRING(s) STRING(s)  #define XSTRING(s) STRING(s)
# Line 263  the number of relocations needed when a Line 393  the number of relocations needed when a
393  it is now one long string. We cannot use a table of offsets, because the  it is now one long string. We cannot use a table of offsets, because the
394  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
395  simply count through to the one we want - this isn't a performance issue  simply count through to the one we want - this isn't a performance issue
396  because these strings are used only when there is a compilation error.  because these strings are used only when there is a compilation error.
397    
398  Each substring ends with \0 to insert a null character. This includes the final  Each substring ends with \0 to insert a null character. This includes the final
399  substring, so that the whole string ends with \0\0, which can be detected when  substring, so that the whole string ends with \0\0, which can be detected when
400  counting through. */  counting through. */
401    
402  static const char error_texts[] =  static const char error_texts[] =
# Line 308  static const char error_texts[] = Line 438  static const char error_texts[] =
438    /* 30 */    /* 30 */
439    "unknown POSIX class name\0"    "unknown POSIX class name\0"
440    "POSIX collating elements are not supported\0"    "POSIX collating elements are not supported\0"
441    "this version of PCRE is not compiled with PCRE_UTF8 support\0"    "this version of PCRE is compiled without UTF support\0"
442    "spare error\0"  /** DEAD **/    "spare error\0"  /** DEAD **/
443    "character value in \\x{...} sequence is too large\0"    "character value in \\x{...} sequence is too large\0"
444    /* 35 */    /* 35 */
445    "invalid condition (?(0)\0"    "invalid condition (?(0)\0"
446    "\\C not allowed in lookbehind assertion\0"    "\\C not allowed in lookbehind assertion\0"
447    "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"    "PCRE does not support \\L, \\l, \\N{name}, \\U, or \\u\0"
448    "number after (?C is > 255\0"    "number after (?C is > 255\0"
449    "closing ) for (?C expected\0"    "closing ) for (?C expected\0"
450    /* 40 */    /* 40 */
# Line 331  static const char error_texts[] = Line 461  static const char error_texts[] =
461    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
462    /* 50 */    /* 50 */
463    "repeated subpattern is too long\0"    /** DEAD **/    "repeated subpattern is too long\0"    /** DEAD **/
464    "octal value is greater than \\377 (not in UTF-8 mode)\0"    "octal value is greater than \\377 in 8-bit non-UTF-8 mode\0"
465    "internal error: overran compiling workspace\0"    "internal error: overran compiling workspace\0"
466    "internal error: previously-checked referenced subpattern not found\0"    "internal error: previously-checked referenced subpattern not found\0"
467    "DEFINE group contains more than one branch\0"    "DEFINE group contains more than one branch\0"
468    /* 55 */    /* 55 */
469    "repeating a DEFINE group is not allowed\0"    "repeating a DEFINE group is not allowed\0"  /** DEAD **/
470    "inconsistent NEWLINE options\0"    "inconsistent NEWLINE options\0"
471    "\\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"
472    "a numbered reference must not be zero\0"    "a numbered reference must not be zero\0"
473    "(*VERB) with an argument is not supported\0"    "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
474    /* 60 */    /* 60 */
475    "(*VERB) not recognized\0"    "(*VERB) not recognized\0"
476    "number is too big\0"    "number is too big\0"
# Line 348  static const char error_texts[] = Line 478  static const char error_texts[] =
478    "digit expected after (?+\0"    "digit expected after (?+\0"
479    "] is an invalid data character in JavaScript compatibility mode\0"    "] is an invalid data character in JavaScript compatibility mode\0"
480    /* 65 */    /* 65 */
481    "different names for subpatterns of the same number are not allowed\0";    "different names for subpatterns of the same number are not allowed\0"
482      "(*MARK) must have an argument\0"
483      "this version of PCRE is not compiled with Unicode property support\0"
484      "\\c must be followed by an ASCII character\0"
485      "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
486      /* 70 */
487      "internal error: unknown opcode in find_fixedlength()\0"
488      "\\N is not supported in a class\0"
489      "too many forward references\0"
490      "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
491      "invalid UTF-16 string\0"
492      /* 75 */
493      "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0"
494      "character value in \\u.... sequence is too large\0"
495      ;
496    
497  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
498  patterns. Note that the tables in chartables are dependent on the locale, and  patterns. Note that the tables in chartables are dependent on the locale, and
# Line 366  For convenience, we use the same bit def Line 510  For convenience, we use the same bit def
510    
511  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
512    
513    /* Using a simple comparison for decimal numbers rather than a memory read
514    is much faster, and the resulting code is simpler (the compiler turns it
515    into a subtraction and unsigned comparison). */
516    
517    #define IS_DIGIT(x) ((x) >= CHAR_0 && (x) <= CHAR_9)
518    
519  #ifndef EBCDIC  #ifndef EBCDIC
520    
521  /* 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
522  UTF-8 mode. */  UTF-8 mode. */
523    
524  static const unsigned char digitab[] =  static const pcre_uint8 digitab[] =
525    {    {
526    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
527    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */
# Line 410  static const unsigned char digitab[] = Line 560  static const unsigned char digitab[] =
560    
561  /* 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. */
562    
563  static const unsigned char digitab[] =  static const pcre_uint8 digitab[] =
564    {    {
565    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
566    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */
# Line 445  static const unsigned char digitab[] = Line 595  static const unsigned char digitab[] =
595    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */
596    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */
597    
598  static const unsigned char ebcdic_chartab[] = { /* chartable partial dup */  static const pcre_uint8 ebcdic_chartab[] = { /* chartable partial dup */
599    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */
600    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
601    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */
# Line 484  static const unsigned char ebcdic_charta Line 634  static const unsigned char ebcdic_charta
634  /* Definition to allow mutual recursion */  /* Definition to allow mutual recursion */
635    
636  static BOOL  static BOOL
637    compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,    compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,
638      int *, int *, branch_chain *, compile_data *, int *);      int *, int *, branch_chain *, compile_data *, int *);
639    
640    
# Line 506  static const char * Line 656  static const char *
656  find_error_text(int n)  find_error_text(int n)
657  {  {
658  const char *s = error_texts;  const char *s = error_texts;
659  for (; n > 0; n--)  for (; n > 0; n--)
660    {    {
661    while (*s++ != 0) {};    while (*s++ != 0) {};
662    if (*s == 0) return "Error text not found (please report)";    if (*s == 0) return "Error text not found (please report)";
663    }    }
664  return s;  return s;
665  }  }
666    
667    
668  /*************************************************  /*************************************************
669    *           Expand the workspace                 *
670    *************************************************/
671    
672    /* This function is called during the second compiling phase, if the number of
673    forward references fills the existing workspace, which is originally a block on
674    the stack. A larger block is obtained from malloc() unless the ultimate limit
675    has been reached or the increase will be rather small.
676    
677    Argument: pointer to the compile data block
678    Returns:  0 if all went well, else an error number
679    */
680    
681    static int
682    expand_workspace(compile_data *cd)
683    {
684    pcre_uchar *newspace;
685    int newsize = cd->workspace_size * 2;
686    
687    if (newsize > COMPILE_WORK_SIZE_MAX) newsize = COMPILE_WORK_SIZE_MAX;
688    if (cd->workspace_size >= COMPILE_WORK_SIZE_MAX ||
689        newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)
690     return ERR72;
691    
692    newspace = (PUBL(malloc))(IN_UCHARS(newsize));
693    if (newspace == NULL) return ERR21;
694    memcpy(newspace, cd->start_workspace, cd->workspace_size * sizeof(pcre_uchar));
695    cd->hwm = (pcre_uchar *)newspace + (cd->hwm - cd->start_workspace);
696    if (cd->workspace_size > COMPILE_WORK_SIZE)
697      (PUBL(free))((void *)cd->start_workspace);
698    cd->start_workspace = newspace;
699    cd->workspace_size = newsize;
700    return 0;
701    }
702    
703    
704    
705    /*************************************************
706    *            Check for counted repeat            *
707    *************************************************/
708    
709    /* This function is called when a '{' is encountered in a place where it might
710    start a quantifier. It looks ahead to see if it really is a quantifier or not.
711    It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
712    where the ddds are digits.
713    
714    Arguments:
715      p         pointer to the first char after '{'
716    
717    Returns:    TRUE or FALSE
718    */
719    
720    static BOOL
721    is_counted_repeat(const pcre_uchar *p)
722    {
723    if (!IS_DIGIT(*p)) return FALSE;
724    p++;
725    while (IS_DIGIT(*p)) p++;
726    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
727    
728    if (*p++ != CHAR_COMMA) return FALSE;
729    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
730    
731    if (!IS_DIGIT(*p)) return FALSE;
732    p++;
733    while (IS_DIGIT(*p)) p++;
734    
735    return (*p == CHAR_RIGHT_CURLY_BRACKET);
736    }
737    
738    
739    
740    /*************************************************
741  *            Handle escapes                      *  *            Handle escapes                      *
742  *************************************************/  *************************************************/
743    
# Line 540  Returns:         zero or positive => a d Line 762  Returns:         zero or positive => a d
762  */  */
763    
764  static int  static int
765  check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,  check_escape(const pcre_uchar **ptrptr, int *errorcodeptr, int bracount,
766    int options, BOOL isclass)    int options, BOOL isclass)
767  {  {
768  BOOL utf8 = (options & PCRE_UTF8) != 0;  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
769  const uschar *ptr = *ptrptr + 1;  BOOL utf = (options & PCRE_UTF8) != 0;
770  int c, i;  const pcre_uchar *ptr = *ptrptr + 1;
771    pcre_int32 c;
772    int i;
773    
774  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
775  ptr--;                            /* Set pointer back to the last byte */  ptr--;                            /* Set pointer back to the last byte */
# Line 559  in a table. A non-zero result is somethi Line 783  in a table. A non-zero result is somethi
783  Otherwise further processing may be required. */  Otherwise further processing may be required. */
784    
785  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
786  else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */  /* Not alphanumeric */
787    else if (c < CHAR_0 || c > CHAR_z) {}
788  else if ((i = escapes[c - CHAR_0]) != 0) c = i;  else if ((i = escapes[c - CHAR_0]) != 0) c = i;
789    
790  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
791  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */  /* Not alphanumeric */
792    else if (c < CHAR_a || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}
793  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if ((i = escapes[c - 0x48]) != 0)  c = i;
794  #endif  #endif
795    
# Line 571  else if ((i = escapes[c - 0x48]) != 0) Line 797  else if ((i = escapes[c - 0x48]) != 0)
797    
798  else  else
799    {    {
800    const uschar *oldptr;    const pcre_uchar *oldptr;
801    BOOL braced, negated;    BOOL braced, negated;
802    
803    switch (c)    switch (c)
# Line 581  else Line 807  else
807    
808      case CHAR_l:      case CHAR_l:
809      case CHAR_L:      case CHAR_L:
810      case CHAR_N:      *errorcodeptr = ERR37;
811        break;
812    
813      case CHAR_u:      case CHAR_u:
814        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
815          {
816          /* In JavaScript, \u must be followed by four hexadecimal numbers.
817          Otherwise it is a lowercase u letter. */
818          if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
819            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0
820            && MAX_255(ptr[3]) && (digitab[ptr[3]] & ctype_xdigit) != 0
821            && MAX_255(ptr[4]) && (digitab[ptr[4]] & ctype_xdigit) != 0)
822            {
823            c = 0;
824            for (i = 0; i < 4; ++i)
825              {
826              register int cc = *(++ptr);
827    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
828              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
829              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
830    #else           /* EBCDIC coding */
831              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
832              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
833    #endif
834              }
835    
836    #ifdef COMPILE_PCRE8
837            if (c > (utf ? 0x10ffff : 0xff))
838    #else
839    #ifdef COMPILE_PCRE16
840            if (c > (utf ? 0x10ffff : 0xffff))
841    #endif
842    #endif
843              {
844              *errorcodeptr = ERR76;
845              }
846            else if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
847            }
848          }
849        else
850          *errorcodeptr = ERR37;
851        break;
852    
853      case CHAR_U:      case CHAR_U:
854      *errorcodeptr = ERR37;      /* In JavaScript, \U is an uppercase U letter. */
855        if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
856      break;      break;
857    
858      /* \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
859        class, \g must be followed by one of a number of specific things:
860    
861      (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
862      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 604  else Line 873  else
873      the -ESC_g code (cf \k). */      the -ESC_g code (cf \k). */
874    
875      case CHAR_g:      case CHAR_g:
876        if (isclass) break;
877      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
878        {        {
879        c = -ESC_g;        c = -ESC_g;
# Line 614  else Line 884  else
884    
885      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
886        {        {
887        const uschar *p;        const pcre_uchar *p;
888        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
889          if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;          if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
890        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
891          {          {
892          c = -ESC_k;          c = -ESC_k;
# Line 634  else Line 904  else
904        }        }
905      else negated = FALSE;      else negated = FALSE;
906    
907        /* The integer range is limited by the machine's int representation. */
908      c = 0;      c = 0;
909      while ((digitab[ptr[1]] & ctype_digit) != 0)      while (IS_DIGIT(ptr[1]))
910          {
911          if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */
912            {
913            c = -1;
914            break;
915            }
916        c = c * 10 + *(++ptr) - CHAR_0;        c = c * 10 + *(++ptr) - CHAR_0;
917          }
918      if (c < 0)   /* Integer overflow */      if (((unsigned int)c) > INT_MAX) /* Integer overflow */
919        {        {
920          while (IS_DIGIT(ptr[1]))
921            ptr++;
922        *errorcodeptr = ERR61;        *errorcodeptr = ERR61;
923        break;        break;
924        }        }
# Line 687  else Line 966  else
966      if (!isclass)      if (!isclass)
967        {        {
968        oldptr = ptr;        oldptr = ptr;
969          /* The integer range is limited by the machine's int representation. */
970        c -= CHAR_0;        c -= CHAR_0;
971        while ((digitab[ptr[1]] & ctype_digit) != 0)        while (IS_DIGIT(ptr[1]))
972            {
973            if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */
974              {
975              c = -1;
976              break;
977              }
978          c = c * 10 + *(++ptr) - CHAR_0;          c = c * 10 + *(++ptr) - CHAR_0;
979        if (c < 0)    /* Integer overflow */          }
980          if (((unsigned int)c) > INT_MAX) /* Integer overflow */
981          {          {
982            while (IS_DIGIT(ptr[1]))
983              ptr++;
984          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
985          break;          break;
986          }          }
# Line 717  else Line 1006  else
1006      /* \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
1007      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
1008      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
1009      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,
1010      than 3 octal digits. */      but no more than 3 octal digits. */
1011    
1012      case CHAR_0:      case CHAR_0:
1013      c -= CHAR_0;      c -= CHAR_0;
1014      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
1015          c = c * 8 + *(++ptr) - CHAR_0;          c = c * 8 + *(++ptr) - CHAR_0;
1016      if (!utf8 && c > 255) *errorcodeptr = ERR51;  #ifdef COMPILE_PCRE8
1017        if (!utf && c > 0xff) *errorcodeptr = ERR51;
1018    #endif
1019      break;      break;
1020    
1021      /* \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
1022      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.
1023      treated as a data character. */      If not, { is treated as a data character. */
1024    
1025      case CHAR_x:      case CHAR_x:
1026        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
1027          {
1028          /* In JavaScript, \x must be followed by two hexadecimal numbers.
1029          Otherwise it is a lowercase x letter. */
1030          if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
1031            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)
1032            {
1033            c = 0;
1034            for (i = 0; i < 2; ++i)
1035              {
1036              register int cc = *(++ptr);
1037    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1038              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
1039              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
1040    #else           /* EBCDIC coding */
1041              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
1042              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1043    #endif
1044              }
1045            }
1046          break;
1047          }
1048    
1049      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
1050        {        {
1051        const uschar *pt = ptr + 2;        const pcre_uchar *pt = ptr + 2;
       int count = 0;  
1052    
1053        c = 0;        c = 0;
1054        while ((digitab[*pt] & ctype_xdigit) != 0)        while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0)
1055          {          {
1056          register int cc = *pt++;          register int cc = *pt++;
1057          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
         count++;  
1058    
1059  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1060          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
# Line 751  else Line 1063  else
1063          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 */
1064          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1065  #endif  #endif
1066    
1067    #ifdef COMPILE_PCRE8
1068            if (c > (utf ? 0x10ffff : 0xff)) { c = -1; break; }
1069    #else
1070    #ifdef COMPILE_PCRE16
1071            if (c > (utf ? 0x10ffff : 0xffff)) { c = -1; break; }
1072    #endif
1073    #endif
1074            }
1075    
1076          if (c < 0)
1077            {
1078            while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0) pt++;
1079            *errorcodeptr = ERR34;
1080          }          }
1081    
1082        if (*pt == CHAR_RIGHT_CURLY_BRACKET)        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
1083          {          {
1084          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
1085          ptr = pt;          ptr = pt;
1086          break;          break;
1087          }          }
# Line 767  else Line 1093  else
1093      /* Read just a single-byte hex-defined char */      /* Read just a single-byte hex-defined char */
1094    
1095      c = 0;      c = 0;
1096      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)
1097        {        {
1098        int cc;                                  /* Some compilers don't like */        int cc;                                  /* Some compilers don't like */
1099        cc = *(++ptr);                           /* ++ in initializers */        cc = *(++ptr);                           /* ++ in initializers */
# Line 782  else Line 1108  else
1108      break;      break;
1109    
1110      /* For \c, a following letter is upper-cased; then the 0x40 bit is flipped.      /* For \c, a following letter is upper-cased; then the 0x40 bit is flipped.
1111      This coding is ASCII-specific, but then the whole concept of \cx is      An error is given if the byte following \c is not an ASCII character. This
1112        coding is ASCII-specific, but then the whole concept of \cx is
1113      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
1114    
1115      case CHAR_c:      case CHAR_c:
# Line 792  else Line 1119  else
1119        *errorcodeptr = ERR2;        *errorcodeptr = ERR2;
1120        break;        break;
1121        }        }
1122    #ifndef EBCDIC    /* ASCII/UTF-8 coding */
1123  #ifndef EBCDIC  /* ASCII/UTF-8 coding */      if (c > 127)  /* Excludes all non-ASCII in either mode */
1124          {
1125          *errorcodeptr = ERR68;
1126          break;
1127          }
1128      if (c >= CHAR_a && c <= CHAR_z) c -= 32;      if (c >= CHAR_a && c <= CHAR_z) c -= 32;
1129      c ^= 0x40;      c ^= 0x40;
1130  #else           /* EBCDIC coding */  #else             /* EBCDIC coding */
1131      if (c >= CHAR_a && c <= CHAR_z) c += 64;      if (c >= CHAR_a && c <= CHAR_z) c += 64;
1132      c ^= 0xC0;      c ^= 0xC0;
1133  #endif  #endif
# Line 819  else Line 1150  else
1150      }      }
1151    }    }
1152    
1153    /* Perl supports \N{name} for character names, as well as plain \N for "not
1154    newline". PCRE does not support \N{name}. However, it does support
1155    quantification such as \N{2,3}. */
1156    
1157    if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
1158         !is_counted_repeat(ptr+2))
1159      *errorcodeptr = ERR37;
1160    
1161    /* If PCRE_UCP is set, we change the values for \d etc. */
1162    
1163    if ((options & PCRE_UCP) != 0 && c <= -ESC_D && c >= -ESC_w)
1164      c -= (ESC_DU - ESC_D);
1165    
1166    /* Set the pointer to the final character before returning. */
1167    
1168  *ptrptr = ptr;  *ptrptr = ptr;
1169  return c;  return c;
1170  }  }
# Line 845  Returns:         type value from ucp_typ Line 1191  Returns:         type value from ucp_typ
1191  */  */
1192    
1193  static int  static int
1194  get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
1195  {  {
1196  int c, i, bot, top;  int c, i, bot, top;
1197  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
1198  char name[32];  pcre_uchar name[32];
1199    
1200  c = *(++ptr);  c = *(++ptr);
1201  if (c == 0) goto ERROR_RETURN;  if (c == 0) goto ERROR_RETURN;
# Line 866  if (c == CHAR_LEFT_CURLY_BRACKET) Line 1212  if (c == CHAR_LEFT_CURLY_BRACKET)
1212      *negptr = TRUE;      *negptr = TRUE;
1213      ptr++;      ptr++;
1214      }      }
1215    for (i = 0; i < (int)sizeof(name) - 1; i++)    for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
1216      {      {
1217      c = *(++ptr);      c = *(++ptr);
1218      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
# Line 890  else Line 1236  else
1236  /* Search for a recognized property name using binary chop */  /* Search for a recognized property name using binary chop */
1237    
1238  bot = 0;  bot = 0;
1239  top = _pcre_utt_size;  top = PRIV(utt_size);
1240    
1241  while (bot < top)  while (bot < top)
1242    {    {
1243    i = (bot + top) >> 1;    i = (bot + top) >> 1;
1244    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);    c = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
1245    if (c == 0)    if (c == 0)
1246      {      {
1247      *dptr = _pcre_utt[i].value;      *dptr = PRIV(utt)[i].value;
1248      return _pcre_utt[i].type;      return PRIV(utt)[i].type;
1249      }      }
1250    if (c > 0) bot = i + 1; else top = i;    if (c > 0) bot = i + 1; else top = i;
1251    }    }
# Line 919  return -1; Line 1265  return -1;
1265    
1266    
1267  /*************************************************  /*************************************************
 *            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);  
 }  
   
   
   
 /*************************************************  
1268  *         Read repeat counts                     *  *         Read repeat counts                     *
1269  *************************************************/  *************************************************/
1270    
# Line 970  Returns:         pointer to '}' on succe Line 1283  Returns:         pointer to '}' on succe
1283                   current ptr on error, with errorcodeptr set non-zero                   current ptr on error, with errorcodeptr set non-zero
1284  */  */
1285    
1286  static const uschar *  static const pcre_uchar *
1287  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)
1288  {  {
1289  int min = 0;  int min = 0;
1290  int max = -1;  int max = -1;
# Line 979  int max = -1; Line 1292  int max = -1;
1292  /* 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
1293  an integer overflow. */  an integer overflow. */
1294    
1295  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;  while (IS_DIGIT(*p)) min = min * 10 + *p++ - CHAR_0;
1296  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
1297    {    {
1298    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 994  if (*p == CHAR_RIGHT_CURLY_BRACKET) max Line 1307  if (*p == CHAR_RIGHT_CURLY_BRACKET) max
1307    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
1308      {      {
1309      max = 0;      max = 0;
1310      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;      while(IS_DIGIT(*p)) max = max * 10 + *p++ - CHAR_0;
1311      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
1312        {        {
1313        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 1027  top-level call starts at the beginning o Line 1340  top-level call starts at the beginning o
1340  start at a parenthesis. It scans along a pattern's text looking for capturing  start at a parenthesis. It scans along a pattern's text looking for capturing
1341  subpatterns, and counting them. If it finds a named pattern that matches the  subpatterns, and counting them. If it finds a named pattern that matches the
1342  name it is given, it returns its number. Alternatively, if the name is NULL, it  name it is given, it returns its number. Alternatively, if the name is NULL, it
1343  returns when it reaches a given numbered subpattern. We know that if (?P< is  returns when it reaches a given numbered subpattern. Recursion is used to keep
1344  encountered, the name will be terminated by '>' because that is checked in the  track of subpatterns that reset the capturing group numbers - the (?| feature.
1345  first pass. Recursion is used to keep track of subpatterns that reset the  
1346  capturing group numbers - the (?| feature.  This function was originally called only from the second pass, in which we know
1347    that if (?< or (?' or (?P< is encountered, the name will be correctly
1348    terminated because that is checked in the first pass. There is now one call to
1349    this function in the first pass, to check for a recursive back reference by
1350    name (so that we can make the whole group atomic). In this case, we need check
1351    only up to the current position in the pattern, and that is still OK because
1352    and previous occurrences will have been checked. To make this work, the test
1353    for "end of pattern" is a check against cd->end_pattern in the main loop,
1354    instead of looking for a binary zero. This means that the special first-pass
1355    call can adjust cd->end_pattern temporarily. (Checks for binary zero while
1356    processing items within the loop are OK, because afterwards the main loop will
1357    terminate.)
1358    
1359  Arguments:  Arguments:
1360    ptrptr       address of the current character pointer (updated)    ptrptr       address of the current character pointer (updated)
# Line 1038  Arguments: Line 1362  Arguments:
1362    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1363    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1364    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1365      utf          TRUE if we are in UTF-8 / UTF-16 mode
1366    count        pointer to the current capturing subpattern number (updated)    count        pointer to the current capturing subpattern number (updated)
1367    
1368  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1369  */  */
1370    
1371  static int  static int
1372  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,  find_parens_sub(pcre_uchar **ptrptr, compile_data *cd, const pcre_uchar *name, int lorn,
1373    BOOL xmode, int *count)    BOOL xmode, BOOL utf, int *count)
1374  {  {
1375  uschar *ptr = *ptrptr;  pcre_uchar *ptr = *ptrptr;
1376  int start_count = *count;  int start_count = *count;
1377  int hwm_count = start_count;  int hwm_count = start_count;
1378  BOOL dup_parens = FALSE;  BOOL dup_parens = FALSE;
# Line 1057  dealing with. The very first call may no Line 1382  dealing with. The very first call may no
1382    
1383  if (ptr[0] == CHAR_LEFT_PARENTHESIS)  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1384    {    {
1385    if (ptr[1] == CHAR_QUESTION_MARK &&    /* Handle specials such as (*SKIP) or (*UTF8) etc. */
1386        ptr[2] == CHAR_VERTICAL_LINE)  
1387      if (ptr[1] == CHAR_ASTERISK) ptr += 2;
1388    
1389      /* Handle a normal, unnamed capturing parenthesis. */
1390    
1391      else if (ptr[1] != CHAR_QUESTION_MARK)
1392        {
1393        *count += 1;
1394        if (name == NULL && *count == lorn) return *count;
1395        ptr++;
1396        }
1397    
1398      /* All cases now have (? at the start. Remember when we are in a group
1399      where the parenthesis numbers are duplicated. */
1400    
1401      else if (ptr[2] == CHAR_VERTICAL_LINE)
1402      {      {
1403      ptr += 3;      ptr += 3;
1404      dup_parens = TRUE;      dup_parens = TRUE;
1405      }      }
1406    
1407    /* Handle a normal, unnamed capturing parenthesis */    /* Handle comments; all characters are allowed until a ket is reached. */
1408    
1409    else if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)    else if (ptr[2] == CHAR_NUMBER_SIGN)
1410      {      {
1411      *count += 1;      for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
1412      if (name == NULL && *count == lorn) return *count;      goto FAIL_EXIT;
     ptr++;  
1413      }      }
1414    
1415    /* Handle a condition. If it is an assertion, just carry on so that it    /* Handle a condition. If it is an assertion, just carry on so that it
1416    is processed as normal. If not, skip to the closing parenthesis of the    is processed as normal. If not, skip to the closing parenthesis of the
1417    condition (there can't be any nested parens. */    condition (there can't be any nested parens). */
1418    
1419    else if (ptr[2] == CHAR_LEFT_PARENTHESIS)    else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
1420      {      {
# Line 1087  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1426  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1426        }        }
1427      }      }
1428    
1429    /* We have either (? or (* and not a condition */    /* Start with (? but not a condition. */
1430    
1431    else    else
1432      {      {
# Line 1100  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1439  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1439          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1440        {        {
1441        int term;        int term;
1442        const uschar *thisname;        const pcre_uchar *thisname;
1443        *count += 1;        *count += 1;
1444        if (name == NULL && *count == lorn) return *count;        if (name == NULL && *count == lorn) return *count;
1445        term = *ptr++;        term = *ptr++;
# Line 1108  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1447  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1447        thisname = ptr;        thisname = ptr;
1448        while (*ptr != term) ptr++;        while (*ptr != term) ptr++;
1449        if (name != NULL && lorn == ptr - thisname &&        if (name != NULL && lorn == ptr - thisname &&
1450            strncmp((const char *)name, (const char *)thisname, lorn) == 0)            STRNCMP_UC_UC(name, thisname, lorn) == 0)
1451          return *count;          return *count;
1452        term++;        term++;
1453        }        }
# Line 1116  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1455  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1455    }    }
1456    
1457  /* Past any initial parenthesis handling, scan for parentheses or vertical  /* Past any initial parenthesis handling, scan for parentheses or vertical
1458  bars. */  bars. Stop if we get to cd->end_pattern. Note that this is important for the
1459    first-pass call when this value is temporarily adjusted to stop at the current
1460    position. So DO NOT change this to a test for binary zero. */
1461    
1462  for (; *ptr != 0; ptr++)  for (; ptr < cd->end_pattern; ptr++)
1463    {    {
1464    /* Skip over backslashed characters and also entire \Q...\E */    /* Skip over backslashed characters and also entire \Q...\E */
1465    
# Line 1149  for (; *ptr != 0; ptr++) Line 1490  for (; *ptr != 0; ptr++)
1490          {          {
1491          if (ptr[2] == CHAR_E)          if (ptr[2] == CHAR_E)
1492            ptr+= 2;            ptr+= 2;
1493          else if (strncmp((const char *)ptr+2,          else if (STRNCMP_UC_C8(ptr + 2,
1494                   STR_Q STR_BACKSLASH STR_E, 3) == 0)                   STR_Q STR_BACKSLASH STR_E, 3) == 0)
1495            ptr += 4;            ptr += 4;
1496          else          else
# Line 1192  for (; *ptr != 0; ptr++) Line 1533  for (; *ptr != 0; ptr++)
1533    
1534    if (xmode && *ptr == CHAR_NUMBER_SIGN)    if (xmode && *ptr == CHAR_NUMBER_SIGN)
1535      {      {
1536      while (*(++ptr) != 0 && *ptr != CHAR_NL) {};      ptr++;
1537        while (*ptr != 0)
1538          {
1539          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
1540          ptr++;
1541    #ifdef SUPPORT_UTF
1542          if (utf) FORWARDCHAR(ptr);
1543    #endif
1544          }
1545      if (*ptr == 0) goto FAIL_EXIT;      if (*ptr == 0) goto FAIL_EXIT;
1546      continue;      continue;
1547      }      }
# Line 1201  for (; *ptr != 0; ptr++) Line 1550  for (; *ptr != 0; ptr++)
1550    
1551    if (*ptr == CHAR_LEFT_PARENTHESIS)    if (*ptr == CHAR_LEFT_PARENTHESIS)
1552      {      {
1553      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, count);      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, count);
1554      if (rc > 0) return rc;      if (rc > 0) return rc;
1555      if (*ptr == 0) goto FAIL_EXIT;      if (*ptr == 0) goto FAIL_EXIT;
1556      }      }
# Line 1209  for (; *ptr != 0; ptr++) Line 1558  for (; *ptr != 0; ptr++)
1558    else if (*ptr == CHAR_RIGHT_PARENTHESIS)    else if (*ptr == CHAR_RIGHT_PARENTHESIS)
1559      {      {
1560      if (dup_parens && *count < hwm_count) *count = hwm_count;      if (dup_parens && *count < hwm_count) *count = hwm_count;
1561      *ptrptr = ptr;      goto FAIL_EXIT;
     return -1;  
1562      }      }
1563    
1564    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
# Line 1248  Arguments: Line 1596  Arguments:
1596    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1597    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1598    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1599      utf          TRUE if we are in UTF-8 / UTF-16 mode
1600    
1601  Returns:       the number of the found subpattern, or -1 if not found  Returns:       the number of the found subpattern, or -1 if not found
1602  */  */
1603    
1604  static int  static int
1605  find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode)  find_parens(compile_data *cd, const pcre_uchar *name, int lorn, BOOL xmode,
1606      BOOL utf)
1607  {  {
1608  uschar *ptr = (uschar *)cd->start_pattern;  pcre_uchar *ptr = (pcre_uchar *)cd->start_pattern;
1609  int count = 0;  int count = 0;
1610  int rc;  int rc;
1611    
# Line 1266  matching closing parens. That is why we Line 1616  matching closing parens. That is why we
1616    
1617  for (;;)  for (;;)
1618    {    {
1619    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, &count);    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, &count);
1620    if (rc > 0 || *ptr++ == 0) break;    if (rc > 0 || *ptr++ == 0) break;
1621    }    }
1622    
# Line 1282  return rc; Line 1632  return rc;
1632    
1633  /* This is called by several functions that scan a compiled expression looking  /* This is called by several functions that scan a compiled expression looking
1634  for a fixed first character, or an anchoring op code etc. It skips over things  for a fixed first character, or an anchoring op code etc. It skips over things
1635  that do not influence this. For some calls, a change of option is important.  that do not influence this. For some calls, it makes sense to skip negative
1636  For some calls, it makes sense to skip negative forward and all backward  forward and all backward assertions, and also the \b assertion; for others it
1637  assertions, and also the \b assertion; for others it does not.  does not.
1638    
1639  Arguments:  Arguments:
1640    code         pointer to the start of the group    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  
1641    skipassert   TRUE if certain assertions are to be skipped    skipassert   TRUE if certain assertions are to be skipped
1642    
1643  Returns:       pointer to the first significant opcode  Returns:       pointer to the first significant opcode
1644  */  */
1645    
1646  static const uschar*  static const pcre_uchar*
1647  first_significant_code(const uschar *code, int *options, int optbit,  first_significant_code(const pcre_uchar *code, BOOL skipassert)
   BOOL skipassert)  
1648  {  {
1649  for (;;)  for (;;)
1650    {    {
1651    switch ((int)*code)    switch ((int)*code)
1652      {      {
     case OP_OPT:  
     if (optbit > 0 && ((int)code[1] & optbit) != (*options & optbit))  
       *options = (int)code[1];  
     code += 2;  
     break;  
   
1653      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1654      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1655      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1656      if (!skipassert) return code;      if (!skipassert) return code;
1657      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
1658      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1659      break;      break;
1660    
1661      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
# Line 1329  for (;;) Line 1669  for (;;)
1669      case OP_RREF:      case OP_RREF:
1670      case OP_NRREF:      case OP_NRREF:
1671      case OP_DEF:      case OP_DEF:
1672      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1673      break;      break;
1674    
1675      default:      default:
# Line 1359  and doing the check at the end; a flag s Line 1699  and doing the check at the end; a flag s
1699    
1700  Arguments:  Arguments:
1701    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1702    options  the compiling options    utf      TRUE in UTF-8 / UTF-16 mode
1703    atend    TRUE if called when the pattern is complete    atend    TRUE if called when the pattern is complete
1704    cd       the "compile data" structure    cd       the "compile data" structure
1705    
1706  Returns:   the fixed length,  Returns:   the fixed length,
1707               or -1 if there is no fixed length,               or -1 if there is no fixed length,
1708               or -2 if \C was encountered               or -2 if \C was encountered (in UTF-8 mode only)
1709               or -3 if an OP_RECURSE item was encountered and atend is FALSE               or -3 if an OP_RECURSE item was encountered and atend is FALSE
1710                 or -4 if an unknown opcode was encountered (internal error)
1711  */  */
1712    
1713  static int  static int
1714  find_fixedlength(uschar *code, int options, BOOL atend, compile_data *cd)  find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd)
1715  {  {
1716  int length = -1;  int length = -1;
1717    
1718  register int branchlength = 0;  register int branchlength = 0;
1719  register uschar *cc = code + 1 + LINK_SIZE;  register pcre_uchar *cc = code + 1 + LINK_SIZE;
1720    
1721  /* Scan along the opcodes for this branch. If we get to the end of the  /* Scan along the opcodes for this branch. If we get to the end of the
1722  branch, check the length against that of the other branches. */  branch, check the length against that of the other branches. */
# Line 1383  branch, check the length against that of Line 1724  branch, check the length against that of
1724  for (;;)  for (;;)
1725    {    {
1726    int d;    int d;
1727    uschar *ce, *cs;    pcre_uchar *ce, *cs;
1728    register int op = *cc;    register int op = *cc;
1729    
1730    switch (op)    switch (op)
1731      {      {
1732        /* We only need to continue for OP_CBRA (normal capturing bracket) and
1733        OP_BRA (normal non-capturing bracket) because the other variants of these
1734        opcodes are all concerned with unlimited repeated groups, which of course
1735        are not of fixed length. */
1736    
1737      case OP_CBRA:      case OP_CBRA:
1738      case OP_BRA:      case OP_BRA:
1739      case OP_ONCE:      case OP_ONCE:
1740        case OP_ONCE_NC:
1741      case OP_COND:      case OP_COND:
1742      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options, atend, cd);      d = find_fixedlength(cc + ((op == OP_CBRA)? IMM2_SIZE : 0), utf, atend, cd);
1743      if (d < 0) return d;      if (d < 0) return d;
1744      branchlength += d;      branchlength += d;
1745      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1746      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1747      break;      break;
1748    
1749      /* Reached end of a branch; if it's a ket it is the end of a nested      /* Reached end of a branch; if it's a ket it is the end of a nested call.
1750      call. If it's ALT it is an alternation in a nested call. If it is      If it's ALT it is an alternation in a nested call. An ACCEPT is effectively
1751      END it's the end of the outer call. All can be handled by the same code. */      an ALT. If it is END it's the end of the outer call. All can be handled by
1752        the same code. Note that we must not include the OP_KETRxxx opcodes here,
1753        because they all imply an unlimited repeat. */
1754    
1755      case OP_ALT:      case OP_ALT:
1756      case OP_KET:      case OP_KET:
     case OP_KETRMAX:  
     case OP_KETRMIN:  
1757      case OP_END:      case OP_END:
1758        case OP_ACCEPT:
1759        case OP_ASSERT_ACCEPT:
1760      if (length < 0) length = branchlength;      if (length < 0) length = branchlength;
1761        else if (length != branchlength) return -1;        else if (length != branchlength) return -1;
1762      if (*cc != OP_ALT) return length;      if (*cc != OP_ALT) return length;
# Line 1420  for (;;) Line 1770  for (;;)
1770    
1771      case OP_RECURSE:      case OP_RECURSE:
1772      if (!atend) return -3;      if (!atend) return -3;
1773      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */      cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1774      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */      do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
1775      if (cc > cs && cc < ce) return -1;                /* Recursion */      if (cc > cs && cc < ce) return -1;                    /* Recursion */
1776      d = find_fixedlength(cs + 2, options, atend, cd);      d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd);
1777      if (d < 0) return d;      if (d < 0) return d;
1778      branchlength += d;      branchlength += d;
1779      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
# Line 1436  for (;;) Line 1786  for (;;)
1786      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1787      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1788      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1789      /* Fall through */      cc += PRIV(OP_lengths)[*cc];
1790        break;
1791    
1792      /* Skip over things that don't match chars */      /* Skip over things that don't match chars */
1793    
1794      case OP_REVERSE:      case OP_MARK:
1795        case OP_PRUNE_ARG:
1796        case OP_SKIP_ARG:
1797        case OP_THEN_ARG:
1798        cc += cc[1] + PRIV(OP_lengths)[*cc];
1799        break;
1800    
1801        case OP_CALLOUT:
1802        case OP_CIRC:
1803        case OP_CIRCM:
1804        case OP_CLOSE:
1805        case OP_COMMIT:
1806      case OP_CREF:      case OP_CREF:
     case OP_NCREF:  
     case OP_RREF:  
     case OP_NRREF:  
1807      case OP_DEF:      case OP_DEF:
1808      case OP_OPT:      case OP_DOLL:
1809      case OP_CALLOUT:      case OP_DOLLM:
     case OP_SOD:  
     case OP_SOM:  
     case OP_SET_SOM:  
1810      case OP_EOD:      case OP_EOD:
1811      case OP_EODN:      case OP_EODN:
1812      case OP_CIRC:      case OP_FAIL:
1813      case OP_DOLL:      case OP_NCREF:
1814        case OP_NRREF:
1815      case OP_NOT_WORD_BOUNDARY:      case OP_NOT_WORD_BOUNDARY:
1816        case OP_PRUNE:
1817        case OP_REVERSE:
1818        case OP_RREF:
1819        case OP_SET_SOM:
1820        case OP_SKIP:
1821        case OP_SOD:
1822        case OP_SOM:
1823        case OP_THEN:
1824      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
1825      cc += _pcre_OP_lengths[*cc];      cc += PRIV(OP_lengths)[*cc];
1826      break;      break;
1827    
1828      /* Handle literal characters */      /* Handle literal characters */
1829    
1830      case OP_CHAR:      case OP_CHAR:
1831      case OP_CHARNC:      case OP_CHARI:
1832      case OP_NOT:      case OP_NOT:
1833        case OP_NOTI:
1834      branchlength++;      branchlength++;
1835      cc += 2;      cc += 2;
1836  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1837      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];  
1838  #endif  #endif
1839      break;      break;
1840    
# Line 1477  for (;;) Line 1842  for (;;)
1842      need to skip over a multibyte character in UTF8 mode.  */      need to skip over a multibyte character in UTF8 mode.  */
1843    
1844      case OP_EXACT:      case OP_EXACT:
1845        case OP_EXACTI:
1846        case OP_NOTEXACT:
1847        case OP_NOTEXACTI:
1848      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1849      cc += 4;      cc += 2 + IMM2_SIZE;
1850  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1851      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];  
1852  #endif  #endif
1853      break;      break;
1854    
1855      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1856      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1857      if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;      if (cc[1 + IMM2_SIZE] == OP_PROP || cc[1 + IMM2_SIZE] == OP_NOTPROP) cc += 2;
1858      cc += 4;      cc += 1 + IMM2_SIZE + 1;
1859      break;      break;
1860    
1861      /* Handle single-char matchers */      /* Handle single-char matchers */
# Line 1498  for (;;) Line 1865  for (;;)
1865      cc += 2;      cc += 2;
1866      /* Fall through */      /* Fall through */
1867    
1868        case OP_HSPACE:
1869        case OP_VSPACE:
1870        case OP_NOT_HSPACE:
1871        case OP_NOT_VSPACE:
1872      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
1873      case OP_DIGIT:      case OP_DIGIT:
1874      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
# Line 1510  for (;;) Line 1881  for (;;)
1881      cc++;      cc++;
1882      break;      break;
1883    
1884      /* The single-byte matcher isn't allowed */      /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
1885        otherwise \C is coded as OP_ALLANY. */
1886    
1887      case OP_ANYBYTE:      case OP_ANYBYTE:
1888      return -2;      return -2;
1889    
1890      /* Check a class for variable quantification */      /* Check a class for variable quantification */
1891    
1892  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || defined COMPILE_PCRE16
1893      case OP_XCLASS:      case OP_XCLASS:
1894      cc += GET(cc, 1) - 33;      cc += GET(cc, 1) - PRIV(OP_lengths)[OP_CLASS];
1895      /* Fall through */      /* Fall through */
1896  #endif  #endif
1897    
1898      case OP_CLASS:      case OP_CLASS:
1899      case OP_NCLASS:      case OP_NCLASS:
1900      cc += 33;      cc += PRIV(OP_lengths)[OP_CLASS];
1901    
1902      switch (*cc)      switch (*cc)
1903        {        {
1904          case OP_CRPLUS:
1905          case OP_CRMINPLUS:
1906        case OP_CRSTAR:        case OP_CRSTAR:
1907        case OP_CRMINSTAR:        case OP_CRMINSTAR:
1908        case OP_CRQUERY:        case OP_CRQUERY:
# Line 1537  for (;;) Line 1911  for (;;)
1911    
1912        case OP_CRRANGE:        case OP_CRRANGE:
1913        case OP_CRMINRANGE:        case OP_CRMINRANGE:
1914        if (GET2(cc,1) != GET2(cc,3)) return -1;        if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
1915        branchlength += GET2(cc,1);        branchlength += GET2(cc,1);
1916        cc += 5;        cc += 1 + 2 * IMM2_SIZE;
1917        break;        break;
1918    
1919        default:        default:
# Line 1549  for (;;) Line 1923  for (;;)
1923    
1924      /* Anything else is variable length */      /* Anything else is variable length */
1925    
1926      default:      case OP_ANYNL:
1927        case OP_BRAMINZERO:
1928        case OP_BRAPOS:
1929        case OP_BRAPOSZERO:
1930        case OP_BRAZERO:
1931        case OP_CBRAPOS:
1932        case OP_EXTUNI:
1933        case OP_KETRMAX:
1934        case OP_KETRMIN:
1935        case OP_KETRPOS:
1936        case OP_MINPLUS:
1937        case OP_MINPLUSI:
1938        case OP_MINQUERY:
1939        case OP_MINQUERYI:
1940        case OP_MINSTAR:
1941        case OP_MINSTARI:
1942        case OP_MINUPTO:
1943        case OP_MINUPTOI:
1944        case OP_NOTMINPLUS:
1945        case OP_NOTMINPLUSI:
1946        case OP_NOTMINQUERY:
1947        case OP_NOTMINQUERYI:
1948        case OP_NOTMINSTAR:
1949        case OP_NOTMINSTARI:
1950        case OP_NOTMINUPTO:
1951        case OP_NOTMINUPTOI:
1952        case OP_NOTPLUS:
1953        case OP_NOTPLUSI:
1954        case OP_NOTPOSPLUS:
1955        case OP_NOTPOSPLUSI:
1956        case OP_NOTPOSQUERY:
1957        case OP_NOTPOSQUERYI:
1958        case OP_NOTPOSSTAR:
1959        case OP_NOTPOSSTARI:
1960        case OP_NOTPOSUPTO:
1961        case OP_NOTPOSUPTOI:
1962        case OP_NOTQUERY:
1963        case OP_NOTQUERYI:
1964        case OP_NOTSTAR:
1965        case OP_NOTSTARI:
1966        case OP_NOTUPTO:
1967        case OP_NOTUPTOI:
1968        case OP_PLUS:
1969        case OP_PLUSI:
1970        case OP_POSPLUS:
1971        case OP_POSPLUSI:
1972        case OP_POSQUERY:
1973        case OP_POSQUERYI:
1974        case OP_POSSTAR:
1975        case OP_POSSTARI:
1976        case OP_POSUPTO:
1977        case OP_POSUPTOI:
1978        case OP_QUERY:
1979        case OP_QUERYI:
1980        case OP_REF:
1981        case OP_REFI:
1982        case OP_SBRA:
1983        case OP_SBRAPOS:
1984        case OP_SCBRA:
1985        case OP_SCBRAPOS:
1986        case OP_SCOND:
1987        case OP_SKIPZERO:
1988        case OP_STAR:
1989        case OP_STARI:
1990        case OP_TYPEMINPLUS:
1991        case OP_TYPEMINQUERY:
1992        case OP_TYPEMINSTAR:
1993        case OP_TYPEMINUPTO:
1994        case OP_TYPEPLUS:
1995        case OP_TYPEPOSPLUS:
1996        case OP_TYPEPOSQUERY:
1997        case OP_TYPEPOSSTAR:
1998        case OP_TYPEPOSUPTO:
1999        case OP_TYPEQUERY:
2000        case OP_TYPESTAR:
2001        case OP_TYPEUPTO:
2002        case OP_UPTO:
2003        case OP_UPTOI:
2004      return -1;      return -1;
2005    
2006        /* Catch unrecognized opcodes so that when new ones are added they
2007        are not forgotten, as has happened in the past. */
2008    
2009        default:
2010        return -4;
2011      }      }
2012    }    }
2013  /* Control never gets here */  /* Control never gets here */
# Line 1571  length. Line 2028  length.
2028    
2029  Arguments:  Arguments:
2030    code        points to start of expression    code        points to start of expression
2031    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 mode
2032    number      the required bracket number or negative to find a lookbehind    number      the required bracket number or negative to find a lookbehind
2033    
2034  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
2035  */  */
2036    
2037  const uschar *  const pcre_uchar *
2038  _pcre_find_bracket(const uschar *code, BOOL utf8, int number)  PRIV(find_bracket)(const pcre_uchar *code, BOOL utf, int number)
2039  {  {
2040  for (;;)  for (;;)
2041    {    {
2042    register int c = *code;    register int c = *code;
2043    
2044    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
2045    
2046    /* 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 1595  for (;;) Line 2053  for (;;)
2053    
2054    else if (c == OP_REVERSE)    else if (c == OP_REVERSE)
2055      {      {
2056      if (number < 0) return (uschar *)code;      if (number < 0) return (pcre_uchar *)code;
2057      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2058      }      }
2059    
2060    /* Handle capturing bracket */    /* Handle capturing bracket */
2061    
2062    else if (c == OP_CBRA)    else if (c == OP_CBRA || c == OP_SCBRA ||
2063               c == OP_CBRAPOS || c == OP_SCBRAPOS)
2064      {      {
2065      int n = GET2(code, 1+LINK_SIZE);      int n = GET2(code, 1+LINK_SIZE);
2066      if (n == number) return (uschar *)code;      if (n == number) return (pcre_uchar *)code;
2067      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2068      }      }
2069    
2070    /* 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
2071    repeated character types, we have to test for \p and \P, which have an extra    repeated character types, we have to test for \p and \P, which have an extra
2072    two bytes of parameters. */    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
2073      must add in its length. */
2074    
2075    else    else
2076      {      {
# Line 1632  for (;;) Line 2092  for (;;)
2092        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2093        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2094        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
2095        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP
2096            || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2097          break;
2098    
2099          case OP_MARK:
2100          case OP_PRUNE_ARG:
2101          case OP_SKIP_ARG:
2102          code += code[1];
2103          break;
2104    
2105          case OP_THEN_ARG:
2106          code += code[1];
2107        break;        break;
2108        }        }
2109    
2110      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
2111    
2112      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2113    
2114    /* 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
2115    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
2116    arrange to skip the extra bytes. */    arrange to skip the extra bytes. */
2117    
2118  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2119      if (utf8) switch(c)      if (utf) switch(c)
2120        {        {
2121        case OP_CHAR:        case OP_CHAR:
2122        case OP_CHARNC:        case OP_CHARI:
2123        case OP_EXACT:        case OP_EXACT:
2124          case OP_EXACTI:
2125        case OP_UPTO:        case OP_UPTO:
2126          case OP_UPTOI:
2127        case OP_MINUPTO:        case OP_MINUPTO:
2128          case OP_MINUPTOI:
2129        case OP_POSUPTO:        case OP_POSUPTO:
2130          case OP_POSUPTOI:
2131        case OP_STAR:        case OP_STAR:
2132          case OP_STARI:
2133        case OP_MINSTAR:        case OP_MINSTAR:
2134          case OP_MINSTARI:
2135        case OP_POSSTAR:        case OP_POSSTAR:
2136          case OP_POSSTARI:
2137        case OP_PLUS:        case OP_PLUS:
2138          case OP_PLUSI:
2139        case OP_MINPLUS:        case OP_MINPLUS:
2140          case OP_MINPLUSI:
2141        case OP_POSPLUS:        case OP_POSPLUS:
2142          case OP_POSPLUSI:
2143        case OP_QUERY:        case OP_QUERY:
2144          case OP_QUERYI:
2145        case OP_MINQUERY:        case OP_MINQUERY:
2146          case OP_MINQUERYI:
2147        case OP_POSQUERY:        case OP_POSQUERY:
2148        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_POSQUERYI:
2149          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2150        break;        break;
2151        }        }
2152  #else  #else
2153      (void)(utf8);  /* Keep compiler happy by referencing function argument */      (void)(utf);  /* Keep compiler happy by referencing function argument */
2154  #endif  #endif
2155      }      }
2156    }    }
# Line 1683  instance of OP_RECURSE. Line 2167  instance of OP_RECURSE.
2167    
2168  Arguments:  Arguments:
2169    code        points to start of expression    code        points to start of expression
2170    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 mode
2171    
2172  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
2173  */  */
2174    
2175  static const uschar *  static const pcre_uchar *
2176  find_recurse(const uschar *code, BOOL utf8)  find_recurse(const pcre_uchar *code, BOOL utf)
2177  {  {
2178  for (;;)  for (;;)
2179    {    {
# Line 1705  for (;;) Line 2189  for (;;)
2189    
2190    /* 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
2191    repeated character types, we have to test for \p and \P, which have an extra    repeated character types, we have to test for \p and \P, which have an extra
2192    two bytes of parameters. */    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
2193      must add in its length. */
2194    
2195    else    else
2196      {      {
# Line 1727  for (;;) Line 2212  for (;;)
2212        case OP_TYPEUPTO:        case OP_TYPEUPTO:
2213        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2214        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2215        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP
2216            || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2217          break;
2218    
2219          case OP_MARK:
2220          case OP_PRUNE_ARG:
2221          case OP_SKIP_ARG:
2222          code += code[1];
2223          break;
2224    
2225          case OP_THEN_ARG:
2226          code += code[1];
2227        break;        break;
2228        }        }
2229    
2230      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
2231    
2232      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2233    
2234      /* 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
2235      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
2236      to arrange to skip the extra bytes. */      to arrange to skip the extra bytes. */
2237    
2238  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2239      if (utf8) switch(c)      if (utf) switch(c)
2240        {        {
2241        case OP_CHAR:        case OP_CHAR:
2242        case OP_CHARNC:        case OP_CHARI:
2243          case OP_NOT:
2244          case OP_NOTI:
2245        case OP_EXACT:        case OP_EXACT:
2246          case OP_EXACTI:
2247          case OP_NOTEXACT:
2248          case OP_NOTEXACTI:
2249        case OP_UPTO:        case OP_UPTO:
2250          case OP_UPTOI:
2251          case OP_NOTUPTO:
2252          case OP_NOTUPTOI:
2253        case OP_MINUPTO:        case OP_MINUPTO:
2254          case OP_MINUPTOI:
2255          case OP_NOTMINUPTO:
2256          case OP_NOTMINUPTOI:
2257        case OP_POSUPTO:        case OP_POSUPTO:
2258          case OP_POSUPTOI:
2259          case OP_NOTPOSUPTO:
2260          case OP_NOTPOSUPTOI:
2261        case OP_STAR:        case OP_STAR:
2262          case OP_STARI:
2263          case OP_NOTSTAR:
2264          case OP_NOTSTARI:
2265        case OP_MINSTAR:        case OP_MINSTAR:
2266          case OP_MINSTARI:
2267          case OP_NOTMINSTAR:
2268          case OP_NOTMINSTARI:
2269        case OP_POSSTAR:        case OP_POSSTAR:
2270          case OP_POSSTARI:
2271          case OP_NOTPOSSTAR:
2272          case OP_NOTPOSSTARI:
2273        case OP_PLUS:        case OP_PLUS:
2274          case OP_PLUSI:
2275          case OP_NOTPLUS:
2276          case OP_NOTPLUSI:
2277        case OP_MINPLUS:        case OP_MINPLUS:
2278          case OP_MINPLUSI:
2279          case OP_NOTMINPLUS:
2280          case OP_NOTMINPLUSI:
2281        case OP_POSPLUS:        case OP_POSPLUS:
2282          case OP_POSPLUSI:
2283          case OP_NOTPOSPLUS:
2284          case OP_NOTPOSPLUSI:
2285        case OP_QUERY:        case OP_QUERY:
2286          case OP_QUERYI:
2287          case OP_NOTQUERY:
2288          case OP_NOTQUERYI:
2289        case OP_MINQUERY:        case OP_MINQUERY:
2290          case OP_MINQUERYI:
2291          case OP_NOTMINQUERY:
2292          case OP_NOTMINQUERYI:
2293        case OP_POSQUERY:        case OP_POSQUERY:
2294        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_POSQUERYI:
2295          case OP_NOTPOSQUERY:
2296          case OP_NOTPOSQUERYI:
2297          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2298        break;        break;
2299        }        }
2300  #else  #else
2301      (void)(utf8);  /* Keep compiler happy by referencing function argument */      (void)(utf);  /* Keep compiler happy by referencing function argument */
2302  #endif  #endif
2303      }      }
2304    }    }
# Line 1784  bracket whose current branch will alread Line 2321  bracket whose current branch will alread
2321  Arguments:  Arguments:
2322    code        points to start of search    code        points to start of search
2323    endcode     points to where to stop    endcode     points to where to stop
2324    utf8        TRUE if in UTF8 mode    utf         TRUE if in UTF-8 / UTF-16 mode
2325      cd          contains pointers to tables etc.
2326    
2327  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2328  */  */
2329    
2330  static BOOL  static BOOL
2331  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8)  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
2332      BOOL utf, compile_data *cd)
2333  {  {
2334  register int c;  register int c;
2335  for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);  for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
2336       code < endcode;       code < endcode;
2337       code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
2338    {    {
2339    const uschar *ccode;    const pcre_uchar *ccode;
2340    
2341    c = *code;    c = *code;
2342    
# Line 1811  for (code = first_significant_code(code Line 2350  for (code = first_significant_code(code
2350      continue;      continue;
2351      }      }
2352    
2353      /* For a recursion/subroutine call, if its end has been reached, which
2354      implies a backward reference subroutine call, we can scan it. If it's a
2355      forward reference subroutine call, we can't. To detect forward reference
2356      we have to scan up the list that is kept in the workspace. This function is
2357      called only when doing the real compile, not during the pre-compile that
2358      measures the size of the compiled pattern. */
2359    
2360      if (c == OP_RECURSE)
2361        {
2362        const pcre_uchar *scode;
2363        BOOL empty_branch;
2364    
2365        /* Test for forward reference */
2366    
2367        for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE)
2368          if (GET(scode, 0) == code + 1 - cd->start_code) return TRUE;
2369    
2370        /* Not a forward reference, test for completed backward reference */
2371    
2372        empty_branch = FALSE;
2373        scode = cd->start_code + GET(code, 1);
2374        if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
2375    
2376        /* Completed backwards reference */
2377    
2378        do
2379          {
2380          if (could_be_empty_branch(scode, endcode, utf, cd))
2381            {
2382            empty_branch = TRUE;
2383            break;
2384            }
2385          scode += GET(scode, 1);
2386          }
2387        while (*scode == OP_ALT);
2388    
2389        if (!empty_branch) return FALSE;  /* All branches are non-empty */
2390        continue;
2391        }
2392    
2393    /* Groups with zero repeats can of course be empty; skip them. */    /* Groups with zero repeats can of course be empty; skip them. */
2394    
2395    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2396          c == OP_BRAPOSZERO)
2397        {
2398        code += PRIV(OP_lengths)[c];
2399        do code += GET(code, 1); while (*code == OP_ALT);
2400        c = *code;
2401        continue;
2402        }
2403    
2404      /* A nested group that is already marked as "could be empty" can just be
2405      skipped. */
2406    
2407      if (c == OP_SBRA  || c == OP_SBRAPOS ||
2408          c == OP_SCBRA || c == OP_SCBRAPOS)
2409      {      {
     code += _pcre_OP_lengths[c];  
2410      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
2411      c = *code;      c = *code;
2412      continue;      continue;
# Line 1823  for (code = first_significant_code(code Line 2414  for (code = first_significant_code(code
2414    
2415    /* For other groups, scan the branches. */    /* For other groups, scan the branches. */
2416    
2417    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)    if (c == OP_BRA  || c == OP_BRAPOS ||
2418          c == OP_CBRA || c == OP_CBRAPOS ||
2419          c == OP_ONCE || c == OP_ONCE_NC ||
2420          c == OP_COND)
2421      {      {
2422      BOOL empty_branch;      BOOL empty_branch;
2423      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
# Line 1839  for (code = first_significant_code(code Line 2433  for (code = first_significant_code(code
2433        empty_branch = FALSE;        empty_branch = FALSE;
2434        do        do
2435          {          {
2436          if (!empty_branch && could_be_empty_branch(code, endcode, utf8))          if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd))
2437            empty_branch = TRUE;            empty_branch = TRUE;
2438          code += GET(code, 1);          code += GET(code, 1);
2439          }          }
# Line 1857  for (code = first_significant_code(code Line 2451  for (code = first_significant_code(code
2451      {      {
2452      /* Check for quantifiers after a class. XCLASS is used for classes that      /* Check for quantifiers after a class. XCLASS is used for classes that
2453      cannot be represented just by a bit map. This includes negated single      cannot be represented just by a bit map. This includes negated single
2454      high-valued characters. The length in _pcre_OP_lengths[] is zero; the      high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
2455      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"
2456      here. */      here. */
2457    
2458  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2459      case OP_XCLASS:      case OP_XCLASS:
2460      ccode = code += GET(code, 1);      ccode = code += GET(code, 1);
2461      goto CHECK_CLASS_REPEAT;      goto CHECK_CLASS_REPEAT;
# Line 1869  for (code = first_significant_code(code Line 2463  for (code = first_significant_code(code
2463    
2464      case OP_CLASS:      case OP_CLASS:
2465      case OP_NCLASS:      case OP_NCLASS:
2466      ccode = code + 33;      ccode = code + PRIV(OP_lengths)[OP_CLASS];
2467    
2468  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2469      CHECK_CLASS_REPEAT:      CHECK_CLASS_REPEAT:
2470  #endif  #endif
2471    
# Line 1910  for (code = first_significant_code(code Line 2504  for (code = first_significant_code(code
2504      case OP_ALLANY:      case OP_ALLANY:
2505      case OP_ANYBYTE:      case OP_ANYBYTE:
2506      case OP_CHAR:      case OP_CHAR:
2507      case OP_CHARNC:      case OP_CHARI:
2508      case OP_NOT:      case OP_NOT:
2509        case OP_NOTI:
2510      case OP_PLUS:      case OP_PLUS:
2511      case OP_MINPLUS:      case OP_MINPLUS:
2512      case OP_POSPLUS:      case OP_POSPLUS:
# Line 1943  for (code = first_significant_code(code Line 2538  for (code = first_significant_code(code
2538      case OP_TYPEUPTO:      case OP_TYPEUPTO:
2539      case OP_TYPEMINUPTO:      case OP_TYPEMINUPTO:
2540      case OP_TYPEPOSUPTO:      case OP_TYPEPOSUPTO:
2541      if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;      if (code[1 + IMM2_SIZE] == OP_PROP
2542          || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2543      break;      break;
2544    
2545      /* End of branch */      /* End of branch */
# Line 1951  for (code = first_significant_code(code Line 2547  for (code = first_significant_code(code
2547      case OP_KET:      case OP_KET:
2548      case OP_KETRMAX:      case OP_KETRMAX:
2549      case OP_KETRMIN:      case OP_KETRMIN:
2550        case OP_KETRPOS:
2551      case OP_ALT:      case OP_ALT:
2552      return TRUE;      return TRUE;
2553    
2554      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
2555      MINUPTO, and POSUPTO may be followed by a multibyte character */      MINUPTO, and POSUPTO may be followed by a multibyte character */
2556    
2557  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2558      case OP_STAR:      case OP_STAR:
2559        case OP_STARI:
2560      case OP_MINSTAR:      case OP_MINSTAR:
2561        case OP_MINSTARI:
2562      case OP_POSSTAR:      case OP_POSSTAR:
2563        case OP_POSSTARI:
2564      case OP_QUERY:      case OP_QUERY:
2565        case OP_QUERYI:
2566      case OP_MINQUERY:      case OP_MINQUERY:
2567        case OP_MINQUERYI:
2568      case OP_POSQUERY:      case OP_POSQUERY:
2569      if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];      case OP_POSQUERYI:
2570        if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
2571      break;      break;
2572    
2573      case OP_UPTO:      case OP_UPTO:
2574        case OP_UPTOI:
2575      case OP_MINUPTO:      case OP_MINUPTO:
2576        case OP_MINUPTOI:
2577      case OP_POSUPTO:      case OP_POSUPTO:
2578      if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];      case OP_POSUPTOI:
2579        if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);
2580      break;      break;
2581  #endif  #endif
2582    
2583        /* MARK, and PRUNE/SKIP/THEN with an argument must skip over the argument
2584        string. */
2585    
2586        case OP_MARK:
2587        case OP_PRUNE_ARG:
2588        case OP_SKIP_ARG:
2589        code += code[1];
2590        break;
2591    
2592        case OP_THEN_ARG:
2593        code += code[1];
2594        break;
2595    
2596        /* None of the remaining opcodes are required to match a character. */
2597    
2598        default:
2599        break;
2600      }      }
2601    }    }
2602    
# Line 1989  return TRUE; Line 2613  return TRUE;
2613  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
2614  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,
2615  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.
2616    This function is called only during the real compile, not during the
2617    pre-compile.
2618    
2619  Arguments:  Arguments:
2620    code        points to start of the recursion    code        points to start of the recursion
2621    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2622    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2623    utf8        TRUE if in UTF-8 mode    utf         TRUE if in UTF-8 / UTF-16 mode
2624      cd          pointers to tables etc
2625    
2626  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2627  */  */
2628    
2629  static BOOL  static BOOL
2630  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
2631    BOOL utf8)    branch_chain *bcptr, BOOL utf, compile_data *cd)
2632  {  {
2633  while (bcptr != NULL && bcptr->current_branch >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2634    {    {
2635    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8))    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd))
2636      return FALSE;      return FALSE;
2637    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2638    }    }
# Line 2038  where Perl recognizes it as the POSIX cl Line 2665  where Perl recognizes it as the POSIX cl
2665  "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,
2666  I think.  I think.
2667    
2668    A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
2669    It seems that the appearance of a nested POSIX class supersedes an apparent
2670    external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
2671    a digit.
2672    
2673    In Perl, unescaped square brackets may also appear as part of class names. For
2674    example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
2675    [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
2676    seem right at all. PCRE does not allow closing square brackets in POSIX class
2677    names.
2678    
2679  Arguments:  Arguments:
2680    ptr      pointer to the initial [    ptr      pointer to the initial [
2681    endptr   where to return the end pointer    endptr   where to return the end pointer
# Line 2046  Returns:   TRUE or FALSE Line 2684  Returns:   TRUE or FALSE
2684  */  */
2685    
2686  static BOOL  static BOOL
2687  check_posix_syntax(const uschar *ptr, const uschar **endptr)  check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
2688  {  {
2689  int terminator;          /* Don't combine these lines; the Solaris cc */  int terminator;          /* Don't combine these lines; the Solaris cc */
2690  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2691  for (++ptr; *ptr != 0; ptr++)  for (++ptr; *ptr != 0; ptr++)
2692    {    {
2693    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2694        ptr++;
2695      else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2696      else
2697      {      {
     if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;  
2698      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2699        {        {
2700        *endptr = ptr;        *endptr = ptr;
2701        return TRUE;        return TRUE;
2702        }        }
2703        if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&
2704             (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
2705              ptr[1] == CHAR_EQUALS_SIGN) &&
2706            check_posix_syntax(ptr, endptr))
2707          return FALSE;
2708      }      }
2709    }    }
2710  return FALSE;  return FALSE;
# Line 2083  Returns:     a value representing the na Line 2728  Returns:     a value representing the na
2728  */  */
2729    
2730  static int  static int
2731  check_posix_name(const uschar *ptr, int len)  check_posix_name(const pcre_uchar *ptr, int len)
2732  {  {
2733  const char *pn = posix_names;  const char *pn = posix_names;
2734  register int yield = 0;  register int yield = 0;
2735  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
2736    {    {
2737    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
2738      strncmp((const char *)ptr, pn, len) == 0) return yield;      STRNCMP_UC_C8(ptr, pn, len) == 0) return yield;
2739    pn += posix_name_lengths[yield] + 1;    pn += posix_name_lengths[yield] + 1;
2740    yield++;    yield++;
2741    }    }
# Line 2122  value in the reference (which is a group Line 2767  value in the reference (which is a group
2767  Arguments:  Arguments:
2768    group      points to the start of the group    group      points to the start of the group
2769    adjust     the amount by which the group is to be moved    adjust     the amount by which the group is to be moved
2770    utf8       TRUE in UTF-8 mode    utf        TRUE in UTF-8 / UTF-16 mode
2771    cd         contains pointers to tables etc.    cd         contains pointers to tables etc.
2772    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
2773    
# Line 2130  Returns:     nothing Line 2775  Returns:     nothing
2775  */  */
2776    
2777  static void  static void
2778  adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,  adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
2779    uschar *save_hwm)    pcre_uchar *save_hwm)
2780  {  {
2781  uschar *ptr = group;  pcre_uchar *ptr = group;
2782    
2783  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
2784    {    {
2785    int offset;    int offset;
2786    uschar *hc;    pcre_uchar *hc;
2787    
2788    /* 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
2789    reference. */    reference. */
# Line 2183  Arguments: Line 2828  Arguments:
2828  Returns:         new code pointer  Returns:         new code pointer
2829  */  */
2830    
2831  static uschar *  static pcre_uchar *
2832  auto_callout(uschar *code, const uschar *ptr, compile_data *cd)  auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
2833  {  {
2834  *code++ = OP_CALLOUT;  *code++ = OP_CALLOUT;
2835  *code++ = 255;  *code++ = 255;
2836  PUT(code, 0, ptr - cd->start_pattern);  /* Pattern offset */  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
2837  PUT(code, LINK_SIZE, 0);                /* Default length */  PUT(code, LINK_SIZE, 0);                       /* Default length */
2838  return code + 2*LINK_SIZE;  return code + 2 * LINK_SIZE;
2839  }  }
2840    
2841    
# Line 2212  Returns:             nothing Line 2857  Returns:             nothing
2857  */  */
2858    
2859  static void  static void
2860  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)  complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
2861  {  {
2862  int length = ptr - cd->start_pattern - GET(previous_callout, 2);  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
2863  PUT(previous_callout, 2 + LINK_SIZE, length);  PUT(previous_callout, 2 + LINK_SIZE, length);
2864  }  }
2865    
# Line 2264  for (++c; c <= d; c++) Line 2909  for (++c; c <= d; c++)
2909    
2910  return TRUE;  return TRUE;
2911  }  }
2912    
2913    
2914    
2915    /*************************************************
2916    *        Check a character and a property        *
2917    *************************************************/
2918    
2919    /* This function is called by check_auto_possessive() when a property item
2920    is adjacent to a fixed character.
2921    
2922    Arguments:
2923      c            the character
2924      ptype        the property type
2925      pdata        the data for the type
2926      negated      TRUE if it's a negated property (\P or \p{^)
2927    
2928    Returns:       TRUE if auto-possessifying is OK
2929    */
2930    
2931    static BOOL
2932    check_char_prop(int c, int ptype, int pdata, BOOL negated)
2933    {
2934    const ucd_record *prop = GET_UCD(c);
2935    switch(ptype)
2936      {
2937      case PT_LAMP:
2938      return (prop->chartype == ucp_Lu ||
2939              prop->chartype == ucp_Ll ||
2940              prop->chartype == ucp_Lt) == negated;
2941    
2942      case PT_GC:
2943      return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
2944    
2945      case PT_PC:
2946      return (pdata == prop->chartype) == negated;
2947    
2948      case PT_SC:
2949      return (pdata == prop->script) == negated;
2950    
2951      /* These are specials */
2952    
2953      case PT_ALNUM:
2954      return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2955              PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
2956    
2957      case PT_SPACE:    /* Perl space */
2958      return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2959              c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2960              == negated;
2961    
2962      case PT_PXSPACE:  /* POSIX space */
2963      return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2964              c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2965              c == CHAR_FF || c == CHAR_CR)
2966              == negated;
2967    
2968      case PT_WORD:
2969      return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2970              PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2971              c == CHAR_UNDERSCORE) == negated;
2972      }
2973    return FALSE;
2974    }
2975  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2976    
2977    
# Line 2277  whether the next thing could possibly ma Line 2985  whether the next thing could possibly ma
2985  sense to automatically possessify the repeated item.  sense to automatically possessify the repeated item.
2986    
2987  Arguments:  Arguments:
2988    op_code       the repeated op code    previous      pointer to the repeated opcode
2989    this          data for this item, depends on the opcode    utf           TRUE in UTF-8 / UTF-16 mode
   utf8          TRUE in UTF-8 mode  
   utf8_char     used for utf8 character bytes, NULL if not relevant  
2990    ptr           next character in pattern    ptr           next character in pattern
2991    options       options bits    options       options bits
2992    cd            contains pointers to tables etc.    cd            contains pointers to tables etc.
# Line 2289  Returns:        TRUE if possessifying is Line 2995  Returns:        TRUE if possessifying is
2995  */  */
2996    
2997  static BOOL  static BOOL
2998  check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,  check_auto_possessive(const pcre_uchar *previous, BOOL utf,
2999    const uschar *ptr, int options, compile_data *cd)    const pcre_uchar *ptr, int options, compile_data *cd)
3000  {  {
3001  int next;  pcre_int32 c, next;
3002    int op_code = *previous++;
3003    
3004  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
3005    
# Line 2300  if ((options & PCRE_EXTENDED) != 0) Line 3007  if ((options & PCRE_EXTENDED) != 0)
3007    {    {
3008    for (;;)    for (;;)
3009      {      {
3010      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
3011      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
3012        {        {
3013        while (*(++ptr) != 0)        ptr++;
3014          while (*ptr != 0)
3015            {
3016          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3017            ptr++;
3018    #ifdef SUPPORT_UTF
3019            if (utf) FORWARDCHAR(ptr);
3020    #endif
3021            }
3022        }        }
3023      else break;      else break;
3024      }      }
# Line 2320  if (*ptr == CHAR_BACKSLASH) Line 3034  if (*ptr == CHAR_BACKSLASH)
3034    if (temperrorcode != 0) return FALSE;    if (temperrorcode != 0) return FALSE;
3035    ptr++;    /* Point after the escape sequence */    ptr++;    /* Point after the escape sequence */
3036    }    }
3037    else if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_meta) == 0)
 else if ((cd->ctypes[*ptr] & ctype_meta) == 0)  
3038    {    {
3039  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3040    if (utf8) { GETCHARINC(next, ptr); } else    if (utf) { GETCHARINC(next, ptr); } else
3041  #endif  #endif
3042    next = *ptr++;    next = *ptr++;
3043    }    }
   
3044  else return FALSE;  else return FALSE;
3045    
3046  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
# Line 2337  if ((options & PCRE_EXTENDED) != 0) Line 3049  if ((options & PCRE_EXTENDED) != 0)
3049    {    {
3050    for (;;)    for (;;)
3051      {      {
3052      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
3053      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
3054        {        {
3055        while (*(++ptr) != 0)        ptr++;
3056          while (*ptr != 0)
3057            {
3058          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3059            ptr++;
3060    #ifdef SUPPORT_UTF
3061            if (utf) FORWARDCHAR(ptr);
3062    #endif
3063            }
3064        }        }
3065      else break;      else break;
3066      }      }
# Line 2350  if ((options & PCRE_EXTENDED) != 0) Line 3069  if ((options & PCRE_EXTENDED) != 0)
3069  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
3070    
3071  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3072    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)
3073      return FALSE;      return FALSE;
3074    
3075  /* Now compare the next item with the previous opcode. If the previous is a  /* Now compare the next item with the previous opcode. First, handle cases when
3076  positive single character match, "item" either contains the character or, if  the next item is a character. */
 "item" is greater than 127 in utf8 mode, the character's bytes are in  
 utf8_char. */  
   
   
 /* Handle cases when the next item is a character. */  
3077    
3078  if (next >= 0) switch(op_code)  if (next >= 0) switch(op_code)
3079    {    {
3080    case OP_CHAR:    case OP_CHAR:
3081  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3082    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
3083  #else  #else
3084    (void)(utf8_char);  /* Keep compiler happy by referencing function argument */    c = *previous;
3085  #endif  #endif
3086    return item != next;    return c != next;
3087    
3088    /* For CHARNC (caseless character) we must check the other case. If we have    /* For CHARI (caseless character) we must check the other case. If we have
3089    Unicode property support, we can use it to test the other case of    Unicode property support, we can use it to test the other case of
3090    high-valued characters. */    high-valued characters. */
3091    
3092    case OP_CHARNC:    case OP_CHARI:
3093  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3094    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
3095  #endif  #else
3096    if (item == next) return FALSE;    c = *previous;
3097  #ifdef SUPPORT_UTF8  #endif
3098    if (utf8)    if (c == next) return FALSE;
3099    #ifdef SUPPORT_UTF
3100      if (utf)
3101      {      {
3102      unsigned int othercase;      unsigned int othercase;
3103      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
# Line 2390  if (next >= 0) switch(op_code) Line 3106  if (next >= 0) switch(op_code)
3106  #else  #else
3107      othercase = NOTACHAR;      othercase = NOTACHAR;
3108  #endif  #endif
3109      return (unsigned int)item != othercase;      return (unsigned int)c != othercase;
3110      }      }
3111    else    else
3112  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3113    return (item != cd->fcc[next]);  /* Non-UTF-8 mode */    return (c != TABLE_GET((unsigned int)next, cd->fcc, next));  /* Non-UTF-8 mode */
   
   /* For OP_NOT, "item" must be a single-byte character. */  
3114    
3115    case OP_NOT:    case OP_NOT:
3116    if (item == next) return TRUE;  #ifdef SUPPORT_UTF
3117    if ((options & PCRE_CASELESS) == 0) return FALSE;    GETCHARTEST(c, previous);
3118  #ifdef SUPPORT_UTF8  #else
3119    if (utf8)    c = *previous;
3120    #endif
3121      return c == next;
3122    
3123      case OP_NOTI:
3124    #ifdef SUPPORT_UTF
3125      GETCHARTEST(c, previous);
3126    #else
3127      c = *previous;
3128    #endif
3129      if (c == next) return TRUE;
3130    #ifdef SUPPORT_UTF
3131      if (utf)
3132      {      {
3133      unsigned int othercase;      unsigned int othercase;
3134      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
3135  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3136      othercase = UCD_OTHERCASE(next);      othercase = UCD_OTHERCASE((unsigned int)next);
3137  #else  #else
3138      othercase = NOTACHAR;      othercase = NOTACHAR;
3139  #endif  #endif
3140      return (unsigned int)item == othercase;      return (unsigned int)c == othercase;
3141      }      }
3142    else    else
3143  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3144    return (item == cd->fcc[next]);  /* Non-UTF-8 mode */    return (c == TABLE_GET((unsigned int)next, cd->fcc, next));  /* Non-UTF-8 mode */
3145    
3146      /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.
3147      When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
3148    
3149    case OP_DIGIT:    case OP_DIGIT:
3150    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;    return next > 255 || (cd->ctypes[next] & ctype_digit) == 0;
3151    
3152    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
3153    return next <= 127 && (cd->ctypes[next] & ctype_digit) != 0;    return next <= 255 && (cd->ctypes[next] & ctype_digit) != 0;
3154    
3155    case OP_WHITESPACE:    case OP_WHITESPACE:
3156    return next > 127 || (cd->ctypes[next] & ctype_space) == 0;    return next > 255 || (cd->ctypes[next] & ctype_space) == 0;
3157    
3158    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
3159    return next <= 127 && (cd->ctypes[next] & ctype_space) != 0;    return next <= 255 && (cd->ctypes[next] & ctype_space) != 0;
3160    
3161    case OP_WORDCHAR:    case OP_WORDCHAR:
3162    return next > 127 || (cd->ctypes[next] & ctype_word) == 0;    return next > 255 || (cd->ctypes[next] & ctype_word) == 0;
3163    
3164    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
3165    return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;    return next <= 255 && (cd->ctypes[next] & ctype_word) != 0;
3166    
3167    case OP_HSPACE:    case OP_HSPACE:
3168    case OP_NOT_HSPACE:    case OP_NOT_HSPACE:
3169    switch(next)    switch(next)
3170      {      {
3171      case 0x09:      case CHAR_HT:
3172      case 0x20:      case CHAR_SPACE:
3173    #ifndef EBCDIC
3174      case 0xa0:      case 0xa0:
3175      case 0x1680:      case 0x1680:
3176      case 0x180e:      case 0x180e:
# Line 2458  if (next >= 0) switch(op_code) Line 3188  if (next >= 0) switch(op_code)
3188      case 0x202f:      case 0x202f:
3189      case 0x205f:      case 0x205f:
3190      case 0x3000:      case 0x3000:
3191      return op_code != OP_HSPACE;  #endif  /* Not EBCDIC */
3192        return op_code == OP_NOT_HSPACE;
3193      default:      default:
3194      return op_code == OP_HSPACE;      return op_code != OP_NOT_HSPACE;
3195      }      }
3196    
3197      case OP_ANYNL:
3198    case OP_VSPACE:    case OP_VSPACE:
3199    case OP_NOT_VSPACE:    case OP_NOT_VSPACE:
3200    switch(next)    switch(next)
3201      {      {
3202      case 0x0a:      case CHAR_LF:
3203      case 0x0b:      case CHAR_VT:
3204      case 0x0c:      case CHAR_FF:
3205      case 0x0d:      case CHAR_CR:
3206      case 0x85:      case CHAR_NEL:
3207    #ifndef EBCDIC
3208      case 0x2028:      case 0x2028:
3209      case 0x2029:      case 0x2029:
3210      return op_code != OP_VSPACE;  #endif
3211        return op_code == OP_NOT_VSPACE;
3212      default:      default:
3213      return op_code == OP_VSPACE;      return op_code != OP_NOT_VSPACE;
3214      }      }
3215    
3216    #ifdef SUPPORT_UCP
3217      case OP_PROP:
3218      return check_char_prop(next, previous[0], previous[1], FALSE);
3219    
3220      case OP_NOTPROP:
3221      return check_char_prop(next, previous[0], previous[1], TRUE);
3222    #endif
3223    
3224    default:    default:
3225    return FALSE;    return FALSE;
3226    }    }
3227    
3228    
3229  /* Handle the case when the next item is \d, \s, etc. */  /* Handle the case when the next item is \d, \s, etc. Note that when PCRE_UCP
3230    is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are
3231    generated only when PCRE_UCP is *not* set, that is, when only ASCII
3232    characteristics are recognized. Similarly, the opcodes OP_DIGIT etc. are
3233    replaced by OP_PROP codes when PCRE_UCP is set. */
3234    
3235  switch(op_code)  switch(op_code)
3236    {    {
3237    case OP_CHAR:    case OP_CHAR:
3238    case OP_CHARNC:    case OP_CHARI:
3239  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3240    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
3241    #else
3242      c = *previous;
3243  #endif  #endif
3244    switch(-next)    switch(-next)
3245      {      {
3246      case ESC_d:      case ESC_d:
3247      return item > 127 || (cd->ctypes[item] & ctype_digit) == 0;      return c > 255 || (cd->ctypes[c] & ctype_digit) == 0;
3248    
3249      case ESC_D:      case ESC_D:
3250      return item <= 127 && (cd->ctypes[item] & ctype_digit) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_digit) != 0;
3251    
3252      case ESC_s:      case ESC_s:
3253      return item > 127 || (cd->ctypes[item] & ctype_space) == 0;      return c > 255 || (cd->ctypes[c] & ctype_space) == 0;
3254    
3255      case ESC_S:      case ESC_S:
3256      return item <= 127 && (cd->ctypes[item] & ctype_space) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_space) != 0;
3257    
3258      case ESC_w:      case ESC_w:
3259      return item > 127 || (cd->ctypes[item] & ctype_word) == 0;      return c > 255 || (cd->ctypes[c] & ctype_word) == 0;
3260    
3261      case ESC_W:      case ESC_W:
3262      return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_word) != 0;
3263    
3264      case ESC_h:      case ESC_h:
3265      case ESC_H:      case ESC_H:
3266      switch(item)      switch(c)
3267        {        {
3268        case 0x09:        case CHAR_HT:
3269        case 0x20:        case CHAR_SPACE:
3270    #ifndef EBCDIC
3271        case 0xa0:        case 0xa0:
3272        case 0x1680:        case 0x1680:
3273        case 0x180e:        case 0x180e:
# Line 2536  switch(op_code) Line 3285  switch(op_code)
3285        case 0x202f:        case 0x202f:
3286        case 0x205f:        case 0x205f:
3287        case 0x3000:        case 0x3000:
3288    #endif  /* Not EBCDIC */
3289        return -next != ESC_h;        return -next != ESC_h;
3290        default:        default:
3291        return -next == ESC_h;        return -next == ESC_h;
# Line 2543  switch(op_code) Line 3293  switch(op_code)
3293    
3294      case ESC_v:      case ESC_v:
3295      case ESC_V:      case ESC_V:
3296      switch(item)      switch(c)
3297        {        {
3298        case 0x0a:        case CHAR_LF:
3299        case 0x0b:        case CHAR_VT:
3300        case 0x0c:        case CHAR_FF:
3301        case 0x0d:        case CHAR_CR:
3302        case 0x85:        case CHAR_NEL:
3303    #ifndef EBCDIC
3304        case 0x2028:        case 0x2028:
3305        case 0x2029:        case 0x2029:
3306    #endif  /* Not EBCDIC */
3307        return -next != ESC_v;        return -next != ESC_v;
3308        default:        default:
3309        return -next == ESC_v;        return -next == ESC_v;
3310        }        }
3311    
3312        /* When PCRE_UCP is set, these values get generated for \d etc. Find
3313        their substitutions and process them. The result will always be either
3314        -ESC_p or -ESC_P. Then fall through to process those values. */
3315    
3316    #ifdef SUPPORT_UCP
3317        case ESC_du:
3318        case ESC_DU:
3319        case ESC_wu:
3320        case ESC_WU:
3321        case ESC_su:
3322        case ESC_SU:
3323          {
3324          int temperrorcode = 0;
3325          ptr = substitutes[-next - ESC_DU];
3326          next = check_escape(&ptr, &temperrorcode, 0, options, FALSE);
3327          if (temperrorcode != 0) return FALSE;
3328          ptr++;    /* For compatibility */
3329          }
3330        /* Fall through */
3331    
3332        case ESC_p:
3333        case ESC_P:
3334          {
3335          int ptype, pdata, errorcodeptr;
3336          BOOL negated;
3337    
3338          ptr--;      /* Make ptr point at the p or P */
3339          ptype = get_ucp(&ptr, &negated, &pdata, &errorcodeptr);
3340          if (ptype < 0) return FALSE;
3341          ptr++;      /* Point past the final curly ket */
3342    
3343          /* If the property item is optional, we have to give up. (When generated
3344          from \d etc by PCRE_UCP, this test will have been applied much earlier,
3345          to the original \d etc. At this point, ptr will point to a zero byte. */
3346    
3347          if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3348            STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
3349              return FALSE;
3350    
3351          /* Do the property check. */
3352    
3353          return check_char_prop(c, ptype, pdata, (next == -ESC_P) != negated);
3354          }
3355    #endif
3356    
3357      default:      default:
3358      return FALSE;      return FALSE;
3359      }      }
3360    
3361      /* In principle, support for Unicode properties should be integrated here as
3362      well. It means re-organizing the above code so as to get hold of the property
3363      values before switching on the op-code. However, I wonder how many patterns
3364      combine ASCII \d etc with Unicode properties? (Note that if PCRE_UCP is set,
3365      these op-codes are never generated.) */
3366    
3367    case OP_DIGIT:    case OP_DIGIT:
3368    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
3369           next == -ESC_h || next == -ESC_v;           next == -ESC_h || next == -ESC_v || next == -ESC_R;
3370    
3371    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
3372    return next == -ESC_d;    return next == -ESC_d;
# Line 2572  switch(op_code) Line 3375  switch(op_code)
3375    return next == -ESC_S || next == -ESC_d || next == -ESC_w;    return next == -ESC_S || next == -ESC_d || next == -ESC_w;
3376    
3377    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
3378    return next == -ESC_s || next == -ESC_h || next == -ESC_v;    return next == -ESC_s || next == -ESC_h || next == -ESC_v || next == -ESC_R;
3379    
3380    case OP_HSPACE:    case OP_HSPACE:
3381    return next == -ESC_S || next == -ESC_H || next == -ESC_d || next == -ESC_w;    return next == -ESC_S || next == -ESC_H || next == -ESC_d ||
3382             next == -ESC_w || next == -ESC_v || next == -ESC_R;
3383    
3384    case OP_NOT_HSPACE:    case OP_NOT_HSPACE:
3385    return next == -ESC_h;    return next == -ESC_h;
3386    
3387    /* Can't have \S in here because VT matches \S (Perl anomaly) */    /* Can't have \S in here because VT matches \S (Perl anomaly) */
3388      case OP_ANYNL:
3389    case OP_VSPACE:    case OP_VSPACE:
3390    return next == -ESC_V || next == -ESC_d || next == -ESC_w;    return next == -ESC_V || next == -ESC_d || next == -ESC_w;
3391    
3392    case OP_NOT_VSPACE:    case OP_NOT_VSPACE:
3393    return next == -ESC_v;    return next == -ESC_v || next == -ESC_R;
3394    
3395    case OP_WORDCHAR:    case OP_WORDCHAR:
3396    return next == -ESC_W || next == -ESC_s || next == -ESC_h || next == -ESC_v;    return next == -ESC_W || next == -ESC_s || next == -ESC_h ||
3397             next == -ESC_v || next == -ESC_R;
3398    
3399    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
3400    return next == -ESC_w || next == -ESC_d;    return next == -ESC_w || next == -ESC_d;
# Line 2617  Arguments: Line 3423  Arguments:
3423    codeptr        points to the pointer to the current code point    codeptr        points to the pointer to the current code point
3424    ptrptr         points to the current pattern pointer    ptrptr         points to the current pattern pointer
3425    errorcodeptr   points to error code variable    errorcodeptr   points to error code variable
3426    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)    firstcharptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)
3427    reqbyteptr     set to the last literal character required, else < 0    reqcharptr     set to the last literal character required, else < 0
3428    bcptr          points to current branch chain    bcptr          points to current branch chain
3429      cond_depth     conditional nesting depth
3430    cd             contains pointers to tables etc.    cd             contains pointers to tables etc.
3431    lengthptr      NULL during the real compile phase    lengthptr      NULL during the real compile phase
3432                   points to length accumulator during pre-compile phase                   points to length accumulator during pre-compile phase
# Line 2629  Returns:         TRUE on success Line 3436  Returns:         TRUE on success
3436  */  */
3437    
3438  static BOOL  static BOOL
3439  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,  compile_branch(int *optionsptr, pcre_uchar **codeptr,
3440    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,    const pcre_uchar **ptrptr, int *errorcodeptr, pcre_int32 *firstcharptr,
3441      pcre_int32 *reqcharptr, branch_chain *bcptr, int cond_depth,
3442    compile_data *cd, int *lengthptr)    compile_data *cd, int *lengthptr)
3443  {  {
3444  int repeat_type, op_type;  int repeat_type, op_type;
3445  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
3446  int bravalue = 0;  int bravalue = 0;
3447  int greedy_default, greedy_non_default;  int greedy_default, greedy_non_default;
3448  int firstbyte, reqbyte;  pcre_int32 firstchar, reqchar;
3449  int zeroreqbyte, zerofirstbyte;  pcre_int32 zeroreqchar, zerofirstchar;
3450  int req_caseopt, reqvary, tempreqvary;  pcre_int32 req_caseopt, reqvary, tempreqvary;
3451  int options = *optionsptr;  int options = *optionsptr;               /* May change dynamically */
3452  int after_manual_callout = 0;  int after_manual_callout = 0;
3453  int length_prevgroup = 0;  int length_prevgroup = 0;
3454  register int c;  register int c;
3455  register uschar *code = *codeptr;  register pcre_uchar *code = *codeptr;
3456  uschar *last_code = code;  pcre_uchar *last_code = code;
3457  uschar *orig_code = code;  pcre_uchar *orig_code = code;
3458  uschar *tempcode;  pcre_uchar *tempcode;
3459  BOOL inescq = FALSE;  BOOL inescq = FALSE;
3460  BOOL groupsetfirstbyte = FALSE;  BOOL groupsetfirstchar = FALSE;
3461  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
3462  const uschar *tempptr;  const pcre_uchar *tempptr;
3463  uschar *previous = NULL;  const pcre_uchar *nestptr = NULL;
3464  uschar *previous_callout = NULL;  pcre_uchar *previous = NULL;
3465  uschar *save_hwm = NULL;  pcre_uchar *previous_callout = NULL;
3466  uschar classbits[32];  pcre_uchar *save_hwm = NULL;
3467    pcre_uint8 classbits[32];
3468  #ifdef SUPPORT_UTF8  
3469  BOOL class_utf8;  /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
3470  BOOL utf8 = (options & PCRE_UTF8) != 0;  must not do this for other options (e.g. PCRE_EXTENDED) because they may change
3471  uschar *class_utf8data;  dynamically as we process the pattern. */
3472  uschar *class_utf8data_base;  
3473  uschar utf8_char[6];  #ifdef SUPPORT_UTF
3474    /* PCRE_UTF16 has the same value as PCRE_UTF8. */
3475    BOOL utf = (options & PCRE_UTF8) != 0;
3476    pcre_uchar utf_chars[6];
3477  #else  #else
3478  BOOL utf8 = FALSE;  BOOL utf = FALSE;
3479  uschar *utf8_char = NULL;  #endif
3480    
3481    /* Helper variables for OP_XCLASS opcode (for characters > 255). */
3482    
3483    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3484    BOOL xclass;
3485    pcre_uchar *class_uchardata;
3486    pcre_uchar *class_uchardata_base;
3487  #endif  #endif
3488    
3489  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 2679  greedy_non_default = greedy_default ^ 1; Line 3497  greedy_non_default = greedy_default ^ 1;
3497    
3498  /* Initialize no first byte, no required byte. REQ_UNSET means "no char  /* Initialize no first byte, no required byte. REQ_UNSET means "no char
3499  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
3500  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
3501  find one.  find one.
3502    
3503  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
3504  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
3505  zerofirstbyte and zeroreqbyte when such a repeat is encountered. The individual  zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual
3506  item types that can be repeated set these backoff variables appropriately. */  item types that can be repeated set these backoff variables appropriately. */
3507    
3508  firstbyte = reqbyte = zerofirstbyte = zeroreqbyte = REQ_UNSET;  firstchar = reqchar = zerofirstchar = zeroreqchar = REQ_UNSET;
3509    
3510  /* The variable req_caseopt contains either the REQ_CASELESS value or zero,  /* The variable req_caseopt contains either the REQ_CASELESS value
3511  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
3512  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
3513  case status of the value. This is used only for ASCII characters. */  firstchar or reqchar variables to record the case status of the
3514    value. This is used only for ASCII characters. */
3515    
3516  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
3517    
3518  /* Switch on next character until the end of the branch */  /* Switch on next character until the end of the branch */
3519    
# Line 2706  for (;; ptr++) Line 3525  for (;; ptr++)
3525    BOOL is_quantifier;    BOOL is_quantifier;
3526    BOOL is_recurse;    BOOL is_recurse;
3527    BOOL reset_bracount;    BOOL reset_bracount;
3528    int class_charcount;    int class_has_8bitchar;
3529    int class_lastchar;    int class_single_char;
3530    int newoptions;    int newoptions;
3531    int recno;    int recno;
3532    int refsign;    int refsign;
3533    int skipbytes;    int skipbytes;
3534    int subreqbyte;    int subreqchar;
3535    int subfirstbyte;    int subfirstchar;
3536    int terminator;    int terminator;
3537    int mclength;    int mclength;
3538    uschar mcbuffer[8];    int tempbracount;
3539      pcre_uchar mcbuffer[8];
3540    
3541    /* Get next byte in the pattern */    /* Get next character in the pattern */
3542    
3543    c = *ptr;    c = *ptr;
3544    
3545      /* If we are at the end of a nested substitution, revert to the outer level
3546      string. Nesting only happens one level deep. */
3547    
3548      if (c == 0 && nestptr != NULL)
3549        {
3550        ptr = nestptr;
3551        nestptr = NULL;
3552        c = *ptr;
3553        }
3554    
3555    /* If we are in the pre-compile phase, accumulate the length used for the    /* If we are in the pre-compile phase, accumulate the length used for the
3556    previous cycle of this loop. */    previous cycle of this loop. */
3557    
# Line 2730  for (;; ptr++) Line 3560  for (;; ptr++)
3560  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
3561      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
3562  #endif  #endif
3563      if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */      if (code > cd->start_workspace + cd->workspace_size -
3564            WORK_SIZE_SAFETY_MARGIN)                       /* Check for overrun */
3565        {        {
3566        *errorcodeptr = ERR52;        *errorcodeptr = ERR52;
3567        goto FAILED;        goto FAILED;
# Line 2752  for (;; ptr++) Line 3583  for (;; ptr++)
3583        goto FAILED;        goto FAILED;
3584        }        }
3585    
3586      *lengthptr += code - last_code;      *lengthptr += (int)(code - last_code);
3587      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));      DPRINTF(("length=%d added %d c=%c (0x%x)\n", *lengthptr,
3588          (int)(code - last_code), c, c));
3589    
3590      /* 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
3591      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 2763  for (;; ptr++) Line 3595  for (;; ptr++)
3595        {        {
3596        if (previous > orig_code)        if (previous > orig_code)
3597          {          {
3598          memmove(orig_code, previous, code - previous);          memmove(orig_code, previous, IN_UCHARS(code - previous));
3599          code -= previous - orig_code;          code -= previous - orig_code;
3600          previous = orig_code;          previous = orig_code;
3601          }          }
# Line 2779  for (;; ptr++) Line 3611  for (;; ptr++)
3611    /* 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
3612    reference list. */    reference list. */
3613    
3614    else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)    else if (cd->hwm > cd->start_workspace + cd->workspace_size -
3615               WORK_SIZE_SAFETY_MARGIN)
3616      {      {
3617      *errorcodeptr = ERR52;      *errorcodeptr = ERR52;
3618      goto FAILED;      goto FAILED;
# Line 2827  for (;; ptr++) Line 3660  for (;; ptr++)
3660      previous_callout = NULL;      previous_callout = NULL;
3661      }      }
3662    
3663    /* In extended mode, skip white space and comments */    /* In extended mode, skip white space and comments. */
3664    
3665    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
3666      {      {
3667      if ((cd->ctypes[c] & ctype_space) != 0) continue;      if (MAX_255(*ptr) && (cd->ctypes[c] & ctype_space) != 0) continue;
3668      if (c == CHAR_NUMBER_SIGN)      if (c == CHAR_NUMBER_SIGN)
3669        {        {
3670        while (*(++ptr) != 0)        ptr++;
3671          while (*ptr != 0)
3672          {          {
3673          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
3674            ptr++;
3675    #ifdef SUPPORT_UTF
3676            if (utf) FORWARDCHAR(ptr);
3677    #endif
3678          }          }
3679        if (*ptr != 0) continue;        if (*ptr != 0) continue;
3680    
# Line 2859  for (;; ptr++) Line 3697  for (;; ptr++)
3697      case 0:                        /* The branch terminates at string end */      case 0:                        /* The branch terminates at string end */
3698      case CHAR_VERTICAL_LINE:       /* or | or ) */      case CHAR_VERTICAL_LINE:       /* or | or ) */
3699      case CHAR_RIGHT_PARENTHESIS:      case CHAR_RIGHT_PARENTHESIS:
3700      *firstbyteptr = firstbyte;      *firstcharptr = firstchar;
3701      *reqbyteptr = reqbyte;      *reqcharptr = reqchar;
3702      *codeptr = code;      *codeptr = code;
3703      *ptrptr = ptr;      *ptrptr = ptr;
3704      if (lengthptr != NULL)      if (lengthptr != NULL)
# Line 2870  for (;; ptr++) Line 3708  for (;; ptr++)
3708          *errorcodeptr = ERR20;          *errorcodeptr = ERR20;
3709          goto FAILED;          goto FAILED;
3710          }          }
3711        *lengthptr += code - last_code;   /* To include callout length */        *lengthptr += (int)(code - last_code);   /* To include callout length */
3712        DPRINTF((">> end branch\n"));        DPRINTF((">> end branch\n"));
3713        }        }
3714      return TRUE;      return TRUE;
# Line 2881  for (;; ptr++) Line 3719  for (;; ptr++)
3719      the setting of any following char as a first character. */      the setting of any following char as a first character. */
3720    
3721      case CHAR_CIRCUMFLEX_ACCENT:      case CHAR_CIRCUMFLEX_ACCENT:
3722        previous = NULL;
3723      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
3724        {        {
3725        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
3726          *code++ = OP_CIRCM;
3727        }        }
3728      previous = NULL;      else *code++ = OP_CIRC;
     *code++ = OP_CIRC;  
3729      break;      break;
3730    
3731      case CHAR_DOLLAR_SIGN:      case CHAR_DOLLAR_SIGN:
3732      previous = NULL;      previous = NULL;
3733      *code++ = OP_DOLL;      *code++ = ((options & PCRE_MULTILINE) != 0)? OP_DOLLM : OP_DOLL;
3734      break;      break;
3735    
3736      /* 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
3737      repeats. The value of reqbyte doesn't change either. */      repeats. The value of reqchar doesn't change either. */
3738    
3739      case CHAR_DOT:      case CHAR_DOT:
3740      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;      if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
3741      zerofirstbyte = firstbyte;      zerofirstchar = firstchar;
3742      zeroreqbyte = reqbyte;      zeroreqchar = reqchar;
3743      previous = code;      previous = code;
3744      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
3745      break;      break;
# Line 2955  for (;; ptr++) Line 3794  for (;; ptr++)
3794          {          {
3795          if (ptr[1] == CHAR_E)          if (ptr[1] == CHAR_E)
3796            ptr++;            ptr++;
3797          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)  
3798            ptr += 3;            ptr += 3;
3799          else          else
3800            break;            break;
# Line 2975  for (;; ptr++) Line 3813  for (;; ptr++)
3813          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
3814        {        {
3815        *code++ = negate_class? OP_ALLANY : OP_FAIL;        *code++ = negate_class? OP_ALLANY : OP_FAIL;
3816        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
3817        zerofirstbyte = firstbyte;        zerofirstchar = firstchar;
3818        break;        break;
3819        }        }
3820    
# Line 2986  for (;; ptr++) Line 3824  for (;; ptr++)
3824    
3825      should_flip_negation = FALSE;      should_flip_negation = FALSE;
3826    
3827      /* 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.
3828      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
3829      valued UTF-8 characters, we don't yet do any optimization. */      < 256 character. class_single_char will be 1 if the class contains only
3830        a single character. */
3831    
3832      class_charcount = 0;      class_has_8bitchar = 0;
3833      class_lastchar = -1;      class_single_char = 0;
3834    
3835      /* 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
3836      temporary bit of memory, in case the class contains only 1 character (less      temporary bit of memory, in case the class contains only 1 character (less
3837      than 256), because in that case the compiled code doesn't use the bit map.      than 256), because in that case the compiled code doesn't use the bit map.
3838      */      */
3839    
3840      memset(classbits, 0, 32 * sizeof(uschar));      memset(classbits, 0, 32 * sizeof(pcre_uint8));
3841    
3842  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3843      class_utf8 = FALSE;                       /* No chars >= 256 */      xclass = FALSE;                           /* No chars >= 256 */
3844      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */      class_uchardata = code + LINK_SIZE + 2;   /* For UTF-8 items */
3845      class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */      class_uchardata_base = class_uchardata;   /* For resetting in pass 1 */
3846  #endif  #endif
3847    
3848      /* Process characters until ] is reached. By writing this as a "do" it      /* Process characters until ] is reached. By writing this as a "do" it
# Line 3012  for (;; ptr++) Line 3851  for (;; ptr++)
3851    
3852      if (c != 0) do      if (c != 0) do
3853        {        {
3854        const uschar *oldptr;        const pcre_uchar *oldptr;
3855    
3856  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3857        if (utf8 && c > 127)        if (utf && HAS_EXTRALEN(c))
3858          {                           /* Braces are required because the */          {                           /* Braces are required because the */
3859          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
3860          }          }
3861    #endif
3862    
3863        /* In the pre-compile phase, accumulate the length of any UTF-8 extra  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3864          /* In the pre-compile phase, accumulate the length of any extra
3865        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
3866        contain a zillion UTF-8 characters no longer overwrite the work space        contain a zillion > 255 characters no longer overwrite the work space
3867        (which is on the stack). */        (which is on the stack). */
3868    
3869        if (lengthptr != NULL)        if (lengthptr != NULL)
3870          {          {
3871          *lengthptr += class_utf8data - class_utf8data_base;          *lengthptr += class_uchardata - class_uchardata_base;
3872          class_utf8data = class_utf8data_base;          class_uchardata = class_uchardata_base;
3873          }          }
   
3874  #endif  #endif
3875    
3876        /* Inside \Q...\E everything is literal except \E */        /* Inside \Q...\E everything is literal except \E */
# Line 3058  for (;; ptr++) Line 3898  for (;; ptr++)
3898          {          {
3899          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
3900          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
3901          register const uschar *cbits = cd->cbits;          register const pcre_uint8 *cbits = cd->cbits;
3902          uschar pbits[32];          pcre_uint8 pbits[32];
3903    
3904          if (ptr[1] != CHAR_COLON)          if (ptr[1] != CHAR_COLON)
3905            {            {
# Line 3075  for (;; ptr++) Line 3915  for (;; ptr++)
3915            ptr++;            ptr++;
3916            }            }
3917    
3918          posix_class = check_posix_name(ptr, tempptr - ptr);          posix_class = check_posix_name(ptr, (int)(tempptr - ptr));
3919          if (posix_class < 0)          if (posix_class < 0)
3920            {            {
3921            *errorcodeptr = ERR30;            *errorcodeptr = ERR30;
# Line 3089  for (;; ptr++) Line 3929  for (;; ptr++)
3929          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)
3930            posix_class = 0;            posix_class = 0;
3931    
3932          /* We build the bit map for the POSIX class in a chunk of local store          /* When PCRE_UCP is set, some of the POSIX classes are converted to
3933          because we may be adding and subtracting from it, and we don't want to          different escape sequences that use Unicode properties. */
3934          subtract bits that may be in the main map already. At the end we or the  
3935          result into the bit map that is being built. */  #ifdef SUPPORT_UCP
3936            if ((options & PCRE_UCP) != 0)
3937              {
3938              int pc = posix_class + ((local_negate)? POSIX_SUBSIZE/2 : 0);
3939              if (posix_substitutes[pc] != NULL)
3940                {
3941                nestptr = tempptr + 1;
3942                ptr = posix_substitutes[pc] - 1;
3943                continue;
3944                }
3945              }
3946    #endif
3947            /* In the non-UCP case, we build the bit map for the POSIX class in a
3948            chunk of local store because we may be adding and subtracting from it,
3949            and we don't want to subtract bits that may be in the main map already.
3950            At the end we or the result into the bit map that is being built. */
3951    
3952          posix_class *= 3;          posix_class *= 3;
3953    
3954          /* Copy in the first table (always present) */          /* Copy in the first table (always present) */
3955    
3956          memcpy(pbits, cbits + posix_class_maps[posix_class],          memcpy(pbits, cbits + posix_class_maps[posix_class],
3957            32 * sizeof(uschar));            32 * sizeof(pcre_uint8));
3958    
3959          /* If there is a second table, add or remove it as required. */          /* If there is a second table, add or remove it as required. */
3960    
# Line 3130  for (;; ptr++) Line 3985  for (;; ptr++)
3985            for (c = 0; c < 32; c++) classbits[c] |= pbits[c];            for (c = 0; c < 32; c++) classbits[c] |= pbits[c];
3986    
3987          ptr = tempptr + 1;          ptr = tempptr + 1;
3988          class_charcount = 10;  /* Set > 1; assumes more than 1 per class */          /* Every class contains at least one < 256 characters. */
3989            class_has_8bitchar = 1;
3990            /* Every class contains at least two characters. */
3991            class_single_char = 2;
3992          continue;    /* End of POSIX syntax handling */          continue;    /* End of POSIX syntax handling */
3993          }          }
3994    
3995        /* Backslash may introduce a single character, or it may introduce one        /* Backslash may introduce a single character, or it may introduce one
3996        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
3997        case. Inside a class (and only there) it is treated as backspace.        case. Inside a class (and only there) it is treated as backspace. We
3998        Elsewhere it marks a word boundary. Other escapes have preset maps ready        assume that other escapes have more than one character in them, so
3999        to 'or' into the one we are building. We assume they have more than one        speculatively set both class_has_8bitchar and class_single_char bigger
4000        character in them, so set class_charcount bigger than one. */        than one. Unrecognized escapes fall through and are either treated
4001          as literal characters (by default), or are faulted if
4002          PCRE_EXTRA is set. */
4003    
4004        if (c == CHAR_BACKSLASH)        if (c == CHAR_BACKSLASH)
4005          {          {
4006          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
4007          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
4008    
4009          if (-c == ESC_b) c = CHAR_BS;       /* \b is backspace in a class */          if (-c == ESC_b) c = CHAR_BS;    /* \b is backspace in a class */
4010          else if (-c == ESC_X) c = CHAR_X;   /* \X is literal X in a class */          else if (-c == ESC_N)            /* \N is not supported in a class */
4011          else if (-c == ESC_R) c = CHAR_R;   /* \R is literal R in a class */            {
4012              *errorcodeptr = ERR71;
4013              goto FAILED;
4014              }
4015          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
4016            {            {
4017            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
# Line 3162  for (;; ptr++) Line 4025  for (;; ptr++)
4025    
4026          if (c < 0)          if (c < 0)
4027            {            {
4028            register const uschar *cbits = cd->cbits;            register const pcre_uint8 *cbits = cd->cbits;
4029            class_charcount += 2;     /* Greater than 1 is what matters */            /* Every class contains at least two < 256 characters. */
4030              class_has_8bitchar++;
4031            /* Save time by not doing this in the pre-compile phase. */            /* Every class contains at least two characters. */
4032              class_single_char += 2;
4033    
4034            if (lengthptr == NULL) switch (-c)            switch (-c)
4035              {              {
4036    #ifdef SUPPORT_UCP
4037                case ESC_du:     /* These are the values given for \d etc */
4038                case ESC_DU:     /* when PCRE_UCP is set. We replace the */
4039                case ESC_wu:     /* escape sequence with an appropriate \p */
4040                case ESC_WU:     /* or \P to test Unicode properties instead */
4041                case ESC_su:     /* of the default ASCII testing. */
4042                case ESC_SU:
4043                nestptr = ptr;
4044                ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
4045                class_has_8bitchar--;                /* Undo! */
4046                continue;
4047    #endif
4048              case ESC_d:              case ESC_d:
4049              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];
4050              continue;              continue;
# Line 3187  for (;; ptr++) Line 4063  for (;; ptr++)
4063              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
4064              continue;              continue;
4065    
4066                /* Perl 5.004 onwards omits VT from \s, but we must preserve it
4067                if it was previously set by something earlier in the character
4068                class. Luckily, the value of CHAR_VT is 0x0b in both ASCII and
4069                EBCDIC, so we lazily just adjust the appropriate bit. */
4070    
4071              case ESC_s:              case ESC_s:
4072              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_space];              classbits[0] |= cbits[cbit_space];
4073              classbits[1] &= ~0x08;   /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= cbits[cbit_space+1] & ~0x08;
4074                for (c = 2; c < 32; c++) classbits[c] |= cbits[c+cbit_space];
4075              continue;              continue;
4076    
4077              case ESC_S:              case ESC_S:
# Line 3198  for (;; ptr++) Line 4080  for (;; ptr++)
4080              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
4081              continue;              continue;
4082    
4083              default:    /* Not recognized; fall through */              case ESC_h:
4084              break;      /* Need "default" setting to stop compiler warning. */              SETBIT(classbits, CHAR_HT);
4085              }              SETBIT(classbits, CHAR_SPACE);
4086    #ifndef EBCDIC
           /* In the pre-compile phase, just do the recognition. */  
   
           else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||  
                    c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;  
   
           /* We need to deal with \H, \h, \V, and \v in both phases because  
           they use extra memory. */  
   
           if (-c == ESC_h)  
             {  
             SETBIT(classbits, 0x09); /* VT */  
             SETBIT(classbits, 0x20); /* SPACE */  
4087              SETBIT(classbits, 0xa0); /* NSBP */              SETBIT(classbits, 0xa0); /* NSBP */
4088  #ifdef SUPPORT_UTF8  #ifndef COMPILE_PCRE8
4089              if (utf8)              xclass = TRUE;
4090                *class_uchardata++ = XCL_SINGLE;
4091                *class_uchardata++ = 0x1680;
4092                *class_uchardata++ = XCL_SINGLE;
4093                *class_uchardata++ = 0x180e;
4094                *class_uchardata++ = XCL_RANGE;
4095                *class_uchardata++ = 0x2000;
4096                *class_uchardata++ = 0x200a;
4097                *class_uchardata++ = XCL_SINGLE;
4098                *class_uchardata++ = 0x202f;
4099                *class_uchardata++ = XCL_SINGLE;
4100                *class_uchardata++ = 0x205f;
4101                *class_uchardata++ = XCL_SINGLE;
4102                *class_uchardata++ = 0x3000;
4103    #elif defined SUPPORT_UTF
4104                if (utf)
4105                {                {
4106                class_utf8 = TRUE;                xclass = TRUE;
4107                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4108                class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x1680, class_uchardata);
4109                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4110                class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x180e, class_uchardata);
4111                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4112                class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2000, class_uchardata);
4113                class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x200a, class_uchardata);
4114                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4115                class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x202f, class_uchardata);
4116                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4117                class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x205f, class_uchardata);
4118                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4119                class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x3000, class_uchardata);
4120                }                }
4121  #endif  #endif
4122    #endif  /* Not EBCDIC */
4123              continue;              continue;
             }  
4124    
4125            if (-c == ESC_H)              case ESC_H:
             {  
4126              for (c = 0; c < 32; c++)              for (c = 0; c < 32; c++)
4127                {                {
4128                int x = 0xff;                int x = 0xff;
4129                switch (c)                switch (c)
4130                  {                  {
4131                  case 0x09/8: x ^= 1 << (0x09%8); break;                  case CHAR_HT/8:    x ^= 1 << (CHAR_HT%8); break;
4132                  case 0x20/8: x ^= 1 << (0x20%8); break;                  case CHAR_SPACE/8: x ^= 1 << (CHAR_SPACE%8); break;
4133                  case 0xa0/8: x ^= 1 << (0xa0%8); break;  #ifndef EBCDIC
4134                    case 0xa0/8: x ^= 1 << (0xa0%8); break;  /* NSBSP */
4135    #endif
4136                  default: break;                  default: break;
4137                  }                  }
4138                classbits[c] |= x;                classbits[c] |= x;
4139                }                }
4140    #ifndef EBCDIC
4141  #ifdef SUPPORT_UTF8  #ifndef COMPILE_PCRE8
4142              if (utf8)              xclass = TRUE;
4143                *class_uchardata++ = XCL_RANGE;
4144                *class_uchardata++ = 0x0100;
4145                *class_uchardata++ = 0x167f;
4146                *class_uchardata++ = XCL_RANGE;
4147                *class_uchardata++ = 0x1681;
4148                *class_uchardata++ = 0x180d;
4149                *class_uchardata++ = XCL_RANGE;
4150                *class_uchardata++ = 0x180f;
4151                *class_uchardata++ = 0x1fff;
4152                *class_uchardata++ = XCL_RANGE;
4153                *class_uchardata++ = 0x200b;
4154                *class_uchardata++ = 0x202e;
4155                *class_uchardata++ = XCL_RANGE;
4156                *class_uchardata++ = 0x2030;
4157                *class_uchardata++ = 0x205e;
4158                *class_uchardata++ = XCL_RANGE;
4159                *class_uchardata++ = 0x2060;
4160                *class_uchardata++ = 0x2fff;
4161                *class_uchardata++ = XCL_RANGE;
4162                *class_uchardata++ = 0x3001;
4163    #ifdef SUPPORT_UTF
4164                if (utf)
4165                  class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4166                else
4167    #endif   /* SUPPORT_UTF */
4168                  *class_uchardata++ = 0xffff;
4169    #elif defined SUPPORT_UTF
4170                if (utf)
4171                {                {
4172                class_utf8 = TRUE;                xclass = TRUE;
4173                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4174                class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x0100, class_uchardata);
4175                class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x167f, class_uchardata);
4176                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4177                class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x1681, class_uchardata);
4178                class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x180d, class_uchardata);
4179                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4180                class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x180f, class_uchardata);
4181                class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x1fff, class_uchardata);
4182                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4183                class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x200b, class_uchardata);
4184                class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x202e, class_uchardata);
4185                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4186                class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2030, class_uchardata);
4187                class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x205e, class_uchardata);
4188                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4189                class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2060, class_uchardata);
4190                class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2fff, class_uchardata);
4191                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4192                class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x3001, class_uchardata);
4193                class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4194                }                }
4195  #endif  #endif
4196    #endif  /* Not EBCDIC */
4197              continue;              continue;
             }  
4198    
4199            if (-c == ESC_v)              case ESC_v:
4200              {              SETBIT(classbits, CHAR_LF);
4201              SETBIT(classbits, 0x0a); /* LF */              SETBIT(classbits, CHAR_VT);
4202              SETBIT(classbits, 0x0b); /* VT */              SETBIT(classbits, CHAR_FF);
4203              SETBIT(classbits, 0x0c); /* FF */              SETBIT(classbits, CHAR_CR);
4204              SETBIT(classbits, 0x0d); /* CR */              SETBIT(classbits, CHAR_NEL);
4205              SETBIT(classbits, 0x85); /* NEL */  #ifndef EBCDIC
4206  #ifdef SUPPORT_UTF8  #ifndef COMPILE_PCRE8
4207              if (utf8)              xclass = TRUE;
4208                *class_uchardata++ = XCL_RANGE;
4209                *class_uchardata++ = 0x2028;
4210                *class_uchardata++ = 0x2029;
4211    #elif defined SUPPORT_UTF
4212                if (utf)
4213                {                {
4214                class_utf8 = TRUE;                xclass = TRUE;
4215                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4216                class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2028, class_uchardata);
4217                class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2029, class_uchardata);
4218                }                }
4219  #endif  #endif
4220    #endif  /* Not EBCDIC */
4221              continue;              continue;
             }  
4222    
4223            if (-c == ESC_V)              case ESC_V:
             {  
4224              for (c = 0; c < 32; c++)              for (c = 0; c < 32; c++)
4225                {                {
4226                int x = 0xff;                int x = 0xff;
4227                switch (c)                switch (c)
4228                  {                  {
4229                  case 0x0a/8: x ^= 1 << (0x0a%8);                  case CHAR_LF/8: x ^= 1 << (CHAR_LF%8);
4230                               x ^= 1 << (0x0b%8);                                  x ^= 1 << (CHAR_VT%8);
4231                               x ^= 1 << (0x0c%8);                                  x ^= 1 << (CHAR_FF%8);
4232                               x ^= 1 << (0x0d%8);                                  x ^= 1 << (CHAR_CR%8);
4233                               break;                                  break;
4234                  case 0x85/8: x ^= 1 << (0x85%8); break;                  case CHAR_NEL/8: x ^= 1 << (CHAR_NEL%8); break;
4235                  default: break;                  default: break;
4236                  }                  }
4237                classbits[c] |= x;                classbits[c] |= x;
4238                }                }
4239    
4240  #ifdef SUPPORT_UTF8  #ifndef EBCDIC
4241              if (utf8)  #ifndef COMPILE_PCRE8
4242                xclass = TRUE;
4243                *class_uchardata++ = XCL_RANGE;
4244                *class_uchardata++ = 0x0100;
4245                *class_uchardata++ = 0x2027;
4246                *class_uchardata++ = XCL_RANGE;
4247                *class_uchardata++ = 0x202a;
4248    #ifdef SUPPORT_UTF
4249                if (utf)
4250                  class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4251                else
4252    #endif
4253                  *class_uchardata++ = 0xffff;
4254    #elif defined SUPPORT_UTF
4255                if (utf)
4256                {                {
4257                class_utf8 = TRUE;                xclass = TRUE;
4258                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4259                class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x0100, class_uchardata);
4260                class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2027, class_uchardata);
4261                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4262                class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x202a, class_uchardata);
4263                class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4264                }                }
4265  #endif  #endif
4266    #endif  /* Not EBCDIC */
4267              continue;              continue;
             }  
   
           /* We need to deal with \P and \p in both phases. */  
4268    
4269  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4270            if (-c == ESC_p || -c == ESC_P)              case ESC_p:
4271              {              case ESC_P:
4272              BOOL negated;                {
4273              int pdata;                BOOL negated;
4274              int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);                int pdata;
4275              if (ptype < 0) goto FAILED;                int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
4276              class_utf8 = TRUE;                if (ptype < 0) goto FAILED;
4277              *class_utf8data++ = ((-c == ESC_p) != negated)?                xclass = TRUE;
4278                XCL_PROP : XCL_NOTPROP;                *class_uchardata++ = ((-c == ESC_p) != negated)?
4279              *class_utf8data++ = ptype;                  XCL_PROP : XCL_NOTPROP;
4280              *class_utf8data++ = pdata;                *class_uchardata++ = ptype;
4281              class_charcount -= 2;   /* Not a < 256 character */                *class_uchardata++ = pdata;
4282              continue;                class_has_8bitchar--;                /* Undo! */
4283              }                continue;
4284                  }
4285  #endif  #endif
4286            /* Unrecognized escapes are faulted if PCRE is running in its              /* Unrecognized escapes are faulted if PCRE is running in its
4287            strict mode. By default, for compatibility with Perl, they are              strict mode. By default, for compatibility with Perl, they are
4288            treated as literals. */              treated as literals. */
4289    
4290            if ((options & PCRE_EXTRA) != 0)              default:
4291              {              if ((options & PCRE_EXTRA) != 0)
4292              *errorcodeptr = ERR7;                {
4293              goto FAILED;                *errorcodeptr = ERR7;
4294                  goto FAILED;
4295                  }
4296                class_has_8bitchar--;    /* Undo the speculative increase. */
4297                class_single_char -= 2;  /* Undo the speculative increase. */
4298                c = *ptr;                /* Get the final character and fall through */
4299                break;
4300              }              }
   
           class_charcount -= 2;  /* Undo the default count from above */  
           c = *ptr;              /* Get the final character and fall through */  
4301            }            }
4302    
4303          /* Fall through if we have a single character (c >= 0). This may be          /* Fall through if we have a single character (c >= 0). This may be
4304          greater than 256 in UTF-8 mode. */          greater than 256. */
4305    
4306          }   /* End of backslash handling */          }   /* End of backslash handling */
4307    
# Line 3415  for (;; ptr++) Line 4349  for (;; ptr++)
4349            goto LONE_SINGLE_CHARACTER;            goto LONE_SINGLE_CHARACTER;
4350            }            }
4351    
4352  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4353          if (utf8)          if (utf)
4354            {                           /* Braces are required because the */            {                           /* Braces are required because the */
4355            GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */            GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */
4356            }            }
# Line 3433  for (;; ptr++) Line 4367  for (;; ptr++)
4367            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
4368            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
4369    
4370            /* \b is backspace; \X is literal X; \R is literal R; any other            /* \b is backspace; any other special means the '-' was literal */
           special means the '-' was literal */  
4371    
4372            if (d < 0)            if (d < 0)
4373              {              {
4374              if (d == -ESC_b) d = CHAR_BS;              if (d == -ESC_b) d = CHAR_BS; else
             else if (d == -ESC_X) d = CHAR_X;  
             else if (d == -ESC_R) d = CHAR_R; else  
4375                {                {
4376                ptr = oldptr;                ptr = oldptr;
4377                goto LONE_SINGLE_CHARACTER;  /* A few lines below */                goto LONE_SINGLE_CHARACTER;  /* A few lines below */
# Line 3463  for (;; ptr++) Line 4394  for (;; ptr++)
4394    
4395          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
4396    
4397            /* Since we found a character range, single character optimizations
4398            cannot be done anymore. */
4399            class_single_char = 2;
4400    
4401          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
4402          matching, we have to use an XCLASS with extra data items. Caseless          matching, we have to use an XCLASS with extra data items. Caseless
4403          matching for characters > 127 is available only if UCP support is          matching for characters > 127 is available only if UCP support is
4404          available. */          available. */
4405    
4406  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !(defined COMPILE_PCRE8)
4407          if (utf8 && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127)))          if ((d > 255) || (utf && ((options & PCRE_CASELESS) != 0 && d > 127)))
4408    #elif defined  SUPPORT_UTF
4409            if (utf && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127)))
4410    #elif !(defined COMPILE_PCRE8)
4411            if (d > 255)
4412    #endif
4413    #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
4414            {            {
4415            class_utf8 = TRUE;            xclass = TRUE;
4416    
4417            /* With UCP support, we can find the other case equivalents of            /* With UCP support, we can find the other case equivalents of
4418            the relevant characters. There may be several ranges. Optimize how            the relevant characters. There may be several ranges. Optimize how
4419            they fit with the basic range. */            they fit with the basic range. */
4420    
4421  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4422    #ifndef COMPILE_PCRE8
4423              if (utf && (options & PCRE_CASELESS) != 0)
4424    #else
4425            if ((options & PCRE_CASELESS) != 0)            if ((options & PCRE_CASELESS) != 0)
4426    #endif
4427              {              {
4428              unsigned int occ, ocd;              unsigned int occ, ocd;
4429              unsigned int cc = c;              unsigned int cc = c;
# Line 3504  for (;; ptr++) Line 4449  for (;; ptr++)
4449    
4450                if (occ == ocd)                if (occ == ocd)
4451                  {                  {
4452                  *class_utf8data++ = XCL_SINGLE;                  *class_uchardata++ = XCL_SINGLE;
4453                  }                  }
4454                else                else
4455                  {                  {
4456                  *class_utf8data++ = XCL_RANGE;                  *class_uchardata++ = XCL_RANGE;
4457                  class_utf8data += _pcre_ord2utf8(occ, class_utf8data);                  class_uchardata += PRIV(ord2utf)(occ, class_uchardata);
4458                  }                  }
4459                class_utf8data += _pcre_ord2utf8(ocd, class_utf8data);                class_uchardata += PRIV(ord2utf)(ocd, class_uchardata);
4460                }                }
4461              }              }
4462  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
# Line 3519  for (;; ptr++) Line 4464  for (;; ptr++)
4464            /* Now record the original range, possibly modified for UCP caseless            /* Now record the original range, possibly modified for UCP caseless
4465            overlapping ranges. */            overlapping ranges. */
4466    
4467            *class_utf8data++ = XCL_RANGE;            *class_uchardata++ = XCL_RANGE;
4468            class_utf8data += _pcre_ord2utf8(c, class_utf8data);  #ifdef SUPPORT_UTF
4469            class_utf8data += _pcre_ord2utf8(d, class_utf8data);  #ifndef COMPILE_PCRE8
4470              if (utf)
4471                {
4472                class_uchardata += PRIV(ord2utf)(c, class_uchardata);
4473                class_uchardata += PRIV(ord2utf)(d, class_uchardata);
4474                }
4475              else
4476                {
4477                *class_uchardata++ = c;
4478                *class_uchardata++ = d;
4479                }
4480    #else
4481              class_uchardata += PRIV(ord2utf)(c, class_uchardata);
4482              class_uchardata += PRIV(ord2utf)(d, class_uchardata);
4483    #endif
4484    #else /* SUPPORT_UTF */
4485              *class_uchardata++ = c;
4486              *class_uchardata++ = d;
4487    #endif /* SUPPORT_UTF */
4488    
4489            /* With UCP support, we are done. Without UCP support, there is no            /* With UCP support, we are done. Without UCP support, there is no
4490            caseless matching for UTF-8 characters > 127; we can use the bit map            caseless matching for UTF characters > 127; we can use the bit map
4491            for the smaller ones. */            for the smaller ones. As for 16 bit characters without UTF, we
4492              can still use  */
4493    
4494  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4495            continue;    /* With next character in the class */  #ifndef COMPILE_PCRE8
4496  #else            if (utf)
4497            if ((options & PCRE_CASELESS) == 0 || c > 127) continue;  #endif
4498                continue;    /* With next character in the class */
4499    #endif  /* SUPPORT_UCP */
4500    
4501    #if defined SUPPORT_UTF && !defined(SUPPORT_UCP) && !(defined COMPILE_PCRE8)
4502              if (utf)
4503                {
4504                if ((options & PCRE_CASELESS) == 0 || c > 127) continue;
4505                /* Adjust upper limit and fall through to set up the map */
4506                d = 127;
4507                }
4508              else
4509                {
4510                if (c > 255) continue;
4511                /* Adjust upper limit and fall through to set up the map */
4512                d = 255;
4513                }
4514    #elif defined SUPPORT_UTF && !defined(SUPPORT_UCP)
4515              if ((options & PCRE_CASELESS) == 0 || c > 127) continue;
4516            /* Adjust upper limit and fall through to set up the map */            /* Adjust upper limit and fall through to set up the map */
   
4517            d = 127;            d = 127;
4518    #else
4519  #endif  /* SUPPORT_UCP */            if (c > 255) continue;
4520              /* Adjust upper limit and fall through to set up the map */
4521              d = 255;
4522    #endif  /* SUPPORT_UTF && !SUPPORT_UCP && !COMPILE_PCRE8 */
4523            }            }
4524  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF || !COMPILE_PCRE8 */
4525    
4526          /* We use the bit map for all cases when not in UTF-8 mode; else          /* We use the bit map for 8 bit mode, or when the characters fall
4527          ranges that lie entirely within 0-127 when there is UCP support; else          partially or entirely to [0-255] ([0-127] for UCP) ranges. */
         for partial ranges without UCP support. */  
4528    
4529          class_charcount += d - c + 1;          class_has_8bitchar = 1;
         class_lastchar = d;  
4530    
4531          /* We can save a bit of time by skipping this in the pre-compile. */          /* We can save a bit of time by skipping this in the pre-compile. */
4532    
# Line 3554  for (;; ptr++) Line 4535  for (;; ptr++)
4535            classbits[c/8] |= (1 << (c&7));            classbits[c/8] |= (1 << (c&7));
4536            if ((options & PCRE_CASELESS) != 0)            if ((options & PCRE_CASELESS) != 0)
4537              {              {
4538              int uc = cd->fcc[c];           /* flip case */              int uc = cd->fcc[c]; /* flip case */
4539              classbits[uc/8] |= (1 << (uc&7));              classbits[uc/8] |= (1 << (uc&7));
4540              }              }
4541            }            }
# Line 3568  for (;; ptr++) Line 4549  for (;; ptr++)
4549    
4550        LONE_SINGLE_CHARACTER:        LONE_SINGLE_CHARACTER:
4551    
4552        /* Handle a character that cannot go in the bit map */        /* Only the value of 1 matters for class_single_char. */
4553    
4554          if (class_single_char < 2) class_single_char++;
4555    
4556  #ifdef SUPPORT_UTF8        /* If class_charcount is 1, we saw precisely one character. As long as
4557        if (utf8 && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127)))        there was no use of \p or \P, in other words, no use of any XCLASS
4558          features, we can optimize.
4559    
4560          The optimization throws away the bit map. We turn the item into a
4561          1-character OP_CHAR[I] if it's positive, or OP_NOT[I] if it's negative.
4562          In the positive case, it can cause firstchar to be set. Otherwise, there
4563          can be no first char if this item is first, whatever repeat count may
4564          follow. In the case of reqchar, save the previous value for reinstating. */
4565    
4566          if (class_single_char == 1 && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
4567          {          {
4568          class_utf8 = TRUE;          ptr++;
4569          *class_utf8data++ = XCL_SINGLE;          zeroreqchar = reqchar;
4570          class_utf8data += _pcre_ord2utf8(c, class_utf8data);  
4571            if (negate_class)
4572              {
4573              if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
4574              zerofirstchar = firstchar;
4575              *code++ = ((options & PCRE_CASELESS) != 0)? OP_NOTI: OP_NOT;
4576    #ifdef SUPPORT_UTF
4577              if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
4578                code += PRIV(ord2utf)(c, code);
4579              else
4580    #endif
4581                *code++ = c;
4582              goto NOT_CHAR;
4583              }
4584    
4585            /* For a single, positive character, get the value into mcbuffer, and
4586            then we can handle this with the normal one-character code. */
4587    
4588    #ifdef SUPPORT_UTF
4589            if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
4590              mclength = PRIV(ord2utf)(c, mcbuffer);
4591            else
4592    #endif
4593              {
4594              mcbuffer[0] = c;
4595              mclength = 1;
4596              }
4597           &n