/[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 107 by ph10, Wed Mar 7 11:02:28 2007 UTC revision 618 by ph10, Sat Jul 16 17:24:16 2011 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-2006 University of Cambridge             Copyright (c) 1997-2011 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_printint() function, which is
57  used by pcretest. DEBUG is not defined when building a production library. */  also used by pcretest. PCRE_DEBUG is not defined when building a production
58    library. */
59    
60  #ifdef DEBUG  #ifdef PCRE_DEBUG
61  #include "pcre_printint.src"  #include "pcre_printint.src"
62  #endif  #endif
63    
64    
65    /* Macro for setting individual bits in class bitmaps. */
66    
67    #define SETBIT(a,b) a[b/8] |= (1 << (b%8))
68    
69    /* Maximum length value to check against when making sure that the integer that
70    holds the compiled pattern length does not overflow. We make it a bit less than
71    INT_MAX to allow for adding in group terminating bytes, so that we don't have
72    to check them every time. */
73    
74    #define OFLOW_MAX (INT_MAX - 20)
75    
76    
77  /*************************************************  /*************************************************
78  *      Code parameters and static tables         *  *      Code parameters and static tables         *
79  *************************************************/  *************************************************/
# Line 76  is 4 there is plenty of room. */ Line 92  is 4 there is plenty of room. */
92    
93  #define COMPILE_WORK_SIZE (4096)  #define COMPILE_WORK_SIZE (4096)
94    
95    /* The overrun tests check for a slightly smaller size so that they detect the
96    overrun before it actually does run off the end of the data block. */
97    
98    #define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100)
99    
100    
101  /* Table for handling escaped characters in the range '0'-'z'. Positive returns  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
102  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
103  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
104  is invalid. */  is invalid. */
105    
106  #ifndef EBCDIC  /* This is the "normal" table for ASCII systems */  #ifndef EBCDIC
107    
108    /* This is the "normal" table for ASCII systems or for EBCDIC systems running
109    in UTF-8 mode. */
110    
111  static const short int escapes[] = {  static const short int escapes[] = {
112       0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */       0,                       0,
113       0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */       0,                       0,
114     '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */       0,                       0,
115       0,      0,      0,      0,      0,      0,      0,      0,   /* H - O */       0,                       0,
116  -ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0,      0, -ESC_W,   /* P - W */       0,                       0,
117  -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */       CHAR_COLON,              CHAR_SEMICOLON,
118     '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */       CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
119       0,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */       CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
120  -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0,      0, -ESC_w,   /* p - w */       CHAR_COMMERCIAL_AT,      -ESC_A,
121       0,      0, -ESC_z                                            /* x - z */       -ESC_B,                  -ESC_C,
122         -ESC_D,                  -ESC_E,
123         0,                       -ESC_G,
124         -ESC_H,                  0,
125         0,                       -ESC_K,
126         0,                       0,
127         -ESC_N,                  0,
128         -ESC_P,                  -ESC_Q,
129         -ESC_R,                  -ESC_S,
130         0,                       0,
131         -ESC_V,                  -ESC_W,
132         -ESC_X,                  0,
133         -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
134         CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
135         CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
136         CHAR_GRAVE_ACCENT,       7,
137         -ESC_b,                  0,
138         -ESC_d,                  ESC_e,
139         ESC_f,                   0,
140         -ESC_h,                  0,
141         0,                       -ESC_k,
142         0,                       0,
143         ESC_n,                   0,
144         -ESC_p,                  0,
145         ESC_r,                   -ESC_s,
146         ESC_tee,                 0,
147         -ESC_v,                  -ESC_w,
148         0,                       0,
149         -ESC_z
150  };  };
151    
152  #else           /* This is the "abnormal" table for EBCDIC systems */  #else
153    
154    /* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
155    
156  static const short int escapes[] = {  static const short int escapes[] = {
157  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
158  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
# Line 106  static const short int escapes[] = { Line 162  static const short int escapes[] = {
162  /*  70 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  70 */     0,     0,      0,       0,      0,     0,      0,      0,
163  /*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',  /*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',
164  /*  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,
165  /*  88 */     0,     0,      0,     '{',      0,     0,      0,      0,  /*  88 */-ESC_h,     0,      0,     '{',      0,     0,      0,      0,
166  /*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,  /*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,
167  /*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,  /*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,
168  /*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,     0, -ESC_w,      0,  /*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,-ESC_v, -ESC_w,      0,
169  /*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,  /*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,
170  /*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,
171  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
172  /*  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,
173  /*  C8 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
174  /*  D0 */   '}',     0,      0,       0,      0,     0,      0, -ESC_P,  /*  D0 */   '}',     0, -ESC_K,       0,      0,-ESC_N,      0, -ESC_P,
175  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
176  /*  E0 */  '\\',     0, -ESC_S,       0,      0,     0, -ESC_W, -ESC_X,  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
177  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
178  /*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,
179  /*  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 181  static const short int escapes[] = {
181  #endif  #endif
182    
183    
184  /* 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
185  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
186  as this is assumed for handling case independence. */  the number of relocations when a shared library is dynamically linked. The
187    string is built from string macros so that it works in UTF-8 mode on EBCDIC
188  static const char *const posix_names[] = {  platforms. */
189    "alpha", "lower", "upper",  
190    "alnum", "ascii", "blank", "cntrl", "digit", "graph",  typedef struct verbitem {
191    "print", "punct", "space", "word",  "xdigit" };    int   len;                 /* Length of verb name */
192      int   op;                  /* Op when no arg, or -1 if arg mandatory */
193      int   op_arg;              /* Op when arg present, or -1 if not allowed */
194    } verbitem;
195    
196    static const char verbnames[] =
197      "\0"                       /* Empty name is a shorthand for MARK */
198      STRING_MARK0
199      STRING_ACCEPT0
200      STRING_COMMIT0
201      STRING_F0
202      STRING_FAIL0
203      STRING_PRUNE0
204      STRING_SKIP0
205      STRING_THEN;
206    
207    static const verbitem verbs[] = {
208      { 0, -1,        OP_MARK },
209      { 4, -1,        OP_MARK },
210      { 6, OP_ACCEPT, -1 },
211      { 6, OP_COMMIT, -1 },
212      { 1, OP_FAIL,   -1 },
213      { 4, OP_FAIL,   -1 },
214      { 5, OP_PRUNE,  OP_PRUNE_ARG },
215      { 4, OP_SKIP,   OP_SKIP_ARG  },
216      { 4, OP_THEN,   OP_THEN_ARG  }
217    };
218    
219    static const int verbcount = sizeof(verbs)/sizeof(verbitem);
220    
221    
222    /* Tables of names of POSIX character classes and their lengths. The names are
223    now all in a single string, to reduce the number of relocations when a shared
224    library is dynamically loaded. The list of lengths is terminated by a zero
225    length entry. The first three must be alpha, lower, upper, as this is assumed
226    for handling case independence. */
227    
228    static const char posix_names[] =
229      STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
230      STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
231      STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
232      STRING_word0  STRING_xdigit;
233    
234  static const uschar posix_name_lengths[] = {  static const uschar posix_name_lengths[] = {
235    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 };
# Line 164  static const int posix_class_maps[] = { Line 261  static const int posix_class_maps[] = {
261    cbit_xdigit,-1,          0              /* xdigit */    cbit_xdigit,-1,          0              /* xdigit */
262  };  };
263    
264    /* Table of substitutes for \d etc when PCRE_UCP is set. The POSIX class
265    substitutes must be in the order of the names, defined above, and there are
266    both positive and negative cases. NULL means no substitute. */
267    
268    #ifdef SUPPORT_UCP
269    static const uschar *substitutes[] = {
270      (uschar *)"\\P{Nd}",    /* \D */
271      (uschar *)"\\p{Nd}",    /* \d */
272      (uschar *)"\\P{Xsp}",   /* \S */       /* NOTE: Xsp is Perl space */
273      (uschar *)"\\p{Xsp}",   /* \s */
274      (uschar *)"\\P{Xwd}",   /* \W */
275      (uschar *)"\\p{Xwd}"    /* \w */
276    };
277    
278    static const uschar *posix_substitutes[] = {
279      (uschar *)"\\p{L}",     /* alpha */
280      (uschar *)"\\p{Ll}",    /* lower */
281      (uschar *)"\\p{Lu}",    /* upper */
282      (uschar *)"\\p{Xan}",   /* alnum */
283      NULL,                   /* ascii */
284      (uschar *)"\\h",        /* blank */
285      NULL,                   /* cntrl */
286      (uschar *)"\\p{Nd}",    /* digit */
287      NULL,                   /* graph */
288      NULL,                   /* print */
289      NULL,                   /* punct */
290      (uschar *)"\\p{Xps}",   /* space */    /* NOTE: Xps is POSIX space */
291      (uschar *)"\\p{Xwd}",   /* word */
292      NULL,                   /* xdigit */
293      /* Negated cases */
294      (uschar *)"\\P{L}",     /* ^alpha */
295      (uschar *)"\\P{Ll}",    /* ^lower */
296      (uschar *)"\\P{Lu}",    /* ^upper */
297      (uschar *)"\\P{Xan}",   /* ^alnum */
298      NULL,                   /* ^ascii */
299      (uschar *)"\\H",        /* ^blank */
300      NULL,                   /* ^cntrl */
301      (uschar *)"\\P{Nd}",    /* ^digit */
302      NULL,                   /* ^graph */
303      NULL,                   /* ^print */
304      NULL,                   /* ^punct */
305      (uschar *)"\\P{Xps}",   /* ^space */   /* NOTE: Xps is POSIX space */
306      (uschar *)"\\P{Xwd}",   /* ^word */
307      NULL                    /* ^xdigit */
308    };
309    #define POSIX_SUBSIZE (sizeof(posix_substitutes)/sizeof(uschar *))
310    #endif
311    
312  #define STRING(a)  # a  #define STRING(a)  # a
313  #define XSTRING(s) STRING(s)  #define XSTRING(s) STRING(s)
# Line 171  static const int posix_class_maps[] = { Line 315  static const int posix_class_maps[] = {
315  /* The texts of compile-time error messages. These are "char *" because they  /* The texts of compile-time error messages. These are "char *" because they
316  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
317  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
318  are no longer used. */  are no longer used. This used to be a table of strings, but in order to reduce
319    the number of relocations needed when a shared library is loaded dynamically,
320  static const char *error_texts[] = {  it is now one long string. We cannot use a table of offsets, because the
321    "no error",  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
322    "\\ at end of pattern",  simply count through to the one we want - this isn't a performance issue
323    "\\c at end of pattern",  because these strings are used only when there is a compilation error.
324    "unrecognized character follows \\",  
325    "numbers out of order in {} quantifier",  Each substring ends with \0 to insert a null character. This includes the final
326    substring, so that the whole string ends with \0\0, which can be detected when
327    counting through. */
328    
329    static const char error_texts[] =
330      "no error\0"
331      "\\ at end of pattern\0"
332      "\\c at end of pattern\0"
333      "unrecognized character follows \\\0"
334      "numbers out of order in {} quantifier\0"
335    /* 5 */    /* 5 */
336    "number too big in {} quantifier",    "number too big in {} quantifier\0"
337    "missing terminating ] for character class",    "missing terminating ] for character class\0"
338    "invalid escape sequence in character class",    "invalid escape sequence in character class\0"
339    "range out of order in character class",    "range out of order in character class\0"
340    "nothing to repeat",    "nothing to repeat\0"
341    /* 10 */    /* 10 */
342    "operand of unlimited repeat could match the empty string",  /** DEAD **/    "operand of unlimited repeat could match the empty string\0"  /** DEAD **/
343    "internal error: unexpected repeat",    "internal error: unexpected repeat\0"
344    "unrecognized character after (?",    "unrecognized character after (? or (?-\0"
345    "POSIX named classes are supported only within a class",    "POSIX named classes are supported only within a class\0"
346    "missing )",    "missing )\0"
347    /* 15 */    /* 15 */
348    "reference to non-existent subpattern",    "reference to non-existent subpattern\0"
349    "erroffset passed as NULL",    "erroffset passed as NULL\0"
350    "unknown option bit(s) set",    "unknown option bit(s) set\0"
351    "missing ) after comment",    "missing ) after comment\0"
352    "parentheses nested too deeply",  /** DEAD **/    "parentheses nested too deeply\0"  /** DEAD **/
353    /* 20 */    /* 20 */
354    "regular expression too large",    "regular expression is too large\0"
355    "failed to get memory",    "failed to get memory\0"
356    "unmatched parentheses",    "unmatched parentheses\0"
357    "internal error: code overflow",    "internal error: code overflow\0"
358    "unrecognized character after (?<",    "unrecognized character after (?<\0"
359    /* 25 */    /* 25 */
360    "lookbehind assertion is not fixed length",    "lookbehind assertion is not fixed length\0"
361    "malformed number or name after (?(",    "malformed number or name after (?(\0"
362    "conditional group contains more than two branches",    "conditional group contains more than two branches\0"
363    "assertion expected after (?(",    "assertion expected after (?(\0"
364    "(?R or (?digits must be followed by )",    "(?R or (?[+-]digits must be followed by )\0"
365    /* 30 */    /* 30 */
366    "unknown POSIX class name",    "unknown POSIX class name\0"
367    "POSIX collating elements are not supported",    "POSIX collating elements are not supported\0"
368    "this version of PCRE is not compiled with PCRE_UTF8 support",    "this version of PCRE is not compiled with PCRE_UTF8 support\0"
369    "spare error",  /** DEAD **/    "spare error\0"  /** DEAD **/
370    "character value in \\x{...} sequence is too large",    "character value in \\x{...} sequence is too large\0"
371    /* 35 */    /* 35 */
372    "invalid condition (?(0)",    "invalid condition (?(0)\0"
373    "\\C not allowed in lookbehind assertion",    "\\C not allowed in lookbehind assertion\0"
374    "PCRE does not support \\L, \\l, \\N, \\U, or \\u",    "PCRE does not support \\L, \\l, \\N{name}, \\U, or \\u\0"
375    "number after (?C is > 255",    "number after (?C is > 255\0"
376    "closing ) for (?C expected",    "closing ) for (?C expected\0"
377    /* 40 */    /* 40 */
378    "recursive call could loop indefinitely",    "recursive call could loop indefinitely\0"
379    "unrecognized character after (?P",    "unrecognized character after (?P\0"
380    "syntax error in subpattern name (missing terminator)",    "syntax error in subpattern name (missing terminator)\0"
381    "two named subpatterns have the same name",    "two named subpatterns have the same name\0"
382    "invalid UTF-8 string",    "invalid UTF-8 string\0"
383    /* 45 */    /* 45 */
384    "support for \\P, \\p, and \\X has not been compiled",    "support for \\P, \\p, and \\X has not been compiled\0"
385    "malformed \\P or \\p sequence",    "malformed \\P or \\p sequence\0"
386    "unknown property name after \\P or \\p",    "unknown property name after \\P or \\p\0"
387    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)",    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
388    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")",    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
389    /* 50 */    /* 50 */
390    "repeated subpattern is too long",    "repeated subpattern is too long\0"    /** DEAD **/
391    "octal value is greater than \\377 (not in UTF-8 mode)",    "octal value is greater than \\377 (not in UTF-8 mode)\0"
392    "internal error: overran compiling workspace",    "internal error: overran compiling workspace\0"
393    "internal error: previously-checked referenced subpattern not found",    "internal error: previously-checked referenced subpattern not found\0"
394    "DEFINE group contains more than one branch",    "DEFINE group contains more than one branch\0"
395    /* 55 */    /* 55 */
396    "repeating a DEFINE group is not allowed",    "repeating a DEFINE group is not allowed\0"
397    "inconsistent NEWLINE options",    "inconsistent NEWLINE options\0"
398    "\\g is not followed by 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"
399  };    "a numbered reference must not be zero\0"
400      "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
401      /* 60 */
402      "(*VERB) not recognized\0"
403      "number is too big\0"
404      "subpattern name expected\0"
405      "digit expected after (?+\0"
406      "] is an invalid data character in JavaScript compatibility mode\0"
407      /* 65 */
408      "different names for subpatterns of the same number are not allowed\0"
409      "(*MARK) must have an argument\0"
410      "this version of PCRE is not compiled with PCRE_UCP support\0"
411      "\\c must be followed by an ASCII character\0"
412      ;
413    
414  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
415  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 262  For convenience, we use the same bit def Line 427  For convenience, we use the same bit def
427    
428  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
429    
430  #ifndef EBCDIC  /* This is the "normal" case, for ASCII systems */  #ifndef EBCDIC
431    
432    /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
433    UTF-8 mode. */
434    
435  static const unsigned char digitab[] =  static const unsigned char digitab[] =
436    {    {
437    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
# Line 298  static const unsigned char digitab[] = Line 467  static const unsigned char digitab[] =
467    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
468    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
469    
470  #else           /* This is the "abnormal" case, for EBCDIC systems */  #else
471    
472    /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
473    
474  static const unsigned char digitab[] =  static const unsigned char digitab[] =
475    {    {
476    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
# Line 373  static const unsigned char ebcdic_charta Line 545  static const unsigned char ebcdic_charta
545  /* Definition to allow mutual recursion */  /* Definition to allow mutual recursion */
546    
547  static BOOL  static BOOL
548    compile_regex(int, int, uschar **, const uschar **, int *, BOOL, int, int *,    compile_regex(int, uschar **, const uschar **, int *, BOOL, BOOL, int, int *,
549      int *, branch_chain *, compile_data *, int *);      int *, branch_chain *, compile_data *, int *);
550    
551    
552    
553  /*************************************************  /*************************************************
554    *            Find an error text                  *
555    *************************************************/
556    
557    /* The error texts are now all in one long string, to save on relocations. As
558    some of the text is of unknown length, we can't use a table of offsets.
559    Instead, just count through the strings. This is not a performance issue
560    because it happens only when there has been a compilation error.
561    
562    Argument:   the error number
563    Returns:    pointer to the error string
564    */
565    
566    static const char *
567    find_error_text(int n)
568    {
569    const char *s = error_texts;
570    for (; n > 0; n--)
571      {
572      while (*s++ != 0) {};
573      if (*s == 0) return "Error text not found (please report)";
574      }
575    return s;
576    }
577    
578    
579    /*************************************************
580  *            Handle escapes                      *  *            Handle escapes                      *
581  *************************************************/  *************************************************/
582    
# Line 399  Arguments: Line 597  Arguments:
597    
598  Returns:         zero or positive => a data character  Returns:         zero or positive => a data character
599                   negative => a special escape sequence                   negative => a special escape sequence
600                   on error, errorptr is set                   on error, errorcodeptr is set
601  */  */
602    
603  static int  static int
# Line 417  ptr--;                            /* Set Line 615  ptr--;                            /* Set
615    
616  if (c == 0) *errorcodeptr = ERR1;  if (c == 0) *errorcodeptr = ERR1;
617    
618  /* 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
619  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.
620  Otherwise further processing may be required. */  Otherwise further processing may be required. */
621    
622  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
623  else if (c < '0' || c > 'z') {}                           /* Not alphameric */  else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */
624  else if ((i = escapes[c - '0']) != 0) c = i;  else if ((i = escapes[c - CHAR_0]) != 0) c = i;
625    
626  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
627  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphameric */  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
628  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if ((i = escapes[c - 0x48]) != 0)  c = i;
629  #endif  #endif
630    
# Line 442  else Line 640  else
640      /* 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
641      error. */      error. */
642    
643      case 'l':      case CHAR_l:
644      case 'L':      case CHAR_L:
645      case 'N':      case CHAR_u:
646      case 'u':      case CHAR_U:
     case 'U':  
647      *errorcodeptr = ERR37;      *errorcodeptr = ERR37;
648      break;      break;
649    
650      /* \g must be followed by a number, either plain or braced. If positive, it      /* \g must be followed by one of a number of specific things:
     is an absolute backreference. If negative, it is a relative backreference.  
     This is a Perl 5.10 feature. */  
651    
652      case 'g':      (1) A number, either plain or braced. If positive, it is an absolute
653      if (ptr[1] == '{')      backreference. If negative, it is a relative backreference. This is a Perl
654        5.10 feature.
655    
656        (2) Perl 5.10 also supports \g{name} as a reference to a named group. This
657        is part of Perl's movement towards a unified syntax for back references. As
658        this is synonymous with \k{name}, we fudge it up by pretending it really
659        was \k.
660    
661        (3) For Oniguruma compatibility we also support \g followed by a name or a
662        number either in angle brackets or in single quotes. However, these are
663        (possibly recursive) subroutine calls, _not_ backreferences. Just return
664        the -ESC_g code (cf \k). */
665    
666        case CHAR_g:
667        if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
668        {        {
669          c = -ESC_g;
670          break;
671          }
672    
673        /* Handle the Perl-compatible cases */
674    
675        if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
676          {
677          const uschar *p;
678          for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
679            if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;
680          if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
681            {
682            c = -ESC_k;
683            break;
684            }
685        braced = TRUE;        braced = TRUE;
686        ptr++;        ptr++;
687        }        }
688      else braced = FALSE;      else braced = FALSE;
689    
690      if (ptr[1] == '-')      if (ptr[1] == CHAR_MINUS)
691        {        {
692        negated = TRUE;        negated = TRUE;
693        ptr++;        ptr++;
# Line 471  else Line 696  else
696    
697      c = 0;      c = 0;
698      while ((digitab[ptr[1]] & ctype_digit) != 0)      while ((digitab[ptr[1]] & ctype_digit) != 0)
699        c = c * 10 + *(++ptr) - '0';        c = c * 10 + *(++ptr) - CHAR_0;
700    
701        if (c < 0)   /* Integer overflow */
702          {
703          *errorcodeptr = ERR61;
704          break;
705          }
706    
707      if (c == 0 || (braced && *(++ptr) != '}'))      if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
708        {        {
709        *errorcodeptr = ERR57;        *errorcodeptr = ERR57;
710        return 0;        break;
711          }
712    
713        if (c == 0)
714          {
715          *errorcodeptr = ERR58;
716          break;
717        }        }
718    
719      if (negated)      if (negated)
# Line 484  else Line 721  else
721        if (c > bracount)        if (c > bracount)
722          {          {
723          *errorcodeptr = ERR15;          *errorcodeptr = ERR15;
724          return 0;          break;
725          }          }
726        c = bracount - (c - 1);        c = bracount - (c - 1);
727        }        }
# Line 504  else Line 741  else
741      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
742      character class, \ followed by a digit is always an octal number. */      character class, \ followed by a digit is always an octal number. */
743    
744      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:
745      case '6': case '7': case '8': case '9':      case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
746    
747      if (!isclass)      if (!isclass)
748        {        {
749        oldptr = ptr;        oldptr = ptr;
750        c -= '0';        c -= CHAR_0;
751        while ((digitab[ptr[1]] & ctype_digit) != 0)        while ((digitab[ptr[1]] & ctype_digit) != 0)
752          c = c * 10 + *(++ptr) - '0';          c = c * 10 + *(++ptr) - CHAR_0;
753          if (c < 0)    /* Integer overflow */
754            {
755            *errorcodeptr = ERR61;
756            break;
757            }
758        if (c < 10 || c <= bracount)        if (c < 10 || c <= bracount)
759          {          {
760          c = -(ESC_REF + c);          c = -(ESC_REF + c);
# Line 525  else Line 767  else
767      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.
768      Thus we have to pull back the pointer by one. */      Thus we have to pull back the pointer by one. */
769    
770      if ((c = *ptr) >= '8')      if ((c = *ptr) >= CHAR_8)
771        {        {
772        ptr--;        ptr--;
773        c = 0;        c = 0;
# Line 538  else Line 780  else
780      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, but no more
781      than 3 octal digits. */      than 3 octal digits. */
782    
783      case '0':      case CHAR_0:
784      c -= '0';      c -= CHAR_0;
785      while(i++ < 2 && ptr[1] >= '0' && ptr[1] <= '7')      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
786          c = c * 8 + *(++ptr) - '0';          c = c * 8 + *(++ptr) - CHAR_0;
787      if (!utf8 && c > 255) *errorcodeptr = ERR51;      if (!utf8 && c > 255) *errorcodeptr = ERR51;
788      break;      break;
789    
# Line 549  else Line 791  else
791      than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is      than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is
792      treated as a data character. */      treated as a data character. */
793    
794      case 'x':      case CHAR_x:
795      if (ptr[1] == '{')      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
796        {        {
797        const uschar *pt = ptr + 2;        const uschar *pt = ptr + 2;
798        int count = 0;        int count = 0;
# Line 559  else Line 801  else
801        while ((digitab[*pt] & ctype_xdigit) != 0)        while ((digitab[*pt] & ctype_xdigit) != 0)
802          {          {
803          register int cc = *pt++;          register int cc = *pt++;
804          if (c == 0 && cc == '0') continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
805          count++;          count++;
806    
807  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
808          if (cc >= 'a') cc -= 32;               /* Convert to upper case */          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
809          c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
810  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
811          if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
812          c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
813  #endif  #endif
814          }          }
815    
816        if (*pt == '}')        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
817          {          {
818          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;
819          ptr = pt;          ptr = pt;
# Line 587  else Line 829  else
829      c = 0;      c = 0;
830      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)
831        {        {
832        int cc;                               /* Some compilers don't like ++ */        int cc;                                  /* Some compilers don't like */
833        cc = *(++ptr);                        /* in initializers */        cc = *(++ptr);                           /* ++ in initializers */
834  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
835        if (cc >= 'a') cc -= 32;              /* Convert to upper case */        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
836        c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
837  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
838        if (cc <= 'z') cc += 64;              /* Convert to upper case */        if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
839        c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
840  #endif  #endif
841        }        }
842      break;      break;
843    
844      /* 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.
845      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
846        coding is ASCII-specific, but then the whole concept of \cx is
847      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
848    
849      case 'c':      case CHAR_c:
850      c = *(++ptr);      c = *(++ptr);
851      if (c == 0)      if (c == 0)
852        {        {
853        *errorcodeptr = ERR2;        *errorcodeptr = ERR2;
854        return 0;        break;
855        }        }
856    #ifndef EBCDIC    /* ASCII/UTF-8 coding */
857  #ifndef EBCDIC  /* ASCII coding */      if (c > 127)  /* Excludes all non-ASCII in either mode */
858      if (c >= 'a' && c <= 'z') c -= 32;        {
859          *errorcodeptr = ERR68;
860          break;
861          }
862        if (c >= CHAR_a && c <= CHAR_z) c -= 32;
863      c ^= 0x40;      c ^= 0x40;
864  #else           /* EBCDIC coding */  #else             /* EBCDIC coding */
865      if (c >= 'a' && c <= 'z') c += 64;      if (c >= CHAR_a && c <= CHAR_z) c += 64;
866      c ^= 0xC0;      c ^= 0xC0;
867  #endif  #endif
868      break;      break;
869    
870      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
871      other alphameric following \ is an error if PCRE_EXTRA was set; otherwise,      other alphanumeric following \ is an error if PCRE_EXTRA was set;
872      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
873      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
874      in future, so I haven't "optimized" it. */      be again in future, so I haven't "optimized" it. */
875    
876      default:      default:
877      if ((options & PCRE_EXTRA) != 0) switch(c)      if ((options & PCRE_EXTRA) != 0) switch(c)
# Line 637  else Line 884  else
884      }      }
885    }    }
886    
887    /* Perl supports \N{name} for character names, as well as plain \N for "not
888    newline". PCRE does not support \N{name}. */
889    
890    if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET)
891      *errorcodeptr = ERR37;
892    
893    /* If PCRE_UCP is set, we change the values for \d etc. */
894    
895    if ((options & PCRE_UCP) != 0 && c <= -ESC_D && c >= -ESC_w)
896      c -= (ESC_DU - ESC_D);
897    
898    /* Set the pointer to the final character before returning. */
899    
900  *ptrptr = ptr;  *ptrptr = ptr;
901  return c;  return c;
902  }  }
# Line 677  if (c == 0) goto ERROR_RETURN; Line 937  if (c == 0) goto ERROR_RETURN;
937  /* \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
938  negation. */  negation. */
939    
940  if (c == '{')  if (c == CHAR_LEFT_CURLY_BRACKET)
941    {    {
942    if (ptr[1] == '^')    if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
943      {      {
944      *negptr = TRUE;      *negptr = TRUE;
945      ptr++;      ptr++;
946      }      }
947    for (i = 0; i < sizeof(name) - 1; i++)    for (i = 0; i < (int)sizeof(name) - 1; i++)
948      {      {
949      c = *(++ptr);      c = *(++ptr);
950      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
951      if (c == '}') break;      if (c == CHAR_RIGHT_CURLY_BRACKET) break;
952      name[i] = c;      name[i] = c;
953      }      }
954    if (c !='}') goto ERROR_RETURN;    if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
955    name[i] = 0;    name[i] = 0;
956    }    }
957    
# Line 713  top = _pcre_utt_size; Line 973  top = _pcre_utt_size;
973  while (bot < top)  while (bot < top)
974    {    {
975    i = (bot + top) >> 1;    i = (bot + top) >> 1;
976    c = strcmp(name, _pcre_utt[i].name);    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);
977    if (c == 0)    if (c == 0)
978      {      {
979      *dptr = _pcre_utt[i].value;      *dptr = _pcre_utt[i].value;
# Line 756  is_counted_repeat(const uschar *p) Line 1016  is_counted_repeat(const uschar *p)
1016  {  {
1017  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
1018  while ((digitab[*p] & ctype_digit) != 0) p++;  while ((digitab[*p] & ctype_digit) != 0) p++;
1019  if (*p == '}') return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
1020    
1021  if (*p++ != ',') return FALSE;  if (*p++ != CHAR_COMMA) return FALSE;
1022  if (*p == '}') return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
1023    
1024  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
1025  while ((digitab[*p] & ctype_digit) != 0) p++;  while ((digitab[*p] & ctype_digit) != 0) p++;
1026    
1027  return (*p == '}');  return (*p == CHAR_RIGHT_CURLY_BRACKET);
1028  }  }
1029    
1030    
# Line 797  int max = -1; Line 1057  int max = -1;
1057  /* 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
1058  an integer overflow. */  an integer overflow. */
1059    
1060  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;
1061  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
1062    {    {
1063    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 807  if (min < 0 || min > 65535) Line 1067  if (min < 0 || min > 65535)
1067  /* 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.
1068  Also, max must not be less than min. */  Also, max must not be less than min. */
1069    
1070  if (*p == '}') max = min; else  if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
1071    {    {
1072    if (*(++p) != '}')    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
1073      {      {
1074      max = 0;      max = 0;
1075      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;
1076      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
1077        {        {
1078        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 837  return p; Line 1097  return p;
1097    
1098    
1099  /*************************************************  /*************************************************
1100  *       Find forward referenced subpattern       *  *  Subroutine for finding forward reference      *
1101  *************************************************/  *************************************************/
1102    
1103  /* This function scans along a pattern's text looking for capturing  /* This recursive function is called only from find_parens() below. The
1104    top-level call starts at the beginning of the pattern. All other calls must
1105    start at a parenthesis. It scans along a pattern's text looking for capturing
1106  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
1107  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
1108  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
1109  references to subpatterns. We know that if (?P< is encountered, the name will  track of subpatterns that reset the capturing group numbers - the (?| feature.
1110  be terminated by '>' because that is checked in the first pass.  
1111    This function was originally called only from the second pass, in which we know
1112    that if (?< or (?' or (?P< is encountered, the name will be correctly
1113    terminated because that is checked in the first pass. There is now one call to
1114    this function in the first pass, to check for a recursive back reference by
1115    name (so that we can make the whole group atomic). In this case, we need check
1116    only up to the current position in the pattern, and that is still OK because
1117    and previous occurrences will have been checked. To make this work, the test
1118    for "end of pattern" is a check against cd->end_pattern in the main loop,
1119    instead of looking for a binary zero. This means that the special first-pass
1120    call can adjust cd->end_pattern temporarily. (Checks for binary zero while
1121    processing items within the loop are OK, because afterwards the main loop will
1122    terminate.)
1123    
1124  Arguments:  Arguments:
1125    ptr          current position in the pattern    ptrptr       address of the current character pointer (updated)
1126    count        current count of capturing parens so far encountered    cd           compile background data
1127    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1128    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1129    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1130      utf8         TRUE if we are in UTF-8 mode
1131      count        pointer to the current capturing subpattern number (updated)
1132    
1133  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1134  */  */
1135    
1136  static int  static int
1137  find_parens(const uschar *ptr, int count, const uschar *name, int lorn,  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,
1138    BOOL xmode)    BOOL xmode, BOOL utf8, int *count)
1139  {  {
1140  const uschar *thisname;  uschar *ptr = *ptrptr;
1141    int start_count = *count;
1142    int hwm_count = start_count;
1143    BOOL dup_parens = FALSE;
1144    
1145  for (; *ptr != 0; ptr++)  /* If the first character is a parenthesis, check on the type of group we are
1146    dealing with. The very first call may not start with a parenthesis. */
1147    
1148    if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1149    {    {
1150    int term;    /* Handle specials such as (*SKIP) or (*UTF8) etc. */
1151    
1152      if (ptr[1] == CHAR_ASTERISK) ptr += 2;
1153    
1154      /* Handle a normal, unnamed capturing parenthesis. */
1155    
1156      else if (ptr[1] != CHAR_QUESTION_MARK)
1157        {
1158        *count += 1;
1159        if (name == NULL && *count == lorn) return *count;
1160        ptr++;
1161        }
1162    
1163      /* All cases now have (? at the start. Remember when we are in a group
1164      where the parenthesis numbers are duplicated. */
1165    
1166      else if (ptr[2] == CHAR_VERTICAL_LINE)
1167        {
1168        ptr += 3;
1169        dup_parens = TRUE;
1170        }
1171    
1172      /* Handle comments; all characters are allowed until a ket is reached. */
1173    
1174      else if (ptr[2] == CHAR_NUMBER_SIGN)
1175        {
1176        for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
1177        goto FAIL_EXIT;
1178        }
1179    
1180      /* Handle a condition. If it is an assertion, just carry on so that it
1181      is processed as normal. If not, skip to the closing parenthesis of the
1182      condition (there can't be any nested parens). */
1183    
1184      else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
1185        {
1186        ptr += 2;
1187        if (ptr[1] != CHAR_QUESTION_MARK)
1188          {
1189          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
1190          if (*ptr != 0) ptr++;
1191          }
1192        }
1193    
1194      /* Start with (? but not a condition. */
1195    
1196      else
1197        {
1198        ptr += 2;
1199        if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */
1200    
1201        /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */
1202    
1203        if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&
1204            ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1205          {
1206          int term;
1207          const uschar *thisname;
1208          *count += 1;
1209          if (name == NULL && *count == lorn) return *count;
1210          term = *ptr++;
1211          if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;
1212          thisname = ptr;
1213          while (*ptr != term) ptr++;
1214          if (name != NULL && lorn == ptr - thisname &&
1215              strncmp((const char *)name, (const char *)thisname, lorn) == 0)
1216            return *count;
1217          term++;
1218          }
1219        }
1220      }
1221    
1222    /* Past any initial parenthesis handling, scan for parentheses or vertical
1223    bars. Stop if we get to cd->end_pattern. Note that this is important for the
1224    first-pass call when this value is temporarily adjusted to stop at the current
1225    position. So DO NOT change this to a test for binary zero. */
1226    
1227    for (; ptr < cd->end_pattern; ptr++)
1228      {
1229    /* Skip over backslashed characters and also entire \Q...\E */    /* Skip over backslashed characters and also entire \Q...\E */
1230    
1231    if (*ptr == '\\')    if (*ptr == CHAR_BACKSLASH)
1232      {      {
1233      if (*(++ptr) == 0) return -1;      if (*(++ptr) == 0) goto FAIL_EXIT;
1234      if (*ptr == 'Q') for (;;)      if (*ptr == CHAR_Q) for (;;)
1235        {        {
1236        while (*(++ptr) != 0 && *ptr != '\\');        while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1237        if (*ptr == 0) return -1;        if (*ptr == 0) goto FAIL_EXIT;
1238        if (*(++ptr) == 'E') break;        if (*(++ptr) == CHAR_E) break;
1239        }        }
1240      continue;      continue;
1241      }      }
1242    
1243    /* Skip over character classes */    /* Skip over character classes; this logic must be similar to the way they
1244      are handled for real. If the first character is '^', skip it. Also, if the
1245      first few characters (either before or after ^) are \Q\E or \E we skip them
1246      too. This makes for compatibility with Perl. Note the use of STR macros to
1247      encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */
1248    
1249    if (*ptr == '[')    if (*ptr == CHAR_LEFT_SQUARE_BRACKET)
1250      {      {
1251      while (*(++ptr) != ']')      BOOL negate_class = FALSE;
1252        for (;;)
1253          {
1254          if (ptr[1] == CHAR_BACKSLASH)
1255            {
1256            if (ptr[2] == CHAR_E)
1257              ptr+= 2;
1258            else if (strncmp((const char *)ptr+2,
1259                     STR_Q STR_BACKSLASH STR_E, 3) == 0)
1260              ptr += 4;
1261            else
1262              break;
1263            }
1264          else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
1265            {
1266            negate_class = TRUE;
1267            ptr++;
1268            }
1269          else break;
1270          }
1271    
1272        /* If the next character is ']', it is a data character that must be
1273        skipped, except in JavaScript compatibility mode. */
1274    
1275        if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&
1276            (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
1277          ptr++;
1278    
1279        while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)
1280        {        {
1281        if (*ptr == '\\')        if (*ptr == 0) return -1;
1282          if (*ptr == CHAR_BACKSLASH)
1283          {          {
1284          if (*(++ptr) == 0) return -1;          if (*(++ptr) == 0) goto FAIL_EXIT;
1285          if (*ptr == 'Q') for (;;)          if (*ptr == CHAR_Q) for (;;)
1286            {            {
1287            while (*(++ptr) != 0 && *ptr != '\\');            while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1288            if (*ptr == 0) return -1;            if (*ptr == 0) goto FAIL_EXIT;
1289            if (*(++ptr) == 'E') break;            if (*(++ptr) == CHAR_E) break;
1290            }            }
1291          continue;          continue;
1292          }          }
# Line 904  for (; *ptr != 0; ptr++) Line 1296  for (; *ptr != 0; ptr++)
1296    
1297    /* Skip comments in /x mode */    /* Skip comments in /x mode */
1298    
1299    if (xmode && *ptr == '#')    if (xmode && *ptr == CHAR_NUMBER_SIGN)
1300      {      {
1301      while (*(++ptr) != 0 && *ptr != '\n');      ptr++;
1302      if (*ptr == 0) return -1;      while (*ptr != 0)
1303          {
1304          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
1305          ptr++;
1306    #ifdef SUPPORT_UTF8
1307          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
1308    #endif
1309          }
1310        if (*ptr == 0) goto FAIL_EXIT;
1311      continue;      continue;
1312      }      }
1313    
1314    /* An opening parens must now be a real metacharacter */    /* Check for the special metacharacters */
1315    
1316    if (*ptr != '(') continue;    if (*ptr == CHAR_LEFT_PARENTHESIS)
   if (ptr[1] != '?')  
1317      {      {
1318      count++;      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, count);
1319      if (name == NULL && count == lorn) return count;      if (rc > 0) return rc;
1320      continue;      if (*ptr == 0) goto FAIL_EXIT;
1321      }      }
1322    
1323    ptr += 2;    else if (*ptr == CHAR_RIGHT_PARENTHESIS)
1324    if (*ptr == 'P') ptr++;                      /* Allow optional P */      {
1325        if (dup_parens && *count < hwm_count) *count = hwm_count;
1326        goto FAIL_EXIT;
1327        }
1328    
1329    /* We have to disambiguate (?<! and (?<= from (?<name> */    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
1330        {
1331        if (*count > hwm_count) hwm_count = *count;
1332        *count = start_count;
1333        }
1334      }
1335    
1336    if ((*ptr != '<' || ptr[1] == '!' || ptr[1] == '=') &&  FAIL_EXIT:
1337         *ptr != '\'')  *ptrptr = ptr;
1338      continue;  return -1;
1339    }
1340    
1341    
1342    
1343    
1344    /*************************************************
1345    *       Find forward referenced subpattern       *
1346    *************************************************/
1347    
1348    /* This function scans along a pattern's text looking for capturing
1349    subpatterns, and counting them. If it finds a named pattern that matches the
1350    name it is given, it returns its number. Alternatively, if the name is NULL, it
1351    returns when it reaches a given numbered subpattern. This is used for forward
1352    references to subpatterns. We used to be able to start this scan from the
1353    current compiling point, using the current count value from cd->bracount, and
1354    do it all in a single loop, but the addition of the possibility of duplicate
1355    subpattern numbers means that we have to scan from the very start, in order to
1356    take account of such duplicates, and to use a recursive function to keep track
1357    of the different types of group.
1358    
1359    Arguments:
1360      cd           compile background data
1361      name         name to seek, or NULL if seeking a numbered subpattern
1362      lorn         name length, or subpattern number if name is NULL
1363      xmode        TRUE if we are in /x mode
1364      utf8         TRUE if we are in UTF-8 mode
1365    
1366    count++;  Returns:       the number of the found subpattern, or -1 if not found
1367    */
1368    
1369    if (name == NULL && count == lorn) return count;  static int
1370    term = *ptr++;  find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode,
1371    if (term == '<') term = '>';    BOOL utf8)
1372    thisname = ptr;  {
1373    while (*ptr != term) ptr++;  uschar *ptr = (uschar *)cd->start_pattern;
1374    if (name != NULL && lorn == ptr - thisname &&  int count = 0;
1375        strncmp((const char *)name, (const char *)thisname, lorn) == 0)  int rc;
1376      return count;  
1377    /* If the pattern does not start with an opening parenthesis, the first call
1378    to find_parens_sub() will scan right to the end (if necessary). However, if it
1379    does start with a parenthesis, find_parens_sub() will return when it hits the
1380    matching closing parens. That is why we have to have a loop. */
1381    
1382    for (;;)
1383      {
1384      rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, &count);
1385      if (rc > 0 || *ptr++ == 0) break;
1386    }    }
1387    
1388  return -1;  return rc;
1389  }  }
1390    
1391    
1392    
1393    
1394  /*************************************************  /*************************************************
1395  *      Find first significant op code            *  *      Find first significant op code            *
1396  *************************************************/  *************************************************/
1397    
1398  /* This is called by several functions that scan a compiled expression looking  /* This is called by several functions that scan a compiled expression looking
1399  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
1400  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
1401  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
1402  assertions, and also the \b assertion; for others it does not.  does not.
1403    
1404  Arguments:  Arguments:
1405    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  
1406    skipassert   TRUE if certain assertions are to be skipped    skipassert   TRUE if certain assertions are to be skipped
1407    
1408  Returns:       pointer to the first significant opcode  Returns:       pointer to the first significant opcode
1409  */  */
1410    
1411  static const uschar*  static const uschar*
1412  first_significant_code(const uschar *code, int *options, int optbit,  first_significant_code(const uschar *code, BOOL skipassert)
   BOOL skipassert)  
1413  {  {
1414  for (;;)  for (;;)
1415    {    {
1416    switch ((int)*code)    switch ((int)*code)
1417      {      {
     case OP_OPT:  
     if (optbit > 0 && ((int)code[1] & optbit) != (*options & optbit))  
       *options = (int)code[1];  
     code += 2;  
     break;  
   
1418      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1419      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1420      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
# Line 996  for (;;) Line 1430  for (;;)
1430    
1431      case OP_CALLOUT:      case OP_CALLOUT:
1432      case OP_CREF:      case OP_CREF:
1433        case OP_NCREF:
1434      case OP_RREF:      case OP_RREF:
1435        case OP_NRREF:
1436      case OP_DEF:      case OP_DEF:
1437      code += _pcre_OP_lengths[*code];      code += _pcre_OP_lengths[*code];
1438      break;      break;
# Line 1012  for (;;) Line 1448  for (;;)
1448    
1449    
1450  /*************************************************  /*************************************************
1451  *        Find the fixed length of a pattern      *  *        Find the fixed length of a branch       *
1452  *************************************************/  *************************************************/
1453    
1454  /* 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,
1455  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.
1456  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
1457    temporarily terminated with OP_END when this function is called.
1458    
1459    This function is called when a backward assertion is encountered, so that if it
1460    fails, the error message can point to the correct place in the pattern.
1461    However, we cannot do this when the assertion contains subroutine calls,
1462    because they can be forward references. We solve this by remembering this case
1463    and doing the check at the end; a flag specifies which mode we are running in.
1464    
1465  Arguments:  Arguments:
1466    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1467    options  the compiling options    utf8     TRUE in UTF-8 mode
1468      atend    TRUE if called when the pattern is complete
1469      cd       the "compile data" structure
1470    
1471  Returns:   the fixed length, or -1 if there is no fixed length,  Returns:   the fixed length,
1472                 or -1 if there is no fixed length,
1473               or -2 if \C was encountered               or -2 if \C was encountered
1474                 or -3 if an OP_RECURSE item was encountered and atend is FALSE
1475  */  */
1476    
1477  static int  static int
1478  find_fixedlength(uschar *code, int options)  find_fixedlength(uschar *code, BOOL utf8, BOOL atend, compile_data *cd)
1479  {  {
1480  int length = -1;  int length = -1;
1481    
# Line 1041  branch, check the length against that of Line 1488  branch, check the length against that of
1488  for (;;)  for (;;)
1489    {    {
1490    int d;    int d;
1491      uschar *ce, *cs;
1492    register int op = *cc;    register int op = *cc;
   
1493    switch (op)    switch (op)
1494      {      {
1495        /* We only need to continue for OP_CBRA (normal capturing bracket) and
1496        OP_BRA (normal non-capturing bracket) because the other variants of these
1497        opcodes are all concerned with unlimited repeated groups, which of course
1498        are not of fixed length. They will cause a -1 response from the default
1499        case of this switch. */
1500    
1501      case OP_CBRA:      case OP_CBRA:
1502      case OP_BRA:      case OP_BRA:
1503      case OP_ONCE:      case OP_ONCE:
1504      case OP_COND:      case OP_COND:
1505      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), utf8, atend, cd);
1506      if (d < 0) return d;      if (d < 0) return d;
1507      branchlength += d;      branchlength += d;
1508      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
# Line 1058  for (;;) Line 1511  for (;;)
1511    
1512      /* 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
1513      call. If it's ALT it is an alternation in a nested call. If it is      call. If it's ALT it is an alternation in a nested call. If it is
1514      END it's the end of the outer call. All can be handled by the same code. */      END it's the end of the outer call. All can be handled by the same code.
1515        Note that we must not include the OP_KETRxxx opcodes here, because they
1516        all imply an unlimited repeat. */
1517    
1518      case OP_ALT:      case OP_ALT:
1519      case OP_KET:      case OP_KET:
     case OP_KETRMAX:  
     case OP_KETRMIN:  
1520      case OP_END:      case OP_END:
1521      if (length < 0) length = branchlength;      if (length < 0) length = branchlength;
1522        else if (length != branchlength) return -1;        else if (length != branchlength) return -1;
# Line 1072  for (;;) Line 1525  for (;;)
1525      branchlength = 0;      branchlength = 0;
1526      break;      break;
1527    
1528        /* A true recursion implies not fixed length, but a subroutine call may
1529        be OK. If the subroutine is a forward reference, we can't deal with
1530        it until the end of the pattern, so return -3. */
1531    
1532        case OP_RECURSE:
1533        if (!atend) return -3;
1534        cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1535        do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */
1536        if (cc > cs && cc < ce) return -1;                /* Recursion */
1537        d = find_fixedlength(cs + 2, utf8, atend, cd);
1538        if (d < 0) return d;
1539        branchlength += d;
1540        cc += 1 + LINK_SIZE;
1541        break;
1542    
1543      /* Skip over assertive subpatterns */      /* Skip over assertive subpatterns */
1544    
1545      case OP_ASSERT:      case OP_ASSERT:
# Line 1085  for (;;) Line 1553  for (;;)
1553    
1554      case OP_REVERSE:      case OP_REVERSE:
1555      case OP_CREF:      case OP_CREF:
1556        case OP_NCREF:
1557      case OP_RREF:      case OP_RREF:
1558        case OP_NRREF:
1559      case OP_DEF:      case OP_DEF:
     case OP_OPT:  
1560      case OP_CALLOUT:      case OP_CALLOUT:
1561      case OP_SOD:      case OP_SOD:
1562      case OP_SOM:      case OP_SOM:
1563        case OP_SET_SOM:
1564      case OP_EOD:      case OP_EOD:
1565      case OP_EODN:      case OP_EODN:
1566      case OP_CIRC:      case OP_CIRC:
1567        case OP_CIRCM:
1568      case OP_DOLL:      case OP_DOLL:
1569        case OP_DOLLM:
1570      case OP_NOT_WORD_BOUNDARY:      case OP_NOT_WORD_BOUNDARY:
1571      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
1572      cc += _pcre_OP_lengths[*cc];      cc += _pcre_OP_lengths[*cc];
# Line 1103  for (;;) Line 1575  for (;;)
1575      /* Handle literal characters */      /* Handle literal characters */
1576    
1577      case OP_CHAR:      case OP_CHAR:
1578      case OP_CHARNC:      case OP_CHARI:
1579      case OP_NOT:      case OP_NOT:
1580        case OP_NOTI:
1581      branchlength++;      branchlength++;
1582      cc += 2;      cc += 2;
1583  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1584      if ((options & PCRE_UTF8) != 0)      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       {  
       while ((*cc & 0xc0) == 0x80) cc++;  
       }  
1585  #endif  #endif
1586      break;      break;
1587    
# Line 1122  for (;;) Line 1592  for (;;)
1592      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1593      cc += 4;      cc += 4;
1594  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1595      if ((options & PCRE_UTF8) != 0)      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       {  
       while((*cc & 0x80) == 0x80) cc++;  
       }  
1596  #endif  #endif
1597      break;      break;
1598    
1599      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1600      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1601        if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;
1602      cc += 4;      cc += 4;
1603      break;      break;
1604    
# Line 1148  for (;;) Line 1616  for (;;)
1616      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
1617      case OP_WORDCHAR:      case OP_WORDCHAR:
1618      case OP_ANY:      case OP_ANY:
1619        case OP_ALLANY:
1620      branchlength++;      branchlength++;
1621      cc++;      cc++;
1622      break;      break;
# Line 1202  for (;;) Line 1671  for (;;)
1671    
1672    
1673  /*************************************************  /*************************************************
1674  *    Scan compiled regex for numbered bracket    *  *    Scan compiled regex for specific bracket    *
1675  *************************************************/  *************************************************/
1676    
1677  /* This little function scans through a compiled pattern until it finds a  /* This little function scans through a compiled pattern until it finds a
1678  capturing bracket with the given number.  capturing bracket with the given number, or, if the number is negative, an
1679    instance of OP_REVERSE for a lookbehind. The function is global in the C sense
1680    so that it can be called from pcre_study() when finding the minimum matching
1681    length.
1682    
1683  Arguments:  Arguments:
1684    code        points to start of expression    code        points to start of expression
1685    utf8        TRUE in UTF-8 mode    utf8        TRUE in UTF-8 mode
1686    number      the required bracket number    number      the required bracket number or negative to find a lookbehind
1687    
1688  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
1689  */  */
1690    
1691  static const uschar *  const uschar *
1692  find_bracket(const uschar *code, BOOL utf8, int number)  _pcre_find_bracket(const uschar *code, BOOL utf8, int number)
1693  {  {
1694  for (;;)  for (;;)
1695    {    {
1696    register int c = *code;    register int c = *code;
1697    
1698    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
1699    
1700    /* 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 1230  for (;;) Line 1703  for (;;)
1703    
1704    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
1705    
1706      /* Handle recursion */
1707    
1708      else if (c == OP_REVERSE)
1709        {
1710        if (number < 0) return (uschar *)code;
1711        code += _pcre_OP_lengths[c];
1712        }
1713    
1714    /* Handle capturing bracket */    /* Handle capturing bracket */
1715    
1716    else if (c == OP_CBRA)    else if (c == OP_CBRA || c == OP_SCBRA ||
1717               c == OP_CBRAPOS || c == OP_SCBRAPOS)
1718      {      {
1719      int n = GET2(code, 1+LINK_SIZE);      int n = GET2(code, 1+LINK_SIZE);
1720      if (n == number) return (uschar *)code;      if (n == number) return (uschar *)code;
1721      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1722      }      }
1723    
1724    /* In UTF-8 mode, opcodes that are followed by a character may be followed by    /* Otherwise, we can get the item's length from the table, except that for
1725    a multi-byte character. The length in the table is a minimum, so we have to    repeated character types, we have to test for \p and \P, which have an extra
1726    arrange to skip the extra bytes. */    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
1727      must add in its length. */
1728    
1729    else    else
1730      {      {
1731        switch(c)
1732          {
1733          case OP_TYPESTAR:
1734          case OP_TYPEMINSTAR:
1735          case OP_TYPEPLUS:
1736          case OP_TYPEMINPLUS:
1737          case OP_TYPEQUERY:
1738          case OP_TYPEMINQUERY:
1739          case OP_TYPEPOSSTAR:
1740          case OP_TYPEPOSPLUS:
1741          case OP_TYPEPOSQUERY:
1742          if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1743          break;
1744    
1745          case OP_TYPEUPTO:
1746          case OP_TYPEMINUPTO:
1747          case OP_TYPEEXACT:
1748          case OP_TYPEPOSUPTO:
1749          if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1750          break;
1751    
1752          case OP_MARK:
1753          case OP_PRUNE_ARG:
1754          case OP_SKIP_ARG:
1755          code += code[1];
1756          break;
1757    
1758          case OP_THEN_ARG:
1759          code += code[1+LINK_SIZE];
1760          break;
1761          }
1762    
1763        /* Add in the fixed length from the table */
1764    
1765      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1766    
1767      /* In UTF-8 mode, opcodes that are followed by a character may be followed by
1768      a multi-byte character. The length in the table is a minimum, so we have to
1769      arrange to skip the extra bytes. */
1770    
1771  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1772      if (utf8) switch(c)      if (utf8) switch(c)
1773        {        {
1774        case OP_CHAR:        case OP_CHAR:
1775        case OP_CHARNC:        case OP_CHARI:
1776        case OP_EXACT:        case OP_EXACT:
1777          case OP_EXACTI:
1778        case OP_UPTO:        case OP_UPTO:
1779          case OP_UPTOI:
1780        case OP_MINUPTO:        case OP_MINUPTO:
1781          case OP_MINUPTOI:
1782        case OP_POSUPTO:        case OP_POSUPTO:
1783          case OP_POSUPTOI:
1784        case OP_STAR:        case OP_STAR:
1785          case OP_STARI:
1786        case OP_MINSTAR:        case OP_MINSTAR:
1787          case OP_MINSTARI:
1788        case OP_POSSTAR:        case OP_POSSTAR:
1789          case OP_POSSTARI:
1790        case OP_PLUS:        case OP_PLUS:
1791          case OP_PLUSI:
1792        case OP_MINPLUS:        case OP_MINPLUS:
1793          case OP_MINPLUSI:
1794        case OP_POSPLUS:        case OP_POSPLUS:
1795          case OP_POSPLUSI:
1796        case OP_QUERY:        case OP_QUERY:
1797          case OP_QUERYI:
1798        case OP_MINQUERY:        case OP_MINQUERY:
1799          case OP_MINQUERYI:
1800        case OP_POSQUERY:        case OP_POSQUERY:
1801          case OP_POSQUERYI:
1802        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1803        break;        break;
1804        }        }
1805  #endif  #else
1806        (void)(utf8);  /* Keep compiler happy by referencing function argument */
1807    #endif
1808      }      }
1809    }    }
1810  }  }
# Line 1303  for (;;) Line 1840  for (;;)
1840    
1841    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
1842    
1843    /* 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
1844    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
1845    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
1846    bytes. */    must add in its length. */
1847    
1848    else    else
1849      {      {
1850        switch(c)
1851          {
1852          case OP_TYPESTAR:
1853          case OP_TYPEMINSTAR:
1854          case OP_TYPEPLUS:
1855          case OP_TYPEMINPLUS:
1856          case OP_TYPEQUERY:
1857          case OP_TYPEMINQUERY:
1858          case OP_TYPEPOSSTAR:
1859          case OP_TYPEPOSPLUS:
1860          case OP_TYPEPOSQUERY:
1861          if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1862          break;
1863    
1864          case OP_TYPEPOSUPTO:
1865          case OP_TYPEUPTO:
1866          case OP_TYPEMINUPTO:
1867          case OP_TYPEEXACT:
1868          if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1869          break;
1870    
1871          case OP_MARK:
1872          case OP_PRUNE_ARG:
1873          case OP_SKIP_ARG:
1874          code += code[1];
1875          break;
1876    
1877          case OP_THEN_ARG:
1878          code += code[1+LINK_SIZE];
1879          break;
1880          }
1881    
1882        /* Add in the fixed length from the table */
1883    
1884      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1885    
1886        /* In UTF-8 mode, opcodes that are followed by a character may be followed
1887        by a multi-byte character. The length in the table is a minimum, so we have
1888        to arrange to skip the extra bytes. */
1889    
1890  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1891      if (utf8) switch(c)      if (utf8) switch(c)
1892        {        {
1893        case OP_CHAR:        case OP_CHAR:
1894        case OP_CHARNC:        case OP_CHARI:
1895        case OP_EXACT:        case OP_EXACT:
1896          case OP_EXACTI:
1897        case OP_UPTO:        case OP_UPTO:
1898          case OP_UPTOI:
1899        case OP_MINUPTO:        case OP_MINUPTO:
1900          case OP_MINUPTOI:
1901        case OP_POSUPTO:        case OP_POSUPTO:
1902          case OP_POSUPTOI:
1903        case OP_STAR:        case OP_STAR:
1904          case OP_STARI:
1905        case OP_MINSTAR:        case OP_MINSTAR:
1906          case OP_MINSTARI:
1907        case OP_POSSTAR:        case OP_POSSTAR:
1908          case OP_POSSTARI:
1909        case OP_PLUS:        case OP_PLUS:
1910          case OP_PLUSI:
1911        case OP_MINPLUS:        case OP_MINPLUS:
1912          case OP_MINPLUSI:
1913        case OP_POSPLUS:        case OP_POSPLUS:
1914          case OP_POSPLUSI:
1915        case OP_QUERY:        case OP_QUERY:
1916          case OP_QUERYI:
1917        case OP_MINQUERY:        case OP_MINQUERY:
1918          case OP_MINQUERYI:
1919        case OP_POSQUERY:        case OP_POSQUERY:
1920          case OP_POSQUERYI:
1921        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1922        break;        break;
1923        }        }
1924  #endif  #else
1925        (void)(utf8);  /* Keep compiler happy by referencing function argument */
1926    #endif
1927      }      }
1928    }    }
1929  }  }
# Line 1347  for (;;) Line 1938  for (;;)
1938  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()
1939  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
1940  group that can match nothing. Note that first_significant_code() skips over  group that can match nothing. Note that first_significant_code() skips over
1941  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
1942  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
1943    bracket whose current branch will already have been scanned.
1944    
1945  Arguments:  Arguments:
1946    code        points to start of search    code        points to start of search
1947    endcode     points to where to stop    endcode     points to where to stop
1948    utf8        TRUE if in UTF8 mode    utf8        TRUE if in UTF8 mode
1949      cd          contains pointers to tables etc.
1950    
1951  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
1952  */  */
1953    
1954  static BOOL  static BOOL
1955  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8)  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8,
1956      compile_data *cd)
1957  {  {
1958  register int c;  register int c;
1959  for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);  for (code = first_significant_code(code + _pcre_OP_lengths[*code], TRUE);
1960       code < endcode;       code < endcode;
1961       code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))       code = first_significant_code(code + _pcre_OP_lengths[c], TRUE))
1962    {    {
1963    const uschar *ccode;    const uschar *ccode;
1964    
1965    c = *code;    c = *code;
1966    
1967    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE)    /* Skip over forward assertions; the other assertions are skipped by
1968      first_significant_code() with a TRUE final argument. */
1969    
1970      if (c == OP_ASSERT)
1971      {      {
1972      BOOL empty_branch;      do code += GET(code, 1); while (*code == OP_ALT);
1973      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      c = *code;
1974        continue;
1975        }
1976    
1977      /* Scan a closed bracket */    /* For a recursion/subroutine call, if its end has been reached, which
1978      implies a subroutine call, we can scan it. */
1979    
1980      empty_branch = FALSE;    if (c == OP_RECURSE)
1981        {
1982        BOOL empty_branch = FALSE;
1983        const uschar *scode = cd->start_code + GET(code, 1);
1984        if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
1985      do      do
1986        {        {
1987        if (!empty_branch && could_be_empty_branch(code, endcode, utf8))        if (could_be_empty_branch(scode, endcode, utf8, cd))
1988            {
1989          empty_branch = TRUE;          empty_branch = TRUE;
1990        code += GET(code, 1);          break;
1991            }
1992          scode += GET(scode, 1);
1993        }        }
1994      while (*code == OP_ALT);      while (*scode == OP_ALT);
1995      if (!empty_branch) return FALSE;   /* All branches are non-empty */      if (!empty_branch) return FALSE;  /* All branches are non-empty */
1996        continue;
1997        }
1998    
1999      /* Groups with zero repeats can of course be empty; skip them. */
2000    
2001      if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2002          c == OP_BRAPOSZERO)
2003        {
2004        code += _pcre_OP_lengths[c];
2005        do code += GET(code, 1); while (*code == OP_ALT);
2006        c = *code;
2007        continue;
2008        }
2009    
2010      /* Move past the KET and fudge things so that the increment in the "for"    /* A nested group that is already marked as "could be empty" can just be
2011      above has no effect. */    skipped. */
2012    
2013      c = OP_END;    if (c == OP_SBRA  || c == OP_SBRAPOS ||
2014      code += 1 + LINK_SIZE - _pcre_OP_lengths[c];        c == OP_SCBRA || c == OP_SCBRAPOS)
2015        {
2016        do code += GET(code, 1); while (*code == OP_ALT);
2017        c = *code;
2018        continue;
2019        }
2020    
2021      /* For other groups, scan the branches. */
2022    
2023      if (c == OP_BRA  || c == OP_BRAPOS ||
2024          c == OP_CBRA || c == OP_CBRAPOS ||
2025          c == OP_ONCE || c == OP_COND)
2026        {
2027        BOOL empty_branch;
2028        if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
2029    
2030        /* If a conditional group has only one branch, there is a second, implied,
2031        empty branch, so just skip over the conditional, because it could be empty.
2032        Otherwise, scan the individual branches of the group. */
2033    
2034        if (c == OP_COND && code[GET(code, 1)] != OP_ALT)
2035          code += GET(code, 1);
2036        else
2037          {
2038          empty_branch = FALSE;
2039          do
2040            {
2041            if (!empty_branch && could_be_empty_branch(code, endcode, utf8, cd))
2042              empty_branch = TRUE;
2043            code += GET(code, 1);
2044            }
2045          while (*code == OP_ALT);
2046          if (!empty_branch) return FALSE;   /* All branches are non-empty */
2047          }
2048    
2049        c = *code;
2050      continue;      continue;
2051      }      }
2052    
# Line 1399  for (code = first_significant_code(code Line 2054  for (code = first_significant_code(code
2054    
2055    switch (c)    switch (c)
2056      {      {
2057      /* Check for quantifiers after a class */      /* Check for quantifiers after a class. XCLASS is used for classes that
2058        cannot be represented just by a bit map. This includes negated single
2059        high-valued characters. The length in _pcre_OP_lengths[] is zero; the
2060        actual length is stored in the compiled code, so we must update "code"
2061        here. */
2062    
2063  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2064      case OP_XCLASS:      case OP_XCLASS:
2065      ccode = code + GET(code, 1);      ccode = code += GET(code, 1);
2066      goto CHECK_CLASS_REPEAT;      goto CHECK_CLASS_REPEAT;
2067  #endif  #endif
2068    
# Line 1447  for (code = first_significant_code(code Line 2106  for (code = first_significant_code(code
2106      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
2107      case OP_WORDCHAR:      case OP_WORDCHAR:
2108      case OP_ANY:      case OP_ANY:
2109        case OP_ALLANY:
2110      case OP_ANYBYTE:      case OP_ANYBYTE:
2111      case OP_CHAR:      case OP_CHAR:
2112      case OP_CHARNC:      case OP_CHARI:
2113      case OP_NOT:      case OP_NOT:
2114        case OP_NOTI:
2115      case OP_PLUS:      case OP_PLUS:
2116      case OP_MINPLUS:      case OP_MINPLUS:
2117      case OP_POSPLUS:      case OP_POSPLUS:
# Line 1465  for (code = first_significant_code(code Line 2126  for (code = first_significant_code(code
2126      case OP_TYPEEXACT:      case OP_TYPEEXACT:
2127      return FALSE;      return FALSE;
2128    
2129        /* These are going to continue, as they may be empty, but we have to
2130        fudge the length for the \p and \P cases. */
2131    
2132        case OP_TYPESTAR:
2133        case OP_TYPEMINSTAR:
2134        case OP_TYPEPOSSTAR:
2135        case OP_TYPEQUERY:
2136        case OP_TYPEMINQUERY:
2137        case OP_TYPEPOSQUERY:
2138        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
2139        break;
2140    
2141        /* Same for these */
2142    
2143        case OP_TYPEUPTO:
2144        case OP_TYPEMINUPTO:
2145        case OP_TYPEPOSUPTO:
2146        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
2147        break;
2148    
2149      /* End of branch */      /* End of branch */
2150    
2151      case OP_KET:      case OP_KET:
2152      case OP_KETRMAX:      case OP_KETRMAX:
2153      case OP_KETRMIN:      case OP_KETRMIN:
2154        case OP_KETRPOS:
2155      case OP_ALT:      case OP_ALT:
2156      return TRUE;      return TRUE;
2157    
# Line 1478  for (code = first_significant_code(code Line 2160  for (code = first_significant_code(code
2160    
2161  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2162      case OP_STAR:      case OP_STAR:
2163        case OP_STARI:
2164      case OP_MINSTAR:      case OP_MINSTAR:
2165        case OP_MINSTARI:
2166      case OP_POSSTAR:      case OP_POSSTAR:
2167        case OP_POSSTARI:
2168      case OP_QUERY:      case OP_QUERY:
2169        case OP_QUERYI:
2170      case OP_MINQUERY:      case OP_MINQUERY:
2171        case OP_MINQUERYI:
2172      case OP_POSQUERY:      case OP_POSQUERY:
2173        case OP_POSQUERYI:
2174        if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];
2175        break;
2176    
2177      case OP_UPTO:      case OP_UPTO:
2178        case OP_UPTOI:
2179      case OP_MINUPTO:      case OP_MINUPTO:
2180        case OP_MINUPTOI:
2181      case OP_POSUPTO:      case OP_POSUPTO:
2182      if (utf8) while ((code[2] & 0xc0) == 0x80) code++;      case OP_POSUPTOI:
2183        if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];
2184      break;      break;
2185  #endif  #endif
2186    
2187        /* MARK, and PRUNE/SKIP/THEN with an argument must skip over the argument
2188        string. */
2189    
2190        case OP_MARK:
2191        case OP_PRUNE_ARG:
2192        case OP_SKIP_ARG:
2193        code += code[1];
2194        break;
2195    
2196        case OP_THEN_ARG:
2197        code += code[1+LINK_SIZE];
2198        break;
2199    
2200        /* None of the remaining opcodes are required to match a character. */
2201    
2202        default:
2203        break;
2204      }      }
2205    }    }
2206    
# Line 1511  Arguments: Line 2223  Arguments:
2223    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2224    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2225    utf8        TRUE if in UTF-8 mode    utf8        TRUE if in UTF-8 mode
2226      cd          pointers to tables etc
2227    
2228  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2229  */  */
2230    
2231  static BOOL  static BOOL
2232  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,
2233    BOOL utf8)    BOOL utf8, compile_data *cd)
2234  {  {
2235  while (bcptr != NULL && bcptr->current >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2236    {    {
2237    if (!could_be_empty_branch(bcptr->current, endcode, utf8)) return FALSE;    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8, cd))
2238        return FALSE;
2239    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2240    }    }
2241  return TRUE;  return TRUE;
# Line 1534  return TRUE; Line 2248  return TRUE;
2248  *************************************************/  *************************************************/
2249    
2250  /* This function is called when the sequence "[:" or "[." or "[=" is  /* This function is called when the sequence "[:" or "[." or "[=" is
2251  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
2252  optional ^ and then a sequence of letters, terminated by a matching ":]" or  sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
2253  ".]" or "=]".  reach an unescaped ']' without the special preceding character, return FALSE.
2254    
2255    Originally, this function only recognized a sequence of letters between the
2256    terminators, but it seems that Perl recognizes any sequence of characters,
2257    though of course unknown POSIX names are subsequently rejected. Perl gives an
2258    "Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
2259    didn't consider this to be a POSIX class. Likewise for [:1234:].
2260    
2261    The problem in trying to be exactly like Perl is in the handling of escapes. We
2262    have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
2263    class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
2264    below handles the special case of \], but does not try to do any other escape
2265    processing. This makes it different from Perl for cases such as [:l\ower:]
2266    where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize
2267    "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
2268    I think.
2269    
2270  Argument:  Arguments:
2271    ptr      pointer to the initial [    ptr      pointer to the initial [
2272    endptr   where to return the end pointer    endptr   where to return the end pointer
   cd       pointer to compile data  
2273    
2274  Returns:   TRUE or FALSE  Returns:   TRUE or FALSE
2275  */  */
2276    
2277  static BOOL  static BOOL
2278  check_posix_syntax(const uschar *ptr, const uschar **endptr, compile_data *cd)  check_posix_syntax(const uschar *ptr, const uschar **endptr)
2279  {  {
2280  int terminator;          /* Don't combine these lines; the Solaris cc */  int terminator;          /* Don't combine these lines; the Solaris cc */
2281  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2282  if (*(++ptr) == '^') ptr++;  for (++ptr; *ptr != 0; ptr++)
 while ((cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;  
 if (*ptr == terminator && ptr[1] == ']')  
2283    {    {
2284    *endptr = ptr;    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else
2285    return TRUE;      {
2286        if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2287        if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2288          {
2289          *endptr = ptr;
2290          return TRUE;
2291          }
2292        }
2293    }    }
2294  return FALSE;  return FALSE;
2295  }  }
# Line 1581  Returns:     a value representing the na Line 2314  Returns:     a value representing the na
2314  static int  static int
2315  check_posix_name(const uschar *ptr, int len)  check_posix_name(const uschar *ptr, int len)
2316  {  {
2317    const char *pn = posix_names;
2318  register int yield = 0;  register int yield = 0;
2319  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
2320    {    {
2321    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
2322      strncmp((const char *)ptr, posix_names[yield], len) == 0) return yield;      strncmp((const char *)ptr, pn, len) == 0) return yield;
2323      pn += posix_name_lengths[yield] + 1;
2324    yield++;    yield++;
2325    }    }
2326  return -1;  return -1;
# Line 1600  return -1; Line 2335  return -1;
2335  that is referenced. This means that groups can be replicated for fixed  that is referenced. This means that groups can be replicated for fixed
2336  repetition simply by copying (because the recursion is allowed to refer to  repetition simply by copying (because the recursion is allowed to refer to
2337  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
2338  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
2339  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
2340  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
2341  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
2342  the partially compiled regex must be temporarily terminated with OP_END.  is called, the partially compiled regex must be temporarily terminated with
2343    OP_END.
2344    
2345  This function has been extended with the possibility of forward references for  This function has been extended with the possibility of forward references for
2346  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 1627  adjust_recurse(uschar *group, int adjust Line 2363  adjust_recurse(uschar *group, int adjust
2363    uschar *save_hwm)    uschar *save_hwm)
2364  {  {
2365  uschar *ptr = group;  uschar *ptr = group;
2366    
2367  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)
2368    {    {
2369    int offset;    int offset;
# Line 1680  auto_callout(uschar *code, const uschar Line 2417  auto_callout(uschar *code, const uschar
2417  {  {
2418  *code++ = OP_CALLOUT;  *code++ = OP_CALLOUT;
2419  *code++ = 255;  *code++ = 255;
2420  PUT(code, 0, ptr - cd->start_pattern);  /* Pattern offset */  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
2421  PUT(code, LINK_SIZE, 0);                /* Default length */  PUT(code, LINK_SIZE, 0);                       /* Default length */
2422  return code + 2*LINK_SIZE;  return code + 2*LINK_SIZE;
2423  }  }
2424    
# Line 1706  Returns:             nothing Line 2443  Returns:             nothing
2443  static void  static void
2444  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)
2445  {  {
2446  int length = ptr - cd->start_pattern - GET(previous_callout, 2);  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
2447  PUT(previous_callout, 2 + LINK_SIZE, length);  PUT(previous_callout, 2 + LINK_SIZE, length);
2448  }  }
2449    
# Line 1738  get_othercase_range(unsigned int *cptr, Line 2475  get_othercase_range(unsigned int *cptr,
2475  unsigned int c, othercase, next;  unsigned int c, othercase, next;
2476    
2477  for (c = *cptr; c <= d; c++)  for (c = *cptr; c <= d; c++)
2478    { if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR) break; }    { if ((othercase = UCD_OTHERCASE(c)) != c) break; }
2479    
2480  if (c > d) return FALSE;  if (c > d) return FALSE;
2481    
# Line 1747  next = othercase + 1; Line 2484  next = othercase + 1;
2484    
2485  for (++c; c <= d; c++)  for (++c; c <= d; c++)
2486    {    {
2487    if (_pcre_ucp_othercase(c) != next) break;    if (UCD_OTHERCASE(c) != next) break;
2488    next++;    next++;
2489    }    }
2490    
# Line 1756  for (++c; c <= d; c++) Line 2493  for (++c; c <= d; c++)
2493    
2494  return TRUE;  return TRUE;
2495  }  }
2496    
2497    
2498    
2499    /*************************************************
2500    *        Check a character and a property        *
2501    *************************************************/
2502    
2503    /* This function is called by check_auto_possessive() when a property item
2504    is adjacent to a fixed character.
2505    
2506    Arguments:
2507      c            the character
2508      ptype        the property type
2509      pdata        the data for the type
2510      negated      TRUE if it's a negated property (\P or \p{^)
2511    
2512    Returns:       TRUE if auto-possessifying is OK
2513    */
2514    
2515    static BOOL
2516    check_char_prop(int c, int ptype, int pdata, BOOL negated)
2517    {
2518    const ucd_record *prop = GET_UCD(c);
2519    switch(ptype)
2520      {
2521      case PT_LAMP:
2522      return (prop->chartype == ucp_Lu ||
2523              prop->chartype == ucp_Ll ||
2524              prop->chartype == ucp_Lt) == negated;
2525    
2526      case PT_GC:
2527      return (pdata == _pcre_ucp_gentype[prop->chartype]) == negated;
2528    
2529      case PT_PC:
2530      return (pdata == prop->chartype) == negated;
2531    
2532      case PT_SC:
2533      return (pdata == prop->script) == negated;
2534    
2535      /* These are specials */
2536    
2537      case PT_ALNUM:
2538      return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
2539              _pcre_ucp_gentype[prop->chartype] == ucp_N) == negated;
2540    
2541      case PT_SPACE:    /* Perl space */
2542      return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
2543              c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2544              == negated;
2545    
2546      case PT_PXSPACE:  /* POSIX space */
2547      return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
2548              c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2549              c == CHAR_FF || c == CHAR_CR)
2550              == negated;
2551    
2552      case PT_WORD:
2553      return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
2554              _pcre_ucp_gentype[prop->chartype] == ucp_N ||
2555              c == CHAR_UNDERSCORE) == negated;
2556      }
2557    return FALSE;
2558    }
2559  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2560    
2561    
# Line 1769  whether the next thing could possibly ma Line 2569  whether the next thing could possibly ma
2569  sense to automatically possessify the repeated item.  sense to automatically possessify the repeated item.
2570    
2571  Arguments:  Arguments:
2572    op_code       the repeated op code    previous      pointer to the repeated opcode
   this          data for this item, depends on the opcode  
2573    utf8          TRUE in UTF-8 mode    utf8          TRUE in UTF-8 mode
   utf8_char     used for utf8 character bytes, NULL if not relevant  
2574    ptr           next character in pattern    ptr           next character in pattern
2575    options       options bits    options       options bits
2576    cd            contains pointers to tables etc.    cd            contains pointers to tables etc.
# Line 1781  Returns:        TRUE if possessifying is Line 2579  Returns:        TRUE if possessifying is
2579  */  */
2580    
2581  static BOOL  static BOOL
2582  check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,  check_auto_possessive(const uschar *previous, BOOL utf8, const uschar *ptr,
2583    const uschar *ptr, int options, compile_data *cd)    int options, compile_data *cd)
2584  {  {
2585  int next;  int c, next;
2586    int op_code = *previous++;
2587    
2588  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
2589    
# Line 1793  if ((options & PCRE_EXTENDED) != 0) Line 2592  if ((options & PCRE_EXTENDED) != 0)
2592    for (;;)    for (;;)
2593      {      {
2594      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2595      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
2596        {        {
2597        while (*(++ptr) != 0)        ptr++;
2598          while (*ptr != 0)
2599            {
2600          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
2601            ptr++;
2602    #ifdef SUPPORT_UTF8
2603            if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
2604    #endif
2605            }
2606        }        }
2607      else break;      else break;
2608      }      }
# Line 1805  if ((options & PCRE_EXTENDED) != 0) Line 2611  if ((options & PCRE_EXTENDED) != 0)
2611  /* 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
2612  value is a character, a negative value is an escape value. */  value is a character, a negative value is an escape value. */
2613    
2614  if (*ptr == '\\')  if (*ptr == CHAR_BACKSLASH)
2615    {    {
2616    int temperrorcode = 0;    int temperrorcode = 0;
2617    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);
# Line 1830  if ((options & PCRE_EXTENDED) != 0) Line 2636  if ((options & PCRE_EXTENDED) != 0)
2636    for (;;)    for (;;)
2637      {      {
2638      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2639      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
2640        {        {
2641        while (*(++ptr) != 0)        ptr++;
2642          while (*ptr != 0)
2643            {
2644          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
2645            ptr++;
2646    #ifdef SUPPORT_UTF8
2647            if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
2648    #endif
2649            }
2650        }        }
2651      else break;      else break;
2652      }      }
2653    }    }
2654    
2655  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
   
 if (*ptr == '*' || *ptr == '?' || strncmp((char *)ptr, "{0,", 3) == 0)  
   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. */  
2656    
2657    if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
2658      strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
2659        return FALSE;
2660    
2661  /* Handle cases when the next item is a character. */  /* Now compare the next item with the previous opcode. First, handle cases when
2662    the next item is a character. */
2663    
2664  if (next >= 0) switch(op_code)  if (next >= 0) switch(op_code)
2665    {    {
2666    case OP_CHAR:    case OP_CHAR:
2667  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2668    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
2669    #else
2670      c = *previous;
2671  #endif  #endif
2672    return item != next;    return c != next;
2673    
2674    /* 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
2675    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
2676    high-valued characters. */    high-valued characters. */
2677    
2678    case OP_CHARNC:    case OP_CHARI:
2679  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2680    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
2681    #else
2682      c = *previous;
2683  #endif  #endif
2684    if (item == next) return FALSE;    if (c == next) return FALSE;
2685  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2686    if (utf8)    if (utf8)
2687      {      {
2688      unsigned int othercase;      unsigned int othercase;
2689      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2690  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2691      othercase = _pcre_ucp_othercase((unsigned int)next);      othercase = UCD_OTHERCASE((unsigned int)next);
2692  #else  #else
2693      othercase = NOTACHAR;      othercase = NOTACHAR;
2694  #endif  #endif
2695      return (unsigned int)item != othercase;      return (unsigned int)c != othercase;
2696      }      }
2697    else    else
2698  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF8 */
2699    return (item != cd->fcc[next]);  /* Non-UTF-8 mode */    return (c != cd->fcc[next]);  /* Non-UTF-8 mode */
2700    
2701    /* For OP_NOT, "item" must be a single-byte character. */    /* For OP_NOT and OP_NOTI, the data is always a single-byte character. These
2702      opcodes are not used for multi-byte characters, because they are coded using
2703      an XCLASS instead. */
2704    
2705    case OP_NOT:    case OP_NOT:
2706    if (next < 0) return FALSE;  /* Not a character */    return (c = *previous) == next;
2707    if (item == next) return TRUE;  
2708    if ((options & PCRE_CASELESS) == 0) return FALSE;    case OP_NOTI:
2709      if ((c = *previous) == next) return TRUE;
2710  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2711    if (utf8)    if (utf8)
2712      {      {
2713      unsigned int othercase;      unsigned int othercase;
2714      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2715  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2716      othercase = _pcre_ucp_othercase(next);      othercase = UCD_OTHERCASE(next);
2717  #else  #else
2718      othercase = NOTACHAR;      othercase = NOTACHAR;
2719  #endif  #endif
2720      return (unsigned int)item == othercase;      return (unsigned int)c == othercase;
2721      }      }
2722    else    else
2723  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF8 */
2724    return (item == cd->fcc[next]);  /* Non-UTF-8 mode */    return (c == cd->fcc[next]);  /* Non-UTF-8 mode */
2725    
2726      /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.
2727      When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
2728    
2729    case OP_DIGIT:    case OP_DIGIT:
2730    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;
# Line 1925  if (next >= 0) switch(op_code) Line 2744  if (next >= 0) switch(op_code)
2744    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
2745    return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;    return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;
2746    
2747      case OP_HSPACE:
2748      case OP_NOT_HSPACE:
2749      switch(next)
2750        {
2751        case 0x09:
2752        case 0x20:
2753        case 0xa0:
2754        case 0x1680:
2755        case 0x180e:
2756        case 0x2000:
2757        case 0x2001:
2758        case 0x2002:
2759        case 0x2003:
2760        case 0x2004:
2761        case 0x2005:
2762        case 0x2006:
2763        case 0x2007:
2764        case 0x2008:
2765        case 0x2009:
2766        case 0x200A:
2767        case 0x202f:
2768        case 0x205f:
2769        case 0x3000:
2770        return op_code == OP_NOT_HSPACE;
2771        default:
2772        return op_code != OP_NOT_HSPACE;
2773        }
2774    
2775      case OP_ANYNL:
2776      case OP_VSPACE:
2777      case OP_NOT_VSPACE:
2778      switch(next)
2779        {
2780        case 0x0a:
2781        case 0x0b:
2782        case 0x0c:
2783        case 0x0d:
2784        case 0x85:
2785        case 0x2028:
2786        case 0x2029:
2787        return op_code == OP_NOT_VSPACE;
2788        default:
2789        return op_code != OP_NOT_VSPACE;
2790        }
2791    
2792    #ifdef SUPPORT_UCP
2793      case OP_PROP:
2794      return check_char_prop(next, previous[0], previous[1], FALSE);
2795    
2796      case OP_NOTPROP:
2797      return check_char_prop(next, previous[0], previous[1], TRUE);
2798    #endif
2799    
2800    default:    default:
2801    return FALSE;    return FALSE;
2802    }    }
2803    
2804    
2805  /* 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
2806    is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are
2807    generated only when PCRE_UCP is *not* set, that is, when only ASCII
2808    characteristics are recognized. Similarly, the opcodes OP_DIGIT etc. are
2809    replaced by OP_PROP codes when PCRE_UCP is set. */
2810    
2811  switch(op_code)  switch(op_code)
2812    {    {
2813    case OP_CHAR:    case OP_CHAR:
2814    case OP_CHARNC:    case OP_CHARI:
2815  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2816    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
2817    #else
2818      c = *previous;
2819  #endif  #endif
2820    switch(-next)    switch(-next)
2821      {      {
2822      case ESC_d:      case ESC_d:
2823      return item > 127 || (cd->ctypes[item] & ctype_digit) == 0;      return c > 127 || (cd->ctypes[c] & ctype_digit) == 0;
2824    
2825      case ESC_D:      case ESC_D:
2826      return item <= 127 && (cd->ctypes[item] & ctype_digit) != 0;      return c <= 127 && (cd->ctypes[c] & ctype_digit) != 0;
2827    
2828      case ESC_s:      case ESC_s:
2829      return item > 127 || (cd->ctypes[item] & ctype_space) == 0;      return c > 127 || (cd->ctypes[c] & ctype_space) == 0;
2830    
2831      case ESC_S:      case ESC_S:
2832      return item <= 127 && (cd->ctypes[item] & ctype_space) != 0;      return c <= 127 && (cd->ctypes[c] & ctype_space) != 0;
2833    
2834      case ESC_w:      case ESC_w:
2835      return item > 127 || (cd->ctypes[item] & ctype_word) == 0;      return c > 127 || (cd->ctypes[c] & ctype_word) == 0;
2836    
2837      case ESC_W:      case ESC_W:
2838      return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;      return c <= 127 && (cd->ctypes[c] & ctype_word) != 0;
2839    
2840        case ESC_h:
2841        case ESC_H:
2842        switch(c)
2843          {
2844          case 0x09:
2845          case 0x20:
2846          case 0xa0:
2847          case 0x1680:
2848          case 0x180e:
2849          case 0x2000:
2850          case 0x2001:
2851          case 0x2002:
2852          case 0x2003:
2853          case 0x2004:
2854          case 0x2005:
2855          case 0x2006:
2856          case 0x2007:
2857          case 0x2008:
2858          case 0x2009:
2859          case 0x200A:
2860          case 0x202f:
2861          case 0x205f:
2862          case 0x3000:
2863          return -next != ESC_h;
2864          default:
2865          return -next == ESC_h;
2866          }
2867    
2868        case ESC_v:
2869        case ESC_V:
2870        switch(c)
2871          {
2872          case 0x0a:
2873          case 0x0b:
2874          case 0x0c:
2875          case 0x0d:
2876          case 0x85:
2877          case 0x2028:
2878          case 0x2029:
2879          return -next != ESC_v;
2880          default:
2881          return -next == ESC_v;
2882          }
2883    
2884        /* When PCRE_UCP is set, these values get generated for \d etc. Find
2885        their substitutions and process them. The result will always be either
2886        -ESC_p or -ESC_P. Then fall through to process those values. */
2887    
2888    #ifdef SUPPORT_UCP
2889        case ESC_du:
2890        case ESC_DU:
2891        case ESC_wu:
2892        case ESC_WU:
2893        case ESC_su:
2894        case ESC_SU:
2895          {
2896          int temperrorcode = 0;
2897          ptr = substitutes[-next - ESC_DU];
2898          next = check_escape(&ptr, &temperrorcode, 0, options, FALSE);
2899          if (temperrorcode != 0) return FALSE;
2900          ptr++;    /* For compatibility */
2901          }
2902        /* Fall through */
2903    
2904        case ESC_p:
2905        case ESC_P:
2906          {
2907          int ptype, pdata, errorcodeptr;
2908          BOOL negated;
2909    
2910          ptr--;      /* Make ptr point at the p or P */
2911          ptype = get_ucp(&ptr, &negated, &pdata, &errorcodeptr);
2912          if (ptype < 0) return FALSE;
2913          ptr++;      /* Point past the final curly ket */
2914    
2915          /* If the property item is optional, we have to give up. (When generated
2916          from \d etc by PCRE_UCP, this test will have been applied much earlier,
2917          to the original \d etc. At this point, ptr will point to a zero byte. */
2918    
2919          if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
2920            strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
2921              return FALSE;
2922    
2923          /* Do the property check. */
2924    
2925          return check_char_prop(c, ptype, pdata, (next == -ESC_P) != negated);
2926          }
2927    #endif
2928    
2929      default:      default:
2930      return FALSE;      return FALSE;
2931      }      }
2932    
2933      /* In principle, support for Unicode properties should be integrated here as
2934      well. It means re-organizing the above code so as to get hold of the property
2935      values before switching on the op-code. However, I wonder how many patterns
2936      combine ASCII \d etc with Unicode properties? (Note that if PCRE_UCP is set,
2937      these op-codes are never generated.) */
2938    
2939    case OP_DIGIT:    case OP_DIGIT:
2940    return next == -ESC_D || next == -ESC_s || next == -ESC_W;    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
2941             next == -ESC_h || next == -ESC_v || next == -ESC_R;
2942    
2943    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
2944    return next == -ESC_d;    return next == -ESC_d;
2945    
2946    case OP_WHITESPACE:    case OP_WHITESPACE:
2947    return next == -ESC_S || next == -ESC_d || next == -ESC_w;    return next == -ESC_S || next == -ESC_d || next == -ESC_w || next == -ESC_R;
2948    
2949    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
2950    return next == -ESC_s;    return next == -ESC_s || next == -ESC_h || next == -ESC_v;
2951    
2952      case OP_HSPACE:
2953      return next == -ESC_S || next == -ESC_H || next == -ESC_d ||
2954             next == -ESC_w || next == -ESC_v || next == -ESC_R;
2955    
2956      case OP_NOT_HSPACE:
2957      return next == -ESC_h;
2958    
2959      /* Can't have \S in here because VT matches \S (Perl anomaly) */
2960      case OP_ANYNL:
2961      case OP_VSPACE:
2962      return next == -ESC_V || next == -ESC_d || next == -ESC_w;
2963    
2964      case OP_NOT_VSPACE:
2965      return next == -ESC_v || next == -ESC_R;
2966    
2967    case OP_WORDCHAR:    case OP_WORDCHAR:
2968    return next == -ESC_W || next == -ESC_s;    return next == -ESC_W || next == -ESC_s || next == -ESC_h ||
2969             next == -ESC_v || next == -ESC_R;
2970    
2971    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
2972    return next == -ESC_w || next == -ESC_d;    return next == -ESC_w || next == -ESC_d;
# Line 2040  BOOL inescq = FALSE; Line 3030  BOOL inescq = FALSE;
3030  BOOL groupsetfirstbyte = FALSE;  BOOL groupsetfirstbyte = FALSE;
3031  const uschar *ptr = *ptrptr;  const uschar *ptr = *ptrptr;
3032  const uschar *tempptr;  const uschar *tempptr;
3033    const uschar *nestptr = NULL;
3034  uschar *previous = NULL;  uschar *previous = NULL;
3035  uschar *previous_callout = NULL;  uschar *previous_callout = NULL;
3036  uschar *save_hwm = NULL;  uschar *save_hwm = NULL;
# Line 2049  uschar classbits[32]; Line 3040  uschar classbits[32];
3040  BOOL class_utf8;  BOOL class_utf8;
3041  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf8 = (options & PCRE_UTF8) != 0;
3042  uschar *class_utf8data;  uschar *class_utf8data;
3043    uschar *class_utf8data_base;
3044  uschar utf8_char[6];  uschar utf8_char[6];
3045  #else  #else
3046  BOOL utf8 = FALSE;  BOOL utf8 = FALSE;
3047  uschar *utf8_char = NULL;  uschar *utf8_char = NULL;
3048  #endif  #endif
3049    
3050  #ifdef DEBUG  #ifdef PCRE_DEBUG
3051  if (lengthptr != NULL) DPRINTF((">> start branch\n"));  if (lengthptr != NULL) DPRINTF((">> start branch\n"));
3052  #endif  #endif
3053    
# Line 2088  req_caseopt = ((options & PCRE_CASELESS) Line 3080  req_caseopt = ((options & PCRE_CASELESS)
3080  for (;; ptr++)  for (;; ptr++)
3081    {    {
3082    BOOL negate_class;    BOOL negate_class;
3083      BOOL should_flip_negation;
3084    BOOL possessive_quantifier;    BOOL possessive_quantifier;
3085    BOOL is_quantifier;    BOOL is_quantifier;
3086    BOOL is_recurse;    BOOL is_recurse;
3087      BOOL reset_bracount;
3088    int class_charcount;    int class_charcount;
3089    int class_lastchar;    int class_lastchar;
3090    int newoptions;    int newoptions;
3091    int recno;    int recno;
3092      int refsign;
3093    int skipbytes;    int skipbytes;
3094    int subreqbyte;    int subreqbyte;
3095    int subfirstbyte;    int subfirstbyte;
# Line 2106  for (;; ptr++) Line 3101  for (;; ptr++)
3101    
3102    c = *ptr;    c = *ptr;
3103    
3104      /* If we are at the end of a nested substitution, revert to the outer level
3105      string. Nesting only happens one level deep. */
3106    
3107      if (c == 0 && nestptr != NULL)
3108        {
3109        ptr = nestptr;
3110        nestptr = NULL;
3111        c = *ptr;
3112        }
3113    
3114    /* 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
3115    previous cycle of this loop. */    previous cycle of this loop. */
3116    
3117    if (lengthptr != NULL)    if (lengthptr != NULL)
3118      {      {
3119  #ifdef DEBUG  #ifdef PCRE_DEBUG
3120      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
3121  #endif  #endif
3122      if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */      if (code > cd->start_workspace + WORK_SIZE_CHECK)   /* Check for overrun */
3123        {        {
3124        *errorcodeptr = ERR52;        *errorcodeptr = ERR52;
3125        goto FAILED;        goto FAILED;
# Line 2127  for (;; ptr++) Line 3132  for (;; ptr++)
3132      */      */
3133    
3134      if (code < last_code) code = last_code;      if (code < last_code) code = last_code;
3135      *lengthptr += code - last_code;  
3136        /* Paranoid check for integer overflow */
3137    
3138        if (OFLOW_MAX - *lengthptr < code - last_code)
3139          {
3140          *errorcodeptr = ERR20;
3141          goto FAILED;
3142          }
3143    
3144        *lengthptr += (int)(code - last_code);
3145      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));
3146    
3147      /* If "previous" is set and it is not at the start of the work space, move      /* If "previous" is set and it is not at the start of the work space, move
# Line 2154  for (;; ptr++) Line 3168  for (;; ptr++)
3168    /* In the real compile phase, just check the workspace used by the forward    /* In the real compile phase, just check the workspace used by the forward
3169    reference list. */    reference list. */
3170    
3171    else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)    else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK)
3172      {      {
3173      *errorcodeptr = ERR52;      *errorcodeptr = ERR52;
3174      goto FAILED;      goto FAILED;
# Line 2164  for (;; ptr++) Line 3178  for (;; ptr++)
3178    
3179    if (inescq && c != 0)    if (inescq && c != 0)
3180      {      {
3181      if (c == '\\' && ptr[1] == 'E')      if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
3182        {        {
3183        inescq = FALSE;        inescq = FALSE;
3184        ptr++;        ptr++;
# Line 2190  for (;; ptr++) Line 3204  for (;; ptr++)
3204    /* Fill in length of a previous callout, except when the next thing is    /* Fill in length of a previous callout, except when the next thing is
3205    a quantifier. */    a quantifier. */
3206    
3207    is_quantifier = c == '*' || c == '+' || c == '?' ||    is_quantifier =
3208      (c == '{' && is_counted_repeat(ptr+1));      c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
3209        (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
3210    
3211    if (!is_quantifier && previous_callout != NULL &&    if (!is_quantifier && previous_callout != NULL &&
3212         after_manual_callout-- <= 0)         after_manual_callout-- <= 0)
# Line 2206  for (;; ptr++) Line 3221  for (;; ptr++)
3221    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
3222      {      {
3223      if ((cd->ctypes[c] & ctype_space) != 0) continue;      if ((cd->ctypes[c] & ctype_space) != 0) continue;
3224      if (c == '#')      if (c == CHAR_NUMBER_SIGN)
3225        {        {
3226        while (*(++ptr) != 0)        ptr++;
3227          while (*ptr != 0)
3228          {          {
3229          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
3230            ptr++;
3231    #ifdef SUPPORT_UTF8
3232            if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
3233    #endif
3234          }          }
3235        if (*ptr != 0) continue;        if (*ptr != 0) continue;
3236    
# Line 2231  for (;; ptr++) Line 3251  for (;; ptr++)
3251      {      {
3252      /* ===================================================================*/      /* ===================================================================*/
3253      case 0:                        /* The branch terminates at string end */      case 0:                        /* The branch terminates at string end */
3254      case '|':                      /* or | or ) */      case CHAR_VERTICAL_LINE:       /* or | or ) */
3255      case ')':      case CHAR_RIGHT_PARENTHESIS:
3256      *firstbyteptr = firstbyte;      *firstbyteptr = firstbyte;
3257      *reqbyteptr = reqbyte;      *reqbyteptr = reqbyte;
3258      *codeptr = code;      *codeptr = code;
3259      *ptrptr = ptr;      *ptrptr = ptr;
3260      if (lengthptr != NULL)      if (lengthptr != NULL)
3261        {        {
3262        *lengthptr += code - last_code;   /* To include callout length */        if (OFLOW_MAX - *lengthptr < code - last_code)
3263            {
3264            *errorcodeptr = ERR20;
3265            goto FAILED;
3266            }
3267          *lengthptr += (int)(code - last_code);   /* To include callout length */
3268        DPRINTF((">> end branch\n"));        DPRINTF((">> end branch\n"));
3269        }        }
3270      return TRUE;      return TRUE;
# Line 2249  for (;; ptr++) Line 3274  for (;; ptr++)
3274      /* Handle single-character metacharacters. In multiline mode, ^ disables      /* Handle single-character metacharacters. In multiline mode, ^ disables
3275      the setting of any following char as a first character. */      the setting of any following char as a first character. */
3276    
3277      case '^':      case CHAR_CIRCUMFLEX_ACCENT:
3278        previous = NULL;
3279      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
3280        {        {
3281        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
3282          *code++ = OP_CIRCM;
3283        }        }
3284      previous = NULL;      else *code++ = OP_CIRC;
     *code++ = OP_CIRC;  
3285      break;      break;
3286    
3287      case '$':      case CHAR_DOLLAR_SIGN:
3288      previous = NULL;      previous = NULL;
3289      *code++ = OP_DOLL;      *code++ = ((options & PCRE_MULTILINE) != 0)? OP_DOLLM : OP_DOLL;
3290      break;      break;
3291    
3292      /* There can never be a first char if '.' is first, whatever happens about      /* There can never be a first char if '.' is first, whatever happens about
3293      repeats. The value of reqbyte doesn't change either. */      repeats. The value of reqbyte doesn't change either. */
3294    
3295      case '.':      case CHAR_DOT:
3296      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
3297      zerofirstbyte = firstbyte;      zerofirstbyte = firstbyte;
3298      zeroreqbyte = reqbyte;      zeroreqbyte = reqbyte;
3299      previous = code;      previous = code;
3300      *code++ = OP_ANY;      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
3301      break;      break;
3302    
3303    
# Line 2286  for (;; ptr++) Line 3312  for (;; ptr++)
3312      opcode is compiled. It may optionally have a bit map for characters < 256,      opcode is compiled. It may optionally have a bit map for characters < 256,
3313      but those above are are explicitly listed afterwards. A flag byte tells      but those above are are explicitly listed afterwards. A flag byte tells
3314      whether the bitmap is present, and whether this is a negated class or not.      whether the bitmap is present, and whether this is a negated class or not.
     */  
3315    
3316      case '[':      In JavaScript compatibility mode, an isolated ']' causes an error. In
3317        default (Perl) mode, it is treated as a data character. */
3318    
3319        case CHAR_RIGHT_SQUARE_BRACKET:
3320        if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
3321          {
3322          *errorcodeptr = ERR64;
3323          goto FAILED;
3324          }
3325        goto NORMAL_CHAR;
3326    
3327        case CHAR_LEFT_SQUARE_BRACKET:
3328      previous = code;      previous = code;
3329    
3330      /* PCRE supports POSIX class stuff inside a class. Perl gives an error if      /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
3331      they are encountered at the top level, so we'll do that too. */      they are encountered at the top level, so we'll do that too. */
3332    
3333      if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&      if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
3334          check_posix_syntax(ptr, &tempptr, cd))           ptr[1] == CHAR_EQUALS_SIGN) &&
3335            check_posix_syntax(ptr, &tempptr))
3336        {        {
3337        *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;        *errorcodeptr = (ptr[1] == CHAR_COLON)? ERR13 : ERR31;
3338        goto FAILED;        goto FAILED;
3339        }        }
3340    
3341      /* If the first character is '^', set the negation flag and skip it. */      /* If the first character is '^', set the negation flag and skip it. Also,
3342        if the first few characters (either before or after ^) are \Q\E or \E we
3343        skip them too. This makes for compatibility with Perl. */
3344    
3345      if ((c = *(++ptr)) == '^')      negate_class = FALSE;
3346        for (;;)
3347        {        {
       negate_class = TRUE;  
3348        c = *(++ptr);        c = *(++ptr);
3349          if (c == CHAR_BACKSLASH)
3350            {
3351            if (ptr[1] == CHAR_E)
3352              ptr++;
3353            else if (strncmp((const char *)ptr+1,
3354                              STR_Q STR_BACKSLASH STR_E, 3) == 0)
3355              ptr += 3;
3356            else
3357              break;
3358            }
3359          else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
3360            negate_class = TRUE;
3361          else break;
3362        }        }
3363      else  
3364        /* Empty classes are allowed in JavaScript compatibility mode. Otherwise,
3365        an initial ']' is taken as a data character -- the code below handles
3366        that. In JS mode, [] must always fail, so generate OP_FAIL, whereas
3367        [^] must match any character, so generate OP_ALLANY. */
3368    
3369        if (c == CHAR_RIGHT_SQUARE_BRACKET &&
3370            (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
3371        {        {
3372        negate_class = FALSE;        *code++ = negate_class? OP_ALLANY : OP_FAIL;
3373          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
3374          zerofirstbyte = firstbyte;
3375          break;
3376        }        }
3377    
3378        /* If a class contains a negative special such as \S, we need to flip the
3379        negation flag at the end, so that support for characters > 255 works
3380        correctly (they are all included in the class). */
3381    
3382        should_flip_negation = FALSE;
3383    
3384      /* Keep a count of chars with values < 256 so that we can optimize the case      /* Keep a count of chars with values < 256 so that we can optimize the case
3385      of just a single character (as long as it's < 256). However, For higher      of just a single character (as long as it's < 256). However, For higher
3386      valued UTF-8 characters, we don't yet do any optimization. */      valued UTF-8 characters, we don't yet do any optimization. */
# Line 2330  for (;; ptr++) Line 3398  for (;; ptr++)
3398  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3399      class_utf8 = FALSE;                       /* No chars >= 256 */      class_utf8 = FALSE;                       /* No chars >= 256 */
3400      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */
3401        class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */
3402  #endif  #endif
3403    
3404      /* Process characters until ] is reached. By writing this as a "do" it      /* Process characters until ] is reached. By writing this as a "do" it
# Line 2345  for (;; ptr++) Line 3414  for (;; ptr++)
3414          {                           /* Braces are required because the */          {                           /* Braces are required because the */
3415          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
3416          }          }
3417    
3418          /* In the pre-compile phase, accumulate the length of any UTF-8 extra
3419          data and reset the pointer. This is so that very large classes that
3420          contain a zillion UTF-8 characters no longer overwrite the work space
3421          (which is on the stack). */
3422    
3423          if (lengthptr != NULL)
3424            {
3425            *lengthptr += class_utf8data - class_utf8data_base;
3426            class_utf8data = class_utf8data_base;
3427            }
3428    
3429  #endif  #endif
3430    
3431        /* Inside \Q...\E everything is literal except \E */        /* Inside \Q...\E everything is literal except \E */
3432    
3433        if (inescq)        if (inescq)
3434          {          {
3435          if (c == '\\' && ptr[1] == 'E')     /* If we are at \E */          if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)  /* If we are at \E */
3436            {            {
3437            inescq = FALSE;                   /* Reset literal state */            inescq = FALSE;                   /* Reset literal state */
3438            ptr++;                            /* Skip the 'E' */            ptr++;                            /* Skip the 'E' */
# Line 2366  for (;; ptr++) Line 3447  for (;; ptr++)
3447        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
3448        5.6 and 5.8 do. */        5.6 and 5.8 do. */
3449    
3450        if (c == '[' &&        if (c == CHAR_LEFT_SQUARE_BRACKET &&
3451            (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&            (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
3452            check_posix_syntax(ptr, &tempptr, cd))             ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))
3453          {          {
3454          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
3455          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
3456          register const uschar *cbits = cd->cbits;          register const uschar *cbits = cd->cbits;
3457          uschar pbits[32];          uschar pbits[32];
3458    
3459          if (ptr[1] != ':')          if (ptr[1] != CHAR_COLON)
3460            {            {
3461            *errorcodeptr = ERR31;            *errorcodeptr = ERR31;
3462            goto FAILED;            goto FAILED;
3463            }            }
3464    
3465          ptr += 2;          ptr += 2;
3466          if (*ptr == '^')          if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
3467            {            {
3468            local_negate = TRUE;            local_negate = TRUE;
3469              should_flip_negation = TRUE;  /* Note negative special */
3470            ptr++;            ptr++;
3471            }            }
3472    
3473          posix_class = check_posix_name(ptr, tempptr - ptr);          posix_class = check_posix_name(ptr, (int)(tempptr - ptr));
3474          if (posix_class < 0)          if (posix_class < 0)
3475            {            {
3476            *errorcodeptr = ERR30;            *errorcodeptr = ERR30;
# Line 2402  for (;; ptr++) Line 3484  for (;; ptr++)
3484          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)
3485            posix_class = 0;            posix_class = 0;
3486    
3487          /* We build the bit map for the POSIX class in a chunk of local store          /* When PCRE_UCP is set, some of the POSIX classes are converted to
3488          because we may be adding and subtracting from it, and we don't want to          different escape sequences that use Unicode properties. */
3489          subtract bits that may be in the main map already. At the end we or the  
3490          result into the bit map that is being built. */  #ifdef SUPPORT_UCP
3491            if ((options & PCRE_UCP) != 0)
3492              {
3493              int pc = posix_class + ((local_negate)? POSIX_SUBSIZE/2 : 0);
3494              if (posix_substitutes[pc] != NULL)
3495                {
3496                nestptr = tempptr + 1;
3497                ptr = posix_substitutes[pc] - 1;
3498                continue;
3499                }
3500              }
3501    #endif
3502            /* In the non-UCP case, we build the bit map for the POSIX class in a
3503            chunk of local store because we may be adding and subtracting from it,
3504            and we don't want to subtract bits that may be in the main map already.
3505            At the end we or the result into the bit map that is being built. */
3506    
3507          posix_class *= 3;          posix_class *= 3;
3508    
# Line 2449  for (;; ptr++) Line 3546  for (;; ptr++)
3546    
3547        /* Backslash may introduce a single character, or it may introduce one        /* Backslash may introduce a single character, or it may introduce one
3548        of the specials, which just set a flag. The sequence \b is a special        of the specials, which just set a flag. The sequence \b is a special
3549        case. Inside a class (and only there) it is treated as backspace.        case. Inside a class (and only there) it is treated as backspace. We
3550        Elsewhere it marks a word boundary. Other escapes have preset maps ready        assume that other escapes have more than one character in them, so set
3551        to or into the one we are building. We assume they have more than one        class_charcount bigger than one. Unrecognized escapes fall through and
3552        character in them, so set class_charcount bigger than one. */        are either treated as literal characters (by default), or are faulted if
3553          PCRE_EXTRA is set. */
3554    
3555        if (c == '\\')        if (c == CHAR_BACKSLASH)
3556          {          {
3557          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3558          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
3559    
3560          if (-c == ESC_b) c = '\b';       /* \b is backslash in a class */          if (-c == ESC_b) c = CHAR_BS;    /* \b is backspace in a class */
         else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */  
         else if (-c == ESC_R) c = 'R';   /* \R is literal R in a class */  
3561          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
3562            {            {
3563            if (ptr[1] == '\\' && ptr[2] == 'E')            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
3564              {              {
3565              ptr += 2; /* avoid empty string */              ptr += 2; /* avoid empty string */
3566              }              }
3567            else inescq = TRUE;            else inescq = TRUE;
3568            continue;            continue;
3569            }            }
3570            else if (-c == ESC_E) continue;  /* Ignore orphan \E */
3571    
3572          if (c < 0)          if (c < 0)
3573            {            {
3574            register const uschar *cbits = cd->cbits;            register const uschar *cbits = cd->cbits;
3575            class_charcount += 2;     /* Greater than 1 is what matters */            class_charcount += 2;     /* Greater than 1 is what matters */
3576    
3577            /* Save time by not doing this in the pre-compile phase. */            switch (-c)
   
           if (lengthptr == NULL) switch (-c)  
3578              {              {
3579    #ifdef SUPPORT_UCP
3580                case ESC_du:     /* These are the values given for \d etc */
3581                case ESC_DU:     /* when PCRE_UCP is set. We replace the */
3582                case ESC_wu:     /* escape sequence with an appropriate \p */
3583                case ESC_WU:     /* or \P to test Unicode properties instead */
3584                case ESC_su:     /* of the default ASCII testing. */
3585                case ESC_SU:
3586                nestptr = ptr;
3587                ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
3588                class_charcount -= 2;                /* Undo! */
3589                continue;
3590    #endif
3591              case ESC_d:              case ESC_d:
3592              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];
3593              continue;              continue;
3594    
3595              case ESC_D:              case ESC_D:
3596                should_flip_negation = TRUE;
3597              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];
3598              continue;              continue;
3599    
# Line 2494  for (;; ptr++) Line 3602  for (;; ptr++)
3602              continue;              continue;
3603    
3604              case ESC_W:              case ESC_W:
3605                should_flip_negation = TRUE;
3606              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
3607              continue;              continue;
3608    
3609                /* Perl 5.004 onwards omits VT from \s, but we must preserve it
3610                if it was previously set by something earlier in the character
3611                class. */
3612    
3613              case ESC_s:              case ESC_s:
3614              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_space];              classbits[0] |= cbits[cbit_space];
3615              classbits[1] &= ~0x08;   /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= cbits[cbit_space+1] & ~0x08;
3616                for (c = 2; c < 32; c++) classbits[c] |= cbits[c+cbit_space];
3617              continue;              continue;
3618    
3619              case ESC_S:              case ESC_S:
3620                should_flip_negation = TRUE;
3621              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
3622              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
3623              continue;              continue;
3624    
3625              case ESC_E: /* Perl ignores an orphan \E */              case ESC_h:
3626                SETBIT(classbits, 0x09); /* VT */
3627                SETBIT(classbits, 0x20); /* SPACE */
3628                SETBIT(classbits, 0xa0); /* NSBP */
3629    #ifdef SUPPORT_UTF8
3630                if (utf8)
3631                  {
3632                  class_utf8 = TRUE;
3633                  *class_utf8data++ = XCL_SINGLE;
3634                  class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);
3635                  *class_utf8data++ = XCL_SINGLE;
3636                  class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);
3637                  *class_utf8data++ = XCL_RANGE;
3638                  class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);
3639                  class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);
3640                  *class_utf8data++ = XCL_SINGLE;
3641                  class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);
3642                  *class_utf8data++ = XCL_SINGLE;
3643                  class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);
3644                  *class_utf8data++ = XCL_SINGLE;
3645                  class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);
3646                  }
3647    #endif
3648              continue;              continue;
3649    
3650              default:    /* Not recognized; fall through */              case ESC_H:
3651              break;      /* Need "default" setting to stop compiler warning. */              for (c = 0; c < 32; c++)
3652              }                {
3653                  int x = 0xff;
3654                  switch (c)
3655                    {
3656                    case 0x09/8: x ^= 1 << (0x09%8); break;
3657                    case 0x20/8: x ^= 1 << (0x20%8); break;
3658                    case 0xa0/8: x ^= 1 << (0xa0%8); break;
3659                    default: break;
3660                    }
3661                  classbits[c] |= x;
3662                  }
3663    
3664            /* In the pre-compile phase, just do the recognition. */  #ifdef SUPPORT_UTF8
3665                if (utf8)
3666                  {
3667                  class_utf8 = TRUE;
3668                  *class_utf8data++ = XCL_RANGE;
3669                  class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
3670                  class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);
3671                  *class_utf8data++ = XCL_RANGE;
3672                  class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);
3673                  class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);
3674                  *class_utf8data++ = XCL_RANGE;
3675                  class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);
3676                  class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);
3677                  *class_utf8data++ = XCL_RANGE;
3678                  class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);
3679                  class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);
3680                  *class_utf8data++ = XCL_RANGE;
3681                  class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);
3682                  class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);
3683                  *class_utf8data++ = XCL_RANGE;
3684                  class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);
3685                  class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);
3686                  *class_utf8data++ = XCL_RANGE;
3687                  class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);
3688                  class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
3689                  }
3690    #endif
3691                continue;
3692    
3693            else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||              case ESC_v:
3694                     c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;              SETBIT(classbits, 0x0a); /* LF */
3695                SETBIT(classbits, 0x0b); /* VT */
3696                SETBIT(classbits, 0x0c); /* FF */
3697                SETBIT(classbits, 0x0d); /* CR */
3698                SETBIT(classbits, 0x85); /* NEL */
3699    #ifdef SUPPORT_UTF8
3700                if (utf8)
3701                  {
3702                  class_utf8 = TRUE;
3703                  *class_utf8data++ = XCL_RANGE;
3704                  class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);
3705                  class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
3706                  }
3707    #endif
3708                continue;
3709    
3710            /* We need to deal with \P and \p in both phases. */              case ESC_V:
3711                for (c = 0; c < 32; c++)
3712                  {
3713                  int x = 0xff;
3714                  switch (c)
3715                    {
3716                    case 0x0a/8: x ^= 1 << (0x0a%8);
3717                                 x ^= 1 << (0x0b%8);
3718                                 x ^= 1 << (0x0c%8);
3719                                 x ^= 1 << (0x0d%8);
3720                                 break;
3721                    case 0x85/8: x ^= 1 << (0x85%8); break;
3722                    default: break;
3723                    }
3724                  classbits[c] |= x;
3725                  }
3726    
3727  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UTF8
3728            if (-c == ESC_p || -c == ESC_P)              if (utf8)
3729              {                {
3730              BOOL negated;                class_utf8 = TRUE;
3731              int pdata;                *class_utf8data++ = XCL_RANGE;
3732              int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);                class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
3733              if (ptype < 0) goto FAILED;                class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);
3734              class_utf8 = TRUE;                *class_utf8data++ = XCL_RANGE;
3735              *class_utf8data++ = ((-c == ESC_p) != negated)?                class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
3736                XCL_PROP : XCL_NOTPROP;                class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
3737              *class_utf8data++ = ptype;                }
3738              *class_utf8data++ = pdata;  #endif
             class_charcount -= 2;   /* Not a < 256 character */  
3739              continue;              continue;
3740              }  
3741    #ifdef SUPPORT_UCP
3742                case ESC_p:
3743                case ESC_P:
3744                  {
3745                  BOOL negated;
3746                  int pdata;
3747                  int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
3748                  if (ptype < 0) goto FAILED;
3749                  class_utf8 = TRUE;
3750                  *class_utf8data++ = ((-c == ESC_p) != negated)?
3751                    XCL_PROP : XCL_NOTPROP;
3752                  *class_utf8data++ = ptype;
3753                  *class_utf8data++ = pdata;
3754                  class_charcount -= 2;   /* Not a < 256 character */
3755                  continue;
3756                  }
3757  #endif  #endif
3758            /* Unrecognized escapes are faulted if PCRE is running in its              /* Unrecognized escapes are faulted if PCRE is running in its
3759            strict mode. By default, for compatibility with Perl, they are              strict mode. By default, for compatibility with Perl, they are
3760            treated as literals. */              treated as literals. */
3761    
3762            if ((options & PCRE_EXTRA) != 0)              default:
3763              {              if ((options & PCRE_EXTRA) != 0)
3764              *errorcodeptr = ERR7;                {
3765              goto FAILED;                *errorcodeptr = ERR7;
3766                  goto FAILED;
3767                  }
3768                class_charcount -= 2;  /* Undo the default count from above */
3769                c = *ptr;              /* Get the final character and fall through */
3770                break;
3771              }              }
   
           class_charcount -= 2;  /* Undo the default count from above */  
           c = *ptr;              /* Get the final character and fall through */  
3772            }            }
3773    
3774          /* Fall through if we have a single character (c >= 0). This may be          /* Fall through if we have a single character (c >= 0). This may be
# Line 2562  for (;; ptr++) Line 3782  for (;; ptr++)
3782        entirely. The code for handling \Q and \E is messy. */        entirely. The code for handling \Q and \E is messy. */
3783    
3784        CHECK_RANGE:        CHECK_RANGE:
3785        while (ptr[1] == '\\' && ptr[2] == 'E')        while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
3786          {          {
3787          inescq = FALSE;          inescq = FALSE;
3788          ptr += 2;          ptr += 2;
# Line 2570  for (;; ptr++) Line 3790  for (;; ptr++)
3790    
3791        oldptr = ptr;        oldptr = ptr;
3792    
3793        if (!inescq && ptr[1] == '-')        /* Remember \r or \n */
3794    
3795          if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
3796    
3797          /* Check for range */
3798    
3799          if (!inescq && ptr[1] == CHAR_MINUS)
3800          {          {
3801          int d;          int d;
3802          ptr += 2;          ptr += 2;
3803          while (*ptr == '\\' && ptr[1] == 'E') ptr += 2;          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;
3804    
3805          /* If we hit \Q (not followed by \E) at this point, go into escaped          /* If we hit \Q (not followed by \E) at this point, go into escaped
3806          mode. */          mode. */
3807    
3808          while (*ptr == '\\' && ptr[1] == 'Q')          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
3809            {            {
3810            ptr += 2;            ptr += 2;
3811            if (*ptr == '\\' && ptr[1] == 'E') { ptr += 2; continue; }            if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)
3812                { ptr += 2; continue; }
3813            inescq = TRUE;            inescq = TRUE;
3814            break;            break;
3815            }            }
3816    
3817          if (*ptr == 0 || (!inescq && *ptr == ']'))          if (*ptr == 0 || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
3818            {            {
3819            ptr = oldptr;            ptr = oldptr;
3820            goto LONE_SINGLE_CHARACTER;            goto LONE_SINGLE_CHARACTER;
# Line 2606  for (;; ptr++) Line 3833  for (;; ptr++)
3833          not any of the other escapes. Perl 5.6 treats a hyphen as a literal          not any of the other escapes. Perl 5.6 treats a hyphen as a literal
3834          in such circumstances. */          in such circumstances. */
3835    
3836          if (!inescq && d == '\\')          if (!inescq && d == CHAR_BACKSLASH)
3837            {            {
3838            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3839            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
3840    
3841            /* \b is backslash; \X is literal X; \R is literal R; any other            /* \b is backspace; any other special means the '-' was literal */
           special means the '-' was literal */  
3842    
3843            if (d < 0)            if (d < 0)
3844              {              {
3845              if (d == -ESC_b) d = '\b';              if (d == -ESC_b) d = CHAR_BS; else
             else if (d == -ESC_X) d = 'X';  
             else if (d == -ESC_R) d = 'R'; else  
3846                {                {
3847                ptr = oldptr;                ptr = oldptr;
3848                goto LONE_SINGLE_CHARACTER;  /* A few lines below */                goto LONE_SINGLE_CHARACTER;  /* A few lines below */
# Line 2637  for (;; ptr++) Line 3861  for (;; ptr++)
3861    
3862          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */
3863    
3864            /* Remember \r or \n */
3865    
3866            if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
3867    
3868          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
3869          matching, we have to use an XCLASS with extra data items. Caseless          matching, we have to use an XCLASS with extra data items. Caseless
3870          matching for characters > 127 is available only if UCP support is          matching for characters > 127 is available only if UCP support is
# Line 2659  for (;; ptr++) Line 3887  for (;; ptr++)
3887              unsigned int origd = d;              unsigned int origd = d;
3888              while (get_othercase_range(&cc, origd, &occ, &ocd))              while (get_othercase_range(&cc, origd, &occ, &ocd))
3889                {                {
3890                if (occ >= c && ocd <= d) continue;  /* Skip embedded ranges */                if (occ >= (unsigned int)c &&
3891                      ocd <= (unsigned int)d)
3892                    continue;                          /* Skip embedded ranges */
3893    
3894                if (occ < c  && ocd >= c - 1)        /* Extend the basic range */                if (occ < (unsigned int)c  &&
3895                      ocd >= (unsigned int)c - 1)      /* Extend the basic range */
3896                  {                                  /* if there is overlap,   */                  {                                  /* if there is overlap,   */
3897                  c = occ;                           /* noting that if occ < c */                  c = occ;                           /* noting that if occ < c */
3898                  continue;                          /* we can't have ocd > d  */                  continue;                          /* we can't have ocd > d  */
3899                  }                                  /* because a subrange is  */                  }                                  /* because a subrange is  */
3900                if (ocd > d && occ <= d + 1)         /* always shorter than    */                if (ocd > (unsigned int)d &&
3901                      occ <= (unsigned int)d + 1)      /* always shorter than    */
3902                  {                                  /* the basic range.       */                  {                                  /* the basic range.       */
3903                  d = ocd;                  d = ocd;
3904                  continue;                  continue;
# Line 2751  for (;; ptr++) Line 3983  for (;; ptr++)
3983          if ((options & PCRE_CASELESS) != 0)          if ((options & PCRE_CASELESS) != 0)
3984            {            {
3985            unsigned int othercase;            unsigned int othercase;
3986            if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR)            if ((othercase = UCD_OTHERCASE(c)) != c)
3987              {              {
3988              *class_utf8data++ = XCL_SINGLE;              *class_utf8data++ = XCL_SINGLE;
3989              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);
# Line 2776  for (;; ptr++) Line 4008  for (;; ptr++)
4008          }          }
4009        }        }
4010    
4011      /* Loop until ']' reached. This "while" is the end of the "do" above. */      /* Loop until ']' reached. This "while" is the end of the "do" far above.
4012        If we are at the end of an internal nested string, revert to the outer
4013        string. */
4014    
4015        while (((c = *(++ptr)) != 0 ||
4016               (nestptr != NULL &&
4017                 (ptr = nestptr, nestptr = NULL, c = *(++ptr)) != 0)) &&
4018               (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
4019    
4020      while ((c = *(++ptr)) != 0 && (c != ']' || inescq));      /* Check for missing terminating ']' */
4021    
4022      if (c == 0)                          /* Missing terminating ']' */      if (c == 0)
4023        {        {
4024        *errorcodeptr = ERR6;        *errorcodeptr = ERR6;
4025        goto FAILED;        goto FAILED;
4026        }        }
4027    
4028      /* If class_charcount is 1, we saw precisely one character whose value is      /* If class_charcount is 1, we saw precisely one character whose value is
4029      less than 256. In non-UTF-8 mode we can always optimize. In UTF-8 mode, we      less than 256. As long as there were no characters >= 128 and there was no
4030      can optimize the negative case only if there were no characters >= 128      use of \p or \P, in other words, no use of any XCLASS features, we can
4031      because OP_NOT and the related opcodes like OP_NOTSTAR operate on      optimize.
4032      single-bytes only. This is an historical hangover. Maybe one day we can  
4033      tidy these opcodes to handle multi-byte characters.      In UTF-8 mode, we can optimize the negative case only if there were no
4034        characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
4035        operate on single-bytes characters only. This is an historical hangover.
4036        Maybe one day we can tidy these opcodes to handle multi-byte characters.
4037    
4038      The optimization throws away the bit map. We turn the item into a      The optimization throws away the bit map. We turn the item into a
4039      1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note      1-character OP_CHAR[I] if it's positive, or OP_NOT[I] if it's negative.
4040      that OP_NOT does not support multibyte characters. In the positive case, it      Note that OP_NOT[I] does not support multibyte characters. In the positive
4041      can cause firstbyte to be set. Otherwise, there can be no first char if      case, it can cause firstbyte to be set. Otherwise, there can be no first
4042      this item is first, whatever repeat count may follow. In the case of      char if this item is first, whatever repeat count may follow. In the case
4043      reqbyte, save the previous value for reinstating. */      of reqbyte, save the previous value for reinstating. */
4044    
4045  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4046      if (class_charcount == 1 &&      if (class_charcount == 1 && !class_utf8 &&
4047            (!utf8 ||        (!utf8 || !negate_class || class_lastchar < 128))
           (!class_utf8 && (!negate_class || class_lastchar < 128))))  
   
4048  #else  #else
4049      if (class_charcount == 1)      if (class_charcount == 1)
4050  #endif  #endif
4051        {        {
4052        zeroreqbyte = reqbyte;        zeroreqbyte = reqbyte;
4053    
4054        /* The OP_NOT opcode works on one-byte characters only. */        /* The OP_NOT[I] opcodes work on one-byte characters only. */
4055    
4056        if (negate_class)        if (negate_class)
4057          {          {
4058          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
4059          zerofirstbyte = firstbyte;          zerofirstbyte = firstbyte;
4060          *code++ = OP_NOT;          *code++ = ((options & PCRE_CASELESS) != 0)? OP_NOTI: OP_NOT;
4061          *code++ = class_lastchar;          *code++ = class_lastchar;
4062          break;          break;
4063          }          }
# Line 2847  for (;; ptr++) Line 4087  for (;; ptr++)
4087      zeroreqbyte = reqbyte;      zeroreqbyte = reqbyte;
4088    
4089      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
4090      extended class, with its own opcode. If there are no characters < 256,      extended class, with its own opcode, unless there was a negated special
4091      we can omit the bitmap in the actual compiled code. */      such as \S in the class, and PCRE_UCP is not set, because in that case all
4092        characters > 255 are in the class, so any that were explicitly given as
4093        well can be ignored. If (when there are explicit characters > 255 that must
4094        be listed) there are no characters < 256, we can omit the bitmap in the
4095        actual compiled code. */
4096    
4097  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4098      if (class_utf8)      if (class_utf8 && (!should_flip_negation || (options & PCRE_UCP) != 0))
4099        {        {
4100        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
4101        *code++ = OP_XCLASS;        *code++ = OP_XCLASS;
# Line 2877  for (;; ptr++) Line 4121  for (;; ptr++)
4121        }        }
4122  #endif  #endif
4123    
4124      /* If there are no characters > 255, negate the 32-byte map if necessary,      /* If there are no characters > 255, or they are all to be included or
4125      and copy it into the code vector. If this is the first thing in the branch,      excluded, set the opcode to OP_CLASS or OP_NCLASS, depending on whether the
4126      there can be no first char setting, whatever the repeat count. Any reqbyte      whole class was negated and whether there were negative specials such as \S
4127      setting must remain unchanged after any kind of repeat. */      (non-UCP) in the class. Then copy the 32-byte map into the code vector,
4128        negating it if necessary. */
4129    
4130        *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
4131      if (negate_class)      if (negate_class)
4132        {        {
       *code++ = OP_NCLASS;  
4133        if (lengthptr == NULL)    /* Save time in the pre-compile phase */        if (lengthptr == NULL)    /* Save time in the pre-compile phase */
4134          for (c = 0; c < 32; c++) code[c] = ~classbits[c];          for (c = 0; c < 32; c++) code[c] = ~classbits[c];
4135        }        }
4136      else      else
4137        {        {
       *code++ = OP_CLASS;  
4138        memcpy(code, classbits, 32);        memcpy(code, classbits, 32);
4139        }        }
4140      code += 32;      code += 32;
# Line 2901  for (;; ptr++) Line 4145  for (;; ptr++)
4145      /* Various kinds of repeat; '{' is not necessarily a quantifier, but this      /* Various kinds of repeat; '{' is not necessarily a quantifier, but this
4146      has been tested above. */      has been tested above. */
4147    
4148      case '{':      case CHAR_LEFT_CURLY_BRACKET:
4149      if (!is_quantifier) goto NORMAL_CHAR;      if (!is_quantifier) goto NORMAL_CHAR;
4150      ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);      ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);
4151      if (*errorcodeptr != 0) goto FAILED;      if (*errorcodeptr != 0) goto FAILED;
4152      goto REPEAT;      goto REPEAT;
4153    
4154      case '*':      case CHAR_ASTERISK:
4155      repeat_min = 0;      repeat_min = 0;
4156      repeat_max = -1;      repeat_max = -1;
4157      goto REPEAT;      goto REPEAT;
4158    
4159      case '+':      case CHAR_PLUS:
4160      repeat_min = 1;      repeat_min = 1;
4161      repeat_max = -1;      repeat_max = -1;
4162      goto REPEAT;      goto REPEAT;
4163    
4164      case '?':      case CHAR_QUESTION_MARK:
4165      repeat_min = 0;      repeat_min = 0;
4166      repeat_max = 1;      repeat_max = 1;
4167    
# Line 2952  for (;; ptr++) Line 4196  for (;; ptr++)
4196      but if PCRE_UNGREEDY is set, it works the other way round. We change the      but if PCRE_UNGREEDY is set, it works the other way round. We change the
4197      repeat type to the non-default. */      repeat type to the non-default. */
4198    
4199      if (ptr[1] == '+')      if (ptr[1] == CHAR_PLUS)
4200        {        {
4201        repeat_type = 0;                  /* Force greedy */        repeat_type = 0;                  /* Force greedy */
4202        possessive_quantifier = TRUE;        possessive_quantifier = TRUE;
4203        ptr++;        ptr++;
4204        }        }
4205      else if (ptr[1] == '?')      else if (ptr[1] == CHAR_QUESTION_MARK)
4206        {        {
4207        repeat_type = greedy_non_default;        repeat_type = greedy_non_default;
4208        ptr++;        ptr++;
# Line 2971  for (;; ptr++) Line 4215  for (;; ptr++)
4215      the first thing in a branch because the x will have gone into firstbyte      the first thing in a branch because the x will have gone into firstbyte
4216      instead.  */      instead.  */
4217    
4218      if (*previous == OP_CHAR || *previous == OP_CHARNC)      if (*previous == OP_CHAR || *previous == OP_CHARI)
4219        {        {
4220          op_type = (*previous == OP_CHAR)? 0 : OP_STARI - OP_STAR;
4221    
4222        /* Deal with UTF-8 characters that take up more than one byte. It's        /* Deal with UTF-8 characters that take up more than one byte. It's
4223        easier to write this out separately than try to macrify it. Use c to        easier to write this out separately than try to macrify it. Use c to
4224        hold the length of the character in bytes, plus 0x80 to flag that it's a        hold the length of the character in bytes, plus 0x80 to flag that it's a
# Line 3005  for (;; ptr++) Line 4251  for (;; ptr++)
4251    
4252        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4253            repeat_max < 0 &&            repeat_max < 0 &&
4254            check_auto_possessive(*previous, c, utf8, utf8_char, ptr + 1,            check_auto_possessive(previous, utf8, ptr + 1, options, cd))
             options, cd))  
4255          {          {
4256          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4257          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 3018  for (;; ptr++) Line 4263  for (;; ptr++)
4263      /* If previous was a single negated character ([^a] or similar), we use      /* If previous was a single negated character ([^a] or similar), we use
4264      one of the special opcodes, replacing it. The code is shared with single-      one of the special opcodes, replacing it. The code is shared with single-
4265      character repeats by setting opt_type to add a suitable offset into      character repeats by setting opt_type to add a suitable offset into
4266      repeat_type. We can also test for auto-possessification. OP_NOT is      repeat_type. We can also test for auto-possessification. OP_NOT and OP_NOTI
4267      currently used only for single-byte chars. */      are currently used only for single-byte chars. */
4268    
4269      else if (*previous == OP_NOT)      else if (*previous == OP_NOT || *previous == OP_NOTI)
4270        {        {
4271        op_type = OP_NOTSTAR - OP_STAR;  /* Use "not" opcodes */        op_type = ((*previous == OP_NOT)? OP_NOTSTAR : OP_NOTSTARI) - OP_STAR;
4272        c = previous[1];        c = previous[1];
4273        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4274            repeat_max < 0 &&            repeat_max < 0 &&
4275            check_auto_possessive(OP_NOT, c, utf8, NULL, ptr + 1, options, cd))            check_auto_possessive(previous, utf8, ptr + 1, options, cd))
4276          {          {
4277          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4278          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 3051  for (;; ptr++) Line 4296  for (;; ptr++)
4296    
4297        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4298            repeat_max < 0 &&            repeat_max < 0 &&
4299            check_auto_possessive(c, 0, utf8, NULL, ptr + 1, options, cd))            check_auto_possessive(previous, utf8, ptr + 1, options, cd))
4300          {          {
4301          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4302          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 3073  for (;; ptr++) Line 4318  for (;; ptr++)
4318    
4319        if (repeat_max == 0) goto END_REPEAT;        if (repeat_max == 0) goto END_REPEAT;
4320    
4321          /*--------------------------------------------------------------------*/
4322          /* This code is obsolete from release 8.00; the restriction was finally
4323          removed: */
4324    
4325        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
4326        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
4327    
4328        if (repeat_max != 1) cd->nopartial = TRUE;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
4329          /*--------------------------------------------------------------------*/
4330    
4331        /* Combine the op_type with the repeat_type */        /* Combine the op_type with the repeat_type */
4332    
# Line 3215  for (;; ptr++) Line 4465  for (;; ptr++)
4465  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4466               *previous == OP_XCLASS ||               *previous == OP_XCLASS ||
4467  #endif  #endif
4468               *previous == OP_REF)               *previous == OP_REF ||
4469                 *previous == OP_REFI)
4470        {        {
4471        if (repeat_max == 0)        if (repeat_max == 0)
4472          {          {
# Line 3223  for (;; ptr++) Line 4474  for (;; ptr++)
4474          goto END_REPEAT;          goto END_REPEAT;
4475          }          }
4476    
4477          /*--------------------------------------------------------------------*/
4478          /* This code is obsolete from release 8.00; the restriction was finally
4479          removed: */
4480    
4481        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
4482        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
4483    
4484        if (repeat_max != 1) cd->nopartial = TRUE;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
4485          /*--------------------------------------------------------------------*/
4486    
4487        if (repeat_min == 0 && repeat_max == -1)        if (repeat_min == 0 && repeat_max == -1)
4488          *code++ = OP_CRSTAR + repeat_type;          *code++ = OP_CRSTAR + repeat_type;
# Line 3244  for (;; ptr++) Line 4500  for (;; ptr++)
4500        }        }
4501    
4502      /* If previous was a bracket group, we may have to replicate it in certain      /* If previous was a bracket group, we may have to replicate it in certain
4503      cases. */      cases. Note that at this point we can encounter only the "basic" BRA and
4504        KET opcodes, as this is the place where they get converted into the more
4505        special varieties. */
4506    
4507      else if (*previous == OP_BRA  || *previous == OP_CBRA ||      else if (*previous == OP_BRA  || *previous == OP_CBRA ||
4508               *previous == OP_ONCE || *previous == OP_COND)               *previous == OP_ONCE || *previous == OP_COND)
4509        {        {
4510        register int i;        register int i;
4511        int ketoffset = 0;        int len = (int)(code - previous);
       int len = code - previous;  
4512        uschar *bralink = NULL;        uschar *bralink = NULL;
4513          uschar *brazeroptr = NULL;
4514    
4515        /* Repeating a DEFINE group is pointless */        /* Repeating a DEFINE group is pointless */
4516    
4517        if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)        if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)
# Line 3262  for (;; ptr++) Line 4520  for (;; ptr++)
4520          goto FAILED;          goto FAILED;
4521          }          }
4522    
       /* This is a paranoid check to stop integer overflow later on */  
   
       if (len > MAX_DUPLENGTH)  
         {  
         *errorcodeptr = ERR50;  
         goto FAILED;  
         }  
   
       /* If the maximum repeat count is unlimited, find the end of the bracket  
       by scanning through from the start, and compute the offset back to it  
       from the current code pointer. There may be an OP_OPT setting following  
       the final KET, so we can't find the end just by going back from the code  
       pointer. */  
   
       if (repeat_max == -1)  
         {  
         register uschar *ket = previous;  
         do ket += GET(ket, 1); while (*ket != OP_KET);  
         ketoffset = code - ket;  
         }  
   
4523        /* The case of a zero minimum is special because of the need to stick        /* The case of a zero minimum is special because of the need to stick
4524        OP_BRAZERO in front of it, and because the group appears once in the        OP_BRAZERO in front of it, and because the group appears once in the
4525        data, whereas in other cases it appears the minimum number of times. For        data, whereas in other cases it appears the minimum number of times. For
# Line 3292  for (;; ptr++) Line 4529  for (;; ptr++)
4529    
4530        if (repeat_min == 0)        if (repeat_min == 0)
4531          {          {
4532          /* If the maximum is also zero, we just omit the group from the output          /* If the maximum is also zero, we used to just omit the group from the
4533          altogether. */          output altogether, like this:
   
         if (repeat_max == 0)  
           {  
           code = previous;  
           goto END_REPEAT;  
           }  
4534    
4535          /* If the maximum is 1 or unlimited, we just have to stick in the          ** if (repeat_max == 0)
4536          BRAZERO and do no more at this point. However, we do need to adjust          **   {
4537          any OP_RECURSE calls inside the group that refer to the group itself or          **   code = previous;
4538          any internal or forward referenced group, because the offset is from          **   goto END_REPEAT;
4539          the start of the whole regex. Temporarily terminate the pattern while          **   }
4540          doing this. */  
4541            However, that fails when a group is referenced as a subroutine from
4542            elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it
4543            so that it is skipped on execution. As we don't have a list of which
4544            groups are referenced, we cannot do this selectively.
4545    
4546            If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
4547            and do no more at this point. However, we do need to adjust any
4548            OP_RECURSE calls inside the group that refer to the group itself or any
4549            internal or forward referenced group, because the offset is from the
4550            start of the whole regex. Temporarily terminate the pattern while doing
4551            this. */
4552    
4553          if (repeat_max <= 1)          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
4554            {            {