/[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 172 by ph10, Tue Jun 5 10:40:13 2007 UTC revision 1045 by ph10, Sun Sep 23 16:50:00 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-2007 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 42  POSSIBILITY OF SUCH DAMAGE. Line 42  POSSIBILITY OF SUCH DAMAGE.
42  supporting internal functions that are not used by other modules. */  supporting internal functions that are not used by other modules. */
43    
44    
45    #ifdef HAVE_CONFIG_H
46    #include "config.h"
47    #endif
48    
49  #define NLBLOCK cd             /* Block containing newline information */  #define NLBLOCK cd             /* Block containing newline information */
50  #define PSSTART start_pattern  /* Field containing processed string start */  #define PSSTART start_pattern  /* Field containing processed string start */
51  #define PSEND   end_pattern    /* Field containing processed string end */  #define PSEND   end_pattern    /* Field containing processed string end */
52    
   
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)_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    COMPILE_PCREx macro will already be appropriately set. */
60    
61  #ifdef DEBUG  #ifdef PCRE_DEBUG
62  #include "pcre_printint.src"  /* pcre_printint.c should not include any headers */
63    #define PCRE_INCLUDED
64    #include "pcre_printint.c"
65    #undef PCRE_INCLUDED
66  #endif  #endif
67    
68    
69    /* Macro for setting individual bits in class bitmaps. */
70    
71    #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
74    holds the compiled pattern length does not overflow. We make it a bit less than
75    INT_MAX to allow for adding in group terminating bytes, so that we don't have
76    to check them every time. */
77    
78    #define OFLOW_MAX (INT_MAX - 20)
79    
80    /* Definitions to allow mutual recursion */
81    
82    static int
83      add_list_to_class(pcre_uint8 *, pcre_uchar **, int, compile_data *,
84        const pcre_uint32 *, unsigned int);
85    
86    static BOOL
87      compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL,
88        int, int, int *, int *, branch_chain *, compile_data *, int *);
89    
90    
91    
92  /*************************************************  /*************************************************
93  *      Code parameters and static tables         *  *      Code parameters and static tables         *
94  *************************************************/  *************************************************/
# Line 72  so this number is very generous. Line 103  so this number is very generous.
103  The same workspace is used during the second, actual compile phase for  The same workspace is used during the second, actual compile phase for
104  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
105  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
106  is 4 there is plenty of room. */  is 4 there is plenty of room for most patterns. However, the memory can get
107    filled up by repetitions of forward references, for example patterns like
108    /(?1){0,1999}(b)/, and one user did hit the limit. The code has been changed so
109    that the workspace is expanded using malloc() in this situation. The value
110    below is therefore a minimum, and we put a maximum on it for safety. The
111    minimum is now also defined in terms of LINK_SIZE so that the use of malloc()
112    kicks in at the same number of forward references in all cases. */
113    
114  #define COMPILE_WORK_SIZE (4096)  #define COMPILE_WORK_SIZE (2048*LINK_SIZE)
115    #define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)
116    
117    /* The overrun tests check for a slightly smaller size so that they detect the
118    overrun before it actually does run off the end of the data block. */
119    
120    #define WORK_SIZE_SAFETY_MARGIN (100)
121    
122    /* Private flags added to firstchar and reqchar. */
123    
124    #define REQ_CASELESS   0x10000000l      /* Indicates caselessness */
125    #define REQ_VARY       0x20000000l      /* Reqchar followed non-literal item */
126    
127    /* Repeated character flags. */
128    
129    #define UTF_LENGTH     0x10000000l      /* The char contains its length. */
130    
131  /* Table for handling escaped characters in the range '0'-'z'. Positive returns  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
132  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
133  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
134  is invalid. */  is invalid. */
135    
136  #ifndef EBCDIC  /* This is the "normal" table for ASCII systems */  #ifndef EBCDIC
137    
138    /* This is the "normal" table for ASCII systems or for EBCDIC systems running
139    in UTF-8 mode. */
140    
141  static const short int escapes[] = {  static const short int escapes[] = {
142       0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */       0,                       0,
143       0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */       0,                       0,
144     '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */       0,                       0,
145       0,      0,      0, -ESC_K,      0,      0,      0,      0,   /* H - O */       0,                       0,
146  -ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0,      0, -ESC_W,   /* P - W */       0,                       0,
147  -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */       CHAR_COLON,              CHAR_SEMICOLON,
148     '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */       CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
149       0,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */       CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
150  -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0,      0, -ESC_w,   /* p - w */       CHAR_COMMERCIAL_AT,      -ESC_A,
151       0,      0, -ESC_z                                            /* x - z */       -ESC_B,                  -ESC_C,
152         -ESC_D,                  -ESC_E,
153         0,                       -ESC_G,
154         -ESC_H,                  0,
155         0,                       -ESC_K,
156         0,                       0,
157         -ESC_N,                  0,
158         -ESC_P,                  -ESC_Q,
159         -ESC_R,                  -ESC_S,
160         0,                       0,
161         -ESC_V,                  -ESC_W,
162         -ESC_X,                  0,
163         -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
164         CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
165         CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
166         CHAR_GRAVE_ACCENT,       7,
167         -ESC_b,                  0,
168         -ESC_d,                  ESC_e,
169         ESC_f,                   0,
170         -ESC_h,                  0,
171         0,                       -ESC_k,
172         0,                       0,
173         ESC_n,                   0,
174         -ESC_p,                  0,
175         ESC_r,                   -ESC_s,
176         ESC_tee,                 0,
177         -ESC_v,                  -ESC_w,
178         0,                       0,
179         -ESC_z
180  };  };
181    
182  #else           /* This is the "abnormal" table for EBCDIC systems */  #else
183    
184    /* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
185    
186  static const short int escapes[] = {  static const short int escapes[] = {
187  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
188  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
# Line 106  static const short int escapes[] = { Line 192  static const short int escapes[] = {
192  /*  70 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  70 */     0,     0,      0,       0,      0,     0,      0,      0,
193  /*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',  /*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',
194  /*  80 */     0,     7, -ESC_b,       0, -ESC_d, ESC_e,  ESC_f,      0,  /*  80 */     0,     7, -ESC_b,       0, -ESC_d, ESC_e,  ESC_f,      0,
195  /*  88 */     0,     0,      0,     '{',      0,     0,      0,      0,  /*  88 */-ESC_h,     0,      0,     '{',      0,     0,      0,      0,
196  /*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,  /*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,
197  /*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,  /*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,
198  /*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,     0, -ESC_w,      0,  /*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,-ESC_v, -ESC_w,      0,
199  /*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,  /*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,
200  /*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,
201  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
202  /*  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,
203  /*  C8 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
204  /*  D0 */   '}',     0,      0,       0,      0,     0,      0, -ESC_P,  /*  D0 */   '}',     0, -ESC_K,       0,      0,-ESC_N,      0, -ESC_P,
205  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
206  /*  E0 */  '\\',     0, -ESC_S,       0,      0,     0, -ESC_W, -ESC_X,  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
207  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
208  /*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,
209  /*  F8 */     0,     0,      0,       0,      0,     0,      0,      0  /*  F8 */     0,     0,      0,       0,      0,     0,      0,      0
# Line 125  static const short int escapes[] = { Line 211  static const short int escapes[] = {
211  #endif  #endif
212    
213    
214  /* Tables of names of POSIX character classes and their lengths. The list is  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is
215  terminated by a zero length entry. The first three must be alpha, lower, upper,  searched linearly. Put all the names into a single string, in order to reduce
216  as this is assumed for handling case independence. */  the number of relocations when a shared library is dynamically linked. The
217    string is built from string macros so that it works in UTF-8 mode on EBCDIC
218  static const char *const posix_names[] = {  platforms. */
219    "alpha", "lower", "upper",  
220    "alnum", "ascii", "blank", "cntrl", "digit", "graph",  typedef struct verbitem {
221    "print", "punct", "space", "word",  "xdigit" };    int   len;                 /* Length of verb name */
222      int   op;                  /* Op when no arg, or -1 if arg mandatory */
223      int   op_arg;              /* Op when arg present, or -1 if not allowed */
224    } verbitem;
225    
226    static const char verbnames[] =
227      "\0"                       /* Empty name is a shorthand for MARK */
228      STRING_MARK0
229      STRING_ACCEPT0
230      STRING_COMMIT0
231      STRING_F0
232      STRING_FAIL0
233      STRING_PRUNE0
234      STRING_SKIP0
235      STRING_THEN;
236    
237    static const verbitem verbs[] = {
238      { 0, -1,        OP_MARK },
239      { 4, -1,        OP_MARK },
240      { 6, OP_ACCEPT, -1 },
241      { 6, OP_COMMIT, -1 },
242      { 1, OP_FAIL,   -1 },
243      { 4, OP_FAIL,   -1 },
244      { 5, OP_PRUNE,  OP_PRUNE_ARG },
245      { 4, OP_SKIP,   OP_SKIP_ARG  },
246      { 4, OP_THEN,   OP_THEN_ARG  }
247    };
248    
249    static const int verbcount = sizeof(verbs)/sizeof(verbitem);
250    
251    
252    /* Tables of names of POSIX character classes and their lengths. The names are
253    now all in a single string, to reduce the number of relocations when a shared
254    library is dynamically loaded. The list of lengths is terminated by a zero
255    length entry. The first three must be alpha, lower, upper, as this is assumed
256    for handling case independence. */
257    
258    static const char posix_names[] =
259      STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
260      STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
261      STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
262      STRING_word0  STRING_xdigit;
263    
264  static const uschar posix_name_lengths[] = {  static const pcre_uint8 posix_name_lengths[] = {
265    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 };
266    
267  /* 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 164  static const int posix_class_maps[] = { Line 291  static const int posix_class_maps[] = {
291    cbit_xdigit,-1,          0              /* xdigit */    cbit_xdigit,-1,          0              /* xdigit */
292  };  };
293    
294    /* Table of substitutes for \d etc when PCRE_UCP is set. The POSIX class
295    substitutes must be in the order of the names, defined above, and there are
296    both positive and negative cases. NULL means no substitute. */
297    
298    #ifdef SUPPORT_UCP
299    static const pcre_uchar string_PNd[]  = {
300      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
301      CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
302    static const pcre_uchar string_pNd[]  = {
303      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
304      CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
305    static const pcre_uchar string_PXsp[] = {
306      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
307      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
308    static const pcre_uchar string_pXsp[] = {
309      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
310      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
311    static const pcre_uchar string_PXwd[] = {
312      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
313      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
314    static const pcre_uchar string_pXwd[] = {
315      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
316      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
317    
318    static const pcre_uchar *substitutes[] = {
319      string_PNd,           /* \D */
320      string_pNd,           /* \d */
321      string_PXsp,          /* \S */       /* NOTE: Xsp is Perl space */
322      string_pXsp,          /* \s */
323      string_PXwd,          /* \W */
324      string_pXwd           /* \w */
325    };
326    
327    static const pcre_uchar string_pL[] =   {
328      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
329      CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
330    static const pcre_uchar string_pLl[] =  {
331      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
332      CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
333    static const pcre_uchar string_pLu[] =  {
334      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
335      CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
336    static const pcre_uchar string_pXan[] = {
337      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
338      CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
339    static const pcre_uchar string_h[] =    {
340      CHAR_BACKSLASH, CHAR_h, '\0' };
341    static const pcre_uchar string_pXps[] = {
342      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
343      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
344    static const pcre_uchar string_PL[] =   {
345      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
346      CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
347    static const pcre_uchar string_PLl[] =  {
348      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
349      CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
350    static const pcre_uchar string_PLu[] =  {
351      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
352      CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
353    static const pcre_uchar string_PXan[] = {
354      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
355      CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
356    static const pcre_uchar string_H[] =    {
357      CHAR_BACKSLASH, CHAR_H, '\0' };
358    static const pcre_uchar string_PXps[] = {
359      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
360      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
361    
362    static const pcre_uchar *posix_substitutes[] = {
363      string_pL,            /* alpha */
364      string_pLl,           /* lower */
365      string_pLu,           /* upper */
366      string_pXan,          /* alnum */
367      NULL,                 /* ascii */
368      string_h,             /* blank */
369      NULL,                 /* cntrl */
370      string_pNd,           /* digit */
371      NULL,                 /* graph */
372      NULL,                 /* print */
373      NULL,                 /* punct */
374      string_pXps,          /* space */    /* NOTE: Xps is POSIX space */
375      string_pXwd,          /* word */
376      NULL,                 /* xdigit */
377      /* Negated cases */
378      string_PL,            /* ^alpha */
379      string_PLl,           /* ^lower */
380      string_PLu,           /* ^upper */
381      string_PXan,          /* ^alnum */
382      NULL,                 /* ^ascii */
383      string_H,             /* ^blank */
384      NULL,                 /* ^cntrl */
385      string_PNd,           /* ^digit */
386      NULL,                 /* ^graph */
387      NULL,                 /* ^print */
388      NULL,                 /* ^punct */
389      string_PXps,          /* ^space */   /* NOTE: Xps is POSIX space */
390      string_PXwd,          /* ^word */
391      NULL                  /* ^xdigit */
392    };
393    #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
394    #endif
395    
396  #define STRING(a)  # a  #define STRING(a)  # a
397  #define XSTRING(s) STRING(s)  #define XSTRING(s) STRING(s)
# Line 171  static const int posix_class_maps[] = { Line 399  static const int posix_class_maps[] = {
399  /* The texts of compile-time error messages. These are "char *" because they  /* The texts of compile-time error messages. These are "char *" because they
400  are passed to the outside world. Do not ever re-use any error number, because  are passed to the outside world. Do not ever re-use any error number, because
401  they are documented. Always add a new error instead. Messages marked DEAD below  they are documented. Always add a new error instead. Messages marked DEAD below
402  are no longer used. */  are no longer used. This used to be a table of strings, but in order to reduce
403    the number of relocations needed when a shared library is loaded dynamically,
404  static const char *error_texts[] = {  it is now one long string. We cannot use a table of offsets, because the
405    "no error",  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
406    "\\ at end of pattern",  simply count through to the one we want - this isn't a performance issue
407    "\\c at end of pattern",  because these strings are used only when there is a compilation error.
408    "unrecognized character follows \\",  
409    "numbers out of order in {} quantifier",  Each substring ends with \0 to insert a null character. This includes the final
410    substring, so that the whole string ends with \0\0, which can be detected when
411    counting through. */
412    
413    static const char error_texts[] =
414      "no error\0"
415      "\\ at end of pattern\0"
416      "\\c at end of pattern\0"
417      "unrecognized character follows \\\0"
418      "numbers out of order in {} quantifier\0"
419    /* 5 */    /* 5 */
420    "number too big in {} quantifier",    "number too big in {} quantifier\0"
421    "missing terminating ] for character class",    "missing terminating ] for character class\0"
422    "invalid escape sequence in character class",    "invalid escape sequence in character class\0"
423    "range out of order in character class",    "range out of order in character class\0"
424    "nothing to repeat",    "nothing to repeat\0"
425    /* 10 */    /* 10 */
426    "operand of unlimited repeat could match the empty string",  /** DEAD **/    "operand of unlimited repeat could match the empty string\0"  /** DEAD **/
427    "internal error: unexpected repeat",    "internal error: unexpected repeat\0"
428    "unrecognized character after (?",    "unrecognized character after (? or (?-\0"
429    "POSIX named classes are supported only within a class",    "POSIX named classes are supported only within a class\0"
430    "missing )",    "missing )\0"
431    /* 15 */    /* 15 */
432    "reference to non-existent subpattern",    "reference to non-existent subpattern\0"
433    "erroffset passed as NULL",    "erroffset passed as NULL\0"
434    "unknown option bit(s) set",    "unknown option bit(s) set\0"
435    "missing ) after comment",    "missing ) after comment\0"
436    "parentheses nested too deeply",  /** DEAD **/    "parentheses nested too deeply\0"  /** DEAD **/
437    /* 20 */    /* 20 */
438    "regular expression too large",    "regular expression is too large\0"
439    "failed to get memory",    "failed to get memory\0"
440    "unmatched parentheses",    "unmatched parentheses\0"
441    "internal error: code overflow",    "internal error: code overflow\0"
442    "unrecognized character after (?<",    "unrecognized character after (?<\0"
443    /* 25 */    /* 25 */
444    "lookbehind assertion is not fixed length",    "lookbehind assertion is not fixed length\0"
445    "malformed number or name after (?(",    "malformed number or name after (?(\0"
446    "conditional group contains more than two branches",    "conditional group contains more than two branches\0"
447    "assertion expected after (?(",    "assertion expected after (?(\0"
448    "(?R or (?[+-]digits must be followed by )",    "(?R or (?[+-]digits must be followed by )\0"
449    /* 30 */    /* 30 */
450    "unknown POSIX class name",    "unknown POSIX class name\0"
451    "POSIX collating elements are not supported",    "POSIX collating elements are not supported\0"
452    "this version of PCRE is not compiled with PCRE_UTF8 support",    "this version of PCRE is compiled without UTF support\0"
453    "spare error",  /** DEAD **/    "spare error\0"  /** DEAD **/
454    "character value in \\x{...} sequence is too large",    "character value in \\x{...} sequence is too large\0"
455    /* 35 */    /* 35 */
456    "invalid condition (?(0)",    "invalid condition (?(0)\0"
457    "\\C not allowed in lookbehind assertion",    "\\C not allowed in lookbehind assertion\0"
458    "PCRE does not support \\L, \\l, \\N, \\U, or \\u",    "PCRE does not support \\L, \\l, \\N{name}, \\U, or \\u\0"
459    "number after (?C is > 255",    "number after (?C is > 255\0"
460    "closing ) for (?C expected",    "closing ) for (?C expected\0"
461    /* 40 */    /* 40 */
462    "recursive call could loop indefinitely",    "recursive call could loop indefinitely\0"
463    "unrecognized character after (?P",    "unrecognized character after (?P\0"
464    "syntax error in subpattern name (missing terminator)",    "syntax error in subpattern name (missing terminator)\0"
465    "two named subpatterns have the same name",    "two named subpatterns have the same name\0"
466    "invalid UTF-8 string",    "invalid UTF-8 string\0"
467    /* 45 */    /* 45 */
468    "support for \\P, \\p, and \\X has not been compiled",    "support for \\P, \\p, and \\X has not been compiled\0"
469    "malformed \\P or \\p sequence",    "malformed \\P or \\p sequence\0"
470    "unknown property name after \\P or \\p",    "unknown property name after \\P or \\p\0"
471    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)",    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
472    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")",    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
473    /* 50 */    /* 50 */
474    "repeated subpattern is too long",    "repeated subpattern is too long\0"    /** DEAD **/
475    "octal value is greater than \\377 (not in UTF-8 mode)",    "octal value is greater than \\377 in 8-bit non-UTF-8 mode\0"
476    "internal error: overran compiling workspace",    "internal error: overran compiling workspace\0"
477    "internal error: previously-checked referenced subpattern not found",    "internal error: previously-checked referenced subpattern not found\0"
478    "DEFINE group contains more than one branch",    "DEFINE group contains more than one branch\0"
479    /* 55 */    /* 55 */
480    "repeating a DEFINE group is not allowed",    "repeating a DEFINE group is not allowed\0"  /** DEAD **/
481    "inconsistent NEWLINE options",    "inconsistent NEWLINE options\0"
482    "\\g is not followed by a braced name or an optionally braced non-zero number",    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
483    "(?+ or (?- or (?(+ or (?(- must be followed by a non-zero number"    "a numbered reference must not be zero\0"
484  };    "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
485      /* 60 */
486      "(*VERB) not recognized\0"
487      "number is too big\0"
488      "subpattern name expected\0"
489      "digit expected after (?+\0"
490      "] is an invalid data character in JavaScript compatibility mode\0"
491      /* 65 */
492      "different names for subpatterns of the same number are not allowed\0"
493      "(*MARK) must have an argument\0"
494      "this version of PCRE is not compiled with Unicode property support\0"
495      "\\c must be followed by an ASCII character\0"
496      "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
497      /* 70 */
498      "internal error: unknown opcode in find_fixedlength()\0"
499      "\\N is not supported in a class\0"
500      "too many forward references\0"
501      "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
502      "invalid UTF-16 string\0"
503      /* 75 */
504      "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0"
505      "character value in \\u.... sequence is too large\0"
506      ;
507    
508  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
509  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 263  For convenience, we use the same bit def Line 521  For convenience, we use the same bit def
521    
522  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
523    
524  #ifndef EBCDIC  /* This is the "normal" case, for ASCII systems */  /* Using a simple comparison for decimal numbers rather than a memory read
525  static const unsigned char digitab[] =  is much faster, and the resulting code is simpler (the compiler turns it
526    into a subtraction and unsigned comparison). */
527    
528    #define IS_DIGIT(x) ((x) >= CHAR_0 && (x) <= CHAR_9)
529    
530    #ifndef EBCDIC
531    
532    /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
533    UTF-8 mode. */
534    
535    static const pcre_uint8 digitab[] =
536    {    {
537    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
538    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */
# Line 299  static const unsigned char digitab[] = Line 567  static const unsigned char digitab[] =
567    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
568    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
569    
570  #else           /* This is the "abnormal" case, for EBCDIC systems */  #else
571  static const unsigned char digitab[] =  
572    /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
573    
574    static const pcre_uint8 digitab[] =
575    {    {
576    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
577    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */
# Line 335  static const unsigned char digitab[] = Line 606  static const unsigned char digitab[] =
606    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */
607    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */
608    
609  static const unsigned char ebcdic_chartab[] = { /* chartable partial dup */  static const pcre_uint8 ebcdic_chartab[] = { /* chartable partial dup */
610    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */
611    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
612    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */
# Line 371  static const unsigned char ebcdic_charta Line 642  static const unsigned char ebcdic_charta
642  #endif  #endif
643    
644    
645  /* Definition to allow mutual recursion */  
646    
647    /*************************************************
648    *            Find an error text                  *
649    *************************************************/
650    
651    /* The error texts are now all in one long string, to save on relocations. As
652    some of the text is of unknown length, we can't use a table of offsets.
653    Instead, just count through the strings. This is not a performance issue
654    because it happens only when there has been a compilation error.
655    
656    Argument:   the error number
657    Returns:    pointer to the error string
658    */
659    
660    static const char *
661    find_error_text(int n)
662    {
663    const char *s = error_texts;
664    for (; n > 0; n--)
665      {
666      while (*s++ != 0) {};
667      if (*s == 0) return "Error text not found (please report)";
668      }
669    return s;
670    }
671    
672    
673    /*************************************************
674    *           Expand the workspace                 *
675    *************************************************/
676    
677    /* This function is called during the second compiling phase, if the number of
678    forward references fills the existing workspace, which is originally a block on
679    the stack. A larger block is obtained from malloc() unless the ultimate limit
680    has been reached or the increase will be rather small.
681    
682    Argument: pointer to the compile data block
683    Returns:  0 if all went well, else an error number
684    */
685    
686    static int
687    expand_workspace(compile_data *cd)
688    {
689    pcre_uchar *newspace;
690    int newsize = cd->workspace_size * 2;
691    
692    if (newsize > COMPILE_WORK_SIZE_MAX) newsize = COMPILE_WORK_SIZE_MAX;
693    if (cd->workspace_size >= COMPILE_WORK_SIZE_MAX ||
694        newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)
695     return ERR72;
696    
697    newspace = (PUBL(malloc))(IN_UCHARS(newsize));
698    if (newspace == NULL) return ERR21;
699    memcpy(newspace, cd->start_workspace, cd->workspace_size * sizeof(pcre_uchar));
700    cd->hwm = (pcre_uchar *)newspace + (cd->hwm - cd->start_workspace);
701    if (cd->workspace_size > COMPILE_WORK_SIZE)
702      (PUBL(free))((void *)cd->start_workspace);
703    cd->start_workspace = newspace;
704    cd->workspace_size = newsize;
705    return 0;
706    }
707    
708    
709    
710    /*************************************************
711    *            Check for counted repeat            *
712    *************************************************/
713    
714    /* This function is called when a '{' is encountered in a place where it might
715    start a quantifier. It looks ahead to see if it really is a quantifier or not.
716    It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
717    where the ddds are digits.
718    
719    Arguments:
720      p         pointer to the first char after '{'
721    
722    Returns:    TRUE or FALSE
723    */
724    
725  static BOOL  static BOOL
726    compile_regex(int, int, uschar **, const uschar **, int *, BOOL, int, int *,  is_counted_repeat(const pcre_uchar *p)
727      int *, branch_chain *, compile_data *, int *);  {
728    if (!IS_DIGIT(*p)) return FALSE;
729    p++;
730    while (IS_DIGIT(*p)) p++;
731    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
732    
733    if (*p++ != CHAR_COMMA) return FALSE;
734    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
735    
736    if (!IS_DIGIT(*p)) return FALSE;
737    p++;
738    while (IS_DIGIT(*p)) p++;
739    
740    return (*p == CHAR_RIGHT_CURLY_BRACKET);
741    }
742    
743    
744    
# Line 400  Arguments: Line 763  Arguments:
763    
764  Returns:         zero or positive => a data character  Returns:         zero or positive => a data character
765                   negative => a special escape sequence                   negative => a special escape sequence
766                   on error, errorptr is set                   on error, errorcodeptr is set
767  */  */
768    
769  static int  static int
770  check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,  check_escape(const pcre_uchar **ptrptr, int *errorcodeptr, int bracount,
771    int options, BOOL isclass)    int options, BOOL isclass)
772  {  {
773  BOOL utf8 = (options & PCRE_UTF8) != 0;  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
774  const uschar *ptr = *ptrptr + 1;  BOOL utf = (options & PCRE_UTF8) != 0;
775  int c, i;  const pcre_uchar *ptr = *ptrptr + 1;
776    pcre_int32 c;
777    int i;
778    
779  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
780  ptr--;                            /* Set pointer back to the last byte */  ptr--;                            /* Set pointer back to the last byte */
# Line 418  ptr--;                            /* Set Line 783  ptr--;                            /* Set
783    
784  if (c == 0) *errorcodeptr = ERR1;  if (c == 0) *errorcodeptr = ERR1;
785    
786  /* Non-alphamerics are literals. For digits or letters, do an initial lookup in  /* Non-alphanumerics are literals. For digits or letters, do an initial lookup
787  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.
788  Otherwise further processing may be required. */  Otherwise further processing may be required. */
789    
790  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
791  else if (c < '0' || c > 'z') {}                           /* Not alphameric */  /* Not alphanumeric */
792  else if ((i = escapes[c - '0']) != 0) c = i;  else if (c < CHAR_0 || c > CHAR_z) {}
793    else if ((i = escapes[c - CHAR_0]) != 0) c = i;
794    
795  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
796  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphameric */  /* Not alphanumeric */
797    else if (c < CHAR_a || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}
798  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if ((i = escapes[c - 0x48]) != 0)  c = i;
799  #endif  #endif
800    
# Line 435  else if ((i = escapes[c - 0x48]) != 0) Line 802  else if ((i = escapes[c - 0x48]) != 0)
802    
803  else  else
804    {    {
805    const uschar *oldptr;    const pcre_uchar *oldptr;
806    BOOL braced, negated;    BOOL braced, negated;
807    
808    switch (c)    switch (c)
# Line 443  else Line 810  else
810      /* 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
811      error. */      error. */
812    
813      case 'l':      case CHAR_l:
814      case 'L':      case CHAR_L:
     case 'N':  
     case 'u':  
     case 'U':  
815      *errorcodeptr = ERR37;      *errorcodeptr = ERR37;
816      break;      break;
817    
818      /* \g must be followed by a number, either plain or braced. If positive, it      case CHAR_u:
819      is an absolute backreference. If negative, it is a relative backreference.      if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
820      This is a Perl 5.10 feature. Perl 5.10 also supports \g{name} as a        {
821      reference to a named group. This is part of Perl's movement towards a        /* In JavaScript, \u must be followed by four hexadecimal numbers.
822      unified syntax for back references. As this is synonymous with \k{name}, we        Otherwise it is a lowercase u letter. */
823      fudge it up by pretending it really was \k. */        if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
824            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0
825      case 'g':          && MAX_255(ptr[3]) && (digitab[ptr[3]] & ctype_xdigit) != 0
826      if (ptr[1] == '{')          && MAX_255(ptr[4]) && (digitab[ptr[4]] & ctype_xdigit) != 0)
827        {          {
828        const uschar *p;          c = 0;
829        for (p = ptr+2; *p != 0 && *p != '}'; p++)          for (i = 0; i < 4; ++i)
830          if (*p != '-' && (digitab[*p] & ctype_digit) == 0) break;            {
831        if (*p != 0 && *p != '}')            register int cc = *(++ptr);
832    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
833              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
834              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
835    #else           /* EBCDIC coding */
836              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
837              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
838    #endif
839              }
840    
841    #ifdef COMPILE_PCRE8
842            if (c > (utf ? 0x10ffff : 0xff))
843    #else
844    #ifdef COMPILE_PCRE16
845            if (c > (utf ? 0x10ffff : 0xffff))
846    #endif
847    #endif
848              {
849              *errorcodeptr = ERR76;
850              }
851            else if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
852            }
853          }
854        else
855          *errorcodeptr = ERR37;
856        break;
857    
858        case CHAR_U:
859        /* In JavaScript, \U is an uppercase U letter. */
860        if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
861        break;
862    
863        /* In a character class, \g is just a literal "g". Outside a character
864        class, \g must be followed by one of a number of specific things:
865    
866        (1) A number, either plain or braced. If positive, it is an absolute
867        backreference. If negative, it is a relative backreference. This is a Perl
868        5.10 feature.
869    
870        (2) Perl 5.10 also supports \g{name} as a reference to a named group. This
871        is part of Perl's movement towards a unified syntax for back references. As
872        this is synonymous with \k{name}, we fudge it up by pretending it really
873        was \k.
874    
875        (3) For Oniguruma compatibility we also support \g followed by a name or a
876        number either in angle brackets or in single quotes. However, these are
877        (possibly recursive) subroutine calls, _not_ backreferences. Just return
878        the -ESC_g code (cf \k). */
879    
880        case CHAR_g:
881        if (isclass) break;
882        if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
883          {
884          c = -ESC_g;
885          break;
886          }
887    
888        /* Handle the Perl-compatible cases */
889    
890        if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
891          {
892          const pcre_uchar *p;
893          for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
894            if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
895          if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
896          {          {
897          c = -ESC_k;          c = -ESC_k;
898          break;          break;
# Line 474  else Line 902  else
902        }        }
903      else braced = FALSE;      else braced = FALSE;
904    
905      if (ptr[1] == '-')      if (ptr[1] == CHAR_MINUS)
906        {        {
907        negated = TRUE;        negated = TRUE;
908        ptr++;        ptr++;
909        }        }
910      else negated = FALSE;      else negated = FALSE;
911    
912        /* The integer range is limited by the machine's int representation. */
913      c = 0;      c = 0;
914      while ((digitab[ptr[1]] & ctype_digit) != 0)      while (IS_DIGIT(ptr[1]))
915        c = c * 10 + *(++ptr) - '0';        {
916          if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */
917            {
918            c = -1;
919            break;
920            }
921          c = c * 10 + *(++ptr) - CHAR_0;
922          }
923        if (((unsigned int)c) > INT_MAX) /* Integer overflow */
924          {
925          while (IS_DIGIT(ptr[1]))
926            ptr++;
927          *errorcodeptr = ERR61;
928          break;
929          }
930    
931      if (c == 0 || (braced && *(++ptr) != '}'))      if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
932        {        {
933        *errorcodeptr = ERR57;        *errorcodeptr = ERR57;
934        return 0;        break;
935          }
936    
937        if (c == 0)
938          {
939          *errorcodeptr = ERR58;
940          break;
941        }        }
942    
943      if (negated)      if (negated)
# Line 496  else Line 945  else
945        if (c > bracount)        if (c > bracount)
946          {          {
947          *errorcodeptr = ERR15;          *errorcodeptr = ERR15;
948          return 0;          break;
949          }          }
950        c = bracount - (c - 1);        c = bracount - (c - 1);
951        }        }
# Line 516  else Line 965  else
965      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
966      character class, \ followed by a digit is always an octal number. */      character class, \ followed by a digit is always an octal number. */
967    
968      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:
969      case '6': case '7': case '8': case '9':      case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
970    
971      if (!isclass)      if (!isclass)
972        {        {
973        oldptr = ptr;        oldptr = ptr;
974        c -= '0';        /* The integer range is limited by the machine's int representation. */
975        while ((digitab[ptr[1]] & ctype_digit) != 0)        c -= CHAR_0;
976          c = c * 10 + *(++ptr) - '0';        while (IS_DIGIT(ptr[1]))
977            {
978            if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */
979              {
980              c = -1;
981              break;
982              }
983            c = c * 10 + *(++ptr) - CHAR_0;
984            }
985          if (((unsigned int)c) > INT_MAX) /* Integer overflow */
986            {
987            while (IS_DIGIT(ptr[1]))
988              ptr++;
989            *errorcodeptr = ERR61;
990            break;
991            }
992        if (c < 10 || c <= bracount)        if (c < 10 || c <= bracount)
993          {          {
994          c = -(ESC_REF + c);          c = -(ESC_REF + c);
# Line 537  else Line 1001  else
1001      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.
1002      Thus we have to pull back the pointer by one. */      Thus we have to pull back the pointer by one. */
1003    
1004      if ((c = *ptr) >= '8')      if ((c = *ptr) >= CHAR_8)
1005        {        {
1006        ptr--;        ptr--;
1007        c = 0;        c = 0;
# Line 547  else Line 1011  else
1011      /* \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
1012      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
1013      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
1014      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,
1015      than 3 octal digits. */      but no more than 3 octal digits. */
1016    
1017      case '0':      case CHAR_0:
1018      c -= '0';      c -= CHAR_0;
1019      while(i++ < 2 && ptr[1] >= '0' && ptr[1] <= '7')      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
1020          c = c * 8 + *(++ptr) - '0';          c = c * 8 + *(++ptr) - CHAR_0;
1021      if (!utf8 && c > 255) *errorcodeptr = ERR51;  #ifdef COMPILE_PCRE8
1022        if (!utf && c > 0xff) *errorcodeptr = ERR51;
1023    #endif
1024      break;      break;
1025    
1026      /* \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
1027      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.
1028      treated as a data character. */      If not, { is treated as a data character. */
1029    
1030        case CHAR_x:
1031        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
1032          {
1033          /* In JavaScript, \x must be followed by two hexadecimal numbers.
1034          Otherwise it is a lowercase x letter. */
1035          if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
1036            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)
1037            {
1038            c = 0;
1039            for (i = 0; i < 2; ++i)
1040              {
1041              register int cc = *(++ptr);
1042    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1043              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
1044              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
1045    #else           /* EBCDIC coding */
1046              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
1047              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1048    #endif
1049              }
1050            }
1051          break;
1052          }
1053    
1054      case 'x':      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
     if (ptr[1] == '{')  
1055        {        {
1056        const uschar *pt = ptr + 2;        const pcre_uchar *pt = ptr + 2;
       int count = 0;  
1057    
1058        c = 0;        c = 0;
1059        while ((digitab[*pt] & ctype_xdigit) != 0)        while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0)
1060          {          {
1061          register int cc = *pt++;          register int cc = *pt++;
1062          if (c == 0 && cc == '0') continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
         count++;  
1063    
1064  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1065          if (cc >= 'a') cc -= 32;               /* Convert to upper case */          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
1066          c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
1067  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
1068          if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
1069          c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1070    #endif
1071    
1072    #ifdef COMPILE_PCRE8
1073            if (c > (utf ? 0x10ffff : 0xff)) { c = -1; break; }
1074    #else
1075    #ifdef COMPILE_PCRE16
1076            if (c > (utf ? 0x10ffff : 0xffff)) { c = -1; break; }
1077    #endif
1078  #endif  #endif
1079          }          }
1080    
1081        if (*pt == '}')        if (c < 0)
1082          {          {
1083          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0) pt++;
1084            *errorcodeptr = ERR34;
1085            }
1086    
1087          if (*pt == CHAR_RIGHT_CURLY_BRACKET)
1088            {
1089            if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
1090          ptr = pt;          ptr = pt;
1091          break;          break;
1092          }          }
# Line 597  else Line 1098  else
1098      /* Read just a single-byte hex-defined char */      /* Read just a single-byte hex-defined char */
1099    
1100      c = 0;      c = 0;
1101      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)
1102        {        {
1103        int cc;                               /* Some compilers don't like ++ */        int cc;                                  /* Some compilers don't like */
1104        cc = *(++ptr);                        /* in initializers */        cc = *(++ptr);                           /* ++ in initializers */
1105  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1106        if (cc >= 'a') cc -= 32;              /* Convert to upper case */        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
1107        c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
1108  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
1109        if (cc <= 'z') cc += 64;              /* Convert to upper case */        if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
1110        c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1111  #endif  #endif
1112        }        }
1113      break;      break;
1114    
1115      /* 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.
1116      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
1117        coding is ASCII-specific, but then the whole concept of \cx is
1118      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
1119    
1120      case 'c':      case CHAR_c:
1121      c = *(++ptr);      c = *(++ptr);
1122      if (c == 0)      if (c == 0)
1123        {        {
1124        *errorcodeptr = ERR2;        *errorcodeptr = ERR2;
1125        return 0;        break;
1126        }        }
1127    #ifndef EBCDIC    /* ASCII/UTF-8 coding */
1128  #ifndef EBCDIC  /* ASCII coding */      if (c > 127)  /* Excludes all non-ASCII in either mode */
1129      if (c >= 'a' && c <= 'z') c -= 32;        {
1130          *errorcodeptr = ERR68;
1131          break;
1132          }
1133        if (c >= CHAR_a && c <= CHAR_z) c -= 32;
1134      c ^= 0x40;      c ^= 0x40;
1135  #else           /* EBCDIC coding */  #else             /* EBCDIC coding */
1136      if (c >= 'a' && c <= 'z') c += 64;      if (c >= CHAR_a && c <= CHAR_z) c += 64;
1137      c ^= 0xC0;      c ^= 0xC0;
1138  #endif  #endif
1139      break;      break;
1140    
1141      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
1142      other alphameric following \ is an error if PCRE_EXTRA was set; otherwise,      other alphanumeric following \ is an error if PCRE_EXTRA was set;
1143      for Perl compatibility, it is a literal. This code looks a bit odd, but      otherwise, for Perl compatibility, it is a literal. This code looks a bit
1144      there used to be some cases other than the default, and there may be again      odd, but there used to be some cases other than the default, and there may
1145      in future, so I haven't "optimized" it. */      be again in future, so I haven't "optimized" it. */
1146    
1147      default:      default:
1148      if ((options & PCRE_EXTRA) != 0) switch(c)      if ((options & PCRE_EXTRA) != 0) switch(c)
# Line 649  else Line 1155  else
1155      }      }
1156    }    }
1157    
1158    /* Perl supports \N{name} for character names, as well as plain \N for "not
1159    newline". PCRE does not support \N{name}. However, it does support
1160    quantification such as \N{2,3}. */
1161    
1162    if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
1163         !is_counted_repeat(ptr+2))
1164      *errorcodeptr = ERR37;
1165    
1166    /* If PCRE_UCP is set, we change the values for \d etc. */
1167    
1168    if ((options & PCRE_UCP) != 0 && c <= -ESC_D && c >= -ESC_w)
1169      c -= (ESC_DU - ESC_D);
1170    
1171    /* Set the pointer to the final character before returning. */
1172    
1173  *ptrptr = ptr;  *ptrptr = ptr;
1174  return c;  return c;
1175  }  }
# Line 675  Returns:         type value from ucp_typ Line 1196  Returns:         type value from ucp_typ
1196  */  */
1197    
1198  static int  static int
1199  get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
1200  {  {
1201  int c, i, bot, top;  int c, i, bot, top;
1202  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
1203  char name[32];  pcre_uchar name[32];
1204    
1205  c = *(++ptr);  c = *(++ptr);
1206  if (c == 0) goto ERROR_RETURN;  if (c == 0) goto ERROR_RETURN;
# Line 689  if (c == 0) goto ERROR_RETURN; Line 1210  if (c == 0) goto ERROR_RETURN;
1210  /* \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
1211  negation. */  negation. */
1212    
1213  if (c == '{')  if (c == CHAR_LEFT_CURLY_BRACKET)
1214    {    {
1215    if (ptr[1] == '^')    if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
1216      {      {
1217      *negptr = TRUE;      *negptr = TRUE;
1218      ptr++;      ptr++;
1219      }      }
1220    for (i = 0; i < sizeof(name) - 1; i++)    for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
1221      {      {
1222      c = *(++ptr);      c = *(++ptr);
1223      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
1224      if (c == '}') break;      if (c == CHAR_RIGHT_CURLY_BRACKET) break;
1225      name[i] = c;      name[i] = c;
1226      }      }
1227    if (c !='}') goto ERROR_RETURN;    if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
1228    name[i] = 0;    name[i] = 0;
1229    }    }
1230    
# Line 720  else Line 1241  else
1241  /* Search for a recognized property name using binary chop */  /* Search for a recognized property name using binary chop */
1242    
1243  bot = 0;  bot = 0;
1244  top = _pcre_utt_size;  top = PRIV(utt_size);
1245    
1246  while (bot < top)  while (bot < top)
1247    {    {
1248    i = (bot + top) >> 1;    i = (bot + top) >> 1;
1249    c = strcmp(name, _pcre_utt[i].name);    c = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
1250    if (c == 0)    if (c == 0)
1251      {      {
1252      *dptr = _pcre_utt[i].value;      *dptr = PRIV(utt)[i].value;
1253      return _pcre_utt[i].type;      return PRIV(utt)[i].type;
1254      }      }
1255    if (c > 0) bot = i + 1; else top = i;    if (c > 0) bot = i + 1; else top = i;
1256    }    }
# Line 749  return -1; Line 1270  return -1;
1270    
1271    
1272  /*************************************************  /*************************************************
 *            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 == '}');  
 }  
   
   
   
 /*************************************************  
1273  *         Read repeat counts                     *  *         Read repeat counts                     *
1274  *************************************************/  *************************************************/
1275    
# Line 800  Returns:         pointer to '}' on succe Line 1288  Returns:         pointer to '}' on succe
1288                   current ptr on error, with errorcodeptr set non-zero                   current ptr on error, with errorcodeptr set non-zero
1289  */  */
1290    
1291  static const uschar *  static const pcre_uchar *
1292  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)
1293  {  {
1294  int min = 0;  int min = 0;
1295  int max = -1;  int max = -1;
# Line 809  int max = -1; Line 1297  int max = -1;
1297  /* 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
1298  an integer overflow. */  an integer overflow. */
1299    
1300  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';  while (IS_DIGIT(*p)) min = min * 10 + *p++ - CHAR_0;
1301  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
1302    {    {
1303    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 819  if (min < 0 || min > 65535) Line 1307  if (min < 0 || min > 65535)
1307  /* 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.
1308  Also, max must not be less than min. */  Also, max must not be less than min. */
1309    
1310  if (*p == '}') max = min; else  if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
1311    {    {
1312    if (*(++p) != '}')    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
1313      {      {
1314      max = 0;      max = 0;
1315      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';      while(IS_DIGIT(*p)) max = max * 10 + *p++ - CHAR_0;
1316      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
1317        {        {
1318        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 849  return p; Line 1337  return p;
1337    
1338    
1339  /*************************************************  /*************************************************
1340  *       Find forward referenced subpattern       *  *  Subroutine for finding forward reference      *
1341  *************************************************/  *************************************************/
1342    
1343  /* This function scans along a pattern's text looking for capturing  /* This recursive function is called only from find_parens() below. The
1344    top-level call starts at the beginning of the pattern. All other calls must
1345    start at a parenthesis. It scans along a pattern's text looking for capturing
1346  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
1347  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
1348  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
1349  references to subpatterns. We know that if (?P< is encountered, the name will  track of subpatterns that reset the capturing group numbers - the (?| feature.
1350  be terminated by '>' because that is checked in the first pass.  
1351    This function was originally called only from the second pass, in which we know
1352    that if (?< or (?' or (?P< is encountered, the name will be correctly
1353    terminated because that is checked in the first pass. There is now one call to
1354    this function in the first pass, to check for a recursive back reference by
1355    name (so that we can make the whole group atomic). In this case, we need check
1356    only up to the current position in the pattern, and that is still OK because
1357    and previous occurrences will have been checked. To make this work, the test
1358    for "end of pattern" is a check against cd->end_pattern in the main loop,
1359    instead of looking for a binary zero. This means that the special first-pass
1360    call can adjust cd->end_pattern temporarily. (Checks for binary zero while
1361    processing items within the loop are OK, because afterwards the main loop will
1362    terminate.)
1363    
1364  Arguments:  Arguments:
1365    ptr          current position in the pattern    ptrptr       address of the current character pointer (updated)
1366    count        current count of capturing parens so far encountered    cd           compile background data
1367    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1368    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1369    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1370      utf          TRUE if we are in UTF-8 / UTF-16 mode
1371      count        pointer to the current capturing subpattern number (updated)
1372    
1373  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1374  */  */
1375    
1376  static int  static int
1377  find_parens(const uschar *ptr, int count, const uschar *name, int lorn,  find_parens_sub(pcre_uchar **ptrptr, compile_data *cd, const pcre_uchar *name, int lorn,
1378    BOOL xmode)    BOOL xmode, BOOL utf, int *count)
1379  {  {
1380  const uschar *thisname;  pcre_uchar *ptr = *ptrptr;
1381    int start_count = *count;
1382    int hwm_count = start_count;
1383    BOOL dup_parens = FALSE;
1384    
1385    /* If the first character is a parenthesis, check on the type of group we are
1386    dealing with. The very first call may not start with a parenthesis. */
1387    
1388  for (; *ptr != 0; ptr++)  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1389    {    {
1390    int term;    /* Handle specials such as (*SKIP) or (*UTF8) etc. */
1391    
1392      if (ptr[1] == CHAR_ASTERISK) ptr += 2;
1393    
1394      /* Handle a normal, unnamed capturing parenthesis. */
1395    
1396      else if (ptr[1] != CHAR_QUESTION_MARK)
1397        {
1398        *count += 1;
1399        if (name == NULL && *count == lorn) return *count;
1400        ptr++;
1401        }
1402    
1403      /* All cases now have (? at the start. Remember when we are in a group
1404      where the parenthesis numbers are duplicated. */
1405    
1406      else if (ptr[2] == CHAR_VERTICAL_LINE)
1407        {
1408        ptr += 3;
1409        dup_parens = TRUE;
1410        }
1411    
1412      /* Handle comments; all characters are allowed until a ket is reached. */
1413    
1414      else if (ptr[2] == CHAR_NUMBER_SIGN)
1415        {
1416        for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
1417        goto FAIL_EXIT;
1418        }
1419    
1420      /* Handle a condition. If it is an assertion, just carry on so that it
1421      is processed as normal. If not, skip to the closing parenthesis of the
1422      condition (there can't be any nested parens). */
1423    
1424      else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
1425        {
1426        ptr += 2;
1427        if (ptr[1] != CHAR_QUESTION_MARK)
1428          {
1429          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
1430          if (*ptr != 0) ptr++;
1431          }
1432        }
1433    
1434      /* Start with (? but not a condition. */
1435    
1436      else
1437        {
1438        ptr += 2;
1439        if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */
1440    
1441        /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */
1442    
1443        if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&
1444            ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1445          {
1446          int term;
1447          const pcre_uchar *thisname;
1448          *count += 1;
1449          if (name == NULL && *count == lorn) return *count;
1450          term = *ptr++;
1451          if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;
1452          thisname = ptr;
1453          while (*ptr != term) ptr++;
1454          if (name != NULL && lorn == ptr - thisname &&
1455              STRNCMP_UC_UC(name, thisname, lorn) == 0)
1456            return *count;
1457          term++;
1458          }
1459        }
1460      }
1461    
1462    /* Past any initial parenthesis handling, scan for parentheses or vertical
1463    bars. Stop if we get to cd->end_pattern. Note that this is important for the
1464    first-pass call when this value is temporarily adjusted to stop at the current
1465    position. So DO NOT change this to a test for binary zero. */
1466    
1467    for (; ptr < cd->end_pattern; ptr++)
1468      {
1469    /* Skip over backslashed characters and also entire \Q...\E */    /* Skip over backslashed characters and also entire \Q...\E */
1470    
1471    if (*ptr == '\\')    if (*ptr == CHAR_BACKSLASH)
1472      {      {
1473      if (*(++ptr) == 0) return -1;      if (*(++ptr) == 0) goto FAIL_EXIT;
1474      if (*ptr == 'Q') for (;;)      if (*ptr == CHAR_Q) for (;;)
1475        {        {
1476        while (*(++ptr) != 0 && *ptr != '\\');        while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1477        if (*ptr == 0) return -1;        if (*ptr == 0) goto FAIL_EXIT;
1478        if (*(++ptr) == 'E') break;        if (*(++ptr) == CHAR_E) break;
1479        }        }
1480      continue;      continue;
1481      }      }
1482    
1483    /* Skip over character classes */    /* Skip over character classes; this logic must be similar to the way they
1484      are handled for real. If the first character is '^', skip it. Also, if the
1485      first few characters (either before or after ^) are \Q\E or \E we skip them
1486      too. This makes for compatibility with Perl. Note the use of STR macros to
1487      encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */
1488    
1489      if (*ptr == CHAR_LEFT_SQUARE_BRACKET)
1490        {
1491        BOOL negate_class = FALSE;
1492        for (;;)
1493          {
1494          if (ptr[1] == CHAR_BACKSLASH)
1495            {
1496            if (ptr[2] == CHAR_E)
1497              ptr+= 2;
1498            else if (STRNCMP_UC_C8(ptr + 2,
1499                     STR_Q STR_BACKSLASH STR_E, 3) == 0)
1500              ptr += 4;
1501            else
1502              break;
1503            }
1504          else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
1505            {
1506            negate_class = TRUE;
1507            ptr++;
1508            }
1509          else break;
1510          }
1511    
1512        /* If the next character is ']', it is a data character that must be
1513        skipped, except in JavaScript compatibility mode. */
1514    
1515    if (*ptr == '[')      if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&
1516      {          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
1517      while (*(++ptr) != ']')        ptr++;
1518    
1519        while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)
1520        {        {
1521        if (*ptr == '\\')        if (*ptr == 0) return -1;
1522          if (*ptr == CHAR_BACKSLASH)
1523          {          {
1524          if (*(++ptr) == 0) return -1;          if (*(++ptr) == 0) goto FAIL_EXIT;
1525          if (*ptr == 'Q') for (;;)          if (*ptr == CHAR_Q) for (;;)
1526            {            {
1527            while (*(++ptr) != 0 && *ptr != '\\');            while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1528            if (*ptr == 0) return -1;            if (*ptr == 0) goto FAIL_EXIT;
1529            if (*(++ptr) == 'E') break;            if (*(++ptr) == CHAR_E) break;
1530            }            }
1531          continue;          continue;
1532          }          }
# Line 916  for (; *ptr != 0; ptr++) Line 1536  for (; *ptr != 0; ptr++)
1536    
1537    /* Skip comments in /x mode */    /* Skip comments in /x mode */
1538    
1539    if (xmode && *ptr == '#')    if (xmode && *ptr == CHAR_NUMBER_SIGN)
1540      {      {
1541      while (*(++ptr) != 0 && *ptr != '\n');      ptr++;
1542      if (*ptr == 0) return -1;      while (*ptr != 0)
1543          {
1544          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
1545          ptr++;
1546    #ifdef SUPPORT_UTF
1547          if (utf) FORWARDCHAR(ptr);
1548    #endif
1549          }
1550        if (*ptr == 0) goto FAIL_EXIT;
1551      continue;      continue;
1552      }      }
1553    
1554    /* An opening parens must now be a real metacharacter */    /* Check for the special metacharacters */
1555    
1556    if (*ptr != '(') continue;    if (*ptr == CHAR_LEFT_PARENTHESIS)
   if (ptr[1] != '?')  
1557      {      {
1558      count++;      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, count);
1559      if (name == NULL && count == lorn) return count;      if (rc > 0) return rc;
1560      continue;      if (*ptr == 0) goto FAIL_EXIT;
1561      }      }
1562    
1563    ptr += 2;    else if (*ptr == CHAR_RIGHT_PARENTHESIS)
1564    if (*ptr == 'P') ptr++;                      /* Allow optional P */      {
1565        if (dup_parens && *count < hwm_count) *count = hwm_count;
1566        goto FAIL_EXIT;
1567        }
1568    
1569    /* We have to disambiguate (?<! and (?<= from (?<name> */    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
1570        {
1571        if (*count > hwm_count) hwm_count = *count;
1572        *count = start_count;
1573        }
1574      }
1575    
1576    if ((*ptr != '<' || ptr[1] == '!' || ptr[1] == '=') &&  FAIL_EXIT:
1577         *ptr != '\'')  *ptrptr = ptr;
1578      continue;  return -1;
1579    }
1580    
1581    
1582    
1583    
1584    /*************************************************
1585    *       Find forward referenced subpattern       *
1586    *************************************************/
1587    
1588    /* This function scans along a pattern's text looking for capturing
1589    subpatterns, and counting them. If it finds a named pattern that matches the
1590    name it is given, it returns its number. Alternatively, if the name is NULL, it
1591    returns when it reaches a given numbered subpattern. This is used for forward
1592    references to subpatterns. We used to be able to start this scan from the
1593    current compiling point, using the current count value from cd->bracount, and
1594    do it all in a single loop, but the addition of the possibility of duplicate
1595    subpattern numbers means that we have to scan from the very start, in order to
1596    take account of such duplicates, and to use a recursive function to keep track
1597    of the different types of group.
1598    
1599    count++;  Arguments:
1600      cd           compile background data
1601      name         name to seek, or NULL if seeking a numbered subpattern
1602      lorn         name length, or subpattern number if name is NULL
1603      xmode        TRUE if we are in /x mode
1604      utf          TRUE if we are in UTF-8 / UTF-16 mode
1605    
1606    Returns:       the number of the found subpattern, or -1 if not found
1607    */
1608    
1609    static int
1610    find_parens(compile_data *cd, const pcre_uchar *name, int lorn, BOOL xmode,
1611      BOOL utf)
1612    {
1613    pcre_uchar *ptr = (pcre_uchar *)cd->start_pattern;
1614    int count = 0;
1615    int rc;
1616    
1617    /* If the pattern does not start with an opening parenthesis, the first call
1618    to find_parens_sub() will scan right to the end (if necessary). However, if it
1619    does start with a parenthesis, find_parens_sub() will return when it hits the
1620    matching closing parens. That is why we have to have a loop. */
1621    
1622    if (name == NULL && count == lorn) return count;  for (;;)
1623    term = *ptr++;    {
1624    if (term == '<') term = '>';    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, &count);
1625    thisname = ptr;    if (rc > 0 || *ptr++ == 0) break;
   while (*ptr != term) ptr++;  
   if (name != NULL && lorn == ptr - thisname &&  
       strncmp((const char *)name, (const char *)thisname, lorn) == 0)  
     return count;  
1626    }    }
1627    
1628  return -1;  return rc;
1629  }  }
1630    
1631    
1632    
1633    
1634  /*************************************************  /*************************************************
1635  *      Find first significant op code            *  *      Find first significant op code            *
1636  *************************************************/  *************************************************/
1637    
1638  /* This is called by several functions that scan a compiled expression looking  /* This is called by several functions that scan a compiled expression looking
1639  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
1640  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
1641  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
1642  assertions, and also the \b assertion; for others it does not.  does not.
1643    
1644  Arguments:  Arguments:
1645    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  
1646    skipassert   TRUE if certain assertions are to be skipped    skipassert   TRUE if certain assertions are to be skipped
1647    
1648  Returns:       pointer to the first significant opcode  Returns:       pointer to the first significant opcode
1649  */  */
1650    
1651  static const uschar*  static const pcre_uchar*
1652  first_significant_code(const uschar *code, int *options, int optbit,  first_significant_code(const pcre_uchar *code, BOOL skipassert)
   BOOL skipassert)  
1653  {  {
1654  for (;;)  for (;;)
1655    {    {
1656    switch ((int)*code)    switch ((int)*code)
1657      {      {
     case OP_OPT:  
     if (optbit > 0 && ((int)code[1] & optbit) != (*options & optbit))  
       *options = (int)code[1];  
     code += 2;  
     break;  
   
1658      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1659      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1660      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1661      if (!skipassert) return code;      if (!skipassert) return code;
1662      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
1663      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1664      break;      break;
1665    
1666      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
# Line 1008  for (;;) Line 1670  for (;;)
1670    
1671      case OP_CALLOUT:      case OP_CALLOUT:
1672      case OP_CREF:      case OP_CREF:
1673        case OP_NCREF:
1674      case OP_RREF:      case OP_RREF:
1675        case OP_NRREF:
1676      case OP_DEF:      case OP_DEF:
1677      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1678      break;      break;
1679    
1680      default:      default:
# Line 1024  for (;;) Line 1688  for (;;)
1688    
1689    
1690  /*************************************************  /*************************************************
1691  *        Find the fixed length of a pattern      *  *        Find the fixed length of a branch       *
1692  *************************************************/  *************************************************/
1693    
1694  /* 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,
1695  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.
1696  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
1697    temporarily terminated with OP_END when this function is called.
1698    
1699    This function is called when a backward assertion is encountered, so that if it
1700    fails, the error message can point to the correct place in the pattern.
1701    However, we cannot do this when the assertion contains subroutine calls,
1702    because they can be forward references. We solve this by remembering this case
1703    and doing the check at the end; a flag specifies which mode we are running in.
1704    
1705  Arguments:  Arguments:
1706    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1707    options  the compiling options    utf      TRUE in UTF-8 / UTF-16 mode
1708      atend    TRUE if called when the pattern is complete
1709  Returns:   the fixed length, or -1 if there is no fixed length,    cd       the "compile data" structure
1710               or -2 if \C was encountered  
1711    Returns:   the fixed length,
1712                 or -1 if there is no fixed length,
1713                 or -2 if \C was encountered (in UTF-8 mode only)
1714                 or -3 if an OP_RECURSE item was encountered and atend is FALSE
1715                 or -4 if an unknown opcode was encountered (internal error)
1716  */  */
1717    
1718  static int  static int
1719  find_fixedlength(uschar *code, int options)  find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd)
1720  {  {
1721  int length = -1;  int length = -1;
1722    
1723  register int branchlength = 0;  register int branchlength = 0;
1724  register uschar *cc = code + 1 + LINK_SIZE;  register pcre_uchar *cc = code + 1 + LINK_SIZE;
1725    
1726  /* 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
1727  branch, check the length against that of the other branches. */  branch, check the length against that of the other branches. */
# Line 1053  branch, check the length against that of Line 1729  branch, check the length against that of
1729  for (;;)  for (;;)
1730    {    {
1731    int d;    int d;
1732      pcre_uchar *ce, *cs;
1733    register int op = *cc;    register int op = *cc;
1734    
1735    switch (op)    switch (op)
1736      {      {
1737        /* We only need to continue for OP_CBRA (normal capturing bracket) and
1738        OP_BRA (normal non-capturing bracket) because the other variants of these
1739        opcodes are all concerned with unlimited repeated groups, which of course
1740        are not of fixed length. */
1741    
1742      case OP_CBRA:      case OP_CBRA:
1743      case OP_BRA:      case OP_BRA:
1744      case OP_ONCE:      case OP_ONCE:
1745        case OP_ONCE_NC:
1746      case OP_COND:      case OP_COND:
1747      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);      d = find_fixedlength(cc + ((op == OP_CBRA)? IMM2_SIZE : 0), utf, atend, cd);
1748      if (d < 0) return d;      if (d < 0) return d;
1749      branchlength += d;      branchlength += d;
1750      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1751      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1752      break;      break;
1753    
1754      /* 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.
1755      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
1756      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
1757        the same code. Note that we must not include the OP_KETRxxx opcodes here,
1758        because they all imply an unlimited repeat. */
1759    
1760      case OP_ALT:      case OP_ALT:
1761      case OP_KET:      case OP_KET:
     case OP_KETRMAX:  
     case OP_KETRMIN:  
1762      case OP_END:      case OP_END:
1763        case OP_ACCEPT:
1764        case OP_ASSERT_ACCEPT:
1765      if (length < 0) length = branchlength;      if (length < 0) length = branchlength;
1766        else if (length != branchlength) return -1;        else if (length != branchlength) return -1;
1767      if (*cc != OP_ALT) return length;      if (*cc != OP_ALT) return length;
# Line 1084  for (;;) Line 1769  for (;;)
1769      branchlength = 0;      branchlength = 0;
1770      break;      break;
1771    
1772        /* A true recursion implies not fixed length, but a subroutine call may
1773        be OK. If the subroutine is a forward reference, we can't deal with
1774        it until the end of the pattern, so return -3. */
1775    
1776        case OP_RECURSE:
1777        if (!atend) return -3;
1778        cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1779        do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
1780        if (cc > cs && cc < ce) return -1;                    /* Recursion */
1781        d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd);
1782        if (d < 0) return d;
1783        branchlength += d;
1784        cc += 1 + LINK_SIZE;
1785        break;
1786    
1787      /* Skip over assertive subpatterns */      /* Skip over assertive subpatterns */
1788    
1789      case OP_ASSERT:      case OP_ASSERT:
# Line 1091  for (;;) Line 1791  for (;;)
1791      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1792      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1793      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1794      /* Fall through */      cc += PRIV(OP_lengths)[*cc];
1795        break;
1796    
1797      /* Skip over things that don't match chars */      /* Skip over things that don't match chars */
1798    
1799      case OP_REVERSE:      case OP_MARK:
1800        case OP_PRUNE_ARG:
1801        case OP_SKIP_ARG:
1802        case OP_THEN_ARG:
1803        cc += cc[1] + PRIV(OP_lengths)[*cc];
1804        break;
1805    
1806        case OP_CALLOUT:
1807        case OP_CIRC:
1808        case OP_CIRCM:
1809        case OP_CLOSE:
1810        case OP_COMMIT:
1811      case OP_CREF:      case OP_CREF:
     case OP_RREF:  
1812      case OP_DEF:      case OP_DEF:
1813      case OP_OPT:      case OP_DOLL:
1814      case OP_CALLOUT:      case OP_DOLLM:
     case OP_SOD:  
     case OP_SOM:  
1815      case OP_EOD:      case OP_EOD:
1816      case OP_EODN:      case OP_EODN:
1817      case OP_CIRC:      case OP_FAIL:
1818      case OP_DOLL:      case OP_NCREF:
1819        case OP_NRREF:
1820      case OP_NOT_WORD_BOUNDARY:      case OP_NOT_WORD_BOUNDARY:
1821        case OP_PRUNE:
1822        case OP_REVERSE:
1823        case OP_RREF:
1824        case OP_SET_SOM:
1825        case OP_SKIP:
1826        case OP_SOD:
1827        case OP_SOM:
1828        case OP_THEN:
1829      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
1830      cc += _pcre_OP_lengths[*cc];      cc += PRIV(OP_lengths)[*cc];
1831      break;      break;
1832    
1833      /* Handle literal characters */      /* Handle literal characters */
1834    
1835      case OP_CHAR:      case OP_CHAR:
1836      case OP_CHARNC:      case OP_CHARI:
1837      case OP_NOT:      case OP_NOT:
1838        case OP_NOTI:
1839      branchlength++;      branchlength++;
1840      cc += 2;      cc += 2;
1841  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1842      if ((options & PCRE_UTF8) != 0)      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
       {  
       while ((*cc & 0xc0) == 0x80) cc++;  
       }  
1843  #endif  #endif
1844      break;      break;
1845    
# Line 1131  for (;;) Line 1847  for (;;)
1847      need to skip over a multibyte character in UTF8 mode.  */      need to skip over a multibyte character in UTF8 mode.  */
1848    
1849      case OP_EXACT:      case OP_EXACT:
1850        case OP_EXACTI:
1851        case OP_NOTEXACT:
1852        case OP_NOTEXACTI:
1853      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1854      cc += 4;      cc += 2 + IMM2_SIZE;
1855  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1856      if ((options & PCRE_UTF8) != 0)      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
       {  
       while((*cc & 0x80) == 0x80) cc++;  
       }  
1857  #endif  #endif
1858      break;      break;
1859    
1860      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1861      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1862      cc += 4;      if (cc[1 + IMM2_SIZE] == OP_PROP || cc[1 + IMM2_SIZE] == OP_NOTPROP) cc += 2;
1863        cc += 1 + IMM2_SIZE + 1;
1864      break;      break;
1865    
1866      /* Handle single-char matchers */      /* Handle single-char matchers */
# Line 1153  for (;;) Line 1870  for (;;)
1870      cc += 2;      cc += 2;
1871      /* Fall through */      /* Fall through */
1872    
1873        case OP_HSPACE:
1874        case OP_VSPACE:
1875        case OP_NOT_HSPACE:
1876        case OP_NOT_VSPACE:
1877      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
1878      case OP_DIGIT:      case OP_DIGIT:
1879      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
# Line 1160  for (;;) Line 1881  for (;;)
1881      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
1882      case OP_WORDCHAR:      case OP_WORDCHAR:
1883      case OP_ANY:      case OP_ANY:
1884        case OP_ALLANY:
1885      branchlength++;      branchlength++;
1886      cc++;      cc++;
1887      break;      break;
1888    
1889      /* The single-byte matcher isn't allowed */      /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
1890        otherwise \C is coded as OP_ALLANY. */
1891    
1892      case OP_ANYBYTE:      case OP_ANYBYTE:
1893      return -2;      return -2;
1894    
1895      /* Check a class for variable quantification */      /* Check a class for variable quantification */
1896    
1897  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || defined COMPILE_PCRE16
1898      case OP_XCLASS:      case OP_XCLASS:
1899      cc += GET(cc, 1) - 33;      cc += GET(cc, 1) - PRIV(OP_lengths)[OP_CLASS];
1900      /* Fall through */      /* Fall through */
1901  #endif  #endif
1902    
1903      case OP_CLASS:      case OP_CLASS:
1904      case OP_NCLASS:      case OP_NCLASS:
1905      cc += 33;      cc += PRIV(OP_lengths)[OP_CLASS];
1906    
1907      switch (*cc)      switch (*cc)
1908        {        {
1909          case OP_CRPLUS:
1910          case OP_CRMINPLUS:
1911        case OP_CRSTAR:        case OP_CRSTAR:
1912        case OP_CRMINSTAR:        case OP_CRMINSTAR:
1913        case OP_CRQUERY:        case OP_CRQUERY:
# Line 1191  for (;;) Line 1916  for (;;)
1916    
1917        case OP_CRRANGE:        case OP_CRRANGE:
1918        case OP_CRMINRANGE:        case OP_CRMINRANGE:
1919        if (GET2(cc,1) != GET2(cc,3)) return -1;        if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
1920        branchlength += GET2(cc,1);        branchlength += GET2(cc,1);
1921        cc += 5;        cc += 1 + 2 * IMM2_SIZE;
1922        break;        break;
1923    
1924        default:        default:
# Line 1203  for (;;) Line 1928  for (;;)
1928    
1929      /* Anything else is variable length */      /* Anything else is variable length */
1930    
1931      default:      case OP_ANYNL:
1932        case OP_BRAMINZERO:
1933        case OP_BRAPOS:
1934        case OP_BRAPOSZERO:
1935        case OP_BRAZERO:
1936        case OP_CBRAPOS:
1937        case OP_EXTUNI:
1938        case OP_KETRMAX:
1939        case OP_KETRMIN:
1940        case OP_KETRPOS:
1941        case OP_MINPLUS:
1942        case OP_MINPLUSI:
1943        case OP_MINQUERY:
1944        case OP_MINQUERYI:
1945        case OP_MINSTAR:
1946        case OP_MINSTARI:
1947        case OP_MINUPTO:
1948        case OP_MINUPTOI:
1949        case OP_NOTMINPLUS:
1950        case OP_NOTMINPLUSI:
1951        case OP_NOTMINQUERY:
1952        case OP_NOTMINQUERYI:
1953        case OP_NOTMINSTAR:
1954        case OP_NOTMINSTARI:
1955        case OP_NOTMINUPTO:
1956        case OP_NOTMINUPTOI:
1957        case OP_NOTPLUS:
1958        case OP_NOTPLUSI:
1959        case OP_NOTPOSPLUS:
1960        case OP_NOTPOSPLUSI:
1961        case OP_NOTPOSQUERY:
1962        case OP_NOTPOSQUERYI:
1963        case OP_NOTPOSSTAR:
1964        case OP_NOTPOSSTARI:
1965        case OP_NOTPOSUPTO:
1966        case OP_NOTPOSUPTOI:
1967        case OP_NOTQUERY:
1968        case OP_NOTQUERYI:
1969        case OP_NOTSTAR:
1970        case OP_NOTSTARI:
1971        case OP_NOTUPTO:
1972        case OP_NOTUPTOI:
1973        case OP_PLUS:
1974        case OP_PLUSI:
1975        case OP_POSPLUS:
1976        case OP_POSPLUSI:
1977        case OP_POSQUERY:
1978        case OP_POSQUERYI:
1979        case OP_POSSTAR:
1980        case OP_POSSTARI:
1981        case OP_POSUPTO:
1982        case OP_POSUPTOI:
1983        case OP_QUERY:
1984        case OP_QUERYI:
1985        case OP_REF:
1986        case OP_REFI:
1987        case OP_SBRA:
1988        case OP_SBRAPOS:
1989        case OP_SCBRA:
1990        case OP_SCBRAPOS:
1991        case OP_SCOND:
1992        case OP_SKIPZERO:
1993        case OP_STAR:
1994        case OP_STARI:
1995        case OP_TYPEMINPLUS:
1996        case OP_TYPEMINQUERY:
1997        case OP_TYPEMINSTAR:
1998        case OP_TYPEMINUPTO:
1999        case OP_TYPEPLUS:
2000        case OP_TYPEPOSPLUS:
2001        case OP_TYPEPOSQUERY:
2002        case OP_TYPEPOSSTAR:
2003        case OP_TYPEPOSUPTO:
2004        case OP_TYPEQUERY:
2005        case OP_TYPESTAR:
2006        case OP_TYPEUPTO:
2007        case OP_UPTO:
2008        case OP_UPTOI:
2009      return -1;      return -1;
2010    
2011        /* Catch unrecognized opcodes so that when new ones are added they
2012        are not forgotten, as has happened in the past. */
2013    
2014        default:
2015        return -4;
2016      }      }
2017    }    }
2018  /* Control never gets here */  /* Control never gets here */
# Line 1214  for (;;) Line 2022  for (;;)
2022    
2023    
2024  /*************************************************  /*************************************************
2025  *    Scan compiled regex for numbered bracket    *  *    Scan compiled regex for specific bracket    *
2026  *************************************************/  *************************************************/
2027    
2028  /* This little function scans through a compiled pattern until it finds a  /* This little function scans through a compiled pattern until it finds a
2029  capturing bracket with the given number.  capturing bracket with the given number, or, if the number is negative, an
2030    instance of OP_REVERSE for a lookbehind. The function is global in the C sense
2031    so that it can be called from pcre_study() when finding the minimum matching
2032    length.
2033    
2034  Arguments:  Arguments:
2035    code        points to start of expression    code        points to start of expression
2036    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 mode
2037    number      the required bracket number    number      the required bracket number or negative to find a lookbehind
2038    
2039  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
2040  */  */
2041    
2042  static const uschar *  const pcre_uchar *
2043  find_bracket(const uschar *code, BOOL utf8, int number)  PRIV(find_bracket)(const pcre_uchar *code, BOOL utf, int number)
2044  {  {
2045  for (;;)  for (;;)
2046    {    {
2047    register int c = *code;    register int c = *code;
2048    
2049    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
2050    
2051    /* 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 1242  for (;;) Line 2054  for (;;)
2054    
2055    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
2056    
2057      /* Handle recursion */
2058    
2059      else if (c == OP_REVERSE)
2060        {
2061        if (number < 0) return (pcre_uchar *)code;
2062        code += PRIV(OP_lengths)[c];
2063        }
2064    
2065    /* Handle capturing bracket */    /* Handle capturing bracket */
2066    
2067    else if (c == OP_CBRA)    else if (c == OP_CBRA || c == OP_SCBRA ||
2068               c == OP_CBRAPOS || c == OP_SCBRAPOS)
2069      {      {
2070      int n = GET2(code, 1+LINK_SIZE);      int n = GET2(code, 1+LINK_SIZE);
2071      if (n == number) return (uschar *)code;      if (n == number) return (pcre_uchar *)code;
2072      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2073      }      }
2074    
2075      /* Otherwise, we can get the item's length from the table, except that for
2076      repeated character types, we have to test for \p and \P, which have an extra
2077      two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
2078      must add in its length. */
2079    
2080      else
2081        {
2082        switch(c)
2083          {
2084          case OP_TYPESTAR:
2085          case OP_TYPEMINSTAR:
2086          case OP_TYPEPLUS:
2087          case OP_TYPEMINPLUS:
2088          case OP_TYPEQUERY:
2089          case OP_TYPEMINQUERY:
2090          case OP_TYPEPOSSTAR:
2091          case OP_TYPEPOSPLUS:
2092          case OP_TYPEPOSQUERY:
2093          if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
2094          break;
2095    
2096          case OP_TYPEUPTO:
2097          case OP_TYPEMINUPTO:
2098          case OP_TYPEEXACT:
2099          case OP_TYPEPOSUPTO:
2100          if (code[1 + IMM2_SIZE] == OP_PROP
2101            || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2102          break;
2103    
2104          case OP_MARK:
2105          case OP_PRUNE_ARG:
2106          case OP_SKIP_ARG:
2107          code += code[1];
2108          break;
2109    
2110          case OP_THEN_ARG:
2111          code += code[1];
2112          break;
2113          }
2114    
2115        /* Add in the fixed length from the table */
2116    
2117        code += PRIV(OP_lengths)[c];
2118    
2119    /* 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
2120    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
2121    arrange to skip the extra bytes. */    arrange to skip the extra bytes. */
2122    
2123    else  #ifdef SUPPORT_UTF
2124      {      if (utf) switch(c)
     code += _pcre_OP_lengths[c];  
 #ifdef SUPPORT_UTF8  
     if (utf8) switch(c)  
2125        {        {
2126        case OP_CHAR:        case OP_CHAR:
2127        case OP_CHARNC:        case OP_CHARI:
2128        case OP_EXACT:        case OP_EXACT:
2129          case OP_EXACTI:
2130        case OP_UPTO:        case OP_UPTO:
2131          case OP_UPTOI:
2132        case OP_MINUPTO:        case OP_MINUPTO:
2133          case OP_MINUPTOI:
2134        case OP_POSUPTO:        case OP_POSUPTO:
2135          case OP_POSUPTOI:
2136        case OP_STAR:        case OP_STAR:
2137          case OP_STARI:
2138        case OP_MINSTAR:        case OP_MINSTAR:
2139          case OP_MINSTARI:
2140        case OP_POSSTAR:        case OP_POSSTAR:
2141          case OP_POSSTARI:
2142        case OP_PLUS:        case OP_PLUS:
2143          case OP_PLUSI:
2144        case OP_MINPLUS:        case OP_MINPLUS:
2145          case OP_MINPLUSI:
2146        case OP_POSPLUS:        case OP_POSPLUS:
2147          case OP_POSPLUSI:
2148        case OP_QUERY:        case OP_QUERY:
2149          case OP_QUERYI:
2150        case OP_MINQUERY:        case OP_MINQUERY:
2151          case OP_MINQUERYI:
2152        case OP_POSQUERY:        case OP_POSQUERY:
2153        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_POSQUERYI:
2154          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2155        break;        break;
2156        }        }
2157    #else
2158        (void)(utf);  /* Keep compiler happy by referencing function argument */
2159  #endif  #endif
2160      }      }
2161    }    }
# Line 1295  instance of OP_RECURSE. Line 2172  instance of OP_RECURSE.
2172    
2173  Arguments:  Arguments:
2174    code        points to start of expression    code        points to start of expression
2175    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 mode
2176    
2177  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
2178  */  */
2179    
2180  static const uschar *  static const pcre_uchar *
2181  find_recurse(const uschar *code, BOOL utf8)  find_recurse(const pcre_uchar *code, BOOL utf)
2182  {  {
2183  for (;;)  for (;;)
2184    {    {
# Line 1315  for (;;) Line 2192  for (;;)
2192    
2193    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
2194    
2195    /* Otherwise, we get the item's length from the table. In UTF-8 mode, opcodes    /* Otherwise, we can get the item's length from the table, except that for
2196    that are followed by a character may be followed by a multi-byte character.    repeated character types, we have to test for \p and \P, which have an extra
2197    The length in the table is a minimum, so we have to arrange to skip the extra    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
2198    bytes. */    must add in its length. */
2199    
2200    else    else
2201      {      {
2202      code += _pcre_OP_lengths[c];      switch(c)
2203  #ifdef SUPPORT_UTF8        {
2204      if (utf8) switch(c)        case OP_TYPESTAR:
2205          case OP_TYPEMINSTAR:
2206          case OP_TYPEPLUS:
2207          case OP_TYPEMINPLUS:
2208          case OP_TYPEQUERY:
2209          case OP_TYPEMINQUERY:
2210          case OP_TYPEPOSSTAR:
2211          case OP_TYPEPOSPLUS:
2212          case OP_TYPEPOSQUERY:
2213          if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
2214          break;
2215    
2216          case OP_TYPEPOSUPTO:
2217          case OP_TYPEUPTO:
2218          case OP_TYPEMINUPTO:
2219          case OP_TYPEEXACT:
2220          if (code[1 + IMM2_SIZE] == OP_PROP
2221            || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2222          break;
2223    
2224          case OP_MARK:
2225          case OP_PRUNE_ARG:
2226          case OP_SKIP_ARG:
2227          code += code[1];
2228          break;
2229    
2230          case OP_THEN_ARG:
2231          code += code[1];
2232          break;
2233          }
2234    
2235        /* Add in the fixed length from the table */
2236    
2237        code += PRIV(OP_lengths)[c];
2238    
2239        /* In UTF-8 mode, opcodes that are followed by a character may be followed
2240        by a multi-byte character. The length in the table is a minimum, so we have
2241        to arrange to skip the extra bytes. */
2242    
2243    #ifdef SUPPORT_UTF
2244        if (utf) switch(c)
2245        {        {
2246        case OP_CHAR:        case OP_CHAR:
2247        case OP_CHARNC:        case OP_CHARI:
2248          case OP_NOT:
2249          case OP_NOTI:
2250        case OP_EXACT:        case OP_EXACT:
2251          case OP_EXACTI:
2252          case OP_NOTEXACT:
2253          case OP_NOTEXACTI:
2254        case OP_UPTO:        case OP_UPTO:
2255          case OP_UPTOI:
2256          case OP_NOTUPTO:
2257          case OP_NOTUPTOI:
2258        case OP_MINUPTO:        case OP_MINUPTO:
2259          case OP_MINUPTOI:
2260          case OP_NOTMINUPTO:
2261          case OP_NOTMINUPTOI:
2262        case OP_POSUPTO:        case OP_POSUPTO:
2263          case OP_POSUPTOI:
2264          case OP_NOTPOSUPTO:
2265          case OP_NOTPOSUPTOI:
2266        case OP_STAR:        case OP_STAR:
2267          case OP_STARI:
2268          case OP_NOTSTAR:
2269          case OP_NOTSTARI:
2270        case OP_MINSTAR:        case OP_MINSTAR:
2271          case OP_MINSTARI:
2272          case OP_NOTMINSTAR:
2273          case OP_NOTMINSTARI:
2274        case OP_POSSTAR:        case OP_POSSTAR:
2275          case OP_POSSTARI:
2276          case OP_NOTPOSSTAR:
2277          case OP_NOTPOSSTARI:
2278        case OP_PLUS:        case OP_PLUS:
2279          case OP_PLUSI:
2280          case OP_NOTPLUS:
2281          case OP_NOTPLUSI:
2282        case OP_MINPLUS:        case OP_MINPLUS:
2283          case OP_MINPLUSI:
2284          case OP_NOTMINPLUS:
2285          case OP_NOTMINPLUSI:
2286        case OP_POSPLUS:        case OP_POSPLUS:
2287          case OP_POSPLUSI:
2288          case OP_NOTPOSPLUS:
2289          case OP_NOTPOSPLUSI:
2290        case OP_QUERY:        case OP_QUERY:
2291          case OP_QUERYI:
2292          case OP_NOTQUERY:
2293          case OP_NOTQUERYI:
2294        case OP_MINQUERY:        case OP_MINQUERY:
2295          case OP_MINQUERYI:
2296          case OP_NOTMINQUERY:
2297          case OP_NOTMINQUERYI:
2298        case OP_POSQUERY:        case OP_POSQUERY:
2299        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_POSQUERYI:
2300          case OP_NOTPOSQUERY:
2301          case OP_NOTPOSQUERYI:
2302          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2303        break;        break;
2304        }        }
2305    #else
2306        (void)(utf);  /* Keep compiler happy by referencing function argument */
2307  #endif  #endif
2308      }      }
2309    }    }
# Line 1359  for (;;) Line 2319  for (;;)
2319  can match the empty string or not. It is called from could_be_empty()  can match the empty string or not. It is called from could_be_empty()
2320  below and from compile_branch() when checking for an unlimited repeat of a  below and from compile_branch() when checking for an unlimited repeat of a
2321  group that can match nothing. Note that first_significant_code() skips over  group that can match nothing. Note that first_significant_code() skips over
2322  assertions. If we hit an unclosed bracket, we return "empty" - this means we've  backward and negative forward assertions when its final argument is TRUE. If we
2323  struck an inner bracket whose current branch will already have been scanned.  hit an unclosed bracket, we return "empty" - this means we've struck an inner
2324    bracket whose current branch will already have been scanned.
2325    
2326  Arguments:  Arguments:
2327    code        points to start of search    code        points to start of search
2328    endcode     points to where to stop    endcode     points to where to stop
2329    utf8        TRUE if in UTF8 mode    utf         TRUE if in UTF-8 / UTF-16 mode
2330      cd          contains pointers to tables etc.
2331    
2332  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2333  */  */
2334    
2335  static BOOL  static BOOL
2336  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8)  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
2337      BOOL utf, compile_data *cd)
2338  {  {
2339  register int c;  register int c;
2340  for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);  for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
2341       code < endcode;       code < endcode;
2342       code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
2343    {    {
2344    const uschar *ccode;    const pcre_uchar *ccode;
2345    
2346    c = *code;    c = *code;
2347    
2348    /* Groups with zero repeats can of course be empty; skip them. */    /* Skip over forward assertions; the other assertions are skipped by
2349      first_significant_code() with a TRUE final argument. */
2350    
2351    if (c == OP_BRAZERO || c == OP_BRAMINZERO)    if (c == OP_ASSERT)
2352      {      {
     code += _pcre_OP_lengths[c];  
2353      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
2354      c = *code;      c = *code;
2355      continue;      continue;
2356      }      }
2357    
2358    /* For other groups, scan the branches. */    /* For a recursion/subroutine call, if its end has been reached, which
2359      implies a backward reference subroutine call, we can scan it. If it's a
2360      forward reference subroutine call, we can't. To detect forward reference
2361      we have to scan up the list that is kept in the workspace. This function is
2362      called only when doing the real compile, not during the pre-compile that
2363      measures the size of the compiled pattern. */
2364    
2365    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE)    if (c == OP_RECURSE)
2366      {      {
2367        const pcre_uchar *scode;
2368      BOOL empty_branch;      BOOL empty_branch;
     if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */  
2369    
2370      /* Scan a closed bracket */      /* Test for forward reference */
2371    
2372        for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE)
2373          if (GET(scode, 0) == code + 1 - cd->start_code) return TRUE;
2374    
2375        /* Not a forward reference, test for completed backward reference */
2376    
2377      empty_branch = FALSE;      empty_branch = FALSE;
2378        scode = cd->start_code + GET(code, 1);
2379        if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
2380    
2381        /* Completed backwards reference */
2382    
2383      do      do
2384        {        {
2385        if (!empty_branch && could_be_empty_branch(code, endcode, utf8))        if (could_be_empty_branch(scode, endcode, utf, cd))
2386            {
2387          empty_branch = TRUE;          empty_branch = TRUE;
2388            break;
2389            }
2390          scode += GET(scode, 1);
2391          }
2392        while (*scode == OP_ALT);
2393    
2394        if (!empty_branch) return FALSE;  /* All branches are non-empty */
2395        continue;
2396        }
2397    
2398      /* Groups with zero repeats can of course be empty; skip them. */
2399    
2400      if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2401          c == OP_BRAPOSZERO)
2402        {
2403        code += PRIV(OP_lengths)[c];
2404        do code += GET(code, 1); while (*code == OP_ALT);
2405        c = *code;
2406        continue;
2407        }
2408    
2409      /* A nested group that is already marked as "could be empty" can just be
2410      skipped. */
2411    
2412      if (c == OP_SBRA  || c == OP_SBRAPOS ||
2413          c == OP_SCBRA || c == OP_SCBRAPOS)
2414        {
2415        do code += GET(code, 1); while (*code == OP_ALT);
2416        c = *code;
2417        continue;
2418        }
2419    
2420      /* For other groups, scan the branches. */
2421    
2422      if (c == OP_BRA  || c == OP_BRAPOS ||
2423          c == OP_CBRA || c == OP_CBRAPOS ||
2424          c == OP_ONCE || c == OP_ONCE_NC ||
2425          c == OP_COND)
2426        {
2427        BOOL empty_branch;
2428        if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
2429    
2430        /* If a conditional group has only one branch, there is a second, implied,
2431        empty branch, so just skip over the conditional, because it could be empty.
2432        Otherwise, scan the individual branches of the group. */
2433    
2434        if (c == OP_COND && code[GET(code, 1)] != OP_ALT)
2435        code += GET(code, 1);        code += GET(code, 1);
2436        else
2437          {
2438          empty_branch = FALSE;
2439          do
2440            {
2441            if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd))
2442              empty_branch = TRUE;
2443            code += GET(code, 1);
2444            }
2445          while (*code == OP_ALT);
2446          if (!empty_branch) return FALSE;   /* All branches are non-empty */
2447        }        }
2448      while (*code == OP_ALT);  
     if (!empty_branch) return FALSE;   /* All branches are non-empty */  
2449      c = *code;      c = *code;
2450      continue;      continue;
2451      }      }
# Line 1418  for (code = first_significant_code(code Line 2454  for (code = first_significant_code(code
2454    
2455    switch (c)    switch (c)
2456      {      {
2457      /* Check for quantifiers after a class */      /* Check for quantifiers after a class. XCLASS is used for classes that
2458        cannot be represented just by a bit map. This includes negated single
2459        high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
2460        actual length is stored in the compiled code, so we must update "code"
2461        here. */
2462    
2463  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2464      case OP_XCLASS:      case OP_XCLASS:
2465      ccode = code + GET(code, 1);      ccode = code += GET(code, 1);
2466      goto CHECK_CLASS_REPEAT;      goto CHECK_CLASS_REPEAT;
2467  #endif  #endif
2468    
2469      case OP_CLASS:      case OP_CLASS:
2470      case OP_NCLASS:      case OP_NCLASS:
2471      ccode = code + 33;      ccode = code + PRIV(OP_lengths)[OP_CLASS];
2472    
2473  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2474      CHECK_CLASS_REPEAT:      CHECK_CLASS_REPEAT:
2475  #endif  #endif
2476    
# Line 1466  for (code = first_significant_code(code Line 2506  for (code = first_significant_code(code
2506      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
2507      case OP_WORDCHAR:      case OP_WORDCHAR:
2508      case OP_ANY:      case OP_ANY:
2509        case OP_ALLANY:
2510      case OP_ANYBYTE:      case OP_ANYBYTE:
2511      case OP_CHAR:      case OP_CHAR:
2512      case OP_CHARNC:      case OP_CHARI:
2513      case OP_NOT:      case OP_NOT:
2514        case OP_NOTI:
2515      case OP_PLUS:      case OP_PLUS:
2516      case OP_MINPLUS:      case OP_MINPLUS:
2517      case OP_POSPLUS:      case OP_POSPLUS:
# Line 1484  for (code = first_significant_code(code Line 2526  for (code = first_significant_code(code
2526      case OP_TYPEEXACT:      case OP_TYPEEXACT:
2527      return FALSE;      return FALSE;
2528    
2529        /* These are going to continue, as they may be empty, but we have to
2530        fudge the length for the \p and \P cases. */
2531    
2532        case OP_TYPESTAR:
2533        case OP_TYPEMINSTAR:
2534        case OP_TYPEPOSSTAR:
2535        case OP_TYPEQUERY:
2536        case OP_TYPEMINQUERY:
2537        case OP_TYPEPOSQUERY:
2538        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
2539        break;
2540    
2541        /* Same for these */
2542    
2543        case OP_TYPEUPTO:
2544        case OP_TYPEMINUPTO:
2545        case OP_TYPEPOSUPTO:
2546        if (code[1 + IMM2_SIZE] == OP_PROP
2547          || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2548        break;
2549    
2550      /* End of branch */      /* End of branch */
2551    
2552      case OP_KET:      case OP_KET:
2553      case OP_KETRMAX:      case OP_KETRMAX:
2554      case OP_KETRMIN:      case OP_KETRMIN:
2555        case OP_KETRPOS:
2556      case OP_ALT:      case OP_ALT:
2557      return TRUE;      return TRUE;
2558    
2559      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
2560      MINUPTO, and POSUPTO may be followed by a multibyte character */      MINUPTO, and POSUPTO may be followed by a multibyte character */
2561    
2562  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2563      case OP_STAR:      case OP_STAR:
2564        case OP_STARI:
2565      case OP_MINSTAR:      case OP_MINSTAR:
2566        case OP_MINSTARI:
2567      case OP_POSSTAR:      case OP_POSSTAR:
2568        case OP_POSSTARI:
2569      case OP_QUERY:      case OP_QUERY:
2570        case OP_QUERYI:
2571      case OP_MINQUERY:      case OP_MINQUERY:
2572        case OP_MINQUERYI:
2573      case OP_POSQUERY:      case OP_POSQUERY:
2574        case OP_POSQUERYI:
2575        if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
2576        break;
2577    
2578      case OP_UPTO:      case OP_UPTO:
2579        case OP_UPTOI:
2580      case OP_MINUPTO:      case OP_MINUPTO:
2581        case OP_MINUPTOI:
2582      case OP_POSUPTO:      case OP_POSUPTO:
2583      if (utf8) while ((code[2] & 0xc0) == 0x80) code++;      case OP_POSUPTOI:
2584        if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);
2585      break;      break;
2586  #endif  #endif
2587    
2588        /* MARK, and PRUNE/SKIP/THEN with an argument must skip over the argument
2589        string. */
2590    
2591        case OP_MARK:
2592        case OP_PRUNE_ARG:
2593        case OP_SKIP_ARG:
2594        code += code[1];
2595        break;
2596    
2597        case OP_THEN_ARG:
2598        code += code[1];
2599        break;
2600    
2601        /* None of the remaining opcodes are required to match a character. */
2602    
2603        default:
2604        break;
2605      }      }
2606    }    }
2607    
# Line 1524  return TRUE; Line 2618  return TRUE;
2618  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
2619  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,
2620  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.
2621    This function is called only during the real compile, not during the
2622    pre-compile.
2623    
2624  Arguments:  Arguments:
2625    code        points to start of the recursion    code        points to start of the recursion
2626    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2627    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2628    utf8        TRUE if in UTF-8 mode    utf         TRUE if in UTF-8 / UTF-16 mode
2629      cd          pointers to tables etc
2630    
2631  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2632  */  */
2633    
2634  static BOOL  static BOOL
2635  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
2636    BOOL utf8)    branch_chain *bcptr, BOOL utf, compile_data *cd)
2637  {  {
2638  while (bcptr != NULL && bcptr->current >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2639    {    {
2640    if (!could_be_empty_branch(bcptr->current, endcode, utf8)) return FALSE;    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd))
2641        return FALSE;
2642    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2643    }    }
2644  return TRUE;  return TRUE;
# Line 1553  return TRUE; Line 2651  return TRUE;
2651  *************************************************/  *************************************************/
2652    
2653  /* This function is called when the sequence "[:" or "[." or "[=" is  /* This function is called when the sequence "[:" or "[." or "[=" is
2654  encountered in a character class. It checks whether this is followed by an  encountered in a character class. It checks whether this is followed by a
2655  optional ^ and then a sequence of letters, terminated by a matching ":]" or  sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
2656  ".]" or "=]".  reach an unescaped ']' without the special preceding character, return FALSE.
2657    
2658    Originally, this function only recognized a sequence of letters between the
2659    terminators, but it seems that Perl recognizes any sequence of characters,
2660    though of course unknown POSIX names are subsequently rejected. Perl gives an
2661    "Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
2662    didn't consider this to be a POSIX class. Likewise for [:1234:].
2663    
2664    The problem in trying to be exactly like Perl is in the handling of escapes. We
2665    have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
2666    class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
2667    below handles the special case of \], but does not try to do any other escape
2668    processing. This makes it different from Perl for cases such as [:l\ower:]
2669    where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize
2670    "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
2671    I think.
2672    
2673    A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
2674    It seems that the appearance of a nested POSIX class supersedes an apparent
2675    external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
2676    a digit.
2677    
2678    In Perl, unescaped square brackets may also appear as part of class names. For
2679    example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
2680    [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
2681    seem right at all. PCRE does not allow closing square brackets in POSIX class
2682    names.
2683    
2684  Argument:  Arguments:
2685    ptr      pointer to the initial [    ptr      pointer to the initial [
2686    endptr   where to return the end pointer    endptr   where to return the end pointer
   cd       pointer to compile data  
2687    
2688  Returns:   TRUE or FALSE  Returns:   TRUE or FALSE
2689  */  */
2690    
2691  static BOOL  static BOOL
2692  check_posix_syntax(const uschar *ptr, const uschar **endptr, compile_data *cd)  check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
2693  {  {
2694  int terminator;          /* Don't combine these lines; the Solaris cc */  int terminator;          /* Don't combine these lines; the Solaris cc */
2695  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2696  if (*(++ptr) == '^') ptr++;  for (++ptr; *ptr != 0; ptr++)
 while ((cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;  
 if (*ptr == terminator && ptr[1] == ']')  
2697    {    {
2698    *endptr = ptr;    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2699    return TRUE;      ptr++;
2700      else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2701      else
2702        {
2703        if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2704          {
2705          *endptr = ptr;
2706          return TRUE;
2707          }
2708        if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&
2709             (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
2710              ptr[1] == CHAR_EQUALS_SIGN) &&
2711            check_posix_syntax(ptr, endptr))
2712          return FALSE;
2713        }
2714    }    }
2715  return FALSE;  return FALSE;
2716  }  }
# Line 1598  Returns:     a value representing the na Line 2733  Returns:     a value representing the na
2733  */  */
2734    
2735  static int  static int
2736  check_posix_name(const uschar *ptr, int len)  check_posix_name(const pcre_uchar *ptr, int len)
2737  {  {
2738    const char *pn = posix_names;
2739  register int yield = 0;  register int yield = 0;
2740  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
2741    {    {
2742    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
2743      strncmp((const char *)ptr, posix_names[yield], len) == 0) return yield;      STRNCMP_UC_C8(ptr, pn, len) == 0) return yield;
2744      pn += posix_name_lengths[yield] + 1;
2745    yield++;    yield++;
2746    }    }
2747  return -1;  return -1;
# Line 1619  return -1; Line 2756  return -1;
2756  that is referenced. This means that groups can be replicated for fixed  that is referenced. This means that groups can be replicated for fixed
2757  repetition simply by copying (because the recursion is allowed to refer to  repetition simply by copying (because the recursion is allowed to refer to
2758  earlier groups that are outside the current group). However, when a group is  earlier groups that are outside the current group). However, when a group is
2759  optional (i.e. the minimum quantifier is zero), OP_BRAZERO is inserted before  optional (i.e. the minimum quantifier is zero), OP_BRAZERO or OP_SKIPZERO is
2760  it, after it has been compiled. This means that any OP_RECURSE items within it  inserted before it, after it has been compiled. This means that any OP_RECURSE
2761  that refer to the group itself or any contained groups have to have their  items within it that refer to the group itself or any contained groups have to
2762  offsets adjusted. That one of the jobs of this function. Before it is called,  have their offsets adjusted. That one of the jobs of this function. Before it
2763  the partially compiled regex must be temporarily terminated with OP_END.  is called, the partially compiled regex must be temporarily terminated with
2764    OP_END.
2765    
2766  This function has been extended with the possibility of forward references for  This function has been extended with the possibility of forward references for
2767  recursions and subroutine calls. It must also check the list of such references  recursions and subroutine calls. It must also check the list of such references
# Line 1634  value in the reference (which is a group Line 2772  value in the reference (which is a group
2772  Arguments:  Arguments:
2773    group      points to the start of the group    group      points to the start of the group
2774    adjust     the amount by which the group is to be moved    adjust     the amount by which the group is to be moved
2775    utf8       TRUE in UTF-8 mode    utf        TRUE in UTF-8 / UTF-16 mode
2776    cd         contains pointers to tables etc.    cd         contains pointers to tables etc.
2777    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
2778    
# Line 1642  Returns:     nothing Line 2780  Returns:     nothing
2780  */  */
2781    
2782  static void  static void
2783  adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,  adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
2784    uschar *save_hwm)    pcre_uchar *save_hwm)
2785  {  {
2786  uschar *ptr = group;  pcre_uchar *ptr = group;
2787  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  
2788    while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
2789    {    {
2790    int offset;    int offset;
2791    uschar *hc;    pcre_uchar *hc;
2792    
2793    /* 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
2794    reference. */    reference. */
# Line 1694  Arguments: Line 2833  Arguments:
2833  Returns:         new code pointer  Returns:         new code pointer
2834  */  */
2835    
2836  static uschar *  static pcre_uchar *
2837  auto_callout(uschar *code, const uschar *ptr, compile_data *cd)  auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
2838  {  {
2839  *code++ = OP_CALLOUT;  *code++ = OP_CALLOUT;
2840  *code++ = 255;  *code++ = 255;
2841  PUT(code, 0, ptr - cd->start_pattern);  /* Pattern offset */  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
2842  PUT(code, LINK_SIZE, 0);                /* Default length */  PUT(code, LINK_SIZE, 0);                       /* Default length */
2843  return code + 2*LINK_SIZE;  return code + 2 * LINK_SIZE;
2844  }  }
2845    
2846    
# Line 1723  Returns:             nothing Line 2862  Returns:             nothing
2862  */  */
2863    
2864  static void  static void
2865  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)  complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
2866  {  {
2867  int length = ptr - cd->start_pattern - GET(previous_callout, 2);  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
2868  PUT(previous_callout, 2 + LINK_SIZE, length);  PUT(previous_callout, 2 + LINK_SIZE, length);
2869  }  }
2870    
# Line 1737  PUT(previous_callout, 2 + LINK_SIZE, len Line 2876  PUT(previous_callout, 2 + LINK_SIZE, len
2876  *************************************************/  *************************************************/
2877    
2878  /* 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
2879  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
2880  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
2881  start address.  start address. A character with multiple other cases is returned on its own
2882    with a special return value.
2883    
2884  Arguments:  Arguments:
2885    cptr        points to starting character value; updated    cptr        points to starting character value; updated
# Line 1747  Arguments: Line 2887  Arguments:
2887    ocptr       where to put start of othercase range    ocptr       where to put start of othercase range
2888    odptr       where to put end of othercase range    odptr       where to put end of othercase range
2889    
2890  Yield:        TRUE when range returned; FALSE when no more  Yield:        -1 when no more
2891                   0 when a range is returned
2892                  >0 the CASESET offset for char with multiple other cases
2893                    in this case, ocptr contains the original
2894  */  */
2895    
2896  static BOOL  static int
2897  get_othercase_range(unsigned int *cptr, unsigned int d, unsigned int *ocptr,  get_othercase_range(unsigned int *cptr, unsigned int d, unsigned int *ocptr,
2898    unsigned int *odptr)    unsigned int *odptr)
2899  {  {
2900  unsigned int c, othercase, next;  unsigned int c, othercase, next;
2901    int co;
2902    
2903    /* Find the first character that has an other case. If it has multiple other
2904    cases, return its case offset value. */
2905    
2906  for (c = *cptr; c <= d; c++)  for (c = *cptr; c <= d; c++)
2907    { if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR) break; }    {
2908      if ((co = UCD_CASESET(c)) != 0)
2909        {
2910        *ocptr = c++;   /* Character that has the set */
2911        *cptr = c;      /* Rest of input range */
2912        return co;
2913        }
2914      if ((othercase = UCD_OTHERCASE(c)) != c) break;
2915      }
2916    
2917  if (c > d) return FALSE;  if (c > d) return -1;  /* Reached end of range */
2918    
2919  *ocptr = othercase;  *ocptr = othercase;
2920  next = othercase + 1;  next = othercase + 1;
2921    
2922  for (++c; c <= d; c++)  for (++c; c <= d; c++)
2923    {    {
2924    if (_pcre_ucp_othercase(c) != next) break;    if (UCD_OTHERCASE(c) != next) break;
2925    next++;    next++;
2926    }    }
2927    
2928  *odptr = next - 1;  *odptr = next - 1;     /* End of othercase range */
2929  *cptr = c;  *cptr = c;             /* Rest of input range */
2930    return 0;
2931    }
2932    
2933    
2934  return TRUE;  
2935    /*************************************************
2936    *        Check a character and a property        *
2937    *************************************************/
2938    
2939    /* This function is called by check_auto_possessive() when a property item
2940    is adjacent to a fixed character.
2941    
2942    Arguments:
2943      c            the character
2944      ptype        the property type
2945      pdata        the data for the type
2946      negated      TRUE if it's a negated property (\P or \p{^)
2947    
2948    Returns:       TRUE if auto-possessifying is OK
2949    */
2950    
2951    static BOOL
2952    check_char_prop(int c, int ptype, int pdata, BOOL negated)
2953    {
2954    const ucd_record *prop = GET_UCD(c);
2955    switch(ptype)
2956      {
2957      case PT_LAMP:
2958      return (prop->chartype == ucp_Lu ||
2959              prop->chartype == ucp_Ll ||
2960              prop->chartype == ucp_Lt) == negated;
2961    
2962      case PT_GC:
2963      return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
2964    
2965      case PT_PC:
2966      return (pdata == prop->chartype) == negated;
2967    
2968      case PT_SC:
2969      return (pdata == prop->script) == negated;
2970    
2971      /* These are specials */
2972    
2973      case PT_ALNUM:
2974      return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2975              PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
2976    
2977      case PT_SPACE:    /* Perl space */
2978      return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2979              c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2980              == negated;
2981    
2982      case PT_PXSPACE:  /* POSIX space */
2983      return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2984              c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2985              c == CHAR_FF || c == CHAR_CR)
2986              == negated;
2987    
2988      case PT_WORD:
2989      return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2990              PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2991              c == CHAR_UNDERSCORE) == negated;
2992      }
2993    return FALSE;
2994  }  }
2995  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2996    
# Line 1788  whether the next thing could possibly ma Line 3005  whether the next thing could possibly ma
3005  sense to automatically possessify the repeated item.  sense to automatically possessify the repeated item.
3006    
3007  Arguments:  Arguments:
3008    op_code       the repeated op code    previous      pointer to the repeated opcode
3009    this          data for this item, depends on the opcode    utf           TRUE in UTF-8 / UTF-16 mode
   utf8          TRUE in UTF-8 mode  
   utf8_char     used for utf8 character bytes, NULL if not relevant  
3010    ptr           next character in pattern    ptr           next character in pattern
3011    options       options bits    options       options bits
3012    cd            contains pointers to tables etc.    cd            contains pointers to tables etc.
# Line 1800  Returns:        TRUE if possessifying is Line 3015  Returns:        TRUE if possessifying is
3015  */  */
3016    
3017  static BOOL  static BOOL
3018  check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,  check_auto_possessive(const pcre_uchar *previous, BOOL utf,
3019    const uschar *ptr, int options, compile_data *cd)    const pcre_uchar *ptr, int options, compile_data *cd)
3020  {  {
3021  int next;  pcre_int32 c, next;
3022    int op_code = *previous++;
3023    
3024  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
3025    
# Line 1811  if ((options & PCRE_EXTENDED) != 0) Line 3027  if ((options & PCRE_EXTENDED) != 0)
3027    {    {
3028    for (;;)    for (;;)
3029      {      {
3030      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
3031      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
3032        {        {
3033        while (*(++ptr) != 0)        ptr++;
3034          while (*ptr != 0)
3035            {
3036          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3037            ptr++;
3038    #ifdef SUPPORT_UTF
3039            if (utf) FORWARDCHAR(ptr);
3040    #endif
3041            }
3042        }        }
3043      else break;      else break;
3044      }      }
# Line 1824  if ((options & PCRE_EXTENDED) != 0) Line 3047  if ((options & PCRE_EXTENDED) != 0)
3047  /* 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
3048  value is a character, a negative value is an escape value. */  value is a character, a negative value is an escape value. */
3049    
3050  if (*ptr == '\\')  if (*ptr == CHAR_BACKSLASH)
3051    {    {
3052    int temperrorcode = 0;    int temperrorcode = 0;
3053    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);
3054    if (temperrorcode != 0) return FALSE;    if (temperrorcode != 0) return FALSE;
3055    ptr++;    /* Point after the escape sequence */    ptr++;    /* Point after the escape sequence */
3056    }    }
3057    else if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_meta) == 0)
 else if ((cd->ctypes[*ptr] & ctype_meta) == 0)  
3058    {    {
3059  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3060    if (utf8) { GETCHARINC(next, ptr); } else    if (utf) { GETCHARINC(next, ptr); } else
3061  #endif  #endif
3062    next = *ptr++;    next = *ptr++;
3063    }    }
   
3064  else return FALSE;  else return FALSE;
3065    
3066  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
# Line 1848  if ((options & PCRE_EXTENDED) != 0) Line 3069  if ((options & PCRE_EXTENDED) != 0)
3069    {    {
3070    for (;;)    for (;;)
3071      {      {
3072      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
3073      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
3074        {        {
3075        while (*(++ptr) != 0)        ptr++;
3076          while (*ptr != 0)
3077            {
3078          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3079            ptr++;
3080    #ifdef SUPPORT_UTF
3081            if (utf) FORWARDCHAR(ptr);
3082    #endif
3083            }
3084        }        }
3085      else break;      else break;
3086      }      }
# Line 1860  if ((options & PCRE_EXTENDED) != 0) Line 3088  if ((options & PCRE_EXTENDED) != 0)
3088    
3089  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
3090    
3091  if (*ptr == '*' || *ptr == '?' || strncmp((char *)ptr, "{0,", 3) == 0)  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3092    return FALSE;    STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
3093        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. */  
   
3094    
3095  /* Handle cases when the next item is a character. */  /* Now compare the next item with the previous opcode. First, handle cases when
3096    the next item is a character. */
3097    
3098  if (next >= 0) switch(op_code)  if (next >= 0) switch(op_code)
3099    {    {
3100    case OP_CHAR:    case OP_CHAR:
3101  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3102    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
3103    #else
3104      c = *previous;
3105  #endif  #endif
3106    return item != next;    return c != next;
3107    
3108    /* For CHARNC (caseless character) we must check the other case. If we have    /* For CHARI (caseless character) we must check the other case. If we have
3109    Unicode property support, we can use it to test the other case of    Unicode property support, we can use it to test the other case of
3110    high-valued characters. */    high-valued characters. */
3111    
3112    case OP_CHARNC:    case OP_CHARI:
3113  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3114    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
3115  #endif  #else
3116    if (item == next) return FALSE;    c = *previous;
3117  #ifdef SUPPORT_UTF8  #endif
3118    if (utf8)    if (c == next) return FALSE;
3119    #ifdef SUPPORT_UTF
3120      if (utf)
3121      {      {
3122      unsigned int othercase;      unsigned int othercase;
3123      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
3124  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3125      othercase = _pcre_ucp_othercase((unsigned int)next);      othercase = UCD_OTHERCASE((unsigned int)next);
3126  #else  #else
3127      othercase = NOTACHAR;      othercase = NOTACHAR;
3128  #endif  #endif
3129      return (unsigned int)item != othercase;      return (unsigned int)c != othercase;
3130      }      }
3131    else    else
3132  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3133    return (item != cd->fcc[next]);  /* Non-UTF-8 mode */    return (c != TABLE_GET((unsigned int)next, cd->fcc, next));  /* Non-UTF-8 mode */
   
   /* For OP_NOT, "item" must be a single-byte character. */  
3134    
3135    case OP_NOT:    case OP_NOT:
3136    if (next < 0) return FALSE;  /* Not a character */  #ifdef SUPPORT_UTF
3137    if (item == next) return TRUE;    GETCHARTEST(c, previous);
3138    if ((options & PCRE_CASELESS) == 0) return FALSE;  #else
3139  #ifdef SUPPORT_UTF8    c = *previous;
3140    if (utf8)  #endif
3141      return c == next;
3142    
3143      case OP_NOTI:
3144    #ifdef SUPPORT_UTF
3145      GETCHARTEST(c, previous);
3146    #else
3147      c = *previous;
3148    #endif
3149      if (c == next) return TRUE;
3150    #ifdef SUPPORT_UTF
3151      if (utf)
3152      {      {
3153      unsigned int othercase;      unsigned int othercase;
3154      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
3155  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3156      othercase = _pcre_ucp_othercase(next);      othercase = UCD_OTHERCASE((unsigned int)next);
3157  #else  #else
3158      othercase = NOTACHAR;      othercase = NOTACHAR;
3159  #endif  #endif
3160      return (unsigned int)item == othercase;      return (unsigned int)c == othercase;
3161      }      }
3162    else    else
3163  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3164    return (item == cd->fcc[next]);  /* Non-UTF-8 mode */    return (c == TABLE_GET((unsigned int)next, cd->fcc, next));  /* Non-UTF-8 mode */
3165    
3166      /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.
3167      When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
3168    
3169    case OP_DIGIT:    case OP_DIGIT:
3170    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;    return next > 255 || (cd->ctypes[next] & ctype_digit) == 0;
3171    
3172    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
3173    return next <= 127 && (cd->ctypes[next] & ctype_digit) != 0;    return next <= 255 && (cd->ctypes[next] & ctype_digit) != 0;
3174    
3175    case OP_WHITESPACE:    case OP_WHITESPACE:
3176    return next > 127 || (cd->ctypes[next] & ctype_space) == 0;    return next > 255 || (cd->ctypes[next] & ctype_space) == 0;
3177    
3178    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
3179    return next <= 127 && (cd->ctypes[next] & ctype_space) != 0;    return next <= 255 && (cd->ctypes[next] & ctype_space) != 0;
3180    
3181    case OP_WORDCHAR:    case OP_WORDCHAR:
3182    return next > 127 || (cd->ctypes[next] & ctype_word) == 0;    return next > 255 || (cd->ctypes[next] & ctype_word) == 0;
3183    
3184    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
3185    return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;    return next <= 255 && (cd->ctypes[next] & ctype_word) != 0;
3186    
3187      case OP_HSPACE:
3188      case OP_NOT_HSPACE:
3189      switch(next)
3190        {
3191        HSPACE_CASES:
3192        return op_code == OP_NOT_HSPACE;
3193    
3194        default:
3195        return op_code != OP_NOT_HSPACE;
3196        }
3197    
3198      case OP_ANYNL:
3199      case OP_VSPACE:
3200      case OP_NOT_VSPACE:
3201      switch(next)
3202        {
3203        VSPACE_CASES:
3204        return op_code == OP_NOT_VSPACE;
3205    
3206        default:
3207        return op_code != OP_NOT_VSPACE;
3208        }
3209    
3210    #ifdef SUPPORT_UCP
3211      case OP_PROP:
3212      return check_char_prop(next, previous[0], previous[1], FALSE);
3213    
3214      case OP_NOTPROP:
3215      return check_char_prop(next, previous[0], previous[1], TRUE);
3216    #endif
3217    
3218    default:    default:
3219    return FALSE;    return FALSE;
3220    }    }
3221    
3222    
3223  /* Handle the case when the next item is \d, \s, etc. */  /* Handle the case when the next item is \d, \s, etc. Note that when PCRE_UCP
3224    is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are
3225    generated only when PCRE_UCP is *not* set, that is, when only ASCII
3226    characteristics are recognized. Similarly, the opcodes OP_DIGIT etc. are
3227    replaced by OP_PROP codes when PCRE_UCP is set. */
3228    
3229  switch(op_code)  switch(op_code)
3230    {    {
3231    case OP_CHAR:    case OP_CHAR:
3232    case OP_CHARNC:    case OP_CHARI:
3233  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3234    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
3235    #else
3236      c = *previous;
3237  #endif  #endif
3238    switch(-next)    switch(-next)
3239      {      {
3240      case ESC_d:      case ESC_d:
3241      return item > 127 || (cd->ctypes[item] & ctype_digit) == 0;      return c > 255 || (cd->ctypes[c] & ctype_digit) == 0;
3242    
3243      case ESC_D:      case ESC_D:
3244      return item <= 127 && (cd->ctypes[item] & ctype_digit) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_digit) != 0;
3245    
3246      case ESC_s:      case ESC_s:
3247      return item > 127 || (cd->ctypes[item] & ctype_space) == 0;      return c > 255 || (cd->ctypes[c] & ctype_space) == 0;
3248    
3249      case ESC_S:      case ESC_S:
3250      return item <= 127 && (cd->ctypes[item] & ctype_space) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_space) != 0;
3251    
3252      case ESC_w:      case ESC_w:
3253      return item > 127 || (cd->ctypes[item] & ctype_word) == 0;      return c > 255 || (cd->ctypes[c] & ctype_word) == 0;
3254    
3255      case ESC_W:      case ESC_W:
3256      return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;      return c <= 255 && (cd->ctypes[c] & ctype_word) != 0;
3257    
3258        case ESC_h:
3259        case ESC_H:
3260        switch(c)
3261          {
3262          HSPACE_CASES:
3263          return -next != ESC_h;
3264    
3265          default:
3266          return -next == ESC_h;
3267          }
3268    
3269        case ESC_v:
3270        case ESC_V:
3271        switch(c)
3272          {
3273          VSPACE_CASES:
3274          return -next != ESC_v;
3275    
3276          default:
3277          return -next == ESC_v;
3278          }
3279    
3280        /* When PCRE_UCP is set, these values get generated for \d etc. Find
3281        their substitutions and process them. The result will always be either
3282        -ESC_p or -ESC_P. Then fall through to process those values. */
3283    
3284    #ifdef SUPPORT_UCP
3285        case ESC_du:
3286        case ESC_DU:
3287        case ESC_wu:
3288        case ESC_WU:
3289        case ESC_su:
3290        case ESC_SU:
3291          {
3292          int temperrorcode = 0;
3293          ptr = substitutes[-next - ESC_DU];
3294          next = check_escape(&ptr, &temperrorcode, 0, options, FALSE);
3295          if (temperrorcode != 0) return FALSE;
3296          ptr++;    /* For compatibility */
3297          }
3298        /* Fall through */
3299    
3300        case ESC_p:
3301        case ESC_P:
3302          {
3303          int ptype, pdata, errorcodeptr;
3304          BOOL negated;
3305    
3306          ptr--;      /* Make ptr point at the p or P */
3307          ptype = get_ucp(&ptr, &negated, &pdata, &errorcodeptr);
3308          if (ptype < 0) return FALSE;
3309          ptr++;      /* Point past the final curly ket */
3310    
3311          /* If the property item is optional, we have to give up. (When generated
3312          from \d etc by PCRE_UCP, this test will have been applied much earlier,
3313          to the original \d etc. At this point, ptr will point to a zero byte. */
3314    
3315          if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3316            STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
3317              return FALSE;
3318    
3319          /* Do the property check. */
3320    
3321          return check_char_prop(c, ptype, pdata, (next == -ESC_P) != negated);
3322          }
3323    #endif
3324    
3325      default:      default:
3326      return FALSE;      return FALSE;
3327      }      }
3328    
3329      /* In principle, support for Unicode properties should be integrated here as
3330      well. It means re-organizing the above code so as to get hold of the property
3331      values before switching on the op-code. However, I wonder how many patterns
3332      combine ASCII \d etc with Unicode properties? (Note that if PCRE_UCP is set,
3333      these op-codes are never generated.) */
3334    
3335    case OP_DIGIT:    case OP_DIGIT:
3336    return next == -ESC_D || next == -ESC_s || next == -ESC_W;    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
3337             next == -ESC_h || next == -ESC_v || next == -ESC_R;
3338    
3339    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
3340    return next == -ESC_d;    return next == -ESC_d;
# Line 1992  switch(op_code) Line 3343  switch(op_code)
3343    return next == -ESC_S || next == -ESC_d || next == -ESC_w;    return next == -ESC_S || next == -ESC_d || next == -ESC_w;
3344    
3345    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
3346    return next == -ESC_s;    return next == -ESC_s || next == -ESC_h || next == -ESC_v || next == -ESC_R;
3347    
3348      case OP_HSPACE:
3349      return next == -ESC_S || next == -ESC_H || next == -ESC_d ||
3350             next == -ESC_w || next == -ESC_v || next == -ESC_R;
3351    
3352      case OP_NOT_HSPACE:
3353      return next == -ESC_h;
3354    
3355      /* Can't have \S in here because VT matches \S (Perl anomaly) */
3356      case OP_ANYNL:
3357      case OP_VSPACE:
3358      return next == -ESC_V || next == -ESC_d || next == -ESC_w;
3359    
3360      case OP_NOT_VSPACE:
3361      return next == -ESC_v || next == -ESC_R;
3362    
3363    case OP_WORDCHAR:    case OP_WORDCHAR:
3364    return next == -ESC_W || next == -ESC_s;    return next == -ESC_W || next == -ESC_s || next == -ESC_h ||
3365             next == -ESC_v || next == -ESC_R;
3366    
3367    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
3368    return next == -ESC_w || next == -ESC_d;    return next == -ESC_w || next == -ESC_d;
# Line 2010  switch(op_code) Line 3377  switch(op_code)
3377    
3378    
3379  /*************************************************  /*************************************************
3380    *        Add a character or range to a class     *
3381    *************************************************/
3382    
3383    /* This function packages up the logic of adding a character or range of
3384    characters to a class. The character values in the arguments will be within the
3385    valid values for the current mode (8-bit, 16-bit, UTF, etc). This function is
3386    mutually recursive with the function immediately below.
3387    
3388    Arguments:
3389      classbits     the bit map for characters < 256
3390      uchardptr     points to the pointer for extra data
3391      options       the options word
3392      cd            contains pointers to tables etc.
3393      start         start of range character
3394      end           end of range character
3395    
3396    Returns:        the number of < 256 characters added
3397                    the pointer to extra data is updated
3398    */
3399    
3400    static int
3401    add_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
3402      compile_data *cd, unsigned int start, unsigned int end)
3403    {
3404    unsigned int c;
3405    int n8 = 0;
3406    
3407    /* If caseless matching is required, scan the range and process alternate
3408    cases. In Unicode, there are 8-bit characters that have alternate cases that
3409    are greater than 255 and vice-versa. Sometimes we can just extend the original
3410    range. */
3411    
3412    if ((options & PCRE_CASELESS) != 0)
3413      {
3414    #ifdef SUPPORT_UCP
3415      if ((options & PCRE_UTF8) != 0)
3416        {
3417        int rc;
3418        unsigned int oc, od;
3419    
3420        options &= ~PCRE_CASELESS;   /* Remove for recursive calls */
3421        c = start;
3422    
3423        while ((rc = get_othercase_range(&c, end, &oc, &od)) >= 0)
3424          {
3425          /* Handle a single character that has more than one other case. */
3426    
3427          if (rc > 0) n8 += add_list_to_class(classbits, uchardptr, options, cd,
3428            PRIV(ucd_caseless_sets) + rc, oc);
3429    
3430          /* Do nothing if the other case range is within the original range. */
3431    
3432          else if (oc >= start && od <= end) continue;
3433    
3434          /* Extend the original range if there is overlap, noting that if oc < c, we
3435          can't have od > end because a subrange is always shorter than the basic
3436          range. Otherwise, use a recursive call to add the additional range. */
3437    
3438          else if (oc < start && od >= start - 1) start = oc; /* Extend downwards */
3439          else if (od > end && oc <= end + 1) end = od;       /* Extend upwards */
3440          else n8 += add_to_class(classbits, uchardptr, options, cd, oc, od);
3441          }
3442        }
3443      else
3444    #endif  /* SUPPORT_UCP */
3445    
3446      /* Not UTF-mode, or no UCP */
3447    
3448      for (c = start; c <= end && c < 256; c++)
3449        {
3450        SETBIT(classbits, cd->fcc[c]);
3451        n8++;
3452        }
3453      }
3454    
3455    /* Now handle the original range. Adjust the final value according to the bit
3456    length - this means that the same lists of (e.g.) horizontal spaces can be used
3457    in all cases. */
3458    
3459    #ifdef COMPILE_PCRE8
3460    #ifdef SUPPORT_UTF
3461      if ((options & PCRE_UTF8) == 0)
3462    #endif
3463      if (end > 0xff) end = 0xff;
3464    #endif
3465    
3466    #ifdef COMPILE_PCRE16
3467    #ifdef SUPPORT_UTF
3468      if ((options & PCRE_UTF16) == 0)
3469    #endif
3470      if (end > 0xffff) end = 0xffff;
3471    #endif
3472    
3473    /* If all characters are less than 256, use the bit map. Otherwise use extra
3474    data. */
3475    
3476    if (end < 0x100)
3477      {
3478      for (c = start; c <= end; c++)
3479        {
3480        n8++;
3481        SETBIT(classbits, c);
3482        }
3483      }
3484    
3485    else
3486      {
3487      pcre_uchar *uchardata = *uchardptr;
3488    
3489    #ifdef SUPPORT_UTF
3490      if ((options & PCRE_UTF8) != 0)  /* All UTFs use the same flag bit */
3491        {
3492        if (start < end)
3493          {
3494          *uchardata++ = XCL_RANGE;
3495          uchardata += PRIV(ord2utf)(start, uchardata);
3496          uchardata += PRIV(ord2utf)(end, uchardata);
3497          }
3498        else if (start == end)
3499          {
3500          *uchardata++ = XCL_SINGLE;
3501          uchardata += PRIV(ord2utf)(start, uchardata);
3502          }
3503        }
3504      else
3505    #endif  /* SUPPORT_UTF */
3506    
3507      /* Without UTF support, character values are constrained by the bit length,
3508      and can only be > 256 for 16-bit and 32-bit libraries. */
3509    
3510    #ifdef COMPILE_PCRE8
3511        {}
3512    #else
3513      if (start < end)
3514        {
3515        *uchardata++ = XCL_RANGE;
3516        *uchardata++ = start;
3517        *uchardata++ = end;
3518        }
3519      else if (start == end)
3520        {
3521        *uchardata++ = XCL_SINGLE;
3522        *uchardata++ = start;
3523        }
3524    #endif
3525    
3526      *uchardptr = uchardata;   /* Updata extra data pointer */
3527      }
3528    
3529    return n8;    /* Number of 8-bit characters */
3530    }
3531    
3532    
3533    
3534    
3535    /*************************************************
3536    *        Add a list of characters to a class     *
3537    *************************************************/
3538    
3539    /* This function is used for adding a list of case-equivalent characters to a
3540    class, and also for adding a list of horizontal or vertical whitespace. If the
3541    list is in order (which it should be), ranges of characters are detected and
3542    handled appropriately. This function is mutually recursive with the function
3543    above.
3544    
3545    Arguments:
3546      classbits     the bit map for characters < 256
3547      uchardptr     points to the pointer for extra data
3548      options       the options word
3549      cd            contains pointers to tables etc.
3550      p             points to row of 32-bit values, terminated by NOTACHAR
3551      except        character to omit; this is used when adding lists of
3552                      case-equivalent characters to avoid including the one we
3553                      already know about
3554    
3555    Returns:        the number of < 256 characters added
3556                    the pointer to extra data is updated
3557    */
3558    
3559    static int
3560    add_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
3561      compile_data *cd, const pcre_uint32 *p, unsigned int except)
3562    {
3563    int n8 = 0;
3564    while (p[0] < NOTACHAR)
3565      {
3566      int n = 0;
3567      if (p[0] != except)
3568        {
3569        while(p[n+1] == p[0] + n + 1) n++;
3570        n8 += add_to_class(classbits, uchardptr, options, cd, p[0], p[n]);
3571        }
3572      p += n + 1;
3573      }
3574    return n8;
3575    }
3576    
3577    
3578    
3579    /*************************************************
3580    *    Add characters not in a list to a class     *
3581    *************************************************/
3582    
3583    /* This function is used for adding the complement of a list of horizontal or
3584    vertical whitespace to a class. The list must be in order.
3585    
3586    Arguments:
3587      classbits     the bit map for characters < 256
3588      uchardptr     points to the pointer for extra data
3589      options       the options word
3590      cd            contains pointers to tables etc.
3591      p             points to row of 32-bit values, terminated by NOTACHAR
3592    
3593    Returns:        the number of < 256 characters added
3594                    the pointer to extra data is updated
3595    */
3596    
3597    static int
3598    add_not_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr,
3599      int options, compile_data *cd, const pcre_uint32 *p)
3600    {
3601    int n8 = 0;
3602    if (p[0] > 0)
3603      n8 += add_to_class(classbits, uchardptr, options, cd, 0, p[0] - 1);
3604    while (p[0] < NOTACHAR)
3605      {
3606      while (p[1] == p[0] + 1) p++;
3607      n8 += add_to_class(classbits, uchardptr, options, cd, p[0] + 1,
3608        (p[1] == NOTACHAR)? 0x10ffff : p[1] - 1);
3609      p++;
3610      }
3611    return n8;
3612    }
3613    
3614    
3615    
3616    /*************************************************
3617  *           Compile one branch                   *  *           Compile one branch                   *
3618  *************************************************/  *************************************************/
3619    
# Line 2024  Arguments: Line 3628  Arguments:
3628    codeptr        points to the pointer to the current code point    codeptr        points to the pointer to the current code point
3629    ptrptr         points to the current pattern pointer    ptrptr         points to the current pattern pointer
3630    errorcodeptr   points to error code variable    errorcodeptr   points to error code variable
3631    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)    firstcharptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)
3632    reqbyteptr     set to the last literal character required, else < 0    reqcharptr     set to the last literal character required, else < 0
3633    bcptr          points to current branch chain    bcptr          points to current branch chain
3634      cond_depth     conditional nesting depth
3635    cd             contains pointers to tables etc.    cd             contains pointers to tables etc.
3636    lengthptr      NULL during the real compile phase    lengthptr      NULL during the real compile phase
3637                   points to length accumulator during pre-compile phase                   points to length accumulator during pre-compile phase
# Line 2036  Returns:         TRUE on success Line 3641  Returns:         TRUE on success
3641  */  */
3642    
3643  static BOOL  static BOOL
3644  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,  compile_branch(int *optionsptr, pcre_uchar **codeptr,
3645    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,    const pcre_uchar **ptrptr, int *errorcodeptr, pcre_int32 *firstcharptr,
3646      pcre_int32 *reqcharptr, branch_chain *bcptr, int cond_depth,
3647    compile_data *cd, int *lengthptr)    compile_data *cd, int *lengthptr)
3648  {  {
3649  int repeat_type, op_type;  int repeat_type, op_type;
3650  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
3651  int bravalue = 0;  int bravalue = 0;
3652  int greedy_default, greedy_non_default;  int greedy_default, greedy_non_default;
3653  int firstbyte, reqbyte;  pcre_int32 firstchar, reqchar;
3654  int zeroreqbyte, zerofirstbyte;  pcre_int32 zeroreqchar, zerofirstchar;
3655  int req_caseopt, reqvary, tempreqvary;  pcre_int32 req_caseopt, reqvary, tempreqvary;
3656  int options = *optionsptr;  int options = *optionsptr;               /* May change dynamically */
3657  int after_manual_callout = 0;  int after_manual_callout = 0;
3658  int length_prevgroup = 0;  int length_prevgroup = 0;
3659  register int c;  register int c;
3660  register uschar *code = *codeptr;  register pcre_uchar *code = *codeptr;
3661  uschar *last_code = code;  pcre_uchar *last_code = code;
3662  uschar *orig_code = code;  pcre_uchar *orig_code = code;
3663  uschar *tempcode;  pcre_uchar *tempcode;
3664  BOOL inescq = FALSE;  BOOL inescq = FALSE;
3665  BOOL groupsetfirstbyte = FALSE;  BOOL groupsetfirstchar = FALSE;
3666  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
3667  const uschar *tempptr;  const pcre_uchar *tempptr;
3668  uschar *previous = NULL;  const pcre_uchar *nestptr = NULL;
3669  uschar *previous_callout = NULL;  pcre_uchar *previous = NULL;
3670  uschar *save_hwm = NULL;  pcre_uchar *previous_callout = NULL;
3671  uschar classbits[32];  pcre_uchar *save_hwm = NULL;
3672    pcre_uint8 classbits[32];
3673  #ifdef SUPPORT_UTF8  
3674  BOOL class_utf8;  /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
3675  BOOL utf8 = (options & PCRE_UTF8) != 0;  must not do this for other options (e.g. PCRE_EXTENDED) because they may change
3676  uschar *class_utf8data;  dynamically as we process the pattern. */
3677  uschar utf8_char[6];  
3678    #ifdef SUPPORT_UTF
3679    /* PCRE_UTF16 has the same value as PCRE_UTF8. */
3680    BOOL utf = (options & PCRE_UTF8) != 0;
3681    pcre_uchar utf_chars[6];
3682  #else  #else
3683  BOOL utf8 = FALSE;  BOOL utf = FALSE;
 uschar *utf8_char = NULL;  
3684  #endif  #endif
3685    
3686  #ifdef DEBUG  /* Helper variables for OP_XCLASS opcode (for characters > 255). */
3687    
3688    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3689    BOOL xclass;
3690    pcre_uchar *class_uchardata;
3691    pcre_uchar *class_uchardata_base;
3692    #endif
3693    
3694    #ifdef PCRE_DEBUG
3695  if (lengthptr != NULL) DPRINTF((">> start branch\n"));  if (lengthptr != NULL) DPRINTF((">> start branch\n"));
3696  #endif  #endif
3697    
# Line 2085  greedy_non_default = greedy_default ^ 1; Line 3702  greedy_non_default = greedy_default ^ 1;
3702    
3703  /* Initialize no first byte, no required byte. REQ_UNSET means "no char  /* Initialize no first byte, no required byte. REQ_UNSET means "no char
3704  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
3705  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
3706  find one.  find one.
3707    
3708  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
3709  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
3710  zerofirstbyte and zeroreqbyte when such a repeat is encountered. The individual  zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual
3711  item types that can be repeated set these backoff variables appropriately. */  item types that can be repeated set these backoff variables appropriately. */
3712    
3713  firstbyte = reqbyte = zerofirstbyte = zeroreqbyte = REQ_UNSET;  firstchar = reqchar = zerofirstchar = zeroreqchar = REQ_UNSET;
3714    
3715  /* The variable req_caseopt contains either the REQ_CASELESS value or zero,  /* The variable req_caseopt contains either the REQ_CASELESS value
3716  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
3717  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
3718  case status of the value. This is used only for ASCII characters. */  firstchar or reqchar variables to record the case status of the
3719    value. This is used only for ASCII characters. */
3720    
3721  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
3722    
3723  /* Switch on next character until the end of the branch */  /* Switch on next character until the end of the branch */
3724    
3725  for (;; ptr++)  for (;; ptr++)
3726    {    {
3727    BOOL negate_class;    BOOL negate_class;
3728      BOOL should_flip_negation;
3729    BOOL possessive_quantifier;    BOOL possessive_quantifier;
3730    BOOL is_quantifier;    BOOL is_quantifier;
3731    BOOL is_recurse;    BOOL is_recurse;
3732    int class_charcount;    BOOL reset_bracount;
3733    int class_lastchar;    int class_has_8bitchar;
3734      int class_one_char;
3735    int newoptions;    int newoptions;
3736    int recno;    int recno;
3737    int refsign;    int refsign;
3738    int skipbytes;    int skipbytes;
3739    int subreqbyte;    int subreqchar;
3740    int subfirstbyte;    int subfirstchar;
3741    int terminator;    int terminator;
3742    int mclength;    int mclength;
3743    uschar mcbuffer[8];    int tempbracount;
3744      pcre_uchar mcbuffer[8];
3745    
3746    /* Get next byte in the pattern */    /* Get next character in the pattern */
3747    
3748    c = *ptr;    c = *ptr;
3749    
3750      /* If we are at the end of a nested substitution, revert to the outer level
3751      string. Nesting only happens one level deep. */
3752    
3753      if (c == 0 && nestptr != NULL)
3754        {
3755        ptr = nestptr;
3756        nestptr = NULL;
3757        c = *ptr;
3758        }
3759    
3760    /* 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
3761    previous cycle of this loop. */    previous cycle of this loop. */
3762    
3763    if (lengthptr != NULL)    if (lengthptr != NULL)
3764      {      {
3765  #ifdef DEBUG  #ifdef PCRE_DEBUG
3766      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm)