/[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 360 by ph10, Wed Jul 9 20:00:28 2008 UTC revision 1131 by chpe, Thu Oct 18 18:35:18 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-2008 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 DEBUG is defined, we need the pcre_printint() function, which is also  /* When PCRE_DEBUG is defined, we need the pcre(16|32)_printint() function, which
57  used by pcretest. DEBUG is not defined when building a production library. */  is also used by pcretest. PCRE_DEBUG is not defined when building a production
58    library. We do not need to select pcre16_printint.c specially, because the
59  #ifdef DEBUG  COMPILE_PCREx macro will already be appropriately set. */
60  #include "pcre_printint.src"  
61    #ifdef PCRE_DEBUG
62    /* pcre_printint.c should not include any headers */
63    #define PCRE_INCLUDED
64    #include "pcre_printint.c"
65    #undef PCRE_INCLUDED
66  #endif  #endif
67    
68    
69  /* Macro for setting individual bits in class bitmaps. */  /* Macro for setting individual bits in class bitmaps. */
70    
71  #define SETBIT(a,b) a[b/8] |= (1 << (b%8))  #define SETBIT(a,b) a[(b)/8] |= (1 << ((b)&7))
72    
73  /* Maximum length value to check against when making sure that the integer that  /* Maximum length value to check against when making sure that the integer that
74  holds the compiled pattern length does not overflow. We make it a bit less than  holds the compiled pattern length does not overflow. We make it a bit less than
# Line 72  to check them every time. */ Line 77  to check them every time. */
77    
78  #define OFLOW_MAX (INT_MAX - 20)  #define OFLOW_MAX (INT_MAX - 20)
79    
80    /* Definitions to allow mutual recursion */
81    
82    static int
83      add_list_to_class(pcre_uint8 *, pcre_uchar **, int, compile_data *,
84        const pcre_uint32 *, unsigned int);
85    
86    static BOOL
87      compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,
88        pcre_uint32 *, pcre_int32 *, pcre_uint32 *, pcre_int32 *, branch_chain *,
89        compile_data *, int *);
90    
91    
92    
93  /*************************************************  /*************************************************
94  *      Code parameters and static tables         *  *      Code parameters and static tables         *
# Line 87  so this number is very generous. Line 104  so this number is very generous.
104  The same workspace is used during the second, actual compile phase for  The same workspace is used during the second, actual compile phase for
105  remembering forward references to groups so that they can be filled in at the  remembering forward references to groups so that they can be filled in at the
106  end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE  end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE
107  is 4 there is plenty of room. */  is 4 there is plenty of room for most patterns. However, the memory can get
108    filled up by repetitions of forward references, for example patterns like
109    /(?1){0,1999}(b)/, and one user did hit the limit. The code has been changed so
110    that the workspace is expanded using malloc() in this situation. The value
111    below is therefore a minimum, and we put a maximum on it for safety. The
112    minimum is now also defined in terms of LINK_SIZE so that the use of malloc()
113    kicks in at the same number of forward references in all cases. */
114    
115    #define COMPILE_WORK_SIZE (2048*LINK_SIZE)
116    #define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)
117    
118  #define COMPILE_WORK_SIZE (4096)  /* The overrun tests check for a slightly smaller size so that they detect the
119    overrun before it actually does run off the end of the data block. */
120    
121    #define WORK_SIZE_SAFETY_MARGIN (100)
122    
123    /* Private flags added to firstchar and reqchar. */
124    
125    #define REQ_CASELESS    (1 << 0)        /* Indicates caselessness */
126    #define REQ_VARY        (1 << 1)        /* Reqchar followed non-literal item */
127    /* Negative values for the firstchar and reqchar flags */
128    #define REQ_UNSET       (-2)
129    #define REQ_NONE        (-1)
130    
131    /* Repeated character flags. */
132    
133    #define UTF_LENGTH     0x10000000l      /* The char contains its length. */
134    
135  /* Table for handling escaped characters in the range '0'-'z'. Positive returns  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
136  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
137  on. Zero means further processing is needed (for things like \x), or the escape  on. Zero means further processing is needed (for things like \x), or the escape
138  is invalid. */  is invalid. */
139    
140  #ifndef EBCDIC  /* This is the "normal" table for ASCII systems */  #ifndef EBCDIC
141    
142    /* This is the "normal" table for ASCII systems or for EBCDIC systems running
143    in UTF-8 mode. */
144    
145  static const short int escapes[] = {  static const short int escapes[] = {
146       0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */       0,                       0,
147       0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */       0,                       0,
148     '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */       0,                       0,
149  -ESC_H,      0,      0, -ESC_K,      0,      0,      0,      0,   /* H - O */       0,                       0,
150  -ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0, -ESC_V, -ESC_W,   /* P - W */       0,                       0,
151  -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */       CHAR_COLON,              CHAR_SEMICOLON,
152     '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */       CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
153  -ESC_h,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */       CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
154  -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0, -ESC_v, -ESC_w,   /* p - w */       CHAR_COMMERCIAL_AT,      -ESC_A,
155       0,      0, -ESC_z                                            /* x - z */       -ESC_B,                  -ESC_C,
156         -ESC_D,                  -ESC_E,
157         0,                       -ESC_G,
158         -ESC_H,                  0,
159         0,                       -ESC_K,
160         0,                       0,
161         -ESC_N,                  0,
162         -ESC_P,                  -ESC_Q,
163         -ESC_R,                  -ESC_S,
164         0,                       0,
165         -ESC_V,                  -ESC_W,
166         -ESC_X,                  0,
167         -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
168         CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
169         CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
170         CHAR_GRAVE_ACCENT,       7,
171         -ESC_b,                  0,
172         -ESC_d,                  ESC_e,
173         ESC_f,                   0,
174         -ESC_h,                  0,
175         0,                       -ESC_k,
176         0,                       0,
177         ESC_n,                   0,
178         -ESC_p,                  0,
179         ESC_r,                   -ESC_s,
180         ESC_tee,                 0,
181         -ESC_v,                  -ESC_w,
182         0,                       0,
183         -ESC_z
184  };  };
185    
186  #else           /* This is the "abnormal" table for EBCDIC systems */  #else
187    
188    /* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
189    
190  static const short int escapes[] = {  static const short int escapes[] = {
191  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
192  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
# Line 130  static const short int escapes[] = { Line 205  static const short int escapes[] = {
205  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
206  /*  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,
207  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
208  /*  D0 */   '}',     0, -ESC_K,       0,      0,     0,      0, -ESC_P,  /*  D0 */   '}',     0, -ESC_K,       0,      0,-ESC_N,      0, -ESC_P,
209  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
210  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
211  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
# Line 142  static const short int escapes[] = { Line 217  static const short int escapes[] = {
217    
218  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is
219  searched linearly. Put all the names into a single string, in order to reduce  searched linearly. Put all the names into a single string, in order to reduce
220  the number of relocations when a shared library is dynamically linked. */  the number of relocations when a shared library is dynamically linked. The
221    string is built from string macros so that it works in UTF-8 mode on EBCDIC
222    platforms. */
223    
224  typedef struct verbitem {  typedef struct verbitem {
225    int   len;    int   len;                 /* Length of verb name */
226    int   op;    int   op;                  /* Op when no arg, or -1 if arg mandatory */
227      int   op_arg;              /* Op when arg present, or -1 if not allowed */
228  } verbitem;  } verbitem;
229    
230  static const char verbnames[] =  static const char verbnames[] =
231    "ACCEPT\0"    "\0"                       /* Empty name is a shorthand for MARK */
232    "COMMIT\0"    STRING_MARK0
233    "F\0"    STRING_ACCEPT0
234    "FAIL\0"    STRING_COMMIT0
235    "PRUNE\0"    STRING_F0
236    "SKIP\0"    STRING_FAIL0
237    "THEN";    STRING_PRUNE0
238      STRING_SKIP0
239      STRING_THEN;
240    
241  static const verbitem verbs[] = {  static const verbitem verbs[] = {
242    { 6, OP_ACCEPT },    { 0, -1,        OP_MARK },
243    { 6, OP_COMMIT },    { 4, -1,        OP_MARK },
244    { 1, OP_FAIL },    { 6, OP_ACCEPT, -1 },
245    { 4, OP_FAIL },    { 6, OP_COMMIT, -1 },
246    { 5, OP_PRUNE },    { 1, OP_FAIL,   -1 },
247    { 4, OP_SKIP  },    { 4, OP_FAIL,   -1 },
248    { 4, OP_THEN  }    { 5, OP_PRUNE,  OP_PRUNE_ARG },
249      { 4, OP_SKIP,   OP_SKIP_ARG  },
250      { 4, OP_THEN,   OP_THEN_ARG  }
251  };  };
252    
253  static const int verbcount = sizeof(verbs)/sizeof(verbitem);  static const int verbcount = sizeof(verbs)/sizeof(verbitem);
# Line 178  length entry. The first three must be al Line 260  length entry. The first three must be al
260  for handling case independence. */  for handling case independence. */
261    
262  static const char posix_names[] =  static const char posix_names[] =
263    "alpha\0"  "lower\0"  "upper\0"  "alnum\0"  "ascii\0"  "blank\0"    STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
264    "cntrl\0"  "digit\0"  "graph\0"  "print\0"  "punct\0"  "space\0"    STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
265    "word\0"   "xdigit";    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
266      STRING_word0  STRING_xdigit;
267    
268  static const uschar posix_name_lengths[] = {  static const pcre_uint8 posix_name_lengths[] = {
269    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 };
270    
271  /* 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 212  static const int posix_class_maps[] = { Line 295  static const int posix_class_maps[] = {
295    cbit_xdigit,-1,          0              /* xdigit */    cbit_xdigit,-1,          0              /* xdigit */
296  };  };
297    
298    /* Table of substitutes for \d etc when PCRE_UCP is set. The POSIX class
299    substitutes must be in the order of the names, defined above, and there are
300    both positive and negative cases. NULL means no substitute. */
301    
302    #ifdef SUPPORT_UCP
303    static const pcre_uchar string_PNd[]  = {
304      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
305      CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
306    static const pcre_uchar string_pNd[]  = {
307      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
308      CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
309    static const pcre_uchar string_PXsp[] = {
310      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
311      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
312    static const pcre_uchar string_pXsp[] = {
313      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
314      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
315    static const pcre_uchar string_PXwd[] = {
316      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
317      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
318    static const pcre_uchar string_pXwd[] = {
319      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
320      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
321    
322    static const pcre_uchar *substitutes[] = {
323      string_PNd,           /* \D */
324      string_pNd,           /* \d */
325      string_PXsp,          /* \S */       /* NOTE: Xsp is Perl space */
326      string_pXsp,          /* \s */
327      string_PXwd,          /* \W */
328      string_pXwd           /* \w */
329    };
330    
331    static const pcre_uchar string_pL[] =   {
332      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
333      CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
334    static const pcre_uchar string_pLl[] =  {
335      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
336      CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
337    static const pcre_uchar string_pLu[] =  {
338      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
339      CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
340    static const pcre_uchar string_pXan[] = {
341      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
342      CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
343    static const pcre_uchar string_h[] =    {
344      CHAR_BACKSLASH, CHAR_h, '\0' };
345    static const pcre_uchar string_pXps[] = {
346      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
347      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
348    static const pcre_uchar string_PL[] =   {
349      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
350      CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
351    static const pcre_uchar string_PLl[] =  {
352      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
353      CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
354    static const pcre_uchar string_PLu[] =  {
355      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
356      CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
357    static const pcre_uchar string_PXan[] = {
358      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
359      CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
360    static const pcre_uchar string_H[] =    {
361      CHAR_BACKSLASH, CHAR_H, '\0' };
362    static const pcre_uchar string_PXps[] = {
363      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
364      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
365    
366    static const pcre_uchar *posix_substitutes[] = {
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      /* Negated cases */
382      string_PL,            /* ^alpha */
383      string_PLl,           /* ^lower */
384      string_PLu,           /* ^upper */
385      string_PXan,          /* ^alnum */
386      NULL,                 /* ^ascii */
387      string_H,             /* ^blank */
388      NULL,                 /* ^cntrl */
389      string_PNd,           /* ^digit */
390      NULL,                 /* ^graph */
391      NULL,                 /* ^print */
392      NULL,                 /* ^punct */
393      string_PXps,          /* ^space */   /* NOTE: Xps is POSIX space */
394      string_PXwd,          /* ^word */
395      NULL                  /* ^xdigit */
396    };
397    #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
398    #endif
399    
400  #define STRING(a)  # a  #define STRING(a)  # a
401  #define XSTRING(s) STRING(s)  #define XSTRING(s) STRING(s)
# Line 224  the number of relocations needed when a Line 408  the number of relocations needed when a
408  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
409  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
410  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
411  because these strings are used only when there is a compilation error. */  because these strings are used only when there is a compilation error.
412    
413    Each substring ends with \0 to insert a null character. This includes the final
414    substring, so that the whole string ends with \0\0, which can be detected when
415    counting through. */
416    
417  static const char error_texts[] =  static const char error_texts[] =
418    "no error\0"    "no error\0"
# Line 265  static const char error_texts[] = Line 453  static const char error_texts[] =
453    /* 30 */    /* 30 */
454    "unknown POSIX class name\0"    "unknown POSIX class name\0"
455    "POSIX collating elements are not supported\0"    "POSIX collating elements are not supported\0"
456    "this version of PCRE is not compiled with PCRE_UTF8 support\0"    "this version of PCRE is compiled without UTF support\0"
457    "spare error\0"  /** DEAD **/    "spare error\0"  /** DEAD **/
458    "character value in \\x{...} sequence is too large\0"    "character value in \\x{...} sequence is too large\0"
459    /* 35 */    /* 35 */
460    "invalid condition (?(0)\0"    "invalid condition (?(0)\0"
461    "\\C not allowed in lookbehind assertion\0"    "\\C not allowed in lookbehind assertion\0"
462    "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"    "PCRE does not support \\L, \\l, \\N{name}, \\U, or \\u\0"
463    "number after (?C is > 255\0"    "number after (?C is > 255\0"
464    "closing ) for (?C expected\0"    "closing ) for (?C expected\0"
465    /* 40 */    /* 40 */
# Line 288  static const char error_texts[] = Line 476  static const char error_texts[] =
476    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
477    /* 50 */    /* 50 */
478    "repeated subpattern is too long\0"    /** DEAD **/    "repeated subpattern is too long\0"    /** DEAD **/
479    "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"
480    "internal error: overran compiling workspace\0"    "internal error: overran compiling workspace\0"
481    "internal error: previously-checked referenced subpattern not found\0"    "internal error: previously-checked referenced subpattern not found\0"
482    "DEFINE group contains more than one branch\0"    "DEFINE group contains more than one branch\0"
483    /* 55 */    /* 55 */
484    "repeating a DEFINE group is not allowed\0"    "repeating a DEFINE group is not allowed\0"  /** DEAD **/
485    "inconsistent NEWLINE options\0"    "inconsistent NEWLINE options\0"
486    "\\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"
487    "a numbered reference must not be zero\0"    "a numbered reference must not be zero\0"
488    "(*VERB) with an argument is not supported\0"    "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
489    /* 60 */    /* 60 */
490    "(*VERB) not recognized\0"    "(*VERB) not recognized\0"
491    "number is too big\0"    "number is too big\0"
492    "subpattern name expected\0"    "subpattern name expected\0"
493    "digit expected after (?+\0"    "digit expected after (?+\0"
494    "] is an invalid data character in JavaScript compatibility mode";    "] is an invalid data character in JavaScript compatibility mode\0"
495      /* 65 */
496      "different names for subpatterns of the same number are not allowed\0"
497      "(*MARK) must have an argument\0"
498      "this version of PCRE is not compiled with Unicode property support\0"
499      "\\c must be followed by an ASCII character\0"
500      "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
501      /* 70 */
502      "internal error: unknown opcode in find_fixedlength()\0"
503      "\\N is not supported in a class\0"
504      "too many forward references\0"
505      "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
506      "invalid UTF-16 string\0"
507      /* 75 */
508      "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0"
509      "character value in \\u.... sequence is too large\0"
510      "invalid UTF-32 string\0"
511      ;
512    
513  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
514  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 322  For convenience, we use the same bit def Line 526  For convenience, we use the same bit def
526    
527  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
528    
529  #ifndef EBCDIC  /* This is the "normal" case, for ASCII systems */  /* Using a simple comparison for decimal numbers rather than a memory read
530  static const unsigned char digitab[] =  is much faster, and the resulting code is simpler (the compiler turns it
531    into a subtraction and unsigned comparison). */
532    
533    #define IS_DIGIT(x) ((x) >= CHAR_0 && (x) <= CHAR_9)
534    
535    #ifndef EBCDIC
536    
537    /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
538    UTF-8 mode. */
539    
540    static const pcre_uint8 digitab[] =
541    {    {
542    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
543    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */
# Line 358  static const unsigned char digitab[] = Line 572  static const unsigned char digitab[] =
572    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
573    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
574    
575  #else           /* This is the "abnormal" case, for EBCDIC systems */  #else
576  static const unsigned char digitab[] =  
577    /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
578    
579    static const pcre_uint8 digitab[] =
580    {    {
581    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
582    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */
# Line 394  static const unsigned char digitab[] = Line 611  static const unsigned char digitab[] =
611    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */
612    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */
613    
614  static const unsigned char ebcdic_chartab[] = { /* chartable partial dup */  static const pcre_uint8 ebcdic_chartab[] = { /* chartable partial dup */
615    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */
616    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
617    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */
# Line 430  static const unsigned char ebcdic_charta Line 647  static const unsigned char ebcdic_charta
647  #endif  #endif
648    
649    
 /* Definition to allow mutual recursion */  
   
 static BOOL  
   compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,  
     int *, int *, branch_chain *, compile_data *, int *);  
   
   
650    
651  /*************************************************  /*************************************************
652  *            Find an error text                  *  *            Find an error text                  *
# Line 455  static const char * Line 665  static const char *
665  find_error_text(int n)  find_error_text(int n)
666  {  {
667  const char *s = error_texts;  const char *s = error_texts;
668  for (; n > 0; n--) while (*s++ != 0);  for (; n > 0; n--)
669      {
670      while (*s++ != 0) {};
671      if (*s == 0) return "Error text not found (please report)";
672      }
673  return s;  return s;
674  }  }
675    
676    
677  /*************************************************  /*************************************************
678    *           Expand the workspace                 *
679    *************************************************/
680    
681    /* This function is called during the second compiling phase, if the number of
682    forward references fills the existing workspace, which is originally a block on
683    the stack. A larger block is obtained from malloc() unless the ultimate limit
684    has been reached or the increase will be rather small.
685    
686    Argument: pointer to the compile data block
687    Returns:  0 if all went well, else an error number
688    */
689    
690    static int
691    expand_workspace(compile_data *cd)
692    {
693    pcre_uchar *newspace;
694    int newsize = cd->workspace_size * 2;
695    
696    if (newsize > COMPILE_WORK_SIZE_MAX) newsize = COMPILE_WORK_SIZE_MAX;
697    if (cd->workspace_size >= COMPILE_WORK_SIZE_MAX ||
698        newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)
699     return ERR72;
700    
701    newspace = (PUBL(malloc))(IN_UCHARS(newsize));
702    if (newspace == NULL) return ERR21;
703    memcpy(newspace, cd->start_workspace, cd->workspace_size * sizeof(pcre_uchar));
704    cd->hwm = (pcre_uchar *)newspace + (cd->hwm - cd->start_workspace);
705    if (cd->workspace_size > COMPILE_WORK_SIZE)
706      (PUBL(free))((void *)cd->start_workspace);
707    cd->start_workspace = newspace;
708    cd->workspace_size = newsize;
709    return 0;
710    }
711    
712    
713    
714    /*************************************************
715    *            Check for counted repeat            *
716    *************************************************/
717    
718    /* This function is called when a '{' is encountered in a place where it might
719    start a quantifier. It looks ahead to see if it really is a quantifier or not.
720    It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
721    where the ddds are digits.
722    
723    Arguments:
724      p         pointer to the first char after '{'
725    
726    Returns:    TRUE or FALSE
727    */
728    
729    static BOOL
730    is_counted_repeat(const pcre_uchar *p)
731    {
732    if (!IS_DIGIT(*p)) return FALSE;
733    p++;
734    while (IS_DIGIT(*p)) p++;
735    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
736    
737    if (*p++ != CHAR_COMMA) return FALSE;
738    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
739    
740    if (!IS_DIGIT(*p)) return FALSE;
741    p++;
742    while (IS_DIGIT(*p)) p++;
743    
744    return (*p == CHAR_RIGHT_CURLY_BRACKET);
745    }
746    
747    
748    
749    /*************************************************
750  *            Handle escapes                      *  *            Handle escapes                      *
751  *************************************************/  *************************************************/
752    
753  /* This function is called when a \ has been encountered. It either returns a  /* This function is called when a \ has been encountered. It either returns a
754  positive value for a simple escape such as \n, or a negative value which  positive value for a simple escape such as \n, or 0 for a data character
755  encodes one of the more complicated things such as \d. A backreference to group  which will be placed in chptr. A backreference to group n is returned as
756  n is returned as -(ESC_REF + n); ESC_REF is the highest ESC_xxx macro. When  negative n. When UTF-8 is enabled, a positive value greater than 255 may
757  UTF-8 is enabled, a positive value greater than 255 may be returned. On entry,  be returned in chptr.
758  ptr is pointing at the \. On exit, it is on the final character of the escape  On entry,ptr is pointing at the \. On exit, it is on the final character of the
759  sequence.  escape sequence.
760    
761  Arguments:  Arguments:
762    ptrptr         points to the pattern position pointer    ptrptr         points to the pattern position pointer
763      chptr          points to the data character
764    errorcodeptr   points to the errorcode variable    errorcodeptr   points to the errorcode variable
765    bracount       number of previous extracting brackets    bracount       number of previous extracting brackets
766    options        the options bits    options        the options bits
767    isclass        TRUE if inside a character class    isclass        TRUE if inside a character class
768    
769  Returns:         zero or positive => a data character  Returns:         zero => a data character
770                   negative => a special escape sequence                   positive => a special escape sequence
771                     negative => a back reference
772                   on error, errorcodeptr is set                   on error, errorcodeptr is set
773  */  */
774    
775  static int  static int
776  check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,  check_escape(const pcre_uchar **ptrptr, pcre_uint32 *chptr, int *errorcodeptr,
777    int options, BOOL isclass)    int bracount, int options, BOOL isclass)
778  {  {
779  BOOL utf8 = (options & PCRE_UTF8) != 0;  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
780  const uschar *ptr = *ptrptr + 1;  BOOL utf = (options & PCRE_UTF8) != 0;
781  int c, i;  const pcre_uchar *ptr = *ptrptr + 1;
782    pcre_uint32 c;
783    int escape = 0;
784    int i;
785    
786  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
787  ptr--;                            /* Set pointer back to the last byte */  ptr--;                            /* Set pointer back to the last byte */
# Line 503  if (c == 0) *errorcodeptr = ERR1; Line 794  if (c == 0) *errorcodeptr = ERR1;
794  in a table. A non-zero result is something that can be returned immediately.  in a table. A non-zero result is something that can be returned immediately.
795  Otherwise further processing may be required. */  Otherwise further processing may be required. */
796    
797  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
798  else if (c < '0' || c > 'z') {}                           /* Not alphanumeric */  /* Not alphanumeric */
799  else if ((i = escapes[c - '0']) != 0) c = i;  else if (c < CHAR_0 || c > CHAR_z) {}
800    else if ((i = escapes[c - CHAR_0]) != 0) { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
801    
802  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
803  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */  /* Not alphanumeric */
804  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if (c < CHAR_a || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}
805    else if ((i = escapes[c - 0x48]) != 0)  { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
806  #endif  #endif
807    
808  /* Escapes that need further processing, or are illegal. */  /* Escapes that need further processing, or are illegal. */
809    
810  else  else
811    {    {
812    const uschar *oldptr;    const pcre_uchar *oldptr;
813    BOOL braced, negated;    BOOL braced, negated, overflow;
814      int s;
815    
816    switch (c)    switch (c)
817      {      {
818      /* A number of Perl escapes are not handled by PCRE. We give an explicit      /* A number of Perl escapes are not handled by PCRE. We give an explicit
819      error. */      error. */
820    
821      case 'l':      case CHAR_l:
822      case 'L':      case CHAR_L:
     case 'N':  
     case 'u':  
     case 'U':  
823      *errorcodeptr = ERR37;      *errorcodeptr = ERR37;
824      break;      break;
825    
826      /* \g must be followed by one of a number of specific things:      case CHAR_u:
827        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
828          {
829          /* In JavaScript, \u must be followed by four hexadecimal numbers.
830          Otherwise it is a lowercase u letter. */
831          if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
832            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0
833            && MAX_255(ptr[3]) && (digitab[ptr[3]] & ctype_xdigit) != 0
834            && MAX_255(ptr[4]) && (digitab[ptr[4]] & ctype_xdigit) != 0)
835            {
836            c = 0;
837            for (i = 0; i < 4; ++i)
838              {
839              register pcre_uint32 cc = *(++ptr);
840    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
841              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
842              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
843    #else           /* EBCDIC coding */
844              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
845              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
846    #endif
847              }
848    
849    #if defined COMPILE_PCRE8
850            if (c > (utf ? 0x10ffff : 0xff))
851    #elif defined COMPILE_PCRE16
852            if (c > (utf ? 0x10ffff : 0xffff))
853    #elif defined COMPILE_PCRE32
854            if (utf && c > 0x10ffff)
855    #endif
856              {
857              *errorcodeptr = ERR76;
858              }
859            else if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
860            }
861          }
862        else
863          *errorcodeptr = ERR37;
864        break;
865    
866        case CHAR_U:
867        /* In JavaScript, \U is an uppercase U letter. */
868        if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
869        break;
870    
871        /* In a character class, \g is just a literal "g". Outside a character
872        class, \g must be followed by one of a number of specific things:
873    
874      (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
875      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 546  else Line 883  else
883      (3) For Oniguruma compatibility we also support \g followed by a name or a      (3) For Oniguruma compatibility we also support \g followed by a name or a
884      number either in angle brackets or in single quotes. However, these are      number either in angle brackets or in single quotes. However, these are
885      (possibly recursive) subroutine calls, _not_ backreferences. Just return      (possibly recursive) subroutine calls, _not_ backreferences. Just return
886      the -ESC_g code (cf \k). */      the ESC_g code (cf \k). */
887    
888      case 'g':      case CHAR_g:
889      if (ptr[1] == '<' || ptr[1] == '\'')      if (isclass) break;
890        if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
891        {        {
892        c = -ESC_g;        escape = ESC_g;
893        break;        break;
894        }        }
895    
896      /* Handle the Perl-compatible cases */      /* Handle the Perl-compatible cases */
897    
898      if (ptr[1] == '{')      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
899        {        {
900        const uschar *p;        const pcre_uchar *p;
901        for (p = ptr+2; *p != 0 && *p != '}'; p++)        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
902          if (*p != '-' && (digitab[*p] & ctype_digit) == 0) break;          if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
903        if (*p != 0 && *p != '}')        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
904          {          {
905          c = -ESC_k;          escape = ESC_k;
906          break;          break;
907          }          }
908        braced = TRUE;        braced = TRUE;
# Line 572  else Line 910  else
910        }        }
911      else braced = FALSE;      else braced = FALSE;
912    
913      if (ptr[1] == '-')      if (ptr[1] == CHAR_MINUS)
914        {        {
915        negated = TRUE;        negated = TRUE;
916        ptr++;        ptr++;
917        }        }
918      else negated = FALSE;      else negated = FALSE;
919    
920      c = 0;      /* The integer range is limited by the machine's int representation. */
921      while ((digitab[ptr[1]] & ctype_digit) != 0)      s = 0;
922        c = c * 10 + *(++ptr) - '0';      overflow = FALSE;
923        while (IS_DIGIT(ptr[1]))
924      if (c < 0)   /* Integer overflow */        {
925          if (s > INT_MAX / 10 - 1) /* Integer overflow */
926            {
927            overflow = TRUE;
928            break;
929            }
930          s = s * 10 + (int)(*(++ptr) - CHAR_0);
931          }
932        if (overflow) /* Integer overflow */
933        {        {
934          while (IS_DIGIT(ptr[1]))
935            ptr++;
936        *errorcodeptr = ERR61;        *errorcodeptr = ERR61;
937        break;        break;
938        }        }
939    
940      if (braced && *(++ptr) != '}')      if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
941        {        {
942        *errorcodeptr = ERR57;        *errorcodeptr = ERR57;
943        break;        break;
944        }        }
945    
946      if (c == 0)      if (s == 0)
947        {        {
948        *errorcodeptr = ERR58;        *errorcodeptr = ERR58;
949        break;        break;
# Line 603  else Line 951  else
951    
952      if (negated)      if (negated)
953        {        {
954        if (c > bracount)        if (s > bracount)
955          {          {
956          *errorcodeptr = ERR15;          *errorcodeptr = ERR15;
957          break;          break;
958          }          }
959        c = bracount - (c - 1);        s = bracount - (s - 1);
960        }        }
961    
962      c = -(ESC_REF + c);      escape = -s;
963      break;      break;
964    
965      /* The handling of escape sequences consisting of a string of digits      /* The handling of escape sequences consisting of a string of digits
# Line 626  else Line 974  else
974      value is greater than 377, the least significant 8 bits are taken. Inside a      value is greater than 377, the least significant 8 bits are taken. Inside a
975      character class, \ followed by a digit is always an octal number. */      character class, \ followed by a digit is always an octal number. */
976    
977      case '1': case '2': case '3': case '4': case '5':      case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4: case CHAR_5:
978      case '6': case '7': case '8': case '9':      case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
979    
980      if (!isclass)      if (!isclass)
981        {        {
982        oldptr = ptr;        oldptr = ptr;
983        c -= '0';        /* The integer range is limited by the machine's int representation. */
984        while ((digitab[ptr[1]] & ctype_digit) != 0)        s = (int)(c -CHAR_0);
985          c = c * 10 + *(++ptr) - '0';        overflow = FALSE;
986        if (c < 0)    /* Integer overflow */        while (IS_DIGIT(ptr[1]))
987            {
988            if (s > INT_MAX / 10 - 1) /* Integer overflow */
989              {
990              overflow = TRUE;
991              break;
992              }
993            s = s * 10 + (int)(*(++ptr) - CHAR_0);
994            }
995          if (overflow) /* Integer overflow */
996          {          {
997            while (IS_DIGIT(ptr[1]))
998              ptr++;
999          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
1000          break;          break;
1001          }          }
1002        if (c < 10 || c <= bracount)        if (s < 10 || s <= bracount)
1003          {          {
1004          c = -(ESC_REF + c);          escape = -s;
1005          break;          break;
1006          }          }
1007        ptr = oldptr;      /* Put the pointer back and fall through */        ptr = oldptr;      /* Put the pointer back and fall through */
# Line 652  else Line 1011  else
1011      generates a binary zero byte and treats the digit as a following literal.      generates a binary zero byte and treats the digit as a following literal.
1012      Thus we have to pull back the pointer by one. */      Thus we have to pull back the pointer by one. */
1013    
1014      if ((c = *ptr) >= '8')      if ((c = *ptr) >= CHAR_8)
1015        {        {
1016        ptr--;        ptr--;
1017        c = 0;        c = 0;
# Line 662  else Line 1021  else
1021      /* \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
1022      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
1023      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
1024      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,
1025      than 3 octal digits. */      but no more than 3 octal digits. */
1026    
1027      case '0':      case CHAR_0:
1028      c -= '0';      c -= CHAR_0;
1029      while(i++ < 2 && ptr[1] >= '0' && ptr[1] <= '7')      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
1030          c = c * 8 + *(++ptr) - '0';          c = c * 8 + *(++ptr) - CHAR_0;
1031      if (!utf8 && c > 255) *errorcodeptr = ERR51;  #ifdef COMPILE_PCRE8
1032        if (!utf && c > 0xff) *errorcodeptr = ERR51;
1033    #endif
1034      break;      break;
1035    
1036      /* \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
1037      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.
1038      treated as a data character. */      If not, { is treated as a data character. */
1039    
1040        case CHAR_x:
1041        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
1042          {
1043          /* In JavaScript, \x must be followed by two hexadecimal numbers.
1044          Otherwise it is a lowercase x letter. */
1045          if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
1046            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)
1047            {
1048            c = 0;
1049            for (i = 0; i < 2; ++i)
1050              {
1051              register pcre_uint32 cc = *(++ptr);
1052    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1053              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
1054              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
1055    #else           /* EBCDIC coding */
1056              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
1057              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1058    #endif
1059              }
1060            }
1061          break;
1062          }
1063    
1064      case 'x':      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
     if (ptr[1] == '{')  
1065        {        {
1066        const uschar *pt = ptr + 2;        const pcre_uchar *pt = ptr + 2;
       int count = 0;  
1067    
1068        c = 0;        c = 0;
1069        while ((digitab[*pt] & ctype_xdigit) != 0)        overflow = FALSE;
1070          while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0)
1071          {          {
1072          register int cc = *pt++;          register pcre_uint32 cc = *pt++;
1073          if (c == 0 && cc == '0') continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
1074          count++;  
1075    #ifdef COMPILE_PCRE32
1076  #ifndef EBCDIC  /* ASCII coding */          if (c >= 0x10000000l) { overflow = TRUE; break; }
1077          if (cc >= 'a') cc -= 32;               /* Convert to upper case */  #endif
1078          c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));  
1079    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1080            if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
1081            c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
1082  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
1083          if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
1084          c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1085  #endif  #endif
1086    
1087    #if defined COMPILE_PCRE8
1088            if (c > (utf ? 0x10ffff : 0xff)) { overflow = TRUE; break; }
1089    #elif defined COMPILE_PCRE16
1090            if (c > (utf ? 0x10ffff : 0xffff)) { overflow = TRUE; break; }
1091    #elif defined COMPILE_PCRE32
1092            if (utf && c > 0x10ffff) { overflow = TRUE; break; }
1093    #endif
1094            }
1095    
1096          if (overflow)
1097            {
1098            while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0) pt++;
1099            *errorcodeptr = ERR34;
1100          }          }
1101    
1102        if (*pt == '}')        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
1103          {          {
1104          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
1105          ptr = pt;          ptr = pt;
1106          break;          break;
1107          }          }
# Line 712  else Line 1113  else
1113      /* Read just a single-byte hex-defined char */      /* Read just a single-byte hex-defined char */
1114    
1115      c = 0;      c = 0;
1116      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)
1117        {        {
1118        int cc;                               /* Some compilers don't like ++ */        pcre_uint32 cc;                          /* Some compilers don't like */
1119        cc = *(++ptr);                        /* in initializers */        cc = *(++ptr);                           /* ++ in initializers */
1120  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1121        if (cc >= 'a') cc -= 32;              /* Convert to upper case */        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
1122        c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
1123  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
1124        if (cc <= 'z') cc += 64;              /* Convert to upper case */        if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
1125        c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1126  #endif  #endif
1127        }        }
1128      break;      break;
1129    
1130      /* 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.
1131      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
1132        coding is ASCII-specific, but then the whole concept of \cx is
1133      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
1134    
1135      case 'c':      case CHAR_c:
1136      c = *(++ptr);      c = *(++ptr);
1137      if (c == 0)      if (c == 0)
1138        {        {
1139        *errorcodeptr = ERR2;        *errorcodeptr = ERR2;
1140        break;        break;
1141        }        }
1142    #ifndef EBCDIC    /* ASCII/UTF-8 coding */
1143  #ifndef EBCDIC  /* ASCII coding */      if (c > 127)  /* Excludes all non-ASCII in either mode */
1144      if (c >= 'a' && c <= 'z') c -= 32;        {
1145          *errorcodeptr = ERR68;
1146          break;
1147          }
1148        if (c >= CHAR_a && c <= CHAR_z) c -= 32;
1149      c ^= 0x40;      c ^= 0x40;
1150  #else           /* EBCDIC coding */  #else             /* EBCDIC coding */
1151      if (c >= 'a' && c <= 'z') c += 64;      if (c >= CHAR_a && c <= CHAR_z) c += 64;
1152      c ^= 0xC0;      c ^= 0xC0;
1153  #endif  #endif
1154      break;      break;
# Line 764  else Line 1170  else
1170      }      }
1171    }    }
1172    
1173  *ptrptr = ptr;  /* Perl supports \N{name} for character names, as well as plain \N for "not
1174  return c;  newline". PCRE does not support \N{name}. However, it does support
1175  }  quantification such as \N{2,3}. */
1176    
1177    if (escape == ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
1178         !is_counted_repeat(ptr+2))
1179      *errorcodeptr = ERR37;
1180    
1181    /* If PCRE_UCP is set, we change the values for \d etc. */
1182    
1183    if ((options & PCRE_UCP) != 0 && escape >= ESC_D && escape <= ESC_w)
1184      escape += (ESC_DU - ESC_D);
1185    
1186    /* Set the pointer to the final character before returning. */
1187    
1188    *ptrptr = ptr;
1189    *chptr = c;
1190    return escape;
1191    }
1192    
1193  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
1194  /*************************************************  /*************************************************
# Line 783  escape sequence. Line 1203  escape sequence.
1203  Argument:  Argument:
1204    ptrptr         points to the pattern position pointer    ptrptr         points to the pattern position pointer
1205    negptr         points to a boolean that is set TRUE for negation else FALSE    negptr         points to a boolean that is set TRUE for negation else FALSE
1206    dptr           points to an int that is set to the detailed property value    ptypeptr       points to an unsigned int that is set to the type value
1207      pdataptr       points to an unsigned int that is set to the detailed property value
1208    errorcodeptr   points to the error code variable    errorcodeptr   points to the error code variable
1209    
1210  Returns:         type value from ucp_type_table, or -1 for an invalid type  Returns:         TRUE if the type value was found, or FALSE for an invalid type
1211  */  */
1212    
1213  static int  static BOOL
1214  get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, unsigned int *ptypeptr,
1215      unsigned int *pdataptr, int *errorcodeptr)
1216  {  {
1217  int c, i, bot, top;  pcre_uchar c;
1218  const uschar *ptr = *ptrptr;  int i, bot, top;
1219  char name[32];  const pcre_uchar *ptr = *ptrptr;
1220    pcre_uchar name[32];
1221    
1222  c = *(++ptr);  c = *(++ptr);
1223  if (c == 0) goto ERROR_RETURN;  if (c == 0) goto ERROR_RETURN;
# Line 804  if (c == 0) goto ERROR_RETURN; Line 1227  if (c == 0) goto ERROR_RETURN;
1227  /* \P or \p can be followed by a name in {}, optionally preceded by ^ for  /* \P or \p can be followed by a name in {}, optionally preceded by ^ for
1228  negation. */  negation. */
1229    
1230  if (c == '{')  if (c == CHAR_LEFT_CURLY_BRACKET)
1231    {    {
1232    if (ptr[1] == '^')    if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
1233      {      {
1234      *negptr = TRUE;      *negptr = TRUE;
1235      ptr++;      ptr++;
1236      }      }
1237    for (i = 0; i < (int)sizeof(name) - 1; i++)    for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
1238      {      {
1239      c = *(++ptr);      c = *(++ptr);
1240      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
1241      if (c == '}') break;      if (c == CHAR_RIGHT_CURLY_BRACKET) break;
1242      name[i] = c;      name[i] = c;
1243      }      }
1244    if (c !='}') goto ERROR_RETURN;    if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
1245    name[i] = 0;    name[i] = 0;
1246    }    }
1247    
# Line 835  else Line 1258  else
1258  /* Search for a recognized property name using binary chop */  /* Search for a recognized property name using binary chop */
1259    
1260  bot = 0;  bot = 0;
1261  top = _pcre_utt_size;  top = PRIV(utt_size);
1262    
1263  while (bot < top)  while (bot < top)
1264    {    {
1265      int r;
1266    i = (bot + top) >> 1;    i = (bot + top) >> 1;
1267    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);    r = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
1268    if (c == 0)    if (r == 0)
1269      {      {
1270      *dptr = _pcre_utt[i].value;      *ptypeptr = PRIV(utt)[i].type;
1271      return _pcre_utt[i].type;      *pdataptr = PRIV(utt)[i].value;
1272        return TRUE;
1273      }      }
1274    if (c > 0) bot = i + 1; else top = i;    if (r > 0) bot = i + 1; else top = i;
1275    }    }
1276    
1277  *errorcodeptr = ERR47;  *errorcodeptr = ERR47;
1278  *ptrptr = ptr;  *ptrptr = ptr;
1279  return -1;  return FALSE;
1280    
1281  ERROR_RETURN:  ERROR_RETURN:
1282  *errorcodeptr = ERR46;  *errorcodeptr = ERR46;
1283  *ptrptr = ptr;  *ptrptr = ptr;
1284  return -1;  return FALSE;
1285  }  }
1286  #endif  #endif
1287    
# Line 864  return -1; Line 1289  return -1;
1289    
1290    
1291  /*************************************************  /*************************************************
 *            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 == '}') return TRUE;  
   
 if (*p++ != ',') return FALSE;  
 if (*p == '}') return TRUE;  
   
 if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  
 while ((digitab[*p] & ctype_digit) != 0) p++;  
   
 return (*p == '}');  
 }  
   
   
   
 /*************************************************  
1292  *         Read repeat counts                     *  *         Read repeat counts                     *
1293  *************************************************/  *************************************************/
1294    
# Line 915  Returns:         pointer to '}' on succe Line 1307  Returns:         pointer to '}' on succe
1307                   current ptr on error, with errorcodeptr set non-zero                   current ptr on error, with errorcodeptr set non-zero
1308  */  */
1309    
1310  static const uschar *  static const pcre_uchar *
1311  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)
1312  {  {
1313  int min = 0;  int min = 0;
1314  int max = -1;  int max = -1;
# Line 924  int max = -1; Line 1316  int max = -1;
1316  /* 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
1317  an integer overflow. */  an integer overflow. */
1318    
1319  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';  while (IS_DIGIT(*p)) min = min * 10 + (int)(*p++ - CHAR_0);
1320  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
1321    {    {
1322    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 934  if (min < 0 || min > 65535) Line 1326  if (min < 0 || min > 65535)
1326  /* Read the maximum value if there is one, and again do a paranoid on its size.  /* Read the maximum value if there is one, and again do a paranoid on its size.
1327  Also, max must not be less than min. */  Also, max must not be less than min. */
1328    
1329  if (*p == '}') max = min; else  if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
1330    {    {
1331    if (*(++p) != '}')    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
1332      {      {
1333      max = 0;      max = 0;
1334      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';      while(IS_DIGIT(*p)) max = max * 10 + (int)(*p++ - CHAR_0);
1335      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
1336        {        {
1337        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 964  return p; Line 1356  return p;
1356    
1357    
1358  /*************************************************  /*************************************************
1359  *       Find forward referenced subpattern       *  *  Subroutine for finding forward reference      *
1360  *************************************************/  *************************************************/
1361    
1362  /* This function scans along a pattern's text looking for capturing  /* This recursive function is called only from find_parens() below. The
1363    top-level call starts at the beginning of the pattern. All other calls must
1364    start at a parenthesis. It scans along a pattern's text looking for capturing
1365  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
1366  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
1367  returns when it reaches a given numbered subpattern. This is used for forward  returns when it reaches a given numbered subpattern. Recursion is used to keep
1368  references to subpatterns. We know that if (?P< is encountered, the name will  track of subpatterns that reset the capturing group numbers - the (?| feature.
1369  be terminated by '>' because that is checked in the first pass.  
1370    This function was originally called only from the second pass, in which we know
1371    that if (?< or (?' or (?P< is encountered, the name will be correctly
1372    terminated because that is checked in the first pass. There is now one call to
1373    this function in the first pass, to check for a recursive back reference by
1374    name (so that we can make the whole group atomic). In this case, we need check
1375    only up to the current position in the pattern, and that is still OK because
1376    and previous occurrences will have been checked. To make this work, the test
1377    for "end of pattern" is a check against cd->end_pattern in the main loop,
1378    instead of looking for a binary zero. This means that the special first-pass
1379    call can adjust cd->end_pattern temporarily. (Checks for binary zero while
1380    processing items within the loop are OK, because afterwards the main loop will
1381    terminate.)
1382    
1383  Arguments:  Arguments:
1384    ptr          current position in the pattern    ptrptr       address of the current character pointer (updated)
1385    cd           compile background data    cd           compile background data
1386    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1387    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1388    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1389      utf          TRUE if we are in UTF-8 / UTF-16 / UTF-32 mode
1390      count        pointer to the current capturing subpattern number (updated)
1391    
1392  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1393  */  */
1394    
1395  static int  static int
1396  find_parens(const uschar *ptr, compile_data *cd, const uschar *name, int lorn,  find_parens_sub(pcre_uchar **ptrptr, compile_data *cd, const pcre_uchar *name, int lorn,
1397    BOOL xmode)    BOOL xmode, BOOL utf, int *count)
1398  {  {
1399  const uschar *thisname;  pcre_uchar *ptr = *ptrptr;
1400  int count = cd->bracount;  int start_count = *count;
1401    int hwm_count = start_count;
1402    BOOL dup_parens = FALSE;
1403    
1404    /* If the first character is a parenthesis, check on the type of group we are
1405    dealing with. The very first call may not start with a parenthesis. */
1406    
1407  for (; *ptr != 0; ptr++)  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1408    {    {
1409    int term;    /* Handle specials such as (*SKIP) or (*UTF8) etc. */
1410    
1411      if (ptr[1] == CHAR_ASTERISK) ptr += 2;
1412    
1413      /* Handle a normal, unnamed capturing parenthesis. */
1414    
1415      else if (ptr[1] != CHAR_QUESTION_MARK)
1416        {
1417        *count += 1;
1418        if (name == NULL && *count == lorn) return *count;
1419        ptr++;
1420        }
1421    
1422      /* All cases now have (? at the start. Remember when we are in a group
1423      where the parenthesis numbers are duplicated. */
1424    
1425      else if (ptr[2] == CHAR_VERTICAL_LINE)
1426        {
1427        ptr += 3;
1428        dup_parens = TRUE;
1429        }
1430    
1431      /* Handle comments; all characters are allowed until a ket is reached. */
1432    
1433      else if (ptr[2] == CHAR_NUMBER_SIGN)
1434        {
1435        for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
1436        goto FAIL_EXIT;
1437        }
1438    
1439      /* Handle a condition. If it is an assertion, just carry on so that it
1440      is processed as normal. If not, skip to the closing parenthesis of the
1441      condition (there can't be any nested parens). */
1442    
1443      else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
1444        {
1445        ptr += 2;
1446        if (ptr[1] != CHAR_QUESTION_MARK)
1447          {
1448          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
1449          if (*ptr != 0) ptr++;
1450          }
1451        }
1452    
1453      /* Start with (? but not a condition. */
1454    
1455      else
1456        {
1457        ptr += 2;
1458        if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */
1459    
1460        /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */
1461    
1462        if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&
1463            ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1464          {
1465          pcre_uchar term;
1466          const pcre_uchar *thisname;
1467          *count += 1;
1468          if (name == NULL && *count == lorn) return *count;
1469          term = *ptr++;
1470          if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;
1471          thisname = ptr;
1472          while (*ptr != term) ptr++;
1473          if (name != NULL && lorn == (int)(ptr - thisname) &&
1474              STRNCMP_UC_UC(name, thisname, (unsigned int)lorn) == 0)
1475            return *count;
1476          term++;
1477          }
1478        }
1479      }
1480    
1481    /* Past any initial parenthesis handling, scan for parentheses or vertical
1482    bars. Stop if we get to cd->end_pattern. Note that this is important for the
1483    first-pass call when this value is temporarily adjusted to stop at the current
1484    position. So DO NOT change this to a test for binary zero. */
1485    
1486    for (; ptr < cd->end_pattern; ptr++)
1487      {
1488    /* Skip over backslashed characters and also entire \Q...\E */    /* Skip over backslashed characters and also entire \Q...\E */
1489    
1490    if (*ptr == '\\')    if (*ptr == CHAR_BACKSLASH)
1491      {      {
1492      if (*(++ptr) == 0) return -1;      if (*(++ptr) == 0) goto FAIL_EXIT;
1493      if (*ptr == 'Q') for (;;)      if (*ptr == CHAR_Q) for (;;)
1494        {        {
1495        while (*(++ptr) != 0 && *ptr != '\\');        while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1496        if (*ptr == 0) return -1;        if (*ptr == 0) goto FAIL_EXIT;
1497        if (*(++ptr) == 'E') break;        if (*(++ptr) == CHAR_E) break;
1498        }        }
1499      continue;      continue;
1500      }      }
# Line 1012  for (; *ptr != 0; ptr++) Line 1502  for (; *ptr != 0; ptr++)
1502    /* Skip over character classes; this logic must be similar to the way they    /* Skip over character classes; this logic must be similar to the way they
1503    are handled for real. If the first character is '^', skip it. Also, if the    are handled for real. If the first character is '^', skip it. Also, if the
1504    first few characters (either before or after ^) are \Q\E or \E we skip them    first few characters (either before or after ^) are \Q\E or \E we skip them
1505    too. This makes for compatibility with Perl. */    too. This makes for compatibility with Perl. Note the use of STR macros to
1506      encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */
1507    
1508    if (*ptr == '[')    if (*ptr == CHAR_LEFT_SQUARE_BRACKET)
1509      {      {
1510      BOOL negate_class = FALSE;      BOOL negate_class = FALSE;
1511      for (;;)      for (;;)
1512        {        {
1513        int c = *(++ptr);        if (ptr[1] == CHAR_BACKSLASH)
       if (c == '\\')  
1514          {          {
1515          if (ptr[1] == 'E') ptr++;          if (ptr[2] == CHAR_E)
1516            else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;            ptr+= 2;
1517              else break;          else if (STRNCMP_UC_C8(ptr + 2,
1518                     STR_Q STR_BACKSLASH STR_E, 3) == 0)
1519              ptr += 4;
1520            else
1521              break;
1522          }          }
1523        else if (!negate_class && c == '^')        else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
1524            {
1525          negate_class = TRUE;          negate_class = TRUE;
1526            ptr++;
1527            }
1528        else break;        else break;
1529        }        }
1530    
1531      /* If the next character is ']', it is a data character that must be      /* If the next character is ']', it is a data character that must be
1532      skipped, except in JavaScript compatibility mode. */      skipped, except in JavaScript compatibility mode. */
1533    
1534      if (ptr[1] == ']' && (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)      if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&
1535            (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
1536        ptr++;        ptr++;
1537    
1538      while (*(++ptr) != ']')      while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)
1539        {        {
1540        if (*ptr == 0) return -1;        if (*ptr == 0) return -1;
1541        if (*ptr == '\\')        if (*ptr == CHAR_BACKSLASH)
1542          {          {
1543          if (*(++ptr) == 0) return -1;          if (*(++ptr) == 0) goto FAIL_EXIT;
1544          if (*ptr == 'Q') for (;;)          if (*ptr == CHAR_Q) for (;;)
1545            {            {
1546            while (*(++ptr) != 0 && *ptr != '\\');            while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1547            if (*ptr == 0) return -1;            if (*ptr == 0) goto FAIL_EXIT;
1548            if (*(++ptr) == 'E') break;            if (*(++ptr) == CHAR_E) break;
1549            }            }
1550          continue;          continue;
1551          }          }
# Line 1057  for (; *ptr != 0; ptr++) Line 1555  for (; *ptr != 0; ptr++)
1555    
1556    /* Skip comments in /x mode */    /* Skip comments in /x mode */
1557    
1558    if (xmode && *ptr == '#')    if (xmode && *ptr == CHAR_NUMBER_SIGN)
1559      {      {
1560      while (*(++ptr) != 0 && *ptr != '\n');      ptr++;
1561      if (*ptr == 0) return -1;      while (*ptr != 0)
1562          {
1563          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
1564          ptr++;
1565    #ifdef SUPPORT_UTF
1566          if (utf) FORWARDCHAR(ptr);
1567    #endif
1568          }
1569        if (*ptr == 0) goto FAIL_EXIT;
1570      continue;      continue;
1571      }      }
1572    
1573    /* An opening parens must now be a real metacharacter */    /* Check for the special metacharacters */
1574    
1575    if (*ptr != '(') continue;    if (*ptr == CHAR_LEFT_PARENTHESIS)
   if (ptr[1] != '?' && ptr[1] != '*')  
1576      {      {
1577      count++;      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, count);
1578      if (name == NULL && count == lorn) return count;      if (rc > 0) return rc;
1579      continue;      if (*ptr == 0) goto FAIL_EXIT;
1580        }
1581    
1582      else if (*ptr == CHAR_RIGHT_PARENTHESIS)
1583        {
1584        if (dup_parens && *count < hwm_count) *count = hwm_count;
1585        goto FAIL_EXIT;
1586      }      }
1587    
1588    ptr += 2;    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
1589    if (*ptr == 'P') ptr++;                      /* Allow optional P */      {
1590        if (*count > hwm_count) hwm_count = *count;
1591        *count = start_count;
1592        }
1593      }
1594    
1595    /* We have to disambiguate (?<! and (?<= from (?<name> */  FAIL_EXIT:
1596    *ptrptr = ptr;
1597    return -1;
1598    }
1599    
   if ((*ptr != '<' || ptr[1] == '!' || ptr[1] == '=') &&  
        *ptr != '\'')  
     continue;  
1600    
   count++;  
1601    
1602    if (name == NULL && count == lorn) return count;  
1603    term = *ptr++;  /*************************************************
1604    if (term == '<') term = '>';  *       Find forward referenced subpattern       *
1605    thisname = ptr;  *************************************************/
1606    while (*ptr != term) ptr++;  
1607    if (name != NULL && lorn == ptr - thisname &&  /* This function scans along a pattern's text looking for capturing
1608        strncmp((const char *)name, (const char *)thisname, lorn) == 0)  subpatterns, and counting them. If it finds a named pattern that matches the
1609      return count;  name it is given, it returns its number. Alternatively, if the name is NULL, it
1610    returns when it reaches a given numbered subpattern. This is used for forward
1611    references to subpatterns. We used to be able to start this scan from the
1612    current compiling point, using the current count value from cd->bracount, and
1613    do it all in a single loop, but the addition of the possibility of duplicate
1614    subpattern numbers means that we have to scan from the very start, in order to
1615    take account of such duplicates, and to use a recursive function to keep track
1616    of the different types of group.
1617    
1618    Arguments:
1619      cd           compile background data
1620      name         name to seek, or NULL if seeking a numbered subpattern
1621      lorn         name length, or subpattern number if name is NULL
1622      xmode        TRUE if we are in /x mode
1623      utf          TRUE if we are in UTF-8 / UTF-16 / UTF-32 mode
1624    
1625    Returns:       the number of the found subpattern, or -1 if not found
1626    */
1627    
1628    static int
1629    find_parens(compile_data *cd, const pcre_uchar *name, int lorn, BOOL xmode,
1630      BOOL utf)
1631    {
1632    pcre_uchar *ptr = (pcre_uchar *)cd->start_pattern;
1633    int count = 0;
1634    int rc;
1635    
1636    /* If the pattern does not start with an opening parenthesis, the first call
1637    to find_parens_sub() will scan right to the end (if necessary). However, if it
1638    does start with a parenthesis, find_parens_sub() will return when it hits the
1639    matching closing parens. That is why we have to have a loop. */
1640    
1641    for (;;)
1642      {
1643      rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, &count);
1644      if (rc > 0 || *ptr++ == 0) break;
1645    }    }
1646    
1647  return -1;  return rc;
1648  }  }
1649    
1650    
1651    
1652    
1653  /*************************************************  /*************************************************
1654  *      Find first significant op code            *  *      Find first significant op code            *
1655  *************************************************/  *************************************************/
1656    
1657  /* This is called by several functions that scan a compiled expression looking  /* This is called by several functions that scan a compiled expression looking
1658  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
1659  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
1660  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
1661  assertions, and also the \b assertion; for others it does not.  does not.
1662    
1663  Arguments:  Arguments:
1664    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  
1665    skipassert   TRUE if certain assertions are to be skipped    skipassert   TRUE if certain assertions are to be skipped
1666    
1667  Returns:       pointer to the first significant opcode  Returns:       pointer to the first significant opcode
1668  */  */
1669    
1670  static const uschar*  static const pcre_uchar*
1671  first_significant_code(const uschar *code, int *options, int optbit,  first_significant_code(const pcre_uchar *code, BOOL skipassert)
   BOOL skipassert)  
1672  {  {
1673  for (;;)  for (;;)
1674    {    {
1675    switch ((int)*code)    switch ((int)*code)
1676      {      {
     case OP_OPT:  
     if (optbit > 0 && ((int)code[1] & optbit) != (*options & optbit))  
       *options = (int)code[1];  
     code += 2;  
     break;  
   
1677      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1678      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1679      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1680      if (!skipassert) return code;      if (!skipassert) return code;
1681      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
1682      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1683      break;      break;
1684    
1685      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
# Line 1149  for (;;) Line 1689  for (;;)
1689    
1690      case OP_CALLOUT:      case OP_CALLOUT:
1691      case OP_CREF:      case OP_CREF:
1692        case OP_NCREF:
1693      case OP_RREF:      case OP_RREF:
1694        case OP_NRREF:
1695      case OP_DEF:      case OP_DEF:
1696      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1697      break;      break;
1698    
1699      default:      default:
# Line 1165  for (;;) Line 1707  for (;;)
1707    
1708    
1709  /*************************************************  /*************************************************
1710  *        Find the fixed length of a pattern      *  *        Find the fixed length of a branch       *
1711  *************************************************/  *************************************************/
1712    
1713  /* Scan a pattern and compute the fixed length of subject that will match it,  /* Scan a branch and compute the fixed length of subject that will match it,
1714  if the length is fixed. This is needed for dealing with backward assertions.  if the length is fixed. This is needed for dealing with backward assertions.
1715  In UTF8 mode, the result is in characters rather than bytes.  In UTF8 mode, the result is in characters rather than bytes. The branch is
1716    temporarily terminated with OP_END when this function is called.
1717    
1718    This function is called when a backward assertion is encountered, so that if it
1719    fails, the error message can point to the correct place in the pattern.
1720    However, we cannot do this when the assertion contains subroutine calls,
1721    because they can be forward references. We solve this by remembering this case
1722    and doing the check at the end; a flag specifies which mode we are running in.
1723    
1724  Arguments:  Arguments:
1725    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1726    options  the compiling options    utf      TRUE in UTF-8 / UTF-16 / UTF-32 mode
1727      atend    TRUE if called when the pattern is complete
1728  Returns:   the fixed length, or -1 if there is no fixed length,    cd       the "compile data" structure
1729               or -2 if \C was encountered  
1730    Returns:   the fixed length,
1731                 or -1 if there is no fixed length,
1732                 or -2 if \C was encountered (in UTF-8 mode only)
1733                 or -3 if an OP_RECURSE item was encountered and atend is FALSE
1734                 or -4 if an unknown opcode was encountered (internal error)
1735  */  */
1736    
1737  static int  static int
1738  find_fixedlength(uschar *code, int options)  find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd)
1739  {  {
1740  int length = -1;  int length = -1;
1741    
1742  register int branchlength = 0;  register int branchlength = 0;
1743  register uschar *cc = code + 1 + LINK_SIZE;  register pcre_uchar *cc = code + 1 + LINK_SIZE;
1744    
1745  /* 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
1746  branch, check the length against that of the other branches. */  branch, check the length against that of the other branches. */
# Line 1194  branch, check the length against that of Line 1748  branch, check the length against that of
1748  for (;;)  for (;;)
1749    {    {
1750    int d;    int d;
1751    register int op = *cc;    pcre_uchar *ce, *cs;
1752      register pcre_uchar op = *cc;
1753    
1754    switch (op)    switch (op)
1755      {      {
1756        /* We only need to continue for OP_CBRA (normal capturing bracket) and
1757        OP_BRA (normal non-capturing bracket) because the other variants of these
1758        opcodes are all concerned with unlimited repeated groups, which of course
1759        are not of fixed length. */
1760    
1761      case OP_CBRA:      case OP_CBRA:
1762      case OP_BRA:      case OP_BRA:
1763      case OP_ONCE:      case OP_ONCE:
1764        case OP_ONCE_NC:
1765      case OP_COND:      case OP_COND:
1766      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);      d = find_fixedlength(cc + ((op == OP_CBRA)? IMM2_SIZE : 0), utf, atend, cd);
1767      if (d < 0) return d;      if (d < 0) return d;
1768      branchlength += d;      branchlength += d;
1769      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1770      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1771      break;      break;
1772    
1773      /* 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.
1774      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
1775      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
1776        the same code. Note that we must not include the OP_KETRxxx opcodes here,
1777        because they all imply an unlimited repeat. */
1778    
1779      case OP_ALT:      case OP_ALT:
1780      case OP_KET:      case OP_KET:
     case OP_KETRMAX:  
     case OP_KETRMIN:  
1781      case OP_END:      case OP_END:
1782        case OP_ACCEPT:
1783        case OP_ASSERT_ACCEPT:
1784      if (length < 0) length = branchlength;      if (length < 0) length = branchlength;
1785        else if (length != branchlength) return -1;        else if (length != branchlength) return -1;
1786      if (*cc != OP_ALT) return length;      if (*cc != OP_ALT) return length;
# Line 1224  for (;;) Line 1788  for (;;)
1788      branchlength = 0;      branchlength = 0;
1789      break;      break;
1790    
1791        /* A true recursion implies not fixed length, but a subroutine call may
1792        be OK. If the subroutine is a forward reference, we can't deal with
1793        it until the end of the pattern, so return -3. */
1794    
1795        case OP_RECURSE:
1796        if (!atend) return -3;
1797        cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1798        do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
1799        if (cc > cs && cc < ce) return -1;                    /* Recursion */
1800        d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd);
1801        if (d < 0) return d;
1802        branchlength += d;
1803        cc += 1 + LINK_SIZE;
1804        break;
1805    
1806      /* Skip over assertive subpatterns */      /* Skip over assertive subpatterns */
1807    
1808      case OP_ASSERT:      case OP_ASSERT:
# Line 1231  for (;;) Line 1810  for (;;)
1810      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1811      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1812      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1813      /* Fall through */      cc += PRIV(OP_lengths)[*cc];
1814        break;
1815    
1816      /* Skip over things that don't match chars */      /* Skip over things that don't match chars */
1817    
1818      case OP_REVERSE:      case OP_MARK:
1819        case OP_PRUNE_ARG:
1820        case OP_SKIP_ARG:
1821        case OP_THEN_ARG:
1822        cc += cc[1] + PRIV(OP_lengths)[*cc];
1823        break;
1824    
1825        case OP_CALLOUT:
1826        case OP_CIRC:
1827        case OP_CIRCM:
1828        case OP_CLOSE:
1829        case OP_COMMIT:
1830      case OP_CREF:      case OP_CREF:
     case OP_RREF:  
1831      case OP_DEF:      case OP_DEF:
1832      case OP_OPT:      case OP_DOLL:
1833      case OP_CALLOUT:      case OP_DOLLM:
     case OP_SOD:  
     case OP_SOM:  
1834      case OP_EOD:      case OP_EOD:
1835      case OP_EODN:      case OP_EODN:
1836      case OP_CIRC:      case OP_FAIL:
1837      case OP_DOLL:      case OP_NCREF:
1838        case OP_NRREF:
1839      case OP_NOT_WORD_BOUNDARY:      case OP_NOT_WORD_BOUNDARY:
1840        case OP_PRUNE:
1841        case OP_REVERSE:
1842        case OP_RREF:
1843        case OP_SET_SOM:
1844        case OP_SKIP:
1845        case OP_SOD:
1846        case OP_SOM:
1847        case OP_THEN:
1848      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
1849      cc += _pcre_OP_lengths[*cc];      cc += PRIV(OP_lengths)[*cc];
1850      break;      break;
1851    
1852      /* Handle literal characters */      /* Handle literal characters */
1853    
1854      case OP_CHAR:      case OP_CHAR:
1855      case OP_CHARNC:      case OP_CHARI:
1856      case OP_NOT:      case OP_NOT:
1857        case OP_NOTI:
1858      branchlength++;      branchlength++;
1859      cc += 2;      cc += 2;
1860  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1861      if ((options & PCRE_UTF8) != 0)      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
       {  
       while ((*cc & 0xc0) == 0x80) cc++;  
       }  
1862  #endif  #endif
1863      break;      break;
1864    
# Line 1271  for (;;) Line 1866  for (;;)
1866      need to skip over a multibyte character in UTF8 mode.  */      need to skip over a multibyte character in UTF8 mode.  */
1867    
1868      case OP_EXACT:      case OP_EXACT:
1869      branchlength += GET2(cc,1);      case OP_EXACTI:
1870      cc += 4;      case OP_NOTEXACT:
1871  #ifdef SUPPORT_UTF8      case OP_NOTEXACTI:
1872      if ((options & PCRE_UTF8) != 0)      branchlength += (int)GET2(cc,1);
1873        {      cc += 2 + IMM2_SIZE;
1874        while((*cc & 0x80) == 0x80) cc++;  #ifdef SUPPORT_UTF
1875        }      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1876  #endif  #endif
1877      break;      break;
1878    
1879      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1880      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1881      if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;      if (cc[1 + IMM2_SIZE] == OP_PROP || cc[1 + IMM2_SIZE] == OP_NOTPROP)
1882      cc += 4;        cc += 2;
1883        cc += 1 + IMM2_SIZE + 1;
1884      break;      break;
1885    
1886      /* Handle single-char matchers */      /* Handle single-char matchers */
# Line 1294  for (;;) Line 1890  for (;;)
1890      cc += 2;      cc += 2;
1891      /* Fall through */      /* Fall through */
1892    
1893        case OP_HSPACE:
1894        case OP_VSPACE:
1895        case OP_NOT_HSPACE:
1896        case OP_NOT_VSPACE:
1897      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
1898      case OP_DIGIT:      case OP_DIGIT:
1899      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
# Line 1306  for (;;) Line 1906  for (;;)
1906      cc++;      cc++;
1907      break;      break;
1908    
1909      /* The single-byte matcher isn't allowed */      /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
1910        otherwise \C is coded as OP_ALLANY. */
1911    
1912      case OP_ANYBYTE:      case OP_ANYBYTE:
1913      return -2;      return -2;
1914    
1915      /* Check a class for variable quantification */      /* Check a class for variable quantification */
1916    
1917  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1918      case OP_XCLASS:      case OP_XCLASS:
1919      cc += GET(cc, 1) - 33;      cc += GET(cc, 1) - PRIV(OP_lengths)[OP_CLASS];
1920      /* Fall through */      /* Fall through */
1921  #endif  #endif
1922    
1923      case OP_CLASS:      case OP_CLASS:
1924      case OP_NCLASS:      case OP_NCLASS:
1925      cc += 33;      cc += PRIV(OP_lengths)[OP_CLASS];
1926    
1927      switch (*cc)      switch (*cc)
1928        {        {
1929          case OP_CRPLUS:
1930          case OP_CRMINPLUS:
1931        case OP_CRSTAR:        case OP_CRSTAR:
1932        case OP_CRMINSTAR:        case OP_CRMINSTAR:
1933        case OP_CRQUERY:        case OP_CRQUERY:
# Line 1333  for (;;) Line 1936  for (;;)
1936    
1937        case OP_CRRANGE:        case OP_CRRANGE:
1938        case OP_CRMINRANGE:        case OP_CRMINRANGE:
1939        if (GET2(cc,1) != GET2(cc,3)) return -1;        if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
1940        branchlength += GET2(cc,1);        branchlength += (int)GET2(cc,1);
1941        cc += 5;        cc += 1 + 2 * IMM2_SIZE;
1942        break;        break;
1943    
1944        default:        default:
# Line 1345  for (;;) Line 1948  for (;;)
1948    
1949      /* Anything else is variable length */      /* Anything else is variable length */
1950    
1951      default:      case OP_ANYNL:
1952        case OP_BRAMINZERO:
1953        case OP_BRAPOS:
1954        case OP_BRAPOSZERO:
1955        case OP_BRAZERO:
1956        case OP_CBRAPOS:
1957        case OP_EXTUNI:
1958        case OP_KETRMAX:
1959        case OP_KETRMIN:
1960        case OP_KETRPOS:
1961        case OP_MINPLUS:
1962        case OP_MINPLUSI:
1963        case OP_MINQUERY:
1964        case OP_MINQUERYI:
1965        case OP_MINSTAR:
1966        case OP_MINSTARI:
1967        case OP_MINUPTO:
1968        case OP_MINUPTOI:
1969        case OP_NOTMINPLUS:
1970        case OP_NOTMINPLUSI:
1971        case OP_NOTMINQUERY:
1972        case OP_NOTMINQUERYI:
1973        case OP_NOTMINSTAR:
1974        case OP_NOTMINSTARI:
1975        case OP_NOTMINUPTO:
1976        case OP_NOTMINUPTOI:
1977        case OP_NOTPLUS:
1978        case OP_NOTPLUSI:
1979        case OP_NOTPOSPLUS:
1980        case OP_NOTPOSPLUSI:
1981        case OP_NOTPOSQUERY:
1982        case OP_NOTPOSQUERYI:
1983        case OP_NOTPOSSTAR:
1984        case OP_NOTPOSSTARI:
1985        case OP_NOTPOSUPTO:
1986        case OP_NOTPOSUPTOI:
1987        case OP_NOTQUERY:
1988        case OP_NOTQUERYI:
1989        case OP_NOTSTAR:
1990        case OP_NOTSTARI:
1991        case OP_NOTUPTO:
1992        case OP_NOTUPTOI:
1993        case OP_PLUS:
1994        case OP_PLUSI:
1995        case OP_POSPLUS:
1996        case OP_POSPLUSI:
1997        case OP_POSQUERY:
1998        case OP_POSQUERYI:
1999        case OP_POSSTAR:
2000        case OP_POSSTARI:
2001        case OP_POSUPTO:
2002        case OP_POSUPTOI:
2003        case OP_QUERY:
2004        case OP_QUERYI:
2005        case OP_REF:
2006        case OP_REFI:
2007        case OP_SBRA:
2008        case OP_SBRAPOS:
2009        case OP_SCBRA:
2010        case OP_SCBRAPOS:
2011        case OP_SCOND:
2012        case OP_SKIPZERO:
2013        case OP_STAR:
2014        case OP_STARI:
2015        case OP_TYPEMINPLUS:
2016        case OP_TYPEMINQUERY:
2017        case OP_TYPEMINSTAR:
2018        case OP_TYPEMINUPTO:
2019        case OP_TYPEPLUS:
2020        case OP_TYPEPOSPLUS:
2021        case OP_TYPEPOSQUERY:
2022        case OP_TYPEPOSSTAR:
2023        case OP_TYPEPOSUPTO:
2024        case OP_TYPEQUERY:
2025        case OP_TYPESTAR:
2026        case OP_TYPEUPTO:
2027        case OP_UPTO:
2028        case OP_UPTOI:
2029      return -1;      return -1;
2030    
2031        /* Catch unrecognized opcodes so that when new ones are added they
2032        are not forgotten, as has happened in the past. */
2033    
2034        default:
2035        return -4;
2036      }      }
2037    }    }
2038  /* Control never gets here */  /* Control never gets here */
# Line 1356  for (;;) Line 2042  for (;;)
2042    
2043    
2044  /*************************************************  /*************************************************
2045  *    Scan compiled regex for numbered bracket    *  *    Scan compiled regex for specific bracket    *
2046  *************************************************/  *************************************************/
2047    
2048  /* This little function scans through a compiled pattern until it finds a  /* This little function scans through a compiled pattern until it finds a
2049  capturing bracket with the given number.  capturing bracket with the given number, or, if the number is negative, an
2050    instance of OP_REVERSE for a lookbehind. The function is global in the C sense
2051    so that it can be called from pcre_study() when finding the minimum matching
2052    length.
2053    
2054  Arguments:  Arguments:
2055    code        points to start of expression    code        points to start of expression
2056    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
2057    number      the required bracket number    number      the required bracket number or negative to find a lookbehind
2058    
2059  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
2060  */  */
2061    
2062  static const uschar *  const pcre_uchar *
2063  find_bracket(const uschar *code, BOOL utf8, int number)  PRIV(find_bracket)(const pcre_uchar *code, BOOL utf, int number)
2064  {  {
2065  for (;;)  for (;;)
2066    {    {
2067    register int c = *code;    register pcre_uchar c = *code;
2068    
2069    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
2070    
2071    /* 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 1384  for (;;) Line 2074  for (;;)
2074    
2075    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
2076    
2077      /* Handle recursion */
2078    
2079      else if (c == OP_REVERSE)
2080        {
2081        if (number < 0) return (pcre_uchar *)code;
2082        code += PRIV(OP_lengths)[c];
2083        }
2084    
2085    /* Handle capturing bracket */    /* Handle capturing bracket */
2086    
2087    else if (c == OP_CBRA)    else if (c == OP_CBRA || c == OP_SCBRA ||
2088               c == OP_CBRAPOS || c == OP_SCBRAPOS)
2089      {      {
2090      int n = GET2(code, 1+LINK_SIZE);      int n = (int)GET2(code, 1+LINK_SIZE);
2091      if (n == number) return (uschar *)code;      if (n == number) return (pcre_uchar *)code;
2092      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2093      }      }
2094    
2095    /* 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
2096    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
2097    two bytes of parameters. */    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
2098      must add in its length. */
2099    
2100    else    else
2101      {      {
# Line 1417  for (;;) Line 2117  for (;;)
2117        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2118        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2119        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
2120        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
2121            code += 2;
2122          break;
2123    
2124          case OP_MARK:
2125          case OP_PRUNE_ARG:
2126          case OP_SKIP_ARG:
2127          code += code[1];
2128          break;
2129    
2130          case OP_THEN_ARG:
2131          code += code[1];
2132        break;        break;
2133        }        }
2134    
2135      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
2136    
2137      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2138    
2139    /* 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
2140    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
2141    arrange to skip the extra bytes. */    arrange to skip the extra bytes. */
2142    
2143  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2144      if (utf8) switch(c)      if (utf) switch(c)
2145        {        {
2146        case OP_CHAR:        case OP_CHAR:
2147        case OP_CHARNC:        case OP_CHARI:
2148        case OP_EXACT:        case OP_EXACT:
2149          case OP_EXACTI:
2150        case OP_UPTO:        case OP_UPTO:
2151          case OP_UPTOI:
2152        case OP_MINUPTO:        case OP_MINUPTO:
2153          case OP_MINUPTOI:
2154        case OP_POSUPTO:        case OP_POSUPTO:
2155          case OP_POSUPTOI:
2156        case OP_STAR:        case OP_STAR:
2157          case OP_STARI:
2158        case OP_MINSTAR:        case OP_MINSTAR:
2159          case OP_MINSTARI:
2160        case OP_POSSTAR:        case OP_POSSTAR:
2161          case OP_POSSTARI:
2162        case OP_PLUS:        case OP_PLUS:
2163          case OP_PLUSI:
2164        case OP_MINPLUS:        case OP_MINPLUS:
2165          case OP_MINPLUSI:
2166        case OP_POSPLUS:        case OP_POSPLUS:
2167          case OP_POSPLUSI:
2168        case OP_QUERY:        case OP_QUERY:
2169          case OP_QUERYI:
2170        case OP_MINQUERY:        case OP_MINQUERY:
2171          case OP_MINQUERYI:
2172        case OP_POSQUERY:        case OP_POSQUERY:
2173        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_POSQUERYI:
2174          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2175        break;        break;
2176        }        }
2177    #else
2178        (void)(utf);  /* Keep compiler happy by referencing function argument */
2179  #endif  #endif
2180      }      }
2181    }    }
# Line 1466  instance of OP_RECURSE. Line 2192  instance of OP_RECURSE.
2192    
2193  Arguments:  Arguments:
2194    code        points to start of expression    code        points to start of expression
2195    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
2196    
2197  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
2198  */  */
2199    
2200  static const uschar *  static const pcre_uchar *
2201  find_recurse(const uschar *code, BOOL utf8)  find_recurse(const pcre_uchar *code, BOOL utf)
2202  {  {
2203  for (;;)  for (;;)
2204    {    {
2205    register int c = *code;    register pcre_uchar c = *code;
2206    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
2207    if (c == OP_RECURSE) return code;    if (c == OP_RECURSE) return code;
2208    
# Line 1488  for (;;) Line 2214  for (;;)
2214    
2215    /* 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
2216    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
2217    two bytes of parameters. */    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
2218      must add in its length. */
2219    
2220    else    else
2221      {      {
# Line 1510  for (;;) Line 2237  for (;;)
2237        case OP_TYPEUPTO:        case OP_TYPEUPTO:
2238        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2239        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2240        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
2241            code += 2;
2242          break;
2243    
2244          case OP_MARK:
2245          case OP_PRUNE_ARG:
2246          case OP_SKIP_ARG:
2247          code += code[1];
2248          break;
2249    
2250          case OP_THEN_ARG:
2251          code += code[1];
2252        break;        break;
2253        }        }
2254    
2255      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
2256    
2257      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2258    
2259      /* 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
2260      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
2261      to arrange to skip the extra bytes. */      to arrange to skip the extra bytes. */
2262    
2263  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2264      if (utf8) switch(c)      if (utf) switch(c)
2265        {        {
2266        case OP_CHAR:        case OP_CHAR:
2267        case OP_CHARNC:        case OP_CHARI:
2268          case OP_NOT:
2269          case OP_NOTI:
2270        case OP_EXACT:        case OP_EXACT:
2271          case OP_EXACTI:
2272          case OP_NOTEXACT:
2273          case OP_NOTEXACTI:
2274        case OP_UPTO:        case OP_UPTO:
2275          case OP_UPTOI:
2276          case OP_NOTUPTO:
2277          case OP_NOTUPTOI:
2278        case OP_MINUPTO:        case OP_MINUPTO:
2279          case OP_MINUPTOI:
2280          case OP_NOTMINUPTO:
2281          case OP_NOTMINUPTOI:
2282        case OP_POSUPTO:        case OP_POSUPTO:
2283          case OP_POSUPTOI:
2284          case OP_NOTPOSUPTO:
2285          case OP_NOTPOSUPTOI:
2286        case OP_STAR:        case OP_STAR:
2287          case OP_STARI:
2288          case OP_NOTSTAR:
2289          case OP_NOTSTARI:
2290        case OP_MINSTAR:        case OP_MINSTAR:
2291          case OP_MINSTARI:
2292          case OP_NOTMINSTAR:
2293          case OP_NOTMINSTARI:
2294        case OP_POSSTAR:        case OP_POSSTAR:
2295          case OP_POSSTARI:
2296          case OP_NOTPOSSTAR:
2297          case OP_NOTPOSSTARI:
2298        case OP_PLUS:        case OP_PLUS:
2299          case OP_PLUSI:
2300          case OP_NOTPLUS:
2301          case OP_NOTPLUSI:
2302        case OP_MINPLUS:        case OP_MINPLUS:
2303          case OP_MINPLUSI:
2304          case OP_NOTMINPLUS:
2305          case OP_NOTMINPLUSI:
2306        case OP_POSPLUS:        case OP_POSPLUS:
2307          case OP_POSPLUSI:
2308          case OP_NOTPOSPLUS:
2309          case OP_NOTPOSPLUSI:
2310        case OP_QUERY:        case OP_QUERY:
2311          case OP_QUERYI:
2312          case OP_NOTQUERY:
2313          case OP_NOTQUERYI:
2314        case OP_MINQUERY:        case OP_MINQUERY:
2315          case OP_MINQUERYI:
2316          case OP_NOTMINQUERY:
2317          case OP_NOTMINQUERYI:
2318        case OP_POSQUERY:        case OP_POSQUERY:
2319        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_POSQUERYI:
2320          case OP_NOTPOSQUERY:
2321          case OP_NOTPOSQUERYI:
2322          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2323        break;        break;
2324        }        }
2325    #else
2326        (void)(utf);  /* Keep compiler happy by referencing function argument */
2327  #endif  #endif
2328      }      }
2329    }    }
# Line 1565  bracket whose current branch will alread Line 2346  bracket whose current branch will alread
2346  Arguments:  Arguments:
2347    code        points to start of search    code        points to start of search
2348    endcode     points to where to stop    endcode     points to where to stop
2349    utf8        TRUE if in UTF8 mode    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
2350      cd          contains pointers to tables etc.
2351    
2352  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2353  */  */
2354    
2355  static BOOL  static BOOL
2356  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8)  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
2357      BOOL utf, compile_data *cd)
2358  {  {
2359  register int c;  register pcre_uchar c;
2360  for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);  for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
2361       code < endcode;       code < endcode;
2362       code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
2363    {    {
2364    const uschar *ccode;    const pcre_uchar *ccode;
2365    
2366    c = *code;    c = *code;
2367    
# Line 1592  for (code = first_significant_code(code Line 2375  for (code = first_significant_code(code
2375      continue;      continue;
2376      }      }
2377    
2378      /* For a recursion/subroutine call, if its end has been reached, which
2379      implies a backward reference subroutine call, we can scan it. If it's a
2380      forward reference subroutine call, we can't. To detect forward reference
2381      we have to scan up the list that is kept in the workspace. This function is
2382      called only when doing the real compile, not during the pre-compile that
2383      measures the size of the compiled pattern. */
2384    
2385      if (c == OP_RECURSE)
2386        {
2387        const pcre_uchar *scode;
2388        BOOL empty_branch;
2389    
2390        /* Test for forward reference */
2391    
2392        for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE)
2393          if ((int)GET(scode, 0) == (int)(code + 1 - cd->start_code)) return TRUE;
2394    
2395        /* Not a forward reference, test for completed backward reference */
2396    
2397        empty_branch = FALSE;
2398        scode = cd->start_code + GET(code, 1);
2399        if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
2400    
2401        /* Completed backwards reference */
2402    
2403        do
2404          {
2405          if (could_be_empty_branch(scode, endcode, utf, cd))
2406            {
2407            empty_branch = TRUE;
2408            break;
2409            }
2410          scode += GET(scode, 1);
2411          }
2412        while (*scode == OP_ALT);
2413    
2414        if (!empty_branch) return FALSE;  /* All branches are non-empty */
2415        continue;
2416        }
2417    
2418    /* Groups with zero repeats can of course be empty; skip them. */    /* Groups with zero repeats can of course be empty; skip them. */
2419    
2420    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2421          c == OP_BRAPOSZERO)
2422        {
2423        code += PRIV(OP_lengths)[c];
2424        do code += GET(code, 1); while (*code == OP_ALT);
2425        c = *code;
2426        continue;
2427        }
2428    
2429      /* A nested group that is already marked as "could be empty" can just be
2430      skipped. */
2431    
2432      if (c == OP_SBRA  || c == OP_SBRAPOS ||
2433          c == OP_SCBRA || c == OP_SCBRAPOS)
2434      {      {
     code += _pcre_OP_lengths[c];  
2435      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
2436      c = *code;      c = *code;
2437      continue;      continue;
# Line 1604  for (code = first_significant_code(code Line 2439  for (code = first_significant_code(code
2439    
2440    /* For other groups, scan the branches. */    /* For other groups, scan the branches. */
2441    
2442    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)    if (c == OP_BRA  || c == OP_BRAPOS ||
2443          c == OP_CBRA || c == OP_CBRAPOS ||
2444          c == OP_ONCE || c == OP_ONCE_NC ||
2445          c == OP_COND)
2446      {      {
2447      BOOL empty_branch;      BOOL empty_branch;
2448      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
2449    
2450      /* Scan a closed bracket */      /* If a conditional group has only one branch, there is a second, implied,
2451        empty branch, so just skip over the conditional, because it could be empty.
2452        Otherwise, scan the individual branches of the group. */
2453    
2454      empty_branch = FALSE;      if (c == OP_COND && code[GET(code, 1)] != OP_ALT)
     do  
       {  
       if (!empty_branch && could_be_empty_branch(code, endcode, utf8))  
         empty_branch = TRUE;  
2455        code += GET(code, 1);        code += GET(code, 1);
2456        else
2457          {
2458          empty_branch = FALSE;
2459          do
2460            {
2461            if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd))
2462              empty_branch = TRUE;
2463            code += GET(code, 1);
2464            }
2465          while (*code == OP_ALT);
2466          if (!empty_branch) return FALSE;   /* All branches are non-empty */
2467        }        }
2468      while (*code == OP_ALT);  
     if (!empty_branch) return FALSE;   /* All branches are non-empty */  
2469      c = *code;      c = *code;
2470      continue;      continue;
2471      }      }
# Line 1630  for (code = first_significant_code(code Line 2476  for (code = first_significant_code(code
2476      {      {
2477      /* Check for quantifiers after a class. XCLASS is used for classes that      /* Check for quantifiers after a class. XCLASS is used for classes that
2478      cannot be represented just by a bit map. This includes negated single      cannot be represented just by a bit map. This includes negated single
2479      high-valued characters. The length in _pcre_OP_lengths[] is zero; the      high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
2480      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"
2481      here. */      here. */
2482    
2483  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2484      case OP_XCLASS:      case OP_XCLASS:
2485      ccode = code += GET(code, 1);      ccode = code += GET(code, 1);
2486      goto CHECK_CLASS_REPEAT;      goto CHECK_CLASS_REPEAT;
# Line 1642  for (code = first_significant_code(code Line 2488  for (code = first_significant_code(code
2488    
2489      case OP_CLASS:      case OP_CLASS:
2490      case OP_NCLASS:      case OP_NCLASS:
2491      ccode = code + 33;      ccode = code + PRIV(OP_lengths)[OP_CLASS];
2492    
2493  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2494      CHECK_CLASS_REPEAT:      CHECK_CLASS_REPEAT:
2495  #endif  #endif
2496    
# Line 1683  for (code = first_significant_code(code Line 2529  for (code = first_significant_code(code
2529      case OP_ALLANY:      case OP_ALLANY:
2530      case OP_ANYBYTE:      case OP_ANYBYTE:
2531      case OP_CHAR:      case OP_CHAR:
2532      case OP_CHARNC:      case OP_CHARI:
2533      case OP_NOT:      case OP_NOT:
2534        case OP_NOTI:
2535      case OP_PLUS:      case OP_PLUS:
2536      case OP_MINPLUS:      case OP_MINPLUS:
2537      case OP_POSPLUS:      case OP_POSPLUS:
# Line 1716  for (code = first_significant_code(code Line 2563  for (code = first_significant_code(code
2563      case OP_TYPEUPTO:      case OP_TYPEUPTO:
2564      case OP_TYPEMINUPTO:      case OP_TYPEMINUPTO:
2565      case OP_TYPEPOSUPTO:      case OP_TYPEPOSUPTO:
2566      if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;      if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
2567          code += 2;
2568      break;      break;
2569    
2570      /* End of branch */      /* End of branch */
# Line 1724  for (code = first_significant_code(code Line 2572  for (code = first_significant_code(code
2572      case OP_KET:      case OP_KET:
2573      case OP_KETRMAX:      case OP_KETRMAX:
2574      case OP_KETRMIN:      case OP_KETRMIN:
2575        case OP_KETRPOS:
2576      case OP_ALT:      case OP_ALT:
2577      return TRUE;      return TRUE;
2578    
2579      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
2580      MINUPTO, and POSUPTO may be followed by a multibyte character */      MINUPTO, and POSUPTO may be followed by a multibyte character */
2581    
2582  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2583      case OP_STAR:      case OP_STAR:
2584        case OP_STARI:
2585      case OP_MINSTAR:      case OP_MINSTAR:
2586        case OP_MINSTARI:
2587      case OP_POSSTAR:      case OP_POSSTAR:
2588        case OP_POSSTARI:
2589      case OP_QUERY:      case OP_QUERY:
2590        case OP_QUERYI:
2591      case OP_MINQUERY:      case OP_MINQUERY:
2592        case OP_MINQUERYI:
2593      case OP_POSQUERY:      case OP_POSQUERY:
2594        case OP_POSQUERYI:
2595        if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
2596        break;
2597    
2598      case OP_UPTO:      case OP_UPTO:
2599        case OP_UPTOI:
2600      case OP_MINUPTO:      case OP_MINUPTO:
2601        case OP_MINUPTOI:
2602      case OP_POSUPTO:      case OP_POSUPTO:
2603      if (utf8) while ((code[2] & 0xc0) == 0x80) code++;      case OP_POSUPTOI:
2604        if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);
2605      break;      break;
2606  #endif  #endif
2607    
2608        /* MARK, and PRUNE/SKIP/THEN with an argument must skip over the argument
2609        string. */
2610    
2611        case OP_MARK:
2612        case OP_PRUNE_ARG:
2613        case OP_SKIP_ARG:
2614        code += code[1];
2615        break;
2616    
2617        case OP_THEN_ARG:
2618        code += code[1];
2619        break;
2620    
2621        /* None of the remaining opcodes are required to match a character. */
2622    
2623        default:
2624        break;
2625      }      }
2626    }    }
2627    
# Line 1759  return TRUE; Line 2638  return TRUE;
2638  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
2639  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,
2640  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.
2641    This function is called only during the real compile, not during the
2642    pre-compile.
2643    
2644  Arguments:  Arguments:
2645    code        points to start of the recursion    code        points to start of the recursion
2646    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2647    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2648    utf8        TRUE if in UTF-8 mode    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
2649      cd          pointers to tables etc
2650    
2651  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2652  */  */
2653    
2654  static BOOL  static BOOL
2655  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
2656    BOOL utf8)    branch_chain *bcptr, BOOL utf, compile_data *cd)
2657  {  {
2658  while (bcptr != NULL && bcptr->current >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2659    {    {
2660    if (!could_be_empty_branch(bcptr->current, endcode, utf8)) return FALSE;    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd))
2661        return FALSE;
2662    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2663    }    }
2664  return TRUE;  return TRUE;
# Line 1807  where Perl recognizes it as the POSIX cl Line 2690  where Perl recognizes it as the POSIX cl
2690  "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,
2691  I think.  I think.
2692    
2693    A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
2694    It seems that the appearance of a nested POSIX class supersedes an apparent
2695    external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
2696    a digit.
2697    
2698    In Perl, unescaped square brackets may also appear as part of class names. For
2699    example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
2700    [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
2701    seem right at all. PCRE does not allow closing square brackets in POSIX class
2702    names.
2703    
2704  Arguments:  Arguments:
2705    ptr      pointer to the initial [    ptr      pointer to the initial [
2706    endptr   where to return the end pointer    endptr   where to return the end pointer
# Line 1815  Returns:   TRUE or FALSE Line 2709  Returns:   TRUE or FALSE
2709  */  */
2710    
2711  static BOOL  static BOOL
2712  check_posix_syntax(const uschar *ptr, const uschar **endptr)  check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
2713  {  {
2714  int terminator;          /* Don't combine these lines; the Solaris cc */  pcre_uchar terminator;          /* Don't combine these lines; the Solaris cc */
2715  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2716  for (++ptr; *ptr != 0; ptr++)  for (++ptr; *ptr != 0; ptr++)
2717    {    {
2718    if (*ptr == '\\' && ptr[1] == ']') ptr++; else    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2719        ptr++;
2720      else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2721      else
2722      {      {
2723      if (*ptr == ']') return FALSE;      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
     if (*ptr == terminator && ptr[1] == ']')  
2724        {        {
2725        *endptr = ptr;        *endptr = ptr;
2726        return TRUE;        return TRUE;
2727        }        }
2728        if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&
2729             (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
2730              ptr[1] == CHAR_EQUALS_SIGN) &&
2731            check_posix_syntax(ptr, endptr))
2732          return FALSE;
2733      }      }
2734    }    }
2735  return FALSE;  return FALSE;
# Line 1852  Returns:     a value representing the na Line 2753  Returns:     a value representing the na
2753  */  */
2754    
2755  static int  static int
2756  check_posix_name(const uschar *ptr, int len)  check_posix_name(const pcre_uchar *ptr, int len)
2757  {  {
2758  const char *pn = posix_names;  const char *pn = posix_names;
2759  register int yield = 0;  register int yield = 0;
2760  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
2761    {    {
2762    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
2763      strncmp((const char *)ptr, pn, len) == 0) return yield;      STRNCMP_UC_C8(ptr, pn, (unsigned int)len) == 0) return yield;
2764    pn += posix_name_lengths[yield] + 1;    pn += posix_name_lengths[yield] + 1;
2765    yield++;    yield++;
2766    }    }
# Line 1891  value in the reference (which is a group Line 2792  value in the reference (which is a group
2792  Arguments:  Arguments:
2793    group      points to the start of the group    group      points to the start of the group
2794    adjust     the amount by which the group is to be moved    adjust     the amount by which the group is to be moved
2795    utf8       TRUE in UTF-8 mode    utf        TRUE in UTF-8 / UTF-16 / UTF-32 mode
2796    cd         contains pointers to tables etc.    cd         contains pointers to tables etc.
2797    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
2798    
# Line 1899  Returns:     nothing Line 2800  Returns:     nothing
2800  */  */
2801    
2802  static void  static void
2803  adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,  adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
2804    uschar *save_hwm)    pcre_uchar *save_hwm)
2805  {  {
2806  uschar *ptr = group;  pcre_uchar *ptr = group;
2807    
2808  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
2809    {    {
2810    int offset;    int offset;
2811    uschar *hc;    pcre_uchar *hc;
2812    
2813    /* 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
2814    reference. */    reference. */
2815    
2816    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
2817      {      {
2818      offset = GET(hc, 0);      offset = (int)GET(hc, 0);
2819      if (cd->start_code + offset == ptr + 1)      if (cd->start_code + offset == ptr + 1)
2820        {        {
2821        PUT(hc, 0, offset + adjust);        PUT(hc, 0, offset + adjust);
# Line 1927  while ((ptr = (uschar *)find_recurse(ptr Line 2828  while ((ptr = (uschar *)find_recurse(ptr
2828    
2829    if (hc >= cd->hwm)    if (hc >= cd->hwm)
2830      {      {
2831      offset = GET(ptr, 1);      offset = (int)GET(ptr, 1);
2832      if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);      if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
2833      }      }
2834    
# Line 1952  Arguments: Line 2853  Arguments:
2853  Returns:         new code pointer  Returns:         new code pointer
2854  */  */
2855    
2856  static uschar *  static pcre_uchar *
2857  auto_callout(uschar *code, const uschar *ptr, compile_data *cd)  auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
2858  {  {
2859  *code++ = OP_CALLOUT;  *code++ = OP_CALLOUT;
2860  *code++ = 255;  *code++ = 255;
2861  PUT(code, 0, ptr - cd->start_pattern);  /* Pattern offset */  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
2862  PUT(code, LINK_SIZE, 0);                /* Default length */  PUT(code, LINK_SIZE, 0);                       /* Default length */
2863  return code + 2*LINK_SIZE;  return code + 2 * LINK_SIZE;
2864  }  }
2865    
2866    
# Line 1981  Returns:             nothing Line 2882  Returns:             nothing
2882  */  */
2883    
2884  static void  static void
2885  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)  complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
2886  {  {
2887  int length = ptr - cd->start_pattern - GET(previous_callout, 2);  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
2888  PUT(previous_callout, 2 + LINK_SIZE, length);  PUT(previous_callout, 2 + LINK_SIZE, length);
2889  }  }
2890    
# Line 1995  PUT(previous_callout, 2 + LINK_SIZE, len Line 2896  PUT(previous_callout, 2 + LINK_SIZE, len
2896  *************************************************/  *************************************************/
2897    
2898  /* This function is passed the start and end of a class range, in UTF-8 mode  /* This function is passed the start and end of a class range, in UTF-8 mode
2899  with UCP support. It searches up the characters, looking for internal ranges of  with UCP support. It searches up the characters, looking for ranges of
2900  characters in the "other" case. Each call returns the next one, updating the  characters in the "other" case. Each call returns the next one, updating the
2901  start address.  start address. A character with multiple other cases is returned on its own
2902    with a special return value.
2903    
2904  Arguments:  Arguments:
2905    cptr        points to starting character value; updated    cptr        points to starting character value; updated
# Line 2005  Arguments: Line 2907  Arguments:
2907    ocptr       where to put start of othercase range    ocptr       where to put start of othercase range
2908    odptr       where to put end of othercase range    odptr       where to put end of othercase range
2909    
2910  Yield:        TRUE when range returned; FALSE when no more  Yield:        -1 when no more
2911                   0 when a range is returned
2912                  >0 the CASESET offset for char with multiple other cases
2913                    in this case, ocptr contains the original
2914  */  */
2915    
2916  static BOOL  static int
2917  get_othercase_range(unsigned int *cptr, unsigned int d, unsigned int *ocptr,  get_othercase_range(pcre_uint32 *cptr, pcre_uint32 d, pcre_uint32 *ocptr,
2918    unsigned int *odptr)    pcre_uint32 *odptr)
2919  {  {
2920  unsigned int c, othercase, next;  pcre_uint32 c, othercase, next;
2921    unsigned int co;
2922    
2923    /* Find the first character that has an other case. If it has multiple other
2924    cases, return its case offset value. */
2925    
2926  for (c = *cptr; c <= d; c++)  for (c = *cptr; c <= d; c++)
2927    { if ((othercase = UCD_OTHERCASE(c)) != c) break; }    {
2928      if ((co = UCD_CASESET(c)) != 0)
2929        {
2930        *ocptr = c++;   /* Character that has the set */
2931        *cptr = c;      /* Rest of input range */
2932        return (int)co;
2933        }
2934      if ((othercase = UCD_OTHERCASE(c)) != c) break;
2935      }
2936    
2937  if (c > d) return FALSE;  if (c > d) return -1;  /* Reached end of range */
2938    
2939  *ocptr = othercase;  *ocptr = othercase;
2940  next = othercase + 1;  next = othercase + 1;
# Line 2028  for (++c; c <= d; c++) Line 2945  for (++c; c <= d; c++)
2945    next++;    next++;
2946    }    }
2947    
2948  *odptr = next - 1;  *odptr = next - 1;     /* End of othercase range */
2949  *cptr = c;  *cptr = c;             /* Rest of input range */
2950    return 0;
2951    }
2952    
2953    
2954  return TRUE;  
2955    /*************************************************
2956    *        Check a character and a property        *
2957    *************************************************/
2958    
2959    /* This function is called by check_auto_possessive() when a property item
2960    is adjacent to a fixed character.
2961    
2962    Arguments:
2963      c            the character
2964      ptype        the property type
2965      pdata        the data for the type
2966      negated      TRUE if it's a negated property (\P or \p{^)
2967    
2968    Returns:       TRUE if auto-possessifying is OK
2969    */
2970    
2971    static BOOL
2972    check_char_prop(pcre_uint32 c, unsigned int ptype, unsigned int pdata, BOOL negated)
2973    {
2974    #ifdef SUPPORT_UCP
2975    const pcre_uint32 *p;
2976    #endif
2977    
2978    const ucd_record *prop = GET_UCD(c);
2979    
2980    switch(ptype)
2981      {
2982      case PT_LAMP:
2983      return (prop->chartype == ucp_Lu ||
2984              prop->chartype == ucp_Ll ||
2985              prop->chartype == ucp_Lt) == negated;
2986    
2987      case PT_GC:
2988      return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
2989    
2990      case PT_PC:
2991      return (pdata == prop->chartype) == negated;
2992    
2993      case PT_SC:
2994      return (pdata == prop->script) == negated;
2995    
2996      /* These are specials */
2997    
2998      case PT_ALNUM:
2999      return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
3000              PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
3001    
3002      case PT_SPACE:    /* Perl space */
3003      return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
3004              c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
3005              == negated;
3006    
3007      case PT_PXSPACE:  /* POSIX space */
3008      return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
3009              c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
3010              c == CHAR_FF || c == CHAR_CR)
3011              == negated;
3012    
3013      case PT_WORD:
3014      return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
3015              PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
3016              c == CHAR_UNDERSCORE) == negated;
3017    
3018    #ifdef SUPPORT_UCP
3019      case PT_CLIST:
3020      p = PRIV(ucd_caseless_sets) + prop->caseset;
3021      for (;;)
3022        {
3023        if ((unsigned int)c < *p) return !negated;
3024        if ((unsigned int)c == *p++) return negated;
3025        }
3026      break;  /* Control never reaches here */
3027    #endif
3028      }
3029    
3030    return FALSE;
3031  }  }
3032  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3033    
# Line 2046  whether the next thing could possibly ma Line 3042  whether the next thing could possibly ma
3042  sense to automatically possessify the repeated item.  sense to automatically possessify the repeated item.
3043    
3044  Arguments:  Arguments:
3045    op_code       the repeated op code    previous      pointer to the repeated opcode
3046    this          data for this item, depends on the opcode    utf           TRUE in UTF-8 / UTF-16 / UTF-32 mode
   utf8          TRUE in UTF-8 mode  
   utf8_char     used for utf8 character bytes, NULL if not relevant  
3047    ptr           next character in pattern    ptr           next character in pattern
3048    options       options bits    options       options bits
3049    cd            contains pointers to tables etc.    cd            contains pointers to tables etc.
# Line 2058  Returns:        TRUE if possessifying is Line 3052  Returns:        TRUE if possessifying is
3052  */  */
3053    
3054  static BOOL  static BOOL
3055  check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,  check_auto_possessive(const pcre_uchar *previous, BOOL utf,
3056    const uschar *ptr, int options, compile_data *cd)    const pcre_uchar *ptr, int options, compile_data *cd)
3057  {  {
3058  int next;  pcre_uint32 c = NOTACHAR;
3059    pcre_uint32 next;
3060    int escape;
3061    pcre_uchar op_code = *previous++;
3062    
3063  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
3064    
# Line 2069  if ((options & PCRE_EXTENDED) != 0) Line 3066  if ((options & PCRE_EXTENDED) != 0)
3066    {    {
3067    for (;;)    for (;;)
3068      {      {
3069      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
3070      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
3071        {        {
3072        while (*(++ptr) != 0)        ptr++;
3073          while (*ptr != 0)
3074            {
3075          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3076            ptr++;
3077    #ifdef SUPPORT_UTF
3078            if (utf) FORWARDCHAR(ptr);
3079    #endif
3080            }
3081        }        }
3082      else break;      else break;
3083      }      }
# Line 2082  if ((options & PCRE_EXTENDED) != 0) Line 3086  if ((options & PCRE_EXTENDED) != 0)
3086  /* If the next item is one that we can handle, get its value. A non-negative  /* If the next item is one that we can handle, get its value. A non-negative
3087  value is a character, a negative value is an escape value. */  value is a character, a negative value is an escape value. */
3088    
3089  if (*ptr == '\\')  if (*ptr == CHAR_BACKSLASH)
3090    {    {
3091    int temperrorcode = 0;    int temperrorcode = 0;
3092    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);    escape = check_escape(&ptr, &next, &temperrorcode, cd->bracount, options, FALSE);
3093    if (temperrorcode != 0) return FALSE;    if (temperrorcode != 0) return FALSE;
3094    ptr++;    /* Point after the escape sequence */    ptr++;    /* Point after the escape sequence */
3095    }    }
3096    else if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_meta) == 0)
 else if ((cd->ctypes[*ptr] & ctype_meta) == 0)  
3097    {    {
3098  #ifdef SUPPORT_UTF8    escape = 0;
3099    if (utf8) { GETCHARINC(next, ptr); } else  #ifdef SUPPORT_UTF
3100      if (utf) { GETCHARINC(next, ptr); } else
3101  #endif  #endif
3102    next = *ptr++;    next = *ptr++;
3103    }    }
   
3104  else return FALSE;  else return FALSE;
3105    
3106  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
# Line 2106  if ((options & PCRE_EXTENDED) != 0) Line 3109  if ((options & PCRE_EXTENDED) != 0)
3109    {    {
3110    for (;;)    for (;;)
3111      {      {
3112      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
3113      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
3114        {        {
3115        while (*(++ptr) != 0)        ptr++;
3116          while (*ptr != 0)
3117            {
3118          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3119            ptr++;
3120    #ifdef SUPPORT_UTF
3121            if (utf) FORWARDCHAR(ptr);
3122    #endif
3123            }
3124        }        }
3125      else break;      else break;
3126      }      }
# Line 2118  if ((options & PCRE_EXTENDED) != 0) Line 3128  if ((options & PCRE_EXTENDED) != 0)
3128    
3129  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
3130    
3131  if (*ptr == '*' || *ptr == '?' || strncmp((char *)ptr, "{0,", 3) == 0)  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3132    return FALSE;    STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
3133        return FALSE;
 /* Now compare the next item with the previous opcode. If the previous is a  
 positive single character match, "item" either contains the character or, if  
 "item" is greater than 127 in utf8 mode, the character's bytes are in  
 utf8_char. */  
   
3134    
3135  /* Handle cases when the next item is a character. */  /* If the previous item is a character, get its value. */
3136    
3137  if (next >= 0) switch(op_code)  if (op_code == OP_CHAR || op_code == OP_CHARI ||
3138        op_code == OP_NOT || op_code == OP_NOTI)
3139    {    {
3140    case OP_CHAR:  #ifdef SUPPORT_UTF
3141  #ifdef SUPPORT_UTF8    GETCHARTEST(c, previous);
3142    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }  #else
3143      c = *previous;
3144  #endif  #endif
3145    return item != next;    }
3146    
3147    /* For CHARNC (caseless character) we must check the other case. If we have  /* Now compare the next item with the previous opcode. First, handle cases when
3148    Unicode property support, we can use it to test the other case of  the next item is a character. */
   high-valued characters. */  
3149    
3150    case OP_CHARNC:  if (escape == 0)
3151  #ifdef SUPPORT_UTF8    {
3152    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    /* For a caseless UTF match, the next character may have more than one other
3153      case, which maps to the special PT_CLIST property. Check this first. */
3154    
3155    #ifdef SUPPORT_UCP
3156      if (utf && c != NOTACHAR && (options & PCRE_CASELESS) != 0)
3157        {
3158        unsigned int ocs = UCD_CASESET(next);
3159        if (ocs > 0) return check_char_prop(c, PT_CLIST, ocs, op_code >= OP_NOT);
3160        }
3161  #endif  #endif
3162    if (item == next) return FALSE;  
3163  #ifdef SUPPORT_UTF8    switch(op_code)
   if (utf8)  
3164      {      {
3165      unsigned int othercase;      case OP_CHAR:
3166      if (next < 128) othercase = cd->fcc[next]; else      return c != next;
3167    
3168        /* For CHARI (caseless character) we must check the other case. If we have
3169        Unicode property support, we can use it to test the other case of
3170        high-valued characters. We know that next can have only one other case,
3171        because multi-other-case characters are dealt with above. */
3172    
3173        case OP_CHARI:
3174        if (c == next) return FALSE;
3175    #ifdef SUPPORT_UTF
3176        if (utf)
3177          {
3178          pcre_uint32 othercase;
3179          if (next < 128) othercase = cd->fcc[next]; else
3180  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3181      othercase = UCD_OTHERCASE((unsigned int)next);        othercase = UCD_OTHERCASE(next);
3182  #else  #else
3183      othercase = NOTACHAR;        othercase = NOTACHAR;
3184  #endif  #endif
3185      return (unsigned int)item != othercase;        return c != othercase;
3186      }        }
3187    else      else
3188  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3189    return (item != cd->fcc[next]);  /* Non-UTF-8 mode */      return (c != TABLE_GET(next, cd->fcc, next));  /* Not UTF */
3190    
3191    /* For OP_NOT, "item" must be a single-byte character. */      case OP_NOT:
3192        return c == next;
3193    case OP_NOT:  
3194    if (item == next) return TRUE;      case OP_NOTI:
3195    if ((options & PCRE_CASELESS) == 0) return FALSE;      if (c == next) return TRUE;
3196  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3197    if (utf8)      if (utf)
3198      {        {
3199      unsigned int othercase;        pcre_uint32 othercase;
3200      if (next < 128) othercase = cd->fcc[next]; else        if (next < 128) othercase = cd->fcc[next]; else
3201  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3202      othercase = UCD_OTHERCASE(next);        othercase = UCD_OTHERCASE(next);
3203  #else  #else
3204      othercase = NOTACHAR;        othercase = NOTACHAR;
3205  #endif  #endif
3206      return (unsigned int)item == othercase;        return c == othercase;
3207      }        }
3208    else      else
3209  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3210    return (item == cd->fcc[next]);  /* Non-UTF-8 mode */      return (c == TABLE_GET(next, cd->fcc, next));  /* Not UTF */
3211    
3212    case OP_DIGIT:      /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.
3213    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;      When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
3214    
3215    case OP_NOT_DIGIT:      case OP_DIGIT:
3216    return next <= 127 && (cd->ctypes[next] & ctype_digit) != 0;      return next > 255 || (cd->ctypes[next] & ctype_digit) == 0;
3217    
3218    case OP_WHITESPACE:      case OP_NOT_DIGIT:
3219    return next > 127 || (cd->ctypes[next] & ctype_space) == 0;      return next <= 255 && (cd->ctypes[next] & ctype_digit) != 0;
3220    
3221    case OP_NOT_WHITESPACE:      case OP_WHITESPACE:
3222    return next <= 127 && (cd->ctypes[next] & ctype_space) != 0;      return next > 255 || (cd->ctypes[next] & ctype_space) == 0;
3223    
3224    case OP_WORDCHAR:      case OP_NOT_WHITESPACE:
3225    return next > 127 || (cd->ctypes[next] & ctype_word) == 0;      return next <= 255 && (cd->ctypes[next] & ctype_space) != 0;
3226    
3227    case OP_NOT_WORDCHAR:      case OP_WORDCHAR:
3228    return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;      return next > 255 || (cd->ctypes[next] & ctype_word) == 0;
3229    
3230    case OP_HSPACE:      case OP_NOT_WORDCHAR:
3231    case OP_NOT_HSPACE:      return next <= 255 && (cd->ctypes[next] & ctype_word) != 0;
3232    switch(next)  
3233      {      case OP_HSPACE:
3234      case 0x09:      case OP_NOT_HSPACE:
3235      case 0x20:      switch(next)
3236      case 0xa0:        {
3237      case 0x1680:        HSPACE_CASES:
3238      case 0x180e:        return op_code == OP_NOT_HSPACE;
3239      case 0x2000:  
3240      case 0x2001:        default:
3241      case 0x2002:        return op_code != OP_NOT_HSPACE;
3242      case 0x2003:        }
3243      case 0x2004:  
3244      case 0x2005:      case OP_ANYNL:
3245      case 0x2006:      case OP_VSPACE:
3246      case 0x2007:      case OP_NOT_VSPACE:
3247      case 0x2008:      switch(next)
3248      case 0x2009:        {
3249      case 0x200A:        VSPACE_CASES:
3250      case 0x202f:        return op_code == OP_NOT_VSPACE;
3251      case 0x205f:  
3252      case 0x3000:        default:
3253      return op_code != OP_HSPACE;        return op_code != OP_NOT_VSPACE;
3254      default:        }
3255      return op_code == OP_HSPACE;  
3256      }  #ifdef SUPPORT_UCP
3257        case OP_PROP:
3258        return check_char_prop(next, previous[0], previous[1], FALSE);
3259    
3260        case OP_NOTPROP:
3261        return check_char_prop(next, previous[0], previous[1], TRUE);
3262    #endif
3263    
   case OP_VSPACE:  
   case OP_NOT_VSPACE:  
   switch(next)  
     {  
     case 0x0a:  
     case 0x0b:  
     case 0x0c:  
     case 0x0d:  
     case 0x85:  
     case 0x2028:  
     case 0x2029:  
     return op_code != OP_VSPACE;  
3264      default:      default:
3265      return op_code == OP_VSPACE;      return FALSE;
3266      }      }
   
   default:  
   return FALSE;  
3267    }    }
3268    
3269    /* Handle the case when the next item is \d, \s, etc. Note that when PCRE_UCP
3270  /* Handle the case when the next item is \d, \s, etc. */  is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are
3271    generated only when PCRE_UCP is *not* set, that is, when only ASCII
3272    characteristics are recognized. Similarly, the opcodes OP_DIGIT etc. are
3273    replaced by OP_PROP codes when PCRE_UCP is set. */
3274    
3275  switch(op_code)  switch(op_code)
3276    {    {
3277    case OP_CHAR:    case OP_CHAR:
3278    case OP_CHARNC:    case OP_CHARI:
3279  #ifdef SUPPORT_UTF8    switch(escape)
   if (utf8 && item > 127) { GETCHAR(item, utf8_char); }  
 #endif  
   switch(-next)  
3280      {      {
3281      case ESC_d:      case ESC_d:
3282      return item > 127 || (cd->ctypes[item] & ctype_digit) == 0;      return c > 255 || (cd->ctypes[c] & ctype_digit) == 0;
3283    
3284      case ESC_D:      case ESC_D:
3285      return item <= 127 && (cd->ctypes[item] & ctype_digit) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_digit) != 0;
3286    
3287      case ESC_s:      case ESC_s:
3288      return item > 127 || (cd->ctypes[item] & ctype_space) == 0;      return c > 255 || (cd->ctypes[c] & ctype_space) == 0;
3289    
3290      case ESC_S:      case ESC_S:
3291      return item <= 127 && (cd->ctypes[item] & ctype_space) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_space) != 0;
3292    
3293      case ESC_w:      case ESC_w:
3294      return item > 127 || (cd->ctypes[item] & ctype_word) == 0;      return c > 255 || (cd->ctypes[c] & ctype_word) == 0;
3295    
3296      case ESC_W:      case ESC_W:
3297      return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_word) != 0;
3298    
3299      case ESC_h:      case ESC_h:
3300      case ESC_H:      case ESC_H:
3301      switch(item)      switch(c)
3302        {        {
3303        case 0x09:        HSPACE_CASES:
3304        case 0x20:        return escape != ESC_h;
3305        case 0xa0:  
       case 0x1680:  
       case 0x180e:  
       case 0x2000:  
       case 0x2001:  
       case 0x2002:  
       case 0x2003:  
       case 0x2004:  
       case 0x2005:  
       case 0x2006:  
       case 0x2007:  
       case 0x2008:  
       case 0x2009:  
       case 0x200A:  
       case 0x202f:  
       case 0x205f:  
       case 0x3000:  
       return -next != ESC_h;  
3306        default:        default:
3307        return -next == ESC_h;        return escape == ESC_h;
3308        }        }
3309    
3310      case ESC_v:      case ESC_v:
3311      case ESC_V:      case ESC_V:
3312      switch(item)      switch(c)
3313        {        {
3314        case 0x0a:        VSPACE_CASES:
3315        case 0x0b:        return escape != ESC_v;
3316        case 0x0c:  
       case 0x0d:  
       case 0x85:  
       case 0x2028:  
       case 0x2029:  
       return -next != ESC_v;  
3317        default:        default:
3318        return -next == ESC_v;        return escape == ESC_v;
3319          }
3320    
3321        /* When PCRE_UCP is set, these values get generated for \d etc. Find
3322        their substitutions and process them. The result will always be either
3323        ESC_p or ESC_P. Then fall through to process those values. */
3324    
3325    #ifdef SUPPORT_UCP
3326        case ESC_du:
3327        case ESC_DU:
3328        case ESC_wu:
3329        case ESC_WU:
3330        case ESC_su:
3331        case ESC_SU:
3332          {
3333          int temperrorcode = 0;
3334          ptr = substitutes[escape - ESC_DU];
3335          escape = check_escape(&ptr, &next, &temperrorcode, 0, options, FALSE);
3336          if (temperrorcode != 0) return FALSE;
3337          ptr++;    /* For compatibility */
3338          }
3339        /* Fall through */
3340    
3341        case ESC_p:
3342        case ESC_P:
3343          {
3344          unsigned int ptype = 0, pdata = 0;
3345          int errorcodeptr;
3346          BOOL negated;
3347    
3348          ptr--;      /* Make ptr point at the p or P */
3349          if (!get_ucp(&ptr, &negated, &ptype, &pdata, &errorcodeptr))
3350            return FALSE;
3351          ptr++;      /* Point past the final curly ket */
3352    
3353          /* If the property item is optional, we have to give up. (When generated
3354          from \d etc by PCRE_UCP, this test will have been applied much earlier,
3355          to the original \d etc. At this point, ptr will point to a zero byte. */
3356    
3357          if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3358            STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
3359              return FALSE;
3360    
3361          /* Do the property check. */
3362    
3363          return check_char_prop(c, ptype, pdata, (escape == ESC_P) != negated);
3364        }        }
3365    #endif
3366    
3367      default:      default:
3368      return FALSE;      return FALSE;
3369      }      }
3370    
3371      /* In principle, support for Unicode properties should be integrated here as
3372      well. It means re-organizing the above code so as to get hold of the property
3373      values before switching on the op-code. However, I wonder how many patterns
3374      combine ASCII \d etc with Unicode properties? (Note that if PCRE_UCP is set,
3375      these op-codes are never generated.) */
3376    
3377    case OP_DIGIT:    case OP_DIGIT:
3378    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||    return escape == ESC_D || escape == ESC_s || escape == ESC_W ||
3379           next == -ESC_h || next == -ESC_v;           escape == ESC_h || escape == ESC_v || escape == ESC_R;
3380    
3381    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
3382    return next == -ESC_d;    return escape == ESC_d;
3383    
3384    case OP_WHITESPACE:    case OP_WHITESPACE:
3385    return next == -ESC_S || next == -ESC_d || next == -ESC_w;    return escape == ESC_S || escape == ESC_d || escape == ESC_w;
3386    
3387    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
3388    return next == -ESC_s || next == -ESC_h || next == -ESC_v;    return escape == ESC_s || escape == ESC_h || escape == ESC_v || escape == ESC_R;
3389    
3390    case OP_HSPACE:    case OP_HSPACE:
3391    return next == -ESC_S || next == -ESC_H || next == -ESC_d || next == -ESC_w;    return escape == ESC_S || escape == ESC_H || escape == ESC_d ||
3392             escape == ESC_w || escape == ESC_v || escape == ESC_R;
3393    
3394    case OP_NOT_HSPACE:    case OP_NOT_HSPACE:
3395    return next == -ESC_h;    return escape == ESC_h;
3396    
3397    /* Can't have \S in here because VT matches \S (Perl anomaly) */    /* Can't have \S in here because VT matches \S (Perl anomaly) */
3398      case OP_ANYNL:
3399    case OP_VSPACE:    case OP_VSPACE:
3400    return next == -ESC_V || next == -ESC_d || next == -ESC_w;    return escape == ESC_V || escape == ESC_d || escape == ESC_w;
3401    
3402    case OP_NOT_VSPACE:    case OP_NOT_VSPACE:
3403    return next == -ESC_v;    return escape == ESC_v || escape == ESC_R;
3404    
3405    case OP_WORDCHAR:    case OP_WORDCHAR:
3406    return next == -ESC_W || next == -ESC_s || next == -ESC_h || next == -ESC_v;    return escape == ESC_W || escape == ESC_s || escape == ESC_h ||
3407             escape == ESC_v || escape == ESC_R;
3408    
3409    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
3410    return next == -ESC_w || next == -ESC_d;    return escape == ESC_w || escape == ESC_d;
3411    
3412    default:    default:
3413    return FALSE;    return FALSE;
# Line 2369  switch(op_code) Line 3419  switch(op_code)
3419    
3420    
3421  /*************************************************  /*************************************************
3422    *        Add a character or range to a class     *
3423    *************************************************/
3424    
3425    /* This function packages up the logic of adding a character or range of
3426    characters to a class. The character values in the arguments will be within the
3427    valid values for the current mode (8-bit, 16-bit, UTF, etc). This function is
3428    mutually recursive with the function immediately below.
3429    
3430    Arguments:
3431      classbits     the bit map for characters < 256
3432      uchardptr     points to the pointer for extra data
3433      options       the options word
3434      cd            contains pointers to tables etc.
3435      start         start of range character
3436      end           end of range character
3437    
3438    Returns:        the number of < 256 characters added
3439                    the pointer to extra data is updated
3440    */
3441    
3442    static int
3443    add_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
3444      compile_data *cd, pcre_uint32 start, pcre_uint32 end)
3445    {
3446    pcre_uint32 c;
3447    int n8 = 0;
3448    
3449    /* If caseless matching is required, scan the range and process alternate
3450    cases. In Unicode, there are 8-bit characters that have alternate cases that
3451    are greater than 255 and vice-versa. Sometimes we can just extend the original
3452    range. */
3453    
3454    if ((options & PCRE_CASELESS) != 0)
3455      {
3456    #ifdef SUPPORT_UCP
3457      if ((options & PCRE_UTF8) != 0)
3458        {
3459        int rc;
3460        pcre_uint32 oc, od;
3461    
3462        options &= ~PCRE_CASELESS;   /* Remove for recursive calls */
3463        c = start;
3464    
3465        while ((rc = get_othercase_range(&c, end, &oc, &od)) >= 0)
3466          {
3467          /* Handle a single character that has more than one other case. */
3468    
3469          if (rc > 0) n8 += add_list_to_class(classbits, uchardptr, options, cd,
3470            PRIV(ucd_caseless_sets) + rc, oc);
3471    
3472          /* Do nothing if the other case range is within the original range. */
3473    
3474          else if (oc >= start && od <= end) continue;
3475    
3476          /* Extend the original range if there is overlap, noting that if oc < c, we
3477          can't have od > end because a subrange is always shorter than the basic
3478          range. Otherwise, use a recursive call to add the additional range. */
3479    
3480          else if (oc < start && od >= start - 1) start = oc; /* Extend downwards */
3481          else if (od > end && oc <= end + 1) end = od;       /* Extend upwards */
3482          else n8 += add_to_class(classbits, uchardptr, options, cd, oc, od);
3483          }
3484        }
3485      else
3486    #endif  /* SUPPORT_UCP */
3487    
3488      /* Not UTF-mode, or no UCP */
3489    
3490      for (c = start; c <= end && c < 256; c++)
3491        {
3492        SETBIT(classbits, cd->fcc[c]);
3493        n8++;
3494        }
3495      }
3496    
3497    /* Now handle the original range. Adjust the final value according to the bit
3498    length - this means that the same lists of (e.g.) horizontal spaces can be used
3499    in all cases. */
3500    
3501    #if defined COMPILE_PCRE8
3502    #ifdef SUPPORT_UTF
3503      if ((options & PCRE_UTF8) == 0)
3504    #endif
3505      if (end > 0xff) end = 0xff;
3506    
3507    #elif defined COMPILE_PCRE16
3508    #ifdef SUPPORT_UTF
3509      if ((options & PCRE_UTF16) == 0)
3510    #endif
3511      if (end > 0xffff) end = 0xffff;
3512    
3513    #endif /* COMPILE_PCRE[8|16] */
3514    
3515    /* If all characters are less than 256, use the bit map. Otherwise use extra
3516    data. */
3517    
3518    if (end < 0x100)
3519      {
3520      for (c = start; c <= end; c++)
3521        {
3522        n8++;
3523        SETBIT(classbits, c);
3524        }
3525      }
3526    
3527    else
3528      {
3529      pcre_uchar *uchardata = *uchardptr;
3530    
3531    #ifdef SUPPORT_UTF
3532      if ((options & PCRE_UTF8) != 0)  /* All UTFs use the same flag bit */
3533        {
3534        if (start < end)
3535          {
3536          *uchardata++ = XCL_RANGE;
3537          uchardata += PRIV(ord2utf)(start, uchardata);
3538          uchardata += PRIV(ord2utf)(end, uchardata);
3539          }
3540        else if (start == end)
3541          {
3542          *uchardata++ = XCL_SINGLE;
3543          uchardata += PRIV(ord2utf)(start, uchardata);
3544          }
3545        }
3546      else
3547    #endif  /* SUPPORT_UTF */
3548    
3549      /* Without UTF support, character values are constrained by the bit length,
3550      and can only be > 256 for 16-bit and 32-bit libraries. */
3551    
3552    #ifdef COMPILE_PCRE8
3553        {}
3554    #else
3555      if (start < end)
3556        {
3557        *uchardata++ = XCL_RANGE;
3558        *uchardata++ = start;
3559        *uchardata++ = end;
3560        }
3561      else if (start == end)
3562        {
3563        *uchardata++ = XCL_SINGLE;
3564        *uchardata++ = start;
3565        }
3566    #endif
3567    
3568      *uchardptr = uchardata;   /* Updata extra data pointer */
3569      }
3570    
3571    return n8;    /* Number of 8-bit characters */
3572    }
3573    
3574    
3575    
3576    
3577    /*************************************************
3578    *        Add a list of characters to a class     *
3579    *************************************************/
3580    
3581    /* This function is used for adding a list of case-equivalent characters to a
3582    class, and also for adding a list of horizontal or vertical whitespace. If the
3583    list is in order (which it should be), ranges of characters are detected and
3584    handled appropriately. This function is mutually recursive with the function
3585    above.
3586    
3587    Arguments:
3588      classbits     the bit map for characters < 256
3589      uchardptr     points to the pointer for extra data
3590      options       the options word
3591      cd            contains pointers to tables etc.
3592      p             points to row of 32-bit values, terminated by NOTACHAR
3593      except        character to omit; this is used when adding lists of
3594                      case-equivalent characters to avoid including the one we
3595                      already know about
3596    
3597    Returns:        the number of < 256 characters added
3598                    the pointer to extra data is updated
3599    */
3600    
3601    static int
3602    add_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
3603      compile_data *cd, const pcre_uint32 *p, unsigned int except)
3604    {
3605    int n8 = 0;
3606    while (p[0] < NOTACHAR)
3607      {
3608      int n = 0;
3609      if (p[0] != except)
3610        {
3611        while(p[n+1] == p[0] + n + 1) n++;
3612        n8 += add_to_class(classbits, uchardptr, options, cd, p[0], p[n]);
3613        }
3614      p += n + 1;
3615      }
3616    return n8;
3617    }
3618    
3619    
3620    
3621    /*************************************************
3622    *    Add characters not in a list to a class     *
3623    *************************************************/
3624    
3625    /* This function is used for adding the complement of a list of horizontal or
3626    vertical whitespace to a class. The list must be in order.
3627    
3628    Arguments:
3629      classbits     the bit map for characters < 256
3630      uchardptr     points to the pointer for extra data
3631      options       the options word
3632      cd            contains pointers to tables etc.
3633      p             points to row of 32-bit values, terminated by NOTACHAR
3634    
3635    Returns:        the number of < 256 characters added
3636                    the pointer to extra data is updated
3637    */
3638    
3639    static int
3640    add_not_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr,
3641      int options, compile_data *cd, const pcre_uint32 *p)
3642    {
3643    BOOL utf = (options & PCRE_UTF8) != 0;
3644    int n8 = 0;
3645    if (p[0] > 0)
3646      n8 += add_to_class(classbits, uchardptr, options, cd, 0, p[0] - 1);
3647    while (p[0] < NOTACHAR)
3648      {
3649      while (p[1] == p[0] + 1) p++;
3650      n8 += add_to_class(classbits, uchardptr, options, cd, p[0] + 1,
3651        (p[1] == NOTACHAR) ? (utf ? 0x10ffffu : 0xffffffffu) : p[1] - 1);
3652      p++;
3653      }
3654    return n8;
3655    }
3656    
3657    
3658    
3659    /*************************************************
3660  *           Compile one branch                   *  *           Compile one branch                   *
3661  *************************************************/  *************************************************/
3662    
# Line 2383  Arguments: Line 3671  Arguments:
3671    codeptr        points to the pointer to the current code point    codeptr        points to the pointer to the current code point
3672    ptrptr         points to the current pattern pointer    ptrptr         points to the current pattern pointer
3673    errorcodeptr   points to error code variable    errorcodeptr   points to error code variable
3674    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)    firstcharptr    place to put the first required character
3675    reqbyteptr     set to the last literal character required, else < 0    firstcharflagsptr place to put the first character flags, or a negative number
3676      reqcharptr     place to put the last required character
3677      reqcharflagsptr place to put the last required character flags, or a negative number
3678    bcptr          points to current branch chain    bcptr          points to current branch chain
3679      cond_depth     conditional nesting depth
3680    cd             contains pointers to tables etc.    cd             contains pointers to tables etc.
3681    lengthptr      NULL during the real compile phase    lengthptr      NULL during the real compile phase
3682                   points to length accumulator during pre-compile phase                   points to length accumulator during pre-compile phase
# Line 2395  Returns:         TRUE on success Line 3686  Returns:         TRUE on success
3686  */  */
3687    
3688  static BOOL  static BOOL
3689  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,  compile_branch(int *optionsptr, pcre_uchar **codeptr,
3690    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,    const pcre_uchar **ptrptr, int *errorcodeptr,
3691      pcre_uint32 *firstcharptr, pcre_int32 *firstcharflagsptr,
3692      pcre_uint32 *reqcharptr, pcre_int32 *reqcharflagsptr,
3693      branch_chain *bcptr, int cond_depth,
3694    compile_data *cd, int *lengthptr)    compile_data *cd, int *lengthptr)
3695  {  {
3696  int repeat_type, op_type;  int repeat_type, op_type;
3697  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
3698  int bravalue = 0;  int bravalue = 0;
3699  int greedy_default, greedy_non_default;  int greedy_default, greedy_non_default;
3700  int firstbyte, reqbyte;  pcre_uint32 firstchar, reqchar;
3701  int zeroreqbyte, zerofirstbyte;  pcre_int32 firstcharflags, reqcharflags;
3702  int req_caseopt, reqvary, tempreqvary;  pcre_uint32 zeroreqchar, zerofirstchar;
3703  int options = *optionsptr;  pcre_int32 zeroreqcharflags, zerofirstcharflags;
3704    pcre_int32 req_caseopt, reqvary, tempreqvary;
3705    int options = *optionsptr;               /* May change dynamically */
3706  int after_manual_callout = 0;  int after_manual_callout = 0;
3707  int length_prevgroup = 0;  int length_prevgroup = 0;
3708  register int c;  register pcre_uint32 c;
3709  register uschar *code = *codeptr;  int escape;
3710  uschar *last_code = code;  register pcre_uchar *code = *codeptr;
3711  uschar *orig_code = code;  pcre_uchar *last_code = code;
3712  uschar *tempcode;  pcre_uchar *orig_code = code;
3713    pcre_uchar *tempcode;
3714  BOOL inescq = FALSE;  BOOL inescq = FALSE;
3715  BOOL groupsetfirstbyte = FALSE;  BOOL groupsetfirstchar = FALSE;
3716  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
3717  const uschar *tempptr;  const pcre_uchar *tempptr;
3718  uschar *previous = NULL;  const pcre_uchar *nestptr = NULL;
3719  uschar *previous_callout = NULL;  pcre_uchar *previous = NULL;
3720  uschar *save_hwm = NULL;  pcre_uchar *previous_callout = NULL;
3721  uschar classbits[32];  pcre_uchar *save_hwm = NULL;
3722    pcre_uint8 classbits[32];
3723  #ifdef SUPPORT_UTF8  
3724  BOOL class_utf8;  /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
3725  BOOL utf8 = (options & PCRE_UTF8) != 0;  must not do this for other options (e.g. PCRE_EXTENDED) because they may change
3726  uschar *class_utf8data;  dynamically as we process the pattern. */
3727  uschar *class_utf8data_base;  
3728  uschar utf8_char[6];  #ifdef SUPPORT_UTF
3729    /* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */
3730    BOOL utf = (options & PCRE_UTF8) != 0;
3731    #ifndef COMPILE_PCRE32
3732    pcre_uchar utf_chars[6];
3733    #endif
3734  #else  #else
3735  BOOL utf8 = FALSE;  BOOL utf = FALSE;
3736  uschar *utf8_char = NULL;  #endif
3737    
3738    /* Helper variables for OP_XCLASS opcode (for characters > 255). We define
3739    class_uchardata always so that it can be passed to add_to_class() always,
3740    though it will not be used in non-UTF 8-bit cases. This avoids having to supply
3741    alternative calls for the different cases. */
3742    
3743    pcre_uchar *class_uchardata;
3744    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3745    BOOL xclass;
3746    pcre_uchar *class_uchardata_base;
3747  #endif  #endif
3748    
3749  #ifdef DEBUG  #ifdef PCRE_DEBUG
3750  if (lengthptr != NULL) DPRINTF((">> start branch\n"));  if (lengthptr != NULL) DPRINTF((">> start branch\n"));
3751  #endif  #endif
3752    
# Line 2445  greedy_non_default = greedy_default ^ 1; Line 3757  greedy_non_default = greedy_default ^ 1;
3757    
3758  /* Initialize no first byte, no required byte. REQ_UNSET means "no char  /* Initialize no first byte, no required byte. REQ_UNSET means "no char
3759  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
3760  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
3761  find one.  find one.
3762    
3763  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
3764  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
3765  zerofirstbyte and zeroreqbyte when such a repeat is encountered. The individual  zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual
3766  item types that can be repeated set these backoff variables appropriately. */  item types that can be repeated set these backoff variables appropriately. */
3767    
3768  firstbyte = reqbyte = zerofirstbyte = zeroreqbyte = REQ_UNSET;  firstchar = reqchar = zerofirstchar = zeroreqchar = 0;
3769    firstcharflags = reqcharflags = zerofirstcharflags = zeroreqcharflags = REQ_UNSET;
3770    
3771  /* The variable req_caseopt contains either the REQ_CASELESS value or zero,  /* The variable req_caseopt contains either the REQ_CASELESS value
3772  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
3773  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
3774  case status of the value. This is used only for ASCII characters. */  firstchar or reqchar variables to record the case status of the
3775    value. This is used only for ASCII characters. */
3776    
3777  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
3778    
3779  /* Switch on next character until the end of the branch */  /* Switch on next character until the end of the branch */
3780    
# Line 2472  for (;; ptr++) Line 3786  for (;; ptr++)
3786    BOOL is_quantifier;    BOOL is_quantifier;
3787    BOOL is_recurse;    BOOL is_recurse;
3788    BOOL reset_bracount;    BOOL reset_bracount;
3789    int class_charcount;    int class_has_8bitchar;
3790    int class_lastchar;    int class_one_char;
3791    int newoptions;    int newoptions;
3792    int recno;    int recno;
3793    int refsign;    int refsign;
3794    int skipbytes;    int skipbytes;
3795    int subreqbyte;    pcre_uint32 subreqchar, subfirstchar;
3796    int subfirstbyte;    pcre_int32 subreqcharflags, subfirstcharflags;
3797    int terminator;    int terminator;
3798    int mclength;    int mclength;
3799    uschar mcbuffer[8];    int tempbracount;
3800      pcre_uint32 ec;
3801      pcre_uchar mcbuffer[8];
3802    
3803    /* Get next byte in the pattern */    /* Get next character in the pattern */
3804    
3805    c = *ptr;    c = *ptr;
3806    
3807      /* If we are at the end of a nested substitution, revert to the outer level
3808      string. Nesting only happens one level deep. */
3809    
3810      if (c == 0 && nestptr != NULL)
3811        {
3812        ptr = nestptr;
3813        nestptr = NULL;
3814        c = *ptr;
3815        }
3816    
3817    /* 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
3818    previous cycle of this loop. */    previous cycle of this loop. */
3819    
3820    if (lengthptr != NULL)    if (lengthptr != NULL)
3821      {      {
3822  #ifdef DEBUG  #ifdef PCRE_DEBUG
3823      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
3824  #endif  #endif
3825      if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */      if (code > cd->start_workspace + cd->workspace_size -
3826            WORK_SIZE_SAFETY_MARGIN)                       /* Check for overrun */
3827        {        {
3828        *errorcodeptr = ERR52;        *errorcodeptr = ERR52;
3829        goto FAILED;        goto FAILED;
# Line 2518  for (;; ptr++) Line 3845  for (;; ptr++)
3845        goto FAILED;        goto FAILED;
3846        }        }
3847    
3848      *lengthptr += code - last_code;      *lengthptr += (int)(code - last_code);
3849      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));      DPRINTF(("length=%d added %d c=%c (0x%x)\n", *lengthptr,
3850          (int)(code - last_code), c, c));
3851    
3852      /* 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
3853      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 2529  for (;; ptr++) Line 3857  for (;; ptr++)
3857        {        {
3858        if (previous > orig_code)        if (previous > orig_code)
3859          {          {
3860          memmove(orig_code, previous, code - previous);          memmove(orig_code, previous, IN_UCHARS(code - previous));
3861          code -= previous - orig_code;          code -= previous - orig_code;
3862          previous = orig_code;          previous = orig_code;
3863          }          }
# Line 2545  for (;; ptr++) Line 3873  for (;; ptr++)
3873    /* 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
3874    reference list. */    reference list. */
3875    
3876    else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)    else if (cd->hwm > cd->start_workspace + cd->workspace_size -
3877               WORK_SIZE_SAFETY_MARGIN)
3878      {      {
3879      *errorcodeptr = ERR52;      *errorcodeptr = ERR52;
3880      goto FAILED;      goto FAILED;
# Line 2555  for (;; ptr++) Line 3884  for (;; ptr++)
3884    
3885    if (inescq && c != 0)    if (inescq && c != 0)
3886      {      {
3887      if (c == '\\' && ptr[1] == 'E')      if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
3888        {        {
3889        inescq = FALSE;        inescq = FALSE;
3890        ptr++;        ptr++;
# Line 2581  for (;; ptr++) Line 3910  for (;; ptr++)
3910    /* Fill in length of a previous callout, except when the next thing is    /* Fill in length of a previous callout, except when the next thing is
3911    a quantifier. */    a quantifier. */
3912    
3913    is_quantifier = c == '*' || c == '+' || c == '?' ||    is_quantifier =
3914      (c == '{' && is_counted_repeat(ptr+1));      c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
3915        (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
3916    
3917    if (!is_quantifier && previous_callout != NULL &&    if (!is_quantifier && previous_callout != NULL &&
3918         after_manual_callout-- <= 0)         after_manual_callout-- <= 0)
# Line 2592  for (;; ptr++) Line 3922  for (;; ptr++)
3922      previous_callout = NULL;      previous_callout = NULL;
3923      }      }
3924    
3925    /* In extended mode, skip white space and comments */