/[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 93 by nigel, Sat Feb 24 21:41:42 2007 UTC revision 335 by ph10, Sat Apr 12 14:36:14 2008 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-2008 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    
# Line 58  used by pcretest. DEBUG is not defined w Line 61  used by pcretest. DEBUG is not defined w
61  #endif  #endif
62    
63    
64    /* Macro for setting individual bits in class bitmaps. */
65    
66    #define SETBIT(a,b) a[b/8] |= (1 << (b%8))
67    
68    /* Maximum length value to check against when making sure that the integer that
69    holds the compiled pattern length does not overflow. We make it a bit less than
70    INT_MAX to allow for adding in group terminating bytes, so that we don't have
71    to check them every time. */
72    
73    #define OFLOW_MAX (INT_MAX - 20)
74    
75    
76  /*************************************************  /*************************************************
77  *      Code parameters and static tables         *  *      Code parameters and static tables         *
78  *************************************************/  *************************************************/
# Line 82  are simple data values; negative values Line 97  are simple data values; negative values
97  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
98  is invalid. */  is invalid. */
99    
100  #if !EBCDIC   /* This is the "normal" table for ASCII systems */  #ifndef EBCDIC  /* This is the "normal" table for ASCII systems */
101  static const short int escapes[] = {  static const short int escapes[] = {
102       0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */       0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */
103       0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */       0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */
104     '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */     '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */
105       0,      0,      0,      0,      0,      0,      0,      0,   /* H - O */  -ESC_H,      0,      0, -ESC_K,      0,      0,      0,      0,   /* H - O */
106  -ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0,      0, -ESC_W,   /* P - W */  -ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0, -ESC_V, -ESC_W,   /* P - W */
107  -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */  -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */
108     '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */     '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */
109       0,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */  -ESC_h,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */
110  -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0,      0, -ESC_w,   /* p - w */  -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0, -ESC_v, -ESC_w,   /* p - w */
111       0,      0, -ESC_z                                            /* x - z */       0,      0, -ESC_z                                            /* x - z */
112  };  };
113    
114  #else         /* This is the "abnormal" table for EBCDIC systems */  #else           /* This is the "abnormal" table for EBCDIC systems */
115  static const short int escapes[] = {  static const short int escapes[] = {
116  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
117  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
# Line 106  static const short int escapes[] = { Line 121  static const short int escapes[] = {
121  /*  70 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  70 */     0,     0,      0,       0,      0,     0,      0,      0,
122  /*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',  /*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',
123  /*  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,
124  /*  88 */     0,     0,      0,     '{',      0,     0,      0,      0,  /*  88 */-ESC_h,     0,      0,     '{',      0,     0,      0,      0,
125  /*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,  /*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,
126  /*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,  /*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,
127  /*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,     0, -ESC_w,      0,  /*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,-ESC_v, -ESC_w,      0,
128  /*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,  /*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,
129  /*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,
130  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
131  /*  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,
132  /*  C8 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
133  /*  D0 */   '}',     0,      0,       0,      0,     0,      0, -ESC_P,  /*  D0 */   '}',     0, -ESC_K,       0,      0,     0,      0, -ESC_P,
134  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
135  /*  E0 */  '\\',     0, -ESC_S,       0,      0,     0, -ESC_W, -ESC_X,  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
136  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
137  /*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,
138  /*  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 140  static const short int escapes[] = {
140  #endif  #endif
141    
142    
143  /* 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
144  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
145  as this is assumed for handling case independence. */  the number of relocations when a shared library is dynamically linked. */
146    
147  static const char *const posix_names[] = {  typedef struct verbitem {
148    "alpha", "lower", "upper",    int   len;
149    "alnum", "ascii", "blank", "cntrl", "digit", "graph",    int   op;
150    "print", "punct", "space", "word",  "xdigit" };  } verbitem;
151    
152    static const char verbnames[] =
153      "ACCEPT\0"
154      "COMMIT\0"
155      "F\0"
156      "FAIL\0"
157      "PRUNE\0"
158      "SKIP\0"
159      "THEN";
160    
161    static const verbitem verbs[] = {
162      { 6, OP_ACCEPT },
163      { 6, OP_COMMIT },
164      { 1, OP_FAIL },
165      { 4, OP_FAIL },
166      { 5, OP_PRUNE },
167      { 4, OP_SKIP  },
168      { 4, OP_THEN  }
169    };
170    
171    static const int verbcount = sizeof(verbs)/sizeof(verbitem);
172    
173    
174    /* Tables of names of POSIX character classes and their lengths. The names are
175    now all in a single string, to reduce the number of relocations when a shared
176    library is dynamically loaded. The list of lengths is terminated by a zero
177    length entry. The first three must be alpha, lower, upper, as this is assumed
178    for handling case independence. */
179    
180    static const char posix_names[] =
181      "alpha\0"  "lower\0"  "upper\0"  "alnum\0"  "ascii\0"  "blank\0"
182      "cntrl\0"  "digit\0"  "graph\0"  "print\0"  "punct\0"  "space\0"
183      "word\0"   "xdigit";
184    
185  static const uschar posix_name_lengths[] = {  static const uschar posix_name_lengths[] = {
186    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 171  static const int posix_class_maps[] = { Line 219  static const int posix_class_maps[] = {
219  /* The texts of compile-time error messages. These are "char *" because they  /* The texts of compile-time error messages. These are "char *" because they
220  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
221  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
222  are no longer used. */  are no longer used. This used to be a table of strings, but in order to reduce
223    the number of relocations needed when a shared library is loaded dynamically,
224  static const char *error_texts[] = {  it is now one long string. We cannot use a table of offsets, because the
225    "no error",  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
226    "\\ at end of pattern",  simply count through to the one we want - this isn't a performance issue
227    "\\c at end of pattern",  because these strings are used only when there is a compilation error. */
228    "unrecognized character follows \\",  
229    "numbers out of order in {} quantifier",  static const char error_texts[] =
230      "no error\0"
231      "\\ at end of pattern\0"
232      "\\c at end of pattern\0"
233      "unrecognized character follows \\\0"
234      "numbers out of order in {} quantifier\0"
235    /* 5 */    /* 5 */
236    "number too big in {} quantifier",    "number too big in {} quantifier\0"
237    "missing terminating ] for character class",    "missing terminating ] for character class\0"
238    "invalid escape sequence in character class",    "invalid escape sequence in character class\0"
239    "range out of order in character class",    "range out of order in character class\0"
240    "nothing to repeat",    "nothing to repeat\0"
241    /* 10 */    /* 10 */
242    "operand of unlimited repeat could match the empty string",  /** DEAD **/    "operand of unlimited repeat could match the empty string\0"  /** DEAD **/
243    "internal error: unexpected repeat",    "internal error: unexpected repeat\0"
244    "unrecognized character after (?",    "unrecognized character after (? or (?-\0"
245    "POSIX named classes are supported only within a class",    "POSIX named classes are supported only within a class\0"
246    "missing )",    "missing )\0"
247    /* 15 */    /* 15 */
248    "reference to non-existent subpattern",    "reference to non-existent subpattern\0"
249    "erroffset passed as NULL",    "erroffset passed as NULL\0"
250    "unknown option bit(s) set",    "unknown option bit(s) set\0"
251    "missing ) after comment",    "missing ) after comment\0"
252    "parentheses nested too deeply",  /** DEAD **/    "parentheses nested too deeply\0"  /** DEAD **/
253    /* 20 */    /* 20 */
254    "regular expression too large",    "regular expression is too large\0"
255    "failed to get memory",    "failed to get memory\0"
256    "unmatched parentheses",    "unmatched parentheses\0"
257    "internal error: code overflow",    "internal error: code overflow\0"
258    "unrecognized character after (?<",    "unrecognized character after (?<\0"
259    /* 25 */    /* 25 */
260    "lookbehind assertion is not fixed length",    "lookbehind assertion is not fixed length\0"
261    "malformed number or name after (?(",    "malformed number or name after (?(\0"
262    "conditional group contains more than two branches",    "conditional group contains more than two branches\0"
263    "assertion expected after (?(",    "assertion expected after (?(\0"
264    "(?R or (?digits must be followed by )",    "(?R or (?[+-]digits must be followed by )\0"
265    /* 30 */    /* 30 */
266    "unknown POSIX class name",    "unknown POSIX class name\0"
267    "POSIX collating elements are not supported",    "POSIX collating elements are not supported\0"
268    "this version of PCRE is not compiled with PCRE_UTF8 support",    "this version of PCRE is not compiled with PCRE_UTF8 support\0"
269    "spare error",  /** DEAD **/    "spare error\0"  /** DEAD **/
270    "character value in \\x{...} sequence is too large",    "character value in \\x{...} sequence is too large\0"
271    /* 35 */    /* 35 */
272    "invalid condition (?(0)",    "invalid condition (?(0)\0"
273    "\\C not allowed in lookbehind assertion",    "\\C not allowed in lookbehind assertion\0"
274    "PCRE does not support \\L, \\l, \\N, \\U, or \\u",    "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"
275    "number after (?C is > 255",    "number after (?C is > 255\0"
276    "closing ) for (?C expected",    "closing ) for (?C expected\0"
277    /* 40 */    /* 40 */
278    "recursive call could loop indefinitely",    "recursive call could loop indefinitely\0"
279    "unrecognized character after (?P",    "unrecognized character after (?P\0"
280    "syntax error in subpattern name (missing terminator)",    "syntax error in subpattern name (missing terminator)\0"
281    "two named subpatterns have the same name",    "two named subpatterns have the same name\0"
282    "invalid UTF-8 string",    "invalid UTF-8 string\0"
283    /* 45 */    /* 45 */
284    "support for \\P, \\p, and \\X has not been compiled",    "support for \\P, \\p, and \\X has not been compiled\0"
285    "malformed \\P or \\p sequence",    "malformed \\P or \\p sequence\0"
286    "unknown property name after \\P or \\p",    "unknown property name after \\P or \\p\0"
287    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)",    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
288    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")",    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
289    /* 50 */    /* 50 */
290    "repeated subpattern is too long",    "repeated subpattern is too long\0"    /** DEAD **/
291    "octal value is greater than \\377 (not in UTF-8 mode)",    "octal value is greater than \\377 (not in UTF-8 mode)\0"
292    "internal error: overran compiling workspace",    "internal error: overran compiling workspace\0"
293    "internal error: previously-checked referenced subpattern not found",    "internal error: previously-checked referenced subpattern not found\0"
294    "DEFINE group contains more than one branch",    "DEFINE group contains more than one branch\0"
295    /* 55 */    /* 55 */
296    "repeating a DEFINE group is not allowed",    "repeating a DEFINE group is not allowed\0"
297    "inconsistent NEWLINE options",    "inconsistent NEWLINE options\0"
298    "\\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"
299  };    "a numbered reference must not be zero\0"
300      "(*VERB) with an argument is not supported\0"
301      /* 60 */
302      "(*VERB) not recognized\0"
303      "number is too big\0"
304      "subpattern name expected\0"
305      "digit expected after (?+";
306    
307    
308  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
# Line 262  For convenience, we use the same bit def Line 321  For convenience, we use the same bit def
321    
322  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
323    
324  #if !EBCDIC    /* This is the "normal" case, for ASCII systems */  #ifndef EBCDIC  /* This is the "normal" case, for ASCII systems */
325  static const unsigned char digitab[] =  static const unsigned char digitab[] =
326    {    {
327    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 357  static const unsigned char digitab[] =
357    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
358    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
359    
360  #else          /* This is the "abnormal" case, for EBCDIC systems */  #else           /* This is the "abnormal" case, for EBCDIC systems */
361  static const unsigned char digitab[] =  static const unsigned char digitab[] =
362    {    {
363    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
# Line 312  static const unsigned char digitab[] = Line 371  static const unsigned char digitab[] =
371    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 40 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 40 */
372    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  72- |     */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  72- |     */
373    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 50 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 50 */
374    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  88-     */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  88- 95    */
375    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 60 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 60 */
376    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 104- ?     */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 104- ?     */
377    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 70 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 70 */
# Line 346  static const unsigned char ebcdic_charta Line 405  static const unsigned char ebcdic_charta
405    0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 */    0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 */
406    0x00,0x00,0x00,0x80,0x00,0x80,0x80,0x80, /*  72- |  */    0x00,0x00,0x00,0x80,0x00,0x80,0x80,0x80, /*  72- |  */
407    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 */
408    0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /*  88-  */    0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /*  88- 95 */
409    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 */
410    0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x80, /* 104- ?  */    0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x80, /* 104- ?  */
411    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 */
# Line 373  static const unsigned char ebcdic_charta Line 432  static const unsigned char ebcdic_charta
432  /* Definition to allow mutual recursion */  /* Definition to allow mutual recursion */
433    
434  static BOOL  static BOOL
435    compile_regex(int, int, uschar **, const uschar **, int *, BOOL, int, int *,    compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,
436      int *, branch_chain *, compile_data *, int *);      int *, int *, branch_chain *, compile_data *, int *);
437    
438    
439    
440  /*************************************************  /*************************************************
441    *            Find an error text                  *
442    *************************************************/
443    
444    /* The error texts are now all in one long string, to save on relocations. As
445    some of the text is of unknown length, we can't use a table of offsets.
446    Instead, just count through the strings. This is not a performance issue
447    because it happens only when there has been a compilation error.
448    
449    Argument:   the error number
450    Returns:    pointer to the error string
451    */
452    
453    static const char *
454    find_error_text(int n)
455    {
456    const char *s = error_texts;
457    for (; n > 0; n--) while (*s++ != 0);
458    return s;
459    }
460    
461    
462    /*************************************************
463  *            Handle escapes                      *  *            Handle escapes                      *
464  *************************************************/  *************************************************/
465    
# Line 399  Arguments: Line 480  Arguments:
480    
481  Returns:         zero or positive => a data character  Returns:         zero or positive => a data character
482                   negative => a special escape sequence                   negative => a special escape sequence
483                   on error, errorptr is set                   on error, errorcodeptr is set
484  */  */
485    
486  static int  static int
# Line 417  ptr--;                            /* Set Line 498  ptr--;                            /* Set
498    
499  if (c == 0) *errorcodeptr = ERR1;  if (c == 0) *errorcodeptr = ERR1;
500    
501  /* 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
502  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.
503  Otherwise further processing may be required. */  Otherwise further processing may be required. */
504    
505  #if !EBCDIC    /* ASCII coding */  #ifndef EBCDIC  /* ASCII coding */
506  else if (c < '0' || c > 'z') {}                           /* Not alphameric */  else if (c < '0' || c > 'z') {}                           /* Not alphanumeric */
507  else if ((i = escapes[c - '0']) != 0) c = i;  else if ((i = escapes[c - '0']) != 0) c = i;
508    
509  #else          /* EBCDIC coding */  #else           /* EBCDIC coding */
510  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphameric */  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
511  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if ((i = escapes[c - 0x48]) != 0)  c = i;
512  #endif  #endif
513    
# Line 450  else Line 531  else
531      *errorcodeptr = ERR37;      *errorcodeptr = ERR37;
532      break;      break;
533    
534      /* \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:
535      is an absolute backreference. If negative, it is a relative backreference.  
536      This is a Perl 5.10 feature. */      (1) A number, either plain or braced. If positive, it is an absolute
537        backreference. If negative, it is a relative backreference. This is a Perl
538        5.10 feature.
539    
540        (2) Perl 5.10 also supports \g{name} as a reference to a named group. This
541        is part of Perl's movement towards a unified syntax for back references. As
542        this is synonymous with \k{name}, we fudge it up by pretending it really
543        was \k.
544    
545        (3) For Oniguruma compatibility we also support \g followed by a name or a
546        number either in angle brackets or in single quotes. However, these are
547        (possibly recursive) subroutine calls, _not_ backreferences. Just return
548        the -ESC_g code (cf \k). */
549    
550      case 'g':      case 'g':
551        if (ptr[1] == '<' || ptr[1] == '\'')
552          {
553          c = -ESC_g;
554          break;
555          }
556    
557        /* Handle the Perl-compatible cases */
558    
559      if (ptr[1] == '{')      if (ptr[1] == '{')
560        {        {
561          const uschar *p;
562          for (p = ptr+2; *p != 0 && *p != '}'; p++)
563            if (*p != '-' && (digitab[*p] & ctype_digit) == 0) break;
564          if (*p != 0 && *p != '}')
565            {
566            c = -ESC_k;
567            break;
568            }
569        braced = TRUE;        braced = TRUE;
570        ptr++;        ptr++;
571        }        }
# Line 473  else Line 582  else
582      while ((digitab[ptr[1]] & ctype_digit) != 0)      while ((digitab[ptr[1]] & ctype_digit) != 0)
583        c = c * 10 + *(++ptr) - '0';        c = c * 10 + *(++ptr) - '0';
584    
585      if (c == 0 || (braced && *(++ptr) != '}'))      if (c < 0)   /* Integer overflow */
586          {
587          *errorcodeptr = ERR61;
588          break;
589          }
590    
591        if (braced && *(++ptr) != '}')
592        {        {
593        *errorcodeptr = ERR57;        *errorcodeptr = ERR57;
594        return 0;        break;
595        }        }
596    
597        if (c == 0)
598          {
599          *errorcodeptr = ERR58;
600          break;
601          }
602    
603      if (negated)      if (negated)
604        {        {
605        if (c > bracount)        if (c > bracount)
606          {          {
607          *errorcodeptr = ERR15;          *errorcodeptr = ERR15;
608          return 0;          break;
609          }          }
610        c = bracount - (c - 1);        c = bracount - (c - 1);
611        }        }
# Line 513  else Line 634  else
634        c -= '0';        c -= '0';
635        while ((digitab[ptr[1]] & ctype_digit) != 0)        while ((digitab[ptr[1]] & ctype_digit) != 0)
636          c = c * 10 + *(++ptr) - '0';          c = c * 10 + *(++ptr) - '0';
637          if (c < 0)    /* Integer overflow */
638            {
639            *errorcodeptr = ERR61;
640            break;
641            }
642        if (c < 10 || c <= bracount)        if (c < 10 || c <= bracount)
643          {          {
644          c = -(ESC_REF + c);          c = -(ESC_REF + c);
# Line 562  else Line 688  else
688          if (c == 0 && cc == '0') continue;     /* Leading zeroes */          if (c == 0 && cc == '0') continue;     /* Leading zeroes */
689          count++;          count++;
690    
691  #if !EBCDIC    /* ASCII coding */  #ifndef EBCDIC  /* ASCII coding */
692          if (cc >= 'a') cc -= 32;               /* Convert to upper case */          if (cc >= 'a') cc -= 32;               /* Convert to upper case */
693          c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));
694  #else          /* EBCDIC coding */  #else           /* EBCDIC coding */
695          if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */          if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */
696          c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));
697  #endif  #endif
# Line 589  else Line 715  else
715        {        {
716        int cc;                               /* Some compilers don't like ++ */        int cc;                               /* Some compilers don't like ++ */
717        cc = *(++ptr);                        /* in initializers */        cc = *(++ptr);                        /* in initializers */
718  #if !EBCDIC    /* ASCII coding */  #ifndef EBCDIC  /* ASCII coding */
719        if (cc >= 'a') cc -= 32;              /* Convert to upper case */        if (cc >= 'a') cc -= 32;              /* Convert to upper case */
720        c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));
721  #else          /* EBCDIC coding */  #else           /* EBCDIC coding */
722        if (cc <= 'z') cc += 64;              /* Convert to upper case */        if (cc <= 'z') cc += 64;              /* Convert to upper case */
723        c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));
724  #endif  #endif
# Line 608  else Line 734  else
734      if (c == 0)      if (c == 0)
735        {        {
736        *errorcodeptr = ERR2;        *errorcodeptr = ERR2;
737        return 0;        break;
738        }        }
739    
740  #if !EBCDIC    /* ASCII coding */  #ifndef EBCDIC  /* ASCII coding */
741      if (c >= 'a' && c <= 'z') c -= 32;      if (c >= 'a' && c <= 'z') c -= 32;
742      c ^= 0x40;      c ^= 0x40;
743  #else          /* EBCDIC coding */  #else           /* EBCDIC coding */
744      if (c >= 'a' && c <= 'z') c += 64;      if (c >= 'a' && c <= 'z') c += 64;
745      c ^= 0xC0;      c ^= 0xC0;
746  #endif  #endif
747      break;      break;
748    
749      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
750      other alphameric following \ is an error if PCRE_EXTRA was set; otherwise,      other alphanumeric following \ is an error if PCRE_EXTRA was set;
751      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
752      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
753      in future, so I haven't "optimized" it. */      be again in future, so I haven't "optimized" it. */
754    
755      default:      default:
756      if ((options & PCRE_EXTRA) != 0) switch(c)      if ((options & PCRE_EXTRA) != 0) switch(c)
# Line 684  if (c == '{') Line 810  if (c == '{')
810      *negptr = TRUE;      *negptr = TRUE;
811      ptr++;      ptr++;
812      }      }
813    for (i = 0; i < sizeof(name) - 1; i++)    for (i = 0; i < (int)sizeof(name) - 1; i++)
814      {      {
815      c = *(++ptr);      c = *(++ptr);
816      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
# Line 713  top = _pcre_utt_size; Line 839  top = _pcre_utt_size;
839  while (bot < top)  while (bot < top)
840    {    {
841    i = (bot + top) >> 1;    i = (bot + top) >> 1;
842    c = strcmp(name, _pcre_utt[i].name);    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);
843    if (c == 0)    if (c == 0)
844      {      {
845      *dptr = _pcre_utt[i].value;      *dptr = _pcre_utt[i].value;
# Line 887  for (; *ptr != 0; ptr++) Line 1013  for (; *ptr != 0; ptr++)
1013      {      {
1014      while (*(++ptr) != ']')      while (*(++ptr) != ']')
1015        {        {
1016          if (*ptr == 0) return -1;
1017        if (*ptr == '\\')        if (*ptr == '\\')
1018          {          {
1019          if (*(++ptr) == 0) return -1;          if (*(++ptr) == 0) return -1;
# Line 914  for (; *ptr != 0; ptr++) Line 1041  for (; *ptr != 0; ptr++)
1041    /* An opening parens must now be a real metacharacter */    /* An opening parens must now be a real metacharacter */
1042    
1043    if (*ptr != '(') continue;    if (*ptr != '(') continue;
1044    if (ptr[1] != '?')    if (ptr[1] != '?' && ptr[1] != '*')
1045      {      {
1046      count++;      count++;
1047      if (name == NULL && count == lorn) return count;      if (name == NULL && count == lorn) return count;
# Line 1042  for (;;) Line 1169  for (;;)
1169    {    {
1170    int d;    int d;
1171    register int op = *cc;    register int op = *cc;
   
1172    switch (op)    switch (op)
1173      {      {
1174      case OP_CBRA:      case OP_CBRA:
# Line 1131  for (;;) Line 1257  for (;;)
1257    
1258      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1259      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1260        if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;
1261      cc += 4;      cc += 4;
1262      break;      break;
1263    
# Line 1239  for (;;) Line 1366  for (;;)
1366      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1367      }      }
1368    
1369    /* 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
1370    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
1371    arrange to skip the extra bytes. */    two bytes of parameters. */
1372    
1373    else    else
1374      {      {
1375        switch(c)
1376          {
1377          case OP_TYPESTAR:
1378          case OP_TYPEMINSTAR:
1379          case OP_TYPEPLUS:
1380          case OP_TYPEMINPLUS:
1381          case OP_TYPEQUERY:
1382          case OP_TYPEMINQUERY:
1383          case OP_TYPEPOSSTAR:
1384          case OP_TYPEPOSPLUS:
1385          case OP_TYPEPOSQUERY:
1386          if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1387          break;
1388    
1389          case OP_TYPEUPTO:
1390          case OP_TYPEMINUPTO:
1391          case OP_TYPEEXACT:
1392          case OP_TYPEPOSUPTO:
1393          if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1394          break;
1395          }
1396    
1397        /* Add in the fixed length from the table */
1398    
1399      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1400    
1401      /* In UTF-8 mode, opcodes that are followed by a character may be followed by
1402      a multi-byte character. The length in the table is a minimum, so we have to
1403      arrange to skip the extra bytes. */
1404    
1405    #ifdef SUPPORT_UTF8
1406      if (utf8) switch(c)      if (utf8) switch(c)
1407        {        {
1408        case OP_CHAR:        case OP_CHAR:
# Line 1266  for (;;) Line 1423  for (;;)
1423        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1424        break;        break;
1425        }        }
1426    #endif
1427      }      }
1428    }    }
1429  }  }
# Line 1301  for (;;) Line 1459  for (;;)
1459    
1460    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
1461    
1462    /* 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
1463    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
1464    The length in the table is a minimum, so we have to arrange to skip the extra    two bytes of parameters. */
   bytes. */  
1465    
1466    else    else
1467      {      {
1468        switch(c)
1469          {
1470          case OP_TYPESTAR:
1471          case OP_TYPEMINSTAR:
1472          case OP_TYPEPLUS:
1473          case OP_TYPEMINPLUS:
1474          case OP_TYPEQUERY:
1475          case OP_TYPEMINQUERY:
1476          case OP_TYPEPOSSTAR:
1477          case OP_TYPEPOSPLUS:
1478          case OP_TYPEPOSQUERY:
1479          if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1480          break;
1481    
1482          case OP_TYPEPOSUPTO:
1483          case OP_TYPEUPTO:
1484          case OP_TYPEMINUPTO:
1485          case OP_TYPEEXACT:
1486          if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1487          break;
1488          }
1489    
1490        /* Add in the fixed length from the table */
1491    
1492      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1493    
1494        /* In UTF-8 mode, opcodes that are followed by a character may be followed
1495        by a multi-byte character. The length in the table is a minimum, so we have
1496        to arrange to skip the extra bytes. */
1497    
1498    #ifdef SUPPORT_UTF8
1499      if (utf8) switch(c)      if (utf8) switch(c)
1500        {        {
1501        case OP_CHAR:        case OP_CHAR:
# Line 1329  for (;;) Line 1516  for (;;)
1516        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1517        break;        break;
1518        }        }
1519    #endif
1520      }      }
1521    }    }
1522  }  }
# Line 1343  for (;;) Line 1531  for (;;)
1531  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()
1532  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
1533  group that can match nothing. Note that first_significant_code() skips over  group that can match nothing. Note that first_significant_code() skips over
1534  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
1535  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
1536    bracket whose current branch will already have been scanned.
1537    
1538  Arguments:  Arguments:
1539    code        points to start of search    code        points to start of search
# Line 1366  for (code = first_significant_code(code Line 1555  for (code = first_significant_code(code
1555    
1556    c = *code;    c = *code;
1557    
1558    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE)    /* Skip over forward assertions; the other assertions are skipped by
1559      first_significant_code() with a TRUE final argument. */
1560    
1561      if (c == OP_ASSERT)
1562        {
1563        do code += GET(code, 1); while (*code == OP_ALT);
1564        c = *code;
1565        continue;
1566        }
1567    
1568      /* Groups with zero repeats can of course be empty; skip them. */
1569    
1570      if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)
1571        {
1572        code += _pcre_OP_lengths[c];
1573        do code += GET(code, 1); while (*code == OP_ALT);
1574        c = *code;
1575        continue;
1576        }
1577    
1578      /* For other groups, scan the branches. */
1579    
1580      if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)
1581      {      {
1582      BOOL empty_branch;      BOOL empty_branch;
1583      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
# Line 1382  for (code = first_significant_code(code Line 1593  for (code = first_significant_code(code
1593        }        }
1594      while (*code == OP_ALT);      while (*code == OP_ALT);
1595      if (!empty_branch) return FALSE;   /* All branches are non-empty */      if (!empty_branch) return FALSE;   /* All branches are non-empty */
1596        c = *code;
     /* Move past the KET and fudge things so that the increment in the "for"  
     above has no effect. */  
   
     c = OP_END;  
     code += 1 + LINK_SIZE - _pcre_OP_lengths[c];  
1597      continue;      continue;
1598      }      }
1599    
# Line 1395  for (code = first_significant_code(code Line 1601  for (code = first_significant_code(code
1601    
1602    switch (c)    switch (c)
1603      {      {
1604      /* Check for quantifiers after a class */      /* Check for quantifiers after a class. XCLASS is used for classes that
1605        cannot be represented just by a bit map. This includes negated single
1606        high-valued characters. The length in _pcre_OP_lengths[] is zero; the
1607        actual length is stored in the compiled code, so we must update "code"
1608        here. */
1609    
1610  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1611      case OP_XCLASS:      case OP_XCLASS:
1612      ccode = code + GET(code, 1);      ccode = code += GET(code, 1);
1613      goto CHECK_CLASS_REPEAT;      goto CHECK_CLASS_REPEAT;
1614  #endif  #endif
1615    
# Line 1461  for (code = first_significant_code(code Line 1671  for (code = first_significant_code(code
1671      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1672      return FALSE;      return FALSE;
1673    
1674        /* These are going to continue, as they may be empty, but we have to
1675        fudge the length for the \p and \P cases. */
1676    
1677        case OP_TYPESTAR:
1678        case OP_TYPEMINSTAR:
1679        case OP_TYPEPOSSTAR:
1680        case OP_TYPEQUERY:
1681        case OP_TYPEMINQUERY:
1682        case OP_TYPEPOSQUERY:
1683        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1684        break;
1685    
1686        /* Same for these */
1687    
1688        case OP_TYPEUPTO:
1689        case OP_TYPEMINUPTO:
1690        case OP_TYPEPOSUPTO:
1691        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1692        break;
1693    
1694      /* End of branch */      /* End of branch */
1695    
1696      case OP_KET:      case OP_KET:
# Line 1530  return TRUE; Line 1760  return TRUE;
1760  *************************************************/  *************************************************/
1761    
1762  /* This function is called when the sequence "[:" or "[." or "[=" is  /* This function is called when the sequence "[:" or "[." or "[=" is
1763  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
1764  optional ^ and then a sequence of letters, terminated by a matching ":]" or  sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
1765  ".]" or "=]".  reach an unescaped ']' without the special preceding character, return FALSE.
1766    
1767    Originally, this function only recognized a sequence of letters between the
1768    terminators, but it seems that Perl recognizes any sequence of characters,
1769    though of course unknown POSIX names are subsequently rejected. Perl gives an
1770    "Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
1771    didn't consider this to be a POSIX class. Likewise for [:1234:].
1772    
1773    The problem in trying to be exactly like Perl is in the handling of escapes. We
1774    have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
1775    class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
1776    below handles the special case of \], but does not try to do any other escape
1777    processing. This makes it different from Perl for cases such as [:l\ower:]
1778    where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize
1779    "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
1780    I think.
1781    
1782  Argument:  Arguments:
1783    ptr      pointer to the initial [    ptr      pointer to the initial [
1784    endptr   where to return the end pointer    endptr   where to return the end pointer
   cd       pointer to compile data  
1785    
1786  Returns:   TRUE or FALSE  Returns:   TRUE or FALSE
1787  */  */
1788    
1789  static BOOL  static BOOL
1790  check_posix_syntax(const uschar *ptr, const uschar **endptr, compile_data *cd)  check_posix_syntax(const uschar *ptr, const uschar **endptr)
1791  {  {
1792  int terminator;          /* Don't combine these lines; the Solaris cc */  int terminator;          /* Don't combine these lines; the Solaris cc */
1793  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
1794  if (*(++ptr) == '^') ptr++;  for (++ptr; *ptr != 0; ptr++)
 while ((cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;  
 if (*ptr == terminator && ptr[1] == ']')  
1795    {    {
1796    *endptr = ptr;    if (*ptr == '\\' && ptr[1] == ']') ptr++; else
1797    return TRUE;      {
1798        if (*ptr == ']') return FALSE;
1799        if (*ptr == terminator && ptr[1] == ']')
1800          {
1801          *endptr = ptr;
1802          return TRUE;
1803          }
1804        }
1805    }    }
1806  return FALSE;  return FALSE;
1807  }  }
# Line 1577  Returns:     a value representing the na Line 1826  Returns:     a value representing the na
1826  static int  static int
1827  check_posix_name(const uschar *ptr, int len)  check_posix_name(const uschar *ptr, int len)
1828  {  {
1829    const char *pn = posix_names;
1830  register int yield = 0;  register int yield = 0;
1831  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
1832    {    {
1833    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
1834      strncmp((const char *)ptr, posix_names[yield], len) == 0) return yield;      strncmp((const char *)ptr, pn, len) == 0) return yield;
1835      pn += posix_name_lengths[yield] + 1;
1836    yield++;    yield++;
1837    }    }
1838  return -1;  return -1;
# Line 1596  return -1; Line 1847  return -1;
1847  that is referenced. This means that groups can be replicated for fixed  that is referenced. This means that groups can be replicated for fixed
1848  repetition simply by copying (because the recursion is allowed to refer to  repetition simply by copying (because the recursion is allowed to refer to
1849  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
1850  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
1851  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
1852  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
1853  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
1854  the partially compiled regex must be temporarily terminated with OP_END.  is called, the partially compiled regex must be temporarily terminated with
1855    OP_END.
1856    
1857  This function has been extended with the possibility of forward references for  This function has been extended with the possibility of forward references for
1858  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 1623  adjust_recurse(uschar *group, int adjust Line 1875  adjust_recurse(uschar *group, int adjust
1875    uschar *save_hwm)    uschar *save_hwm)
1876  {  {
1877  uschar *ptr = group;  uschar *ptr = group;
1878    
1879  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)
1880    {    {
1881    int offset;    int offset;
# Line 1630  while ((ptr = (uschar *)find_recurse(ptr Line 1883  while ((ptr = (uschar *)find_recurse(ptr
1883    
1884    /* See if this recursion is on the forward reference list. If so, adjust the    /* See if this recursion is on the forward reference list. If so, adjust the
1885    reference. */    reference. */
1886    
1887    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
1888      {      {
1889      offset = GET(hc, 0);      offset = GET(hc, 0);
# Line 1884  if (next >= 0) switch(op_code) Line 2137  if (next >= 0) switch(op_code)
2137    /* For OP_NOT, "item" must be a single-byte character. */    /* For OP_NOT, "item" must be a single-byte character. */
2138    
2139    case OP_NOT:    case OP_NOT:
   if (next < 0) return FALSE;  /* Not a character */  
2140    if (item == next) return TRUE;    if (item == next) return TRUE;
2141    if ((options & PCRE_CASELESS) == 0) return FALSE;    if ((options & PCRE_CASELESS) == 0) return FALSE;
2142  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
# Line 1921  if (next >= 0) switch(op_code) Line 2173  if (next >= 0) switch(op_code)
2173    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
2174    return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;    return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;
2175    
2176      case OP_HSPACE:
2177      case OP_NOT_HSPACE:
2178      switch(next)
2179        {
2180        case 0x09:
2181        case 0x20:
2182        case 0xa0:
2183        case 0x1680:
2184        case 0x180e:
2185        case 0x2000:
2186        case 0x2001:
2187        case 0x2002:
2188        case 0x2003:
2189        case 0x2004:
2190        case 0x2005:
2191        case 0x2006:
2192        case 0x2007:
2193        case 0x2008:
2194        case 0x2009:
2195        case 0x200A:
2196        case 0x202f:
2197        case 0x205f:
2198        case 0x3000:
2199        return op_code != OP_HSPACE;
2200        default:
2201        return op_code == OP_HSPACE;
2202        }
2203    
2204      case OP_VSPACE:
2205      case OP_NOT_VSPACE:
2206      switch(next)
2207        {
2208        case 0x0a:
2209        case 0x0b:
2210        case 0x0c:
2211        case 0x0d:
2212        case 0x85:
2213        case 0x2028:
2214        case 0x2029:
2215        return op_code != OP_VSPACE;
2216        default:
2217        return op_code == OP_VSPACE;
2218        }
2219    
2220    default:    default:
2221    return FALSE;    return FALSE;
2222    }    }
# Line 1955  switch(op_code) Line 2251  switch(op_code)
2251      case ESC_W:      case ESC_W:
2252      return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;      return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;
2253    
2254        case ESC_h:
2255        case ESC_H:
2256        switch(item)
2257          {
2258          case 0x09:
2259          case 0x20:
2260          case 0xa0:
2261          case 0x1680:
2262          case 0x180e:
2263          case 0x2000:
2264          case 0x2001:
2265          case 0x2002:
2266          case 0x2003:
2267          case 0x2004:
2268          case 0x2005:
2269          case 0x2006:
2270          case 0x2007:
2271          case 0x2008:
2272          case 0x2009:
2273          case 0x200A:
2274          case 0x202f:
2275          case 0x205f:
2276          case 0x3000:
2277          return -next != ESC_h;
2278          default:
2279          return -next == ESC_h;
2280          }
2281    
2282        case ESC_v:
2283        case ESC_V:
2284        switch(item)
2285          {
2286          case 0x0a:
2287          case 0x0b:
2288          case 0x0c:
2289          case 0x0d:
2290          case 0x85:
2291          case 0x2028:
2292          case 0x2029:
2293          return -next != ESC_v;
2294          default:
2295          return -next == ESC_v;
2296          }
2297    
2298      default:      default:
2299      return FALSE;      return FALSE;
2300      }      }
2301    
2302    case OP_DIGIT:    case OP_DIGIT:
2303    return next == -ESC_D || next == -ESC_s || next == -ESC_W;    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
2304             next == -ESC_h || next == -ESC_v;
2305    
2306    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
2307    return next == -ESC_d;    return next == -ESC_d;
# Line 1969  switch(op_code) Line 2310  switch(op_code)
2310    return next == -ESC_S || next == -ESC_d || next == -ESC_w;    return next == -ESC_S || next == -ESC_d || next == -ESC_w;
2311    
2312    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
2313    return next == -ESC_s;    return next == -ESC_s || next == -ESC_h || next == -ESC_v;
2314    
2315      case OP_HSPACE:
2316      return next == -ESC_S || next == -ESC_H || next == -ESC_d || next == -ESC_w;
2317    
2318      case OP_NOT_HSPACE:
2319      return next == -ESC_h;
2320    
2321      /* Can't have \S in here because VT matches \S (Perl anomaly) */
2322      case OP_VSPACE:
2323      return next == -ESC_V || next == -ESC_d || next == -ESC_w;
2324    
2325      case OP_NOT_VSPACE:
2326      return next == -ESC_v;
2327    
2328    case OP_WORDCHAR:    case OP_WORDCHAR:
2329    return next == -ESC_W || next == -ESC_s;    return next == -ESC_W || next == -ESC_s || next == -ESC_h || next == -ESC_v;
2330    
2331    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
2332    return next == -ESC_w || next == -ESC_d;    return next == -ESC_w || next == -ESC_d;
# Line 2045  uschar classbits[32]; Line 2399  uschar classbits[32];
2399  BOOL class_utf8;  BOOL class_utf8;
2400  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf8 = (options & PCRE_UTF8) != 0;
2401  uschar *class_utf8data;  uschar *class_utf8data;
2402    uschar *class_utf8data_base;
2403  uschar utf8_char[6];  uschar utf8_char[6];
2404  #else  #else
2405  BOOL utf8 = FALSE;  BOOL utf8 = FALSE;
# Line 2084  req_caseopt = ((options & PCRE_CASELESS) Line 2439  req_caseopt = ((options & PCRE_CASELESS)
2439  for (;; ptr++)  for (;; ptr++)
2440    {    {
2441    BOOL negate_class;    BOOL negate_class;
2442      BOOL should_flip_negation;
2443    BOOL possessive_quantifier;    BOOL possessive_quantifier;
2444    BOOL is_quantifier;    BOOL is_quantifier;
2445    BOOL is_recurse;    BOOL is_recurse;
2446      BOOL reset_bracount;
2447    int class_charcount;    int class_charcount;
2448    int class_lastchar;    int class_lastchar;
2449    int newoptions;    int newoptions;
2450    int recno;    int recno;
2451      int refsign;
2452    int skipbytes;    int skipbytes;
2453    int subreqbyte;    int subreqbyte;
2454    int subfirstbyte;    int subfirstbyte;
# Line 2101  for (;; ptr++) Line 2459  for (;; ptr++)
2459    /* Get next byte in the pattern */    /* Get next byte in the pattern */
2460    
2461    c = *ptr;    c = *ptr;
2462    
2463    /* 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
2464    previous cycle of this loop. */    previous cycle of this loop. */
2465    
# Line 2123  for (;; ptr++) Line 2481  for (;; ptr++)
2481      */      */
2482    
2483      if (code < last_code) code = last_code;      if (code < last_code) code = last_code;
2484    
2485        /* Paranoid check for integer overflow */
2486    
2487        if (OFLOW_MAX - *lengthptr < code - last_code)
2488          {
2489          *errorcodeptr = ERR20;
2490          goto FAILED;
2491          }
2492    
2493      *lengthptr += code - last_code;      *lengthptr += code - last_code;
2494      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));
2495    
# Line 2235  for (;; ptr++) Line 2602  for (;; ptr++)
2602      *ptrptr = ptr;      *ptrptr = ptr;
2603      if (lengthptr != NULL)      if (lengthptr != NULL)
2604        {        {
2605          if (OFLOW_MAX - *lengthptr < code - last_code)
2606            {
2607            *errorcodeptr = ERR20;
2608            goto FAILED;
2609            }
2610        *lengthptr += code - last_code;   /* To include callout length */        *lengthptr += code - last_code;   /* To include callout length */
2611        DPRINTF((">> end branch\n"));        DPRINTF((">> end branch\n"));
2612        }        }
# Line 2291  for (;; ptr++) Line 2663  for (;; ptr++)
2663      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. */
2664    
2665      if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&      if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
2666          check_posix_syntax(ptr, &tempptr, cd))          check_posix_syntax(ptr, &tempptr))
2667        {        {
2668        *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;        *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;
2669        goto FAILED;        goto FAILED;
2670        }        }
2671    
2672      /* 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,
2673        if the first few characters (either before or after ^) are \Q\E or \E we
2674        skip them too. This makes for compatibility with Perl. */
2675    
2676      if ((c = *(++ptr)) == '^')      negate_class = FALSE;
2677        for (;;)
2678        {        {
       negate_class = TRUE;  
2679        c = *(++ptr);        c = *(++ptr);
2680          if (c == '\\')
2681            {
2682            if (ptr[1] == 'E') ptr++;
2683              else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;
2684                else break;
2685            }
2686          else if (!negate_class && c == '^')
2687            negate_class = TRUE;
2688          else break;
2689        }        }
2690      else  
2691        {      /* If a class contains a negative special such as \S, we need to flip the
2692        negate_class = FALSE;      negation flag at the end, so that support for characters > 255 works
2693        }      correctly (they are all included in the class). */
2694    
2695        should_flip_negation = FALSE;
2696    
2697      /* 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
2698      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
# Line 2326  for (;; ptr++) Line 2711  for (;; ptr++)
2711  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2712      class_utf8 = FALSE;                       /* No chars >= 256 */      class_utf8 = FALSE;                       /* No chars >= 256 */
2713      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */
2714        class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */
2715  #endif  #endif
2716    
2717      /* 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 2341  for (;; ptr++) Line 2727  for (;; ptr++)
2727          {                           /* Braces are required because the */          {                           /* Braces are required because the */
2728          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
2729          }          }
2730    
2731          /* In the pre-compile phase, accumulate the length of any UTF-8 extra
2732          data and reset the pointer. This is so that very large classes that
2733          contain a zillion UTF-8 characters no longer overwrite the work space
2734          (which is on the stack). */
2735    
2736          if (lengthptr != NULL)
2737            {
2738            *lengthptr += class_utf8data - class_utf8data_base;
2739            class_utf8data = class_utf8data_base;
2740            }
2741    
2742  #endif  #endif
2743    
2744        /* Inside \Q...\E everything is literal except \E */        /* Inside \Q...\E everything is literal except \E */
# Line 2364  for (;; ptr++) Line 2762  for (;; ptr++)
2762    
2763        if (c == '[' &&        if (c == '[' &&
2764            (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&            (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
2765            check_posix_syntax(ptr, &tempptr, cd))            check_posix_syntax(ptr, &tempptr))
2766          {          {
2767          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
2768          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
# Line 2381  for (;; ptr++) Line 2779  for (;; ptr++)
2779          if (*ptr == '^')          if (*ptr == '^')
2780            {            {
2781            local_negate = TRUE;            local_negate = TRUE;
2782              should_flip_negation = TRUE;  /* Note negative special */
2783            ptr++;            ptr++;
2784            }            }
2785    
# Line 2447  for (;; ptr++) Line 2846  for (;; ptr++)
2846        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
2847        case. Inside a class (and only there) it is treated as backspace.        case. Inside a class (and only there) it is treated as backspace.
2848        Elsewhere it marks a word boundary. Other escapes have preset maps ready        Elsewhere it marks a word boundary. Other escapes have preset maps ready
2849        to or into the one we are building. We assume they have more than one        to 'or' into the one we are building. We assume they have more than one
2850        character in them, so set class_charcount bigger than one. */        character in them, so set class_charcount bigger than one. */
2851    
2852        if (c == '\\')        if (c == '\\')
# Line 2455  for (;; ptr++) Line 2854  for (;; ptr++)
2854          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
2855          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
2856    
2857          if (-c == ESC_b) c = '\b';       /* \b is backslash in a class */          if (-c == ESC_b) c = '\b';       /* \b is backspace in a class */
2858          else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */          else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */
2859          else if (-c == ESC_R) c = 'R';   /* \R is literal R in a class */          else if (-c == ESC_R) c = 'R';   /* \R is literal R in a class */
2860          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
# Line 2467  for (;; ptr++) Line 2866  for (;; ptr++)
2866            else inescq = TRUE;            else inescq = TRUE;
2867            continue;            continue;
2868            }            }
2869            else if (-c == ESC_E) continue;  /* Ignore orphan \E */
2870    
2871          if (c < 0)          if (c < 0)
2872            {            {
# Line 2482  for (;; ptr++) Line 2882  for (;; ptr++)
2882              continue;              continue;
2883    
2884              case ESC_D:              case ESC_D:
2885                should_flip_negation = TRUE;
2886              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];
2887              continue;              continue;
2888    
# Line 2490  for (;; ptr++) Line 2891  for (;; ptr++)
2891              continue;              continue;
2892    
2893              case ESC_W:              case ESC_W:
2894                should_flip_negation = TRUE;
2895              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
2896              continue;              continue;
2897    
# Line 2499  for (;; ptr++) Line 2901  for (;; ptr++)
2901              continue;              continue;
2902    
2903              case ESC_S:              case ESC_S:
2904                should_flip_negation = TRUE;
2905              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
2906              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
2907              continue;              continue;
2908    
             case ESC_E: /* Perl ignores an orphan \E */  
             continue;  
   
2909              default:    /* Not recognized; fall through */              default:    /* Not recognized; fall through */
2910              break;      /* Need "default" setting to stop compiler warning. */              break;      /* Need "default" setting to stop compiler warning. */
2911              }              }
# Line 2515  for (;; ptr++) Line 2915  for (;; ptr++)
2915            else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||            else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||
2916                     c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;                     c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;
2917    
2918              /* We need to deal with \H, \h, \V, and \v in both phases because
2919              they use extra memory. */
2920    
2921              if (-c == ESC_h)
2922                {
2923                SETBIT(classbits, 0x09); /* VT */
2924                SETBIT(classbits, 0x20); /* SPACE */
2925                SETBIT(classbits, 0xa0); /* NSBP */
2926    #ifdef SUPPORT_UTF8
2927                if (utf8)
2928                  {
2929                  class_utf8 = TRUE;
2930                  *class_utf8data++ = XCL_SINGLE;
2931                  class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);
2932                  *class_utf8data++ = XCL_SINGLE;
2933                  class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);
2934                  *class_utf8data++ = XCL_RANGE;
2935                  class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);
2936                  class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);
2937                  *class_utf8data++ = XCL_SINGLE;
2938                  class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);
2939                  *class_utf8data++ = XCL_SINGLE;
2940                  class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);
2941                  *class_utf8data++ = XCL_SINGLE;
2942                  class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);
2943                  }
2944    #endif
2945                continue;
2946                }
2947    
2948              if (-c == ESC_H)
2949                {
2950                for (c = 0; c < 32; c++)
2951                  {
2952                  int x = 0xff;
2953                  switch (c)
2954                    {
2955                    case 0x09/8: x ^= 1 << (0x09%8); break;
2956                    case 0x20/8: x ^= 1 << (0x20%8); break;
2957                    case 0xa0/8: x ^= 1 << (0xa0%8); break;
2958                    default: break;
2959                    }
2960                  classbits[c] |= x;
2961                  }
2962    
2963    #ifdef SUPPORT_UTF8
2964                if (utf8)
2965                  {
2966                  class_utf8 = TRUE;
2967                  *class_utf8data++ = XCL_RANGE;
2968                  class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
2969                  class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);
2970                  *class_utf8data++ = XCL_RANGE;
2971                  class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);
2972                  class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);
2973                  *class_utf8data++ = XCL_RANGE;
2974                  class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);
2975                  class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);
2976                  *class_utf8data++ = XCL_RANGE;
2977                  class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);
2978                  class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);
2979                  *class_utf8data++ = XCL_RANGE;
2980                  class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);
2981                  class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);
2982                  *class_utf8data++ = XCL_RANGE;
2983                  class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);
2984                  class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);
2985                  *class_utf8data++ = XCL_RANGE;
2986                  class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);
2987                  class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
2988                  }
2989    #endif
2990                continue;
2991                }
2992    
2993              if (-c == ESC_v)
2994                {
2995                SETBIT(classbits, 0x0a); /* LF */
2996                SETBIT(classbits, 0x0b); /* VT */
2997                SETBIT(classbits, 0x0c); /* FF */
2998                SETBIT(classbits, 0x0d); /* CR */
2999                SETBIT(classbits, 0x85); /* NEL */
3000    #ifdef SUPPORT_UTF8
3001                if (utf8)
3002                  {
3003                  class_utf8 = TRUE;
3004                  *class_utf8data++ = XCL_RANGE;
3005                  class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);
3006                  class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
3007                  }
3008    #endif
3009                continue;
3010                }
3011    
3012              if (-c == ESC_V)
3013                {
3014                for (c = 0; c < 32; c++)
3015                  {
3016                  int x = 0xff;
3017                  switch (c)
3018                    {
3019                    case 0x0a/8: x ^= 1 << (0x0a%8);
3020                                 x ^= 1 << (0x0b%8);
3021                                 x ^= 1 << (0x0c%8);
3022                                 x ^= 1 << (0x0d%8);
3023                                 break;
3024                    case 0x85/8: x ^= 1 << (0x85%8); break;
3025                    default: break;
3026                    }
3027                  classbits[c] |= x;
3028                  }
3029    
3030    #ifdef SUPPORT_UTF8
3031                if (utf8)
3032                  {
3033                  class_utf8 = TRUE;
3034                  *class_utf8data++ = XCL_RANGE;
3035                  class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
3036                  class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);
3037                  *class_utf8data++ = XCL_RANGE;
3038                  class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
3039                  class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
3040                  }
3041    #endif
3042                continue;
3043                }
3044    
3045            /* We need to deal with \P and \p in both phases. */            /* We need to deal with \P and \p in both phases. */
3046    
3047  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 2566  for (;; ptr++) Line 3093  for (;; ptr++)
3093    
3094        oldptr = ptr;        oldptr = ptr;
3095    
3096          /* Remember \r or \n */
3097    
3098          if (c == '\r' || c == '\n') cd->external_flags |= PCRE_HASCRORLF;
3099    
3100          /* Check for range */
3101    
3102        if (!inescq && ptr[1] == '-')        if (!inescq && ptr[1] == '-')
3103          {          {
3104          int d;          int d;
# Line 2607  for (;; ptr++) Line 3140  for (;; ptr++)
3140            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3141            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
3142    
3143            /* \b is backslash; \X is literal X; \R is literal R; any other            /* \b is backspace; \X is literal X; \R is literal R; any other
3144            special means the '-' was literal */            special means the '-' was literal */
3145    
3146            if (d < 0)            if (d < 0)
# Line 2633  for (;; ptr++) Line 3166  for (;; ptr++)
3166    
3167          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */
3168    
3169            /* Remember \r or \n */
3170    
3171            if (d == '\r' || d == '\n') cd->external_flags |= PCRE_HASCRORLF;
3172    
3173          /* 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
3174          matching, we have to use an XCLASS with extra data items. Caseless          matching, we have to use an XCLASS with extra data items. Caseless
3175          matching for characters > 127 is available only if UCP support is          matching for characters > 127 is available only if UCP support is
# Line 2655  for (;; ptr++) Line 3192  for (;; ptr++)
3192              unsigned int origd = d;              unsigned int origd = d;
3193              while (get_othercase_range(&cc, origd, &occ, &ocd))              while (get_othercase_range(&cc, origd, &occ, &ocd))
3194                {                {
3195                if (occ >= c && ocd <= d) continue;  /* Skip embedded ranges */                if (occ >= (unsigned int)c &&
3196                      ocd <= (unsigned int)d)
3197                    continue;                          /* Skip embedded ranges */
3198    
3199                if (occ < c  && ocd >= c - 1)        /* Extend the basic range */                if (occ < (unsigned int)c  &&
3200                      ocd >= (unsigned int)c - 1)      /* Extend the basic range */
3201                  {                                  /* if there is overlap,   */                  {                                  /* if there is overlap,   */
3202                  c = occ;                           /* noting that if occ < c */                  c = occ;                           /* noting that if occ < c */
3203                  continue;                          /* we can't have ocd > d  */                  continue;                          /* we can't have ocd > d  */
3204                  }                                  /* because a subrange is  */                  }                                  /* because a subrange is  */
3205                if (ocd > d && occ <= d + 1)         /* always shorter than    */                if (ocd > (unsigned int)d &&
3206                      occ <= (unsigned int)d + 1)      /* always shorter than    */
3207                  {                                  /* the basic range.       */                  {                                  /* the basic range.       */
3208                  d = ocd;                  d = ocd;
3209                  continue;                  continue;
# Line 2782  for (;; ptr++) Line 3323  for (;; ptr++)
3323        goto FAILED;        goto FAILED;
3324        }        }
3325    
3326    
3327    /* This code has been disabled because it would mean that \s counts as
3328    an explicit \r or \n reference, and that's not really what is wanted. Now
3329    we set the flag only if there is a literal "\r" or "\n" in the class. */
3330    
3331    #if 0
3332        /* Remember whether \r or \n are in this class */
3333    
3334        if (negate_class)
3335          {
3336          if ((classbits[1] & 0x24) != 0x24) cd->external_flags |= PCRE_HASCRORLF;
3337          }
3338        else
3339          {
3340          if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;
3341          }
3342    #endif
3343    
3344    
3345      /* 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
3346      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
3347      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
3348      because OP_NOT and the related opcodes like OP_NOTSTAR operate on      optimize.
3349      single-bytes only. This is an historical hangover. Maybe one day we can  
3350      tidy these opcodes to handle multi-byte characters.      In UTF-8 mode, we can optimize the negative case only if there were no
3351        characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
3352        operate on single-bytes only. This is an historical hangover. Maybe one day
3353        we can tidy these opcodes to handle multi-byte characters.
3354    
3355      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
3356      1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note      1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note
# Line 2797  for (;; ptr++) Line 3360  for (;; ptr++)
3360      reqbyte, save the previous value for reinstating. */      reqbyte, save the previous value for reinstating. */
3361    
3362  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3363      if (class_charcount == 1 &&      if (class_charcount == 1 && !class_utf8 &&
3364            (!utf8 ||        (!utf8 || !negate_class || class_lastchar < 128))
           (!class_utf8 && (!negate_class || class_lastchar < 128))))  
   
3365  #else  #else
3366      if (class_charcount == 1)      if (class_charcount == 1)
3367  #endif  #endif
# Line 2843  for (;; ptr++) Line 3404  for (;; ptr++)
3404      zeroreqbyte = reqbyte;      zeroreqbyte = reqbyte;
3405    
3406      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
3407      extended class, with its own opcode. If there are no characters < 256,      extended class, with its own opcode, unless there was a negated special
3408      we can omit the bitmap in the actual compiled code. */      such as \S in the class, because in that case all characters > 255 are in
3409        the class, so any that were explicitly given as well can be ignored. If
3410        (when there are explicit characters > 255 that must be listed) there are no
3411        characters < 256, we can omit the bitmap in the actual compiled code. */
3412    
3413  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3414      if (class_utf8)      if (class_utf8 && !should_flip_negation)
3415        {        {
3416        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
3417        *code++ = OP_XCLASS;        *code++ = OP_XCLASS;
# Line 2873  for (;; ptr++) Line 3437  for (;; ptr++)
3437        }        }
3438  #endif  #endif
3439    
3440      /* If there are no characters > 255, negate the 32-byte map if necessary,      /* If there are no characters > 255, set the opcode to OP_CLASS or
3441      and copy it into the code vector. If this is the first thing in the branch,      OP_NCLASS, depending on whether the whole class was negated and whether
3442      there can be no first char setting, whatever the repeat count. Any reqbyte      there were negative specials such as \S in the class. Then copy the 32-byte
3443      setting must remain unchanged after any kind of repeat. */      map into the code vector, negating it if necessary. */
3444    
3445        *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
3446      if (negate_class)      if (negate_class)
3447        {        {
       *code++ = OP_NCLASS;  
3448        if (lengthptr == NULL)    /* Save time in the pre-compile phase */        if (lengthptr == NULL)    /* Save time in the pre-compile phase */
3449          for (c = 0; c < 32; c++) code[c] = ~classbits[c];          for (c = 0; c < 32; c++) code[c] = ~classbits[c];
3450        }        }
3451      else      else
3452        {        {
       *code++ = OP_CLASS;  
3453        memcpy(code, classbits, 32);        memcpy(code, classbits, 32);
3454        }        }
3455      code += 32;      code += 32;
# Line 3072  for (;; ptr++) Line 3635  for (;; ptr++)
3635        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
3636        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
3637    
3638        if (repeat_max != 1) cd->nopartial = TRUE;        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
3639    
3640        /* Combine the op_type with the repeat_type */        /* Combine the op_type with the repeat_type */
3641    
# Line 3222  for (;; ptr++) Line 3785  for (;; ptr++)
3785        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
3786        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
3787    
3788        if (repeat_max != 1) cd->nopartial = TRUE;        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
3789    
3790        if (repeat_min == 0 && repeat_max == -1)        if (repeat_min == 0 && repeat_max == -1)
3791          *code++ = OP_CRSTAR + repeat_type;          *code++ = OP_CRSTAR + repeat_type;
# Line 3258  for (;; ptr++) Line 3821  for (;; ptr++)
3821          goto FAILED;          goto FAILED;
3822          }          }
3823    
       /* This is a paranoid check to stop integer overflow later on */  
   
       if (len > MAX_DUPLENGTH)  
         {  
         *errorcodeptr = ERR50;  
         goto FAILED;  
         }  
   
3824        /* If the maximum repeat count is unlimited, find the end of the bracket        /* If the maximum repeat count is unlimited, find the end of the bracket
3825        by scanning through from the start, and compute the offset back to it        by scanning through from the start, and compute the offset back to it
3826        from the current code pointer. There may be an OP_OPT setting following        from the current code pointer. There may be an OP_OPT setting following
# Line 3288  for (;; ptr++) Line 3843  for (;; ptr++)
3843    
3844        if (repeat_min == 0)        if (repeat_min == 0)
3845          {          {
3846          /* 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
3847          altogether. */          output altogether, like this:
   
         if (repeat_max == 0)  
           {  
           code = previous;  
           goto END_REPEAT;  
           }  
3848    
3849          /* If the maximum is 1 or unlimited, we just have to stick in the          ** if (repeat_max == 0)
3850          BRAZERO and do no more at this point. However, we do need to adjust          **   {
3851          any OP_RECURSE calls inside the group that refer to the group itself or          **   code = previous;
3852          any internal or forward referenced group, because the offset is from          **   goto END_REPEAT;
3853          the start of the whole regex. Temporarily terminate the pattern while          **   }
3854          doing this. */  
3855            However, that fails when a group is referenced as a subroutine from
3856            elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it
3857            so that it is skipped on execution. As we don't have a list of which
3858            groups are referenced, we cannot do this selectively.
3859    
3860            If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
3861            and do no more at this point. However, we do need to adjust any
3862            OP_RECURSE calls inside the group that refer to the group itself or any
3863            internal or forward referenced group, because the offset is from the
3864            start of the whole regex. Temporarily terminate the pattern while doing
3865            this. */
3866    
3867          if (repeat_max <= 1)          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
3868            {            {
3869            *code = OP_END;            *code = OP_END;
3870            adjust_recurse(previous, 1, utf8, cd, save_hwm);            adjust_recurse(previous, 1, utf8, cd, save_hwm);
3871            memmove(previous+1, previous, len);            memmove(previous+1, previous, len);
3872            code++;            code++;
3873              if (repeat_max == 0)
3874                {
3875                *previous++ = OP_SKIPZERO;
3876                goto END_REPEAT;
3877                }
3878            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
3879            }            }
3880    
# Line 3354  for (;; ptr++) Line 3919  for (;; ptr++)
3919          if (repeat_min > 1)          if (repeat_min > 1)
3920            {            {
3921            /* In the pre-compile phase, we don't actually do the replication. We            /* In the pre-compile phase, we don't actually do the replication. We
3922            just adjust the length as if we had. */            just adjust the length as if we had. Do some paranoid checks for
3923              potential integer overflow. */
3924    
3925            if (lengthptr != NULL)            if (lengthptr != NULL)
3926              *lengthptr += (repeat_min - 1)*length_prevgroup;              {
3927                int delta = (repeat_min - 1)*length_prevgroup;
3928                if ((double)(repeat_min - 1)*(double)length_prevgroup >
3929                                                                (double)INT_MAX ||
3930                    OFLOW_MAX - *lengthptr < delta)
3931                  {
3932                  *errorcodeptr = ERR20;
3933                  goto FAILED;
3934                  }
3935                *lengthptr += delta;
3936                }
3937    
3938            /* This is compiling for real */            /* This is compiling for real */
3939    
# Line 3395  for (;; ptr++) Line 3971  for (;; ptr++)
3971          /* In the pre-compile phase, we don't actually do the replication. We          /* In the pre-compile phase, we don't actually do the replication. We
3972          just adjust the length as if we had. For each repetition we must add 1          just adjust the length as if we had. For each repetition we must add 1
3973          to the length for BRAZERO and for all but the last repetition we must          to the length for BRAZERO and for all but the last repetition we must
3974          add 2 + 2*LINKSIZE to allow for the nesting that occurs. */          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
3975            paranoid checks to avoid integer overflow. */
3976    
3977          if (lengthptr != NULL && repeat_max > 0)          if (lengthptr != NULL && repeat_max > 0)
3978            *lengthptr += repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -            {
3979              2 - 2*LINK_SIZE;  /* Last one doesn't nest */            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
3980                          2 - 2*LINK_SIZE;   /* Last one doesn't nest */
3981              if ((double)repeat_max *
3982                    (double)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
3983                      > (double)INT_MAX ||
3984                  OFLOW_MAX - *lengthptr < delta)
3985                {
3986                *errorcodeptr = ERR20;
3987                goto FAILED;
3988                }
3989              *lengthptr += delta;
3990              }
3991    
3992          /* This is compiling for real */          /* This is compiling for real */
3993    
# Line 3507  for (;; ptr++) Line 4095  for (;; ptr++)
4095        int len;        int len;
4096        if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||        if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||
4097            *tempcode == OP_NOTEXACT)            *tempcode == OP_NOTEXACT)
4098          tempcode += _pcre_OP_lengths[*tempcode];          tempcode += _pcre_OP_lengths[*tempcode] +
4099              ((*tempcode == OP_TYPEEXACT &&
4100                 (tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP))? 2:0);
4101        len = code - tempcode;        len = code - tempcode;
4102        if (len > 0) switch (*tempcode)        if (len > 0) switch (*tempcode)
4103          {          {
# Line 3551  for (;; ptr++) Line 4141  for (;; ptr++)
4141      /* ===================================================================*/      /* ===================================================================*/
4142      /* Start of nested parenthesized sub-expression, or comment or lookahead or      /* Start of nested parenthesized sub-expression, or comment or lookahead or
4143      lookbehind or option setting or condition or all the other extended      lookbehind or option setting or condition or all the other extended
4144      parenthesis forms. First deal with the specials; all are introduced by ?,      parenthesis forms.  */
     and the appearance of any of them means that this is not a capturing  
     group. */  
4145    
4146      case '(':      case '(':
4147      newoptions = options;      newoptions = options;
4148      skipbytes = 0;      skipbytes = 0;
4149      bravalue = OP_CBRA;      bravalue = OP_CBRA;
4150      save_hwm = cd->hwm;      save_hwm = cd->hwm;
4151        reset_bracount = FALSE;
4152    
4153        /* First deal with various "verbs" that can be introduced by '*'. */
4154    
4155        if (*(++ptr) == '*' && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
4156          {
4157          int i, namelen;
4158          const char *vn = verbnames;
4159          const uschar *name = ++ptr;
4160          previous = NULL;
4161          while ((cd->ctypes[*++ptr] & ctype_letter) != 0);
4162          if (*ptr == ':')
4163            {
4164            *errorcodeptr = ERR59;   /* Not supported */
4165            goto FAILED;
4166            }
4167          if (*ptr != ')')
4168            {
4169            *errorcodeptr = ERR60;
4170            goto FAILED;
4171            }
4172          namelen = ptr - name;
4173          for (i = 0; i < verbcount; i++)
4174            {
4175            if (namelen == verbs[i].len &&
4176                strncmp((char *)name, vn, namelen) == 0)
4177              {
4178              *code = verbs[i].op;
4179              if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;
4180              break;
4181              }
4182            vn += verbs[i].len + 1;
4183            }
4184          if (i < verbcount) continue;
4185          *errorcodeptr = ERR60;
4186          goto FAILED;
4187          }
4188    
4189      if (*(++ptr) == '?')      /* Deal with the extended parentheses; all are introduced by '?', and the
4190        appearance of any of them means that this is not a capturing group. */
4191    
4192        else if (*ptr == '?')
4193        {        {
4194        int i, set, unset, namelen;        int i, set, unset, namelen;
4195        int *optset;        int *optset;
# Line 3582  for (;; ptr++) Line 4210  for (;; ptr++)
4210    
4211    
4212          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4213            case '|':                 /* Reset capture count for each branch */
4214            reset_bracount = TRUE;
4215            /* Fall through */
4216    
4217            /* ------------------------------------------------------------ */
4218          case ':':                 /* Non-capturing bracket */          case ':':                 /* Non-capturing bracket */
4219          bravalue = OP_BRA;          bravalue = OP_BRA;
4220          ptr++;          ptr++;
# Line 3617  for (;; ptr++) Line 4250  for (;; ptr++)
4250    
4251          code[1+LINK_SIZE] = OP_CREF;          code[1+LINK_SIZE] = OP_CREF;
4252          skipbytes = 3;          skipbytes = 3;
4253            refsign = -1;
4254    
4255          /* Check for a test for recursion in a named group. */          /* Check for a test for recursion in a named group. */
4256    
# Line 3640  for (;; ptr++) Line 4274  for (;; ptr++)
4274            terminator = '\'';            terminator = '\'';
4275            ptr++;            ptr++;
4276            }            }
4277          else terminator = 0;          else
4278              {
4279              terminator = 0;
4280              if (ptr[1] == '-' || ptr[1] == '+') refsign = *(++ptr);
4281              }
4282    
4283          /* We now expect to read a name; any thing else is an error */          /* We now expect to read a name; any thing else is an error */
4284    
# Line 3676  for (;; ptr++) Line 4314  for (;; ptr++)
4314          if (lengthptr != NULL) break;          if (lengthptr != NULL) break;
4315    
4316          /* In the real compile we do the work of looking for the actual          /* In the real compile we do the work of looking for the actual
4317          reference. */          reference. If the string started with "+" or "-" we require the rest to
4318            be digits, in which case recno will be set. */
4319    
4320            if (refsign > 0)
4321              {
4322              if (recno <= 0)
4323                {
4324                *errorcodeptr = ERR58;
4325                goto FAILED;
4326                }
4327              recno = (refsign == '-')?
4328                cd->bracount - recno + 1 : recno +cd->bracount;
4329              if (recno <= 0 || recno > cd->final_bracount)
4330                {
4331                *errorcodeptr = ERR15;
4332                goto FAILED;
4333                }
4334              PUT2(code, 2+LINK_SIZE, recno);
4335              break;
4336              }
4337    
4338            /* Otherwise (did not start with "+" or "-"), start by looking for the
4339            name. */
4340    
4341          slot = cd->name_table;          slot = cd->name_table;
4342          for (i = 0; i < cd->names_found; i++)          for (i = 0; i < cd->names_found; i++)
# Line 3742  for (;; ptr++) Line 4402  for (;; ptr++)
4402            skipbytes = 1;            skipbytes = 1;
4403            }            }
4404    
4405          /* Check for the "name" actually being a subpattern number. */          /* Check for the "name" actually being a subpattern number. We are
4406            in the second pass here, so final_bracount is set. */
4407    
4408          else if (recno > 0)          else if (recno > 0 && recno <= cd->final_bracount)
4409            {            {
4410            PUT2(code, 2+LINK_SIZE, recno);            PUT2(code, 2+LINK_SIZE, recno);
4411            }            }
# Line 3768  for (;; ptr++) Line 4429  for (;; ptr++)
4429    
4430          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4431          case '!':                 /* Negative lookahead */          case '!':                 /* Negative lookahead */
         bravalue = OP_ASSERT_NOT;  
4432          ptr++;          ptr++;
4433            if (*ptr == ')')          /* Optimize (?!) */
4434              {
4435              *code++ = OP_FAIL;
4436              previous = NULL;
4437              continue;
4438              }
4439            bravalue = OP_ASSERT_NOT;
4440          break;          break;
4441    
4442    
# Line 3932  for (;; ptr++) Line 4599  for (;; ptr++)
4599    
4600          /* We come here from the Python syntax above that handles both          /* We come here from the Python syntax above that handles both
4601          references (?P=name) and recursion (?P>name), as well as falling          references (?P=name) and recursion (?P>name), as well as falling
4602          through from the Perl recursion syntax (?&name). */          through from the Perl recursion syntax (?&name). We also come here from
4603            the Perl \k<name> or \k'name' back reference syntax and the \k{name}
4604            .NET syntax, and the Oniguruma \g<...> and \g'...' subroutine syntax. */
4605    
4606          NAMED_REF_OR_RECURSE:          NAMED_REF_OR_RECURSE:
4607          name = ++ptr;          name = ++ptr;
# Line 3944  for (;; ptr++) Line 4613  for (;; ptr++)
4613    
4614          if (lengthptr != NULL)          if (lengthptr != NULL)
4615            {            {
4616              if (namelen == 0)
4617                {
4618                *errorcodeptr = ERR62;
4619                goto FAILED;
4620                }
4621            if (*ptr != terminator)            if (*ptr != terminator)
4622              {              {
4623              *errorcodeptr = ERR42;              *errorcodeptr = ERR42;
# Line 3957  for (;; ptr++) Line 4631  for (;; ptr++)
4631            recno = 0;            recno = 0;
4632            }            }
4633    
4634          /* In the real compile, seek the name in the table */          /* In the real compile, seek the name in the table. We check the name
4635            first, and then check that we have reached the end of the name in the
4636            table. That way, if the name that is longer than any in the table,
4637            the comparison will fail without reading beyond the table entry. */
4638    
4639          else          else
4640            {            {
4641            slot = cd->name_table;            slot = cd->name_table;
4642            for (i = 0; i < cd->names_found; i++)            for (i = 0; i < cd->names_found; i++)
4643              {              {
4644              if (strncmp((char *)name, (char *)slot+2, namelen) == 0) break;              if (strncmp((char *)name, (char *)slot+2, namelen) == 0 &&
4645                    slot[2+namelen] == 0)
4646                  break;
4647              slot += cd->name_entry_size;              slot += cd->name_entry_size;
4648              }              }
4649    
# Line 3995  for (;; ptr++) Line 4674  for (;; ptr++)
4674    
4675    
4676          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4677            case '-': case '+':
4678          case '0': case '1': case '2': case '3': case '4':   /* Recursion or */          case '0': case '1': case '2': case '3': case '4':   /* Recursion or */
4679          case '5': case '6': case '7': case '8': case '9':   /* subroutine */          case '5': case '6': case '7': case '8': case '9':   /* subroutine */
4680            {            {
4681            const uschar *called;            const uschar *called;
4682              terminator = ')';
4683    
4684              /* Come here from the \g<...> and \g'...' code (Oniguruma
4685              compatibility). However, the syntax has been checked to ensure that
4686              the ... are a (signed) number, so that neither ERR63 nor ERR29 will
4687              be called on this path, nor with the jump to OTHER_CHAR_AFTER_QUERY
4688              ever be taken. */
4689    
4690              HANDLE_NUMERICAL_RECURSION:
4691    
4692              if ((refsign = *ptr) == '+')
4693                {
4694                ptr++;
4695                if ((digitab[*ptr] & ctype_digit) == 0)
4696                  {
4697                  *errorcodeptr = ERR63;
4698                  goto FAILED;
4699                  }
4700                }
4701              else if (refsign == '-')
4702                {
4703                if ((digitab[ptr[1]] & ctype_digit) == 0)
4704                  goto OTHER_CHAR_AFTER_QUERY;
4705                ptr++;
4706                }
4707    
4708            recno = 0;            recno = 0;
4709            while((digitab[*ptr] & ctype_digit) != 0)            while((digitab[*ptr] & ctype_digit) != 0)
4710              recno = recno * 10 + *ptr++ - '0';              recno = recno * 10 + *ptr++ - '0';
4711            if (*ptr != ')')  
4712              if (*ptr != terminator)
4713              {              {
4714              *errorcodeptr = ERR29;              *errorcodeptr = ERR29;
4715              goto FAILED;              goto FAILED;
4716              }              }
4717    
4718              if (refsign == '-')
4719                {
4720                if (recno == 0)
4721                  {
4722                  *errorcodeptr = ERR58;
4723                  goto FAILED;
4724                  }
4725                recno = cd->bracount - recno + 1;
4726                if (recno <= 0)
4727                  {
4728                  *errorcodeptr = ERR15;
4729                  goto FAILED;
4730                  }
4731                }
4732              else if (refsign == '+')
4733                {
4734                if (recno == 0)
4735                  {
4736                  *errorcodeptr = ERR58;
4737                  goto FAILED;
4738                  }
4739                recno += cd->bracount;
4740                }
4741    
4742            /* Come here from code above that handles a named recursion */            /* Come here from code above that handles a named recursion */
4743    
4744            HANDLE_RECURSION:            HANDLE_RECURSION:
# Line 4080  for (;; ptr++) Line 4811  for (;; ptr++)
4811    
4812          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4813          default:              /* Other characters: check option setting */          default:              /* Other characters: check option setting */
4814            OTHER_CHAR_AFTER_QUERY:
4815          set = unset = 0;          set = unset = 0;
4816          optset = &set;          optset = &set;
4817    
# Line 4091  for (;; ptr++) Line 4823  for (;; ptr++)
4823    
4824              case 'J':    /* Record that it changed in the external options */              case 'J':    /* Record that it changed in the external options */
4825              *optset |= PCRE_DUPNAMES;              *optset |= PCRE_DUPNAMES;
4826              cd->external_options |= PCRE_JCHANGED;              cd->external_flags |= PCRE_JCHANGED;
4827              break;              break;
4828    
4829              case 'i': *optset |= PCRE_CASELESS; break;              case 'i': *optset |= PCRE_CASELESS; break;
# Line 4214  for (;; ptr++) Line 4946  for (;; ptr++)
4946           errorcodeptr,                 /* Where to put an error message */           errorcodeptr,                 /* Where to put an error message */
4947           (bravalue == OP_ASSERTBACK ||           (bravalue == OP_ASSERTBACK ||
4948            bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */            bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */
4949             reset_bracount,               /* True if (?| group */
4950           skipbytes,                    /* Skip over bracket number */           skipbytes,                    /* Skip over bracket number */
4951           &subfirstbyte,                /* For possible first char */           &subfirstbyte,                /* For possible first char */
4952           &subreqbyte,                  /* For possible last char */           &subreqbyte,                  /* For possible last char */
# Line 4230  for (;; ptr++) Line 4963  for (;; ptr++)
4963      is on the bracket. */      is on the bracket. */
4964    
4965      /* If this is a conditional bracket, check that there are no more than      /* If this is a conditional bracket, check that there are no more than
4966      two branches in the group, or just one if it's a DEFINE group. */      two branches in the group, or just one if it's a DEFINE group. We do this
4967        in the real compile phase, not in the pre-pass, where the whole group may
4968        not be available. */
4969    
4970      if (bravalue == OP_COND)      if (bravalue == OP_COND && lengthptr == NULL)
4971        {        {
4972        uschar *tc = code;        uschar *tc = code;
4973        int condcount = 0;        int condcount = 0;
# Line 4279  for (;; ptr++) Line 5014  for (;; ptr++)
5014        goto FAILED;        goto FAILED;
5015        }        }
5016    
5017      /* In the pre-compile phase, update the length by the length of the nested      /* In the pre-compile phase, update the length by the length of the group,
5018      group, less the brackets at either end. Then reduce the compiled code to      less the brackets at either end. Then reduce the compiled code to just a
5019      just the brackets so that it doesn't use much memory if it is duplicated by      set of non-capturing brackets so that it doesn't use much memory if it is
5020      a quantifier. */      duplicated by a quantifier.*/
5021    
5022      if (lengthptr != NULL)      if (lengthptr != NULL)
5023        {        {
5024          if (OFLOW_MAX - *lengthptr < length_prevgroup - 2 - 2*LINK_SIZE)
5025            {
5026            *errorcodeptr = ERR20;
5027            goto FAILED;
5028            }
5029        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
5030        code++;        *code++ = OP_BRA;
5031        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
5032        *code++ = OP_KET;        *code++ = OP_KET;
5033        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
5034          break;    /* No need to waste time with special character handling */
5035        }        }
5036    
5037      /* Otherwise update the main code pointer to the end of the group. */      /* Otherwise update the main code pointer to the end of the group. */
5038    
5039      else code = tempcode;      code = tempcode;
5040    
5041      /* For a DEFINE group, required and first character settings are not      /* For a DEFINE group, required and first character settings are not
5042      relevant. */      relevant. */
# Line 4364  for (;; ptr++) Line 5105  for (;; ptr++)
5105      back references and those types that consume a character may be repeated.      back references and those types that consume a character may be repeated.
5106      We can test for values between ESC_b and ESC_Z for the latter; this may      We can test for values between ESC_b and ESC_Z for the latter; this may
5107      have to change if any new ones are ever created. */      have to change if any new ones are ever created. */
5108    
5109      case '\\':      case '\\':
5110      tempptr = ptr;      tempptr = ptr;
5111      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);
# Line 4391  for (;; ptr++) Line 5132  for (;; ptr++)
5132    
5133        zerofirstbyte = firstbyte;        zerofirstbyte = firstbyte;
5134        zeroreqbyte = reqbyte;        zeroreqbyte = reqbyte;
5135    
5136          /* \g<name> or \g'name' is a subroutine call by name and \g<n> or \g'n'
5137          is a subroutine call by number (Oniguruma syntax). In fact, the value
5138          -ESC_g is returned only for these cases. So we don't need to check for <
5139          or ' if the value is -ESC_g. For the Perl syntax \g{n} the value is
5140          -ESC_REF+n, and for the Perl syntax \g{name} the result is -ESC_k (as
5141          that is a synonym for a named back reference). */
5142    
5143          if (-c == ESC_g)
5144            {
5145            const uschar *p;
5146            save_hwm = cd->hwm;   /* Normally this is set when '(' is read */
5147            terminator = (*(++ptr) == '<')? '>' : '\'';
5148    
5149            /* These two statements stop the compiler for warning about possibly
5150            unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In
5151            fact, because we actually check for a number below, the paths that
5152            would actually be in error are never taken. */
5153    
5154            skipbytes = 0;
5155            reset_bracount = FALSE;
5156    
5157            /* Test for a name */
5158    
5159            if (ptr[1] != '+' && ptr[1] != '-')
5160              {
5161              BOOL isnumber = TRUE;
5162              for (p = ptr + 1; *p != 0 && *p != terminator; p++)
5163                {
5164                if ((cd->ctypes[*p] & ctype_digit) == 0) isnumber = FALSE;
5165                if ((cd->ctypes[*p] & ctype_word) == 0) break;
5166                }
5167              if (*p != terminator)
5168                {
5169                *errorcodeptr = ERR57;
5170                break;
5171                }
5172              if (isnumber)
5173                {
5174                ptr++;
5175                goto HANDLE_NUMERICAL_RECURSION;
5176                }
5177              is_recurse = TRUE;
5178              goto NAMED_REF_OR_RECURSE;
5179              }
5180    
5181            /* Test a signed number in angle brackets or quotes. */
5182    
5183            p = ptr + 2;
5184            while ((digitab[*p] & ctype_digit) != 0) p++;
5185            if (*p != terminator)
5186              {
5187              *errorcodeptr = ERR57;
5188              break;
5189              }
5190            ptr++;
5191            goto HANDLE_NUMERICAL_RECURSION;
5192            }
5193    
5194        /* \k<name> or \k'name' is a back reference by name (Perl syntax) */        /* \k<name> or \k'name' is a back reference by name (Perl syntax).
5195          We also support \k{name} (.NET syntax) */
5196    
5197        if (-c == ESC_k && (ptr[1] == '<' || ptr[1] == '\''))        if (-c == ESC_k && (ptr[1] == '<' || ptr[1] == '\'' || ptr[1] == '{'))
5198          {          {
5199          is_recurse = FALSE;          is_recurse = FALSE;
5200          terminator = (*(++ptr) == '<')? '>' : '\'';          terminator = (*(++ptr) == '<')? '>' : (*ptr == '\'')? '\'' : '}';
5201          goto NAMED_REF_OR_RECURSE;          goto NAMED_REF_OR_RECURSE;
5202          }          }
5203    
# Line 4498  for (;; ptr++) Line 5298  for (;; ptr++)
5298      *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;      *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;
5299      for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];      for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];
5300    
5301        /* Remember if \r or \n were seen */
5302    
5303        if (mcbuffer[0] == '\r' || mcbuffer[0] == '\n')
5304          cd->external_flags |= PCRE_HASCRORLF;
5305    
5306      /* Set the first and required bytes appropriately. If no previous first      /* Set the first and required bytes appropriately. If no previous first
5307      byte, set it from this character, but revert to none on a zero repeat.      byte, set it from this character, but revert to none on a zero repeat.
5308      Otherwise, leave the firstbyte value alone, and don't change it on a zero      Otherwise, leave the firstbyte value alone, and don't change it on a zero
# Line 4563  This function is used during the pre-com Line 5368  This function is used during the pre-com
5368  out the amount of memory needed, as well as during the real compile phase. The  out the amount of memory needed, as well as during the real compile phase. The
5369  value of lengthptr distinguishes the two phases.  value of lengthptr distinguishes the two phases.
5370    
5371  Argument:  Arguments:
5372    options        option bits, including any changes for this subpattern    options        option bits, including any changes for this subpattern
5373    oldims         previous settings of ims option bits    oldims         previous settings of ims option bits
5374    codeptr        -> the address of the current code pointer    codeptr        -> the address of the current code pointer
5375    ptrptr         -> the address of the current pattern pointer    ptrptr         -> the address of the current pattern pointer
5376    errorcodeptr   -> pointer to error code variable    errorcodeptr   -> pointer to error code variable
5377    lookbehind     TRUE if this is a lookbehind assertion    lookbehind     TRUE if this is a lookbehind assertion
5378      reset_bracount TRUE to reset the count for each branch
5379    skipbytes      skip this many bytes at start (for brackets and OP_COND)    skipbytes      skip this many bytes at start (for brackets and OP_COND)
5380    firstbyteptr   place to put the first required character, or a negative number    firstbyteptr   place to put the first required character, or a negative number
5381    reqbyteptr     place to put the last required character, or a negative number    reqbyteptr     place to put the last required character, or a negative number
# Line 4583  Returns:         TRUE on success Line 5389  Returns:         TRUE on success
5389    
5390  static BOOL  static BOOL
5391  compile_regex(int options, int oldims, uschar **codeptr, const uschar **ptrptr,  compile_regex(int options, int oldims, uschar **codeptr, const uschar **ptrptr,
5392    int *errorcodeptr, BOOL lookbehind, int skipbytes, int *firstbyteptr,    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
5393    int *reqbyteptr, branch_chain *bcptr, compile_data *cd, int *lengthptr)    int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr, compile_data *cd,
5394      int *lengthptr)
5395  {  {
5396  const uschar *ptr = *ptrptr;  const uschar *ptr = *ptrptr;
5397  uschar *code = *codeptr;  uschar *code = *codeptr;
# Line 4594  uschar *reverse_count = NULL; Line 5401  uschar *reverse_count = NULL;
5401  int firstbyte, reqbyte;  int firstbyte, reqbyte;
5402  int branchfirstbyte, branchreqbyte;  int branchfirstbyte, branchreqbyte;
5403  int length;  int length;
5404    int orig_bracount;
5405    int max_bracount;
5406  branch_chain bc;  branch_chain bc;
5407    
5408  bc.outer = bcptr;  bc.outer = bcptr;
# Line 4622  code += 1 + LINK_SIZE + skipbytes; Line 5431  code += 1 + LINK_SIZE + skipbytes;
5431    
5432  /* Loop for each alternative branch */  /* Loop for each alternative branch */
5433    
5434    orig_bracount = max_bracount = cd->bracount;
5435  for (;;)  for (;;)
5436    {    {
5437      /* For a (?| group, reset the capturing bracket count so that each branch
5438      uses the same numbers. */
5439    
5440      if (reset_bracount) cd->bracount = orig_bracount;
5441    
5442    /* Handle a change of ims options at the start of the branch */    /* Handle a change of ims options at the start of the branch */
5443    
5444    if ((options & PCRE_IMS) != oldims)    if ((options & PCRE_IMS) != oldims)
# Line 4653  for (;;) Line 5468  for (;;)
5468      return FALSE;      return FALSE;
5469      }      }
5470    
5471      /* Keep the highest bracket count in case (?| was used and some branch
5472      has fewer than the rest. */
5473    
5474      if (cd->bracount > max_bracount) max_bracount = cd->bracount;
5475    
5476    /* In the real compile phase, there is some post-processing to be done. */    /* In the real compile phase, there is some post-processing to be done. */
5477    
5478    if (lengthptr == NULL)    if (lengthptr == NULL)
# Line 4716  for (;;) Line 5536  for (;;)
5536        }        }
5537      }      }
5538    
5539    /* Reached end of expression, either ')' or end of pattern. Go back through    /* Reached end of expression, either ')' or end of pattern. In the real
5540    the alternative branches and reverse the chain of offsets, with the field in    compile phase, go back through the alternative branches and reverse the chain
5541    the BRA item now becoming an offset to the first alternative. If there are    of offsets, with the field in the BRA item now becoming an offset to the
5542    no alternatives, it points to the end of the group. The length in the    first alternative. If there are no alternatives, it points to the end of the
5543    terminating ket is always the length of the whole bracketed item. If any of    group. The length in the terminating ket is always the length of the whole
5544    the ims options were changed inside the group, compile a resetting op-code    bracketed item. If any of the ims options were changed inside the group,
5545    following, except at the very end of the pattern. Return leaving the pointer    compile a resetting op-code following, except at the very end of the pattern.
5546    at the terminating char. */    Return leaving the pointer at the terminating char. */
5547    
5548    if (*ptr != '|')    if (*ptr != '|')
5549      {      {
5550      int branch_length = code - last_branch;      if (lengthptr == NULL)
     do  
5551        {        {
5552        int prev_length = GET(last_branch, 1);        int branch_length = code - last_branch;
5553        PUT(last_branch, 1, branch_length);        do
5554        branch_length = prev_length;          {
5555        last_branch -= branch_length;          int prev_length = GET(last_branch, 1);
5556            PUT(last_branch, 1, branch_length);
5557            branch_length = prev_length;
5558            last_branch -= branch_length;
5559            }
5560          while (branch_length > 0);
5561        }        }
     while (branch_length > 0);  
5562    
5563      /* Fill in the ket */      /* Fill in the ket */
5564    
# Line 4752  for (;;) Line 5575  for (;;)
5575        length += 2;        length += 2;
5576        }        }
5577    
5578        /* Retain the highest bracket number, in case resetting was used. */
5579    
5580        cd->bracount = max_bracount;
5581    
5582      /* Set values to pass back */      /* Set values to pass back */
5583    
5584      *codeptr = code;      *codeptr = code;
5585      *ptrptr = ptr;      *ptrptr = ptr;
5586      *firstbyteptr = firstbyte;      *firstbyteptr = firstbyte;
5587      *reqbyteptr = reqbyte;      *reqbyteptr = reqbyte;
5588      if (lengthptr != NULL) *lengthptr += length;      if (lengthptr != NULL)
5589          {
5590          if (OFLOW_MAX - *lengthptr < length)
5591            {
5592            *errorcodeptr = ERR20;
5593            return FALSE;
5594            }
5595          *lengthptr += length;
5596          }
5597      return TRUE;      return TRUE;
5598      }      }
5599    
5600    /* Another branch follows; insert an "or" node. Its length field points back    /* Another branch follows. In the pre-compile phase, we can move the code
5601      pointer back to where it was for the start of the first branch. (That is,
5602      pretend that each branch is the only one.)
5603    
5604      In the real compile phase, insert an ALT node. Its length field points back
5605    to the previous branch while the bracket remains open. At the end the chain    to the previous branch while the bracket remains open. At the end the chain
5606    is reversed. It's done like this so that the start of the bracket has a    is reversed. It's done like this so that the start of the bracket has a
5607    zero offset until it is closed, making it possible to detect recursion. */    zero offset until it is closed, making it possible to detect recursion. */
5608    
5609    *code = OP_ALT;    if (lengthptr != NULL)
5610    PUT(code, 1, code - last_branch);      {
5611    bc.current = last_branch = code;      code = *codeptr + 1 + LINK_SIZE + skipbytes;
5612    code += 1 + LINK_SIZE;      length += 1 + LINK_SIZE;
5613        }
5614      else
5615        {
5616        *code = OP_ALT;
5617        PUT(code, 1, code - last_branch);
5618        bc.current = last_branch = code;
5619        code += 1 + LINK_SIZE;
5620        }
5621    
5622    ptr++;    ptr++;
   length += 1 + LINK_SIZE;  
5623    }    }
5624  /* Control never reaches here */  /* Control never reaches here */
5625  }  }
# Line 5039  Returns:        pointer to compiled data Line 5886  Returns:        pointer to compiled data
5886                  with errorptr and erroroffset set                  with errorptr and erroroffset set
5887  */  */
5888    
5889  PCRE_DATA_SCOPE pcre *  PCRE_EXP_DEFN pcre *
5890  pcre_compile(const char *pattern, int options, const char **errorptr,  pcre_compile(const char *pattern, int options, const char **errorptr,
5891    int *erroroffset, const unsigned char *tables)    int *erroroffset, const unsigned char *tables)
5892  {  {
# Line 5047  return pcre_compile2(pattern, options, N Line 5894  return pcre_compile2(pattern, options, N
5894  }  }
5895    
5896    
5897  PCRE_DATA_SCOPE pcre *  PCRE_EXP_DEFN pcre *
5898  pcre_compile2(const char *pattern, int options, int *errorcodeptr,  pcre_compile2(const char *pattern, int options, int *errorcodeptr,
5899    const char **errorptr, int *erroroffset, const unsigned char *tables)    const char **errorptr, int *erroroffset, const unsigned char *tables)
5900  {  {
# Line 5055  real_pcre *re; Line 5902  real_pcre *re;
5902  int length = 1;  /* For final END opcode */  int length = 1;  /* For final END opcode */
5903  int firstbyte, reqbyte, newline;  int firstbyte, reqbyte, newline;
5904  int errorcode = 0;  int errorcode = 0;
5905    int skipatstart = 0;
5906  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
5907  BOOL utf8;  BOOL utf8;
5908  #endif  #endif
# Line 5073  to fill in forward references to subpatt Line 5921  to fill in forward references to subpatt
5921    
5922  uschar cworkspace[COMPILE_WORK_SIZE];  uschar cworkspace[COMPILE_WORK_SIZE];
5923    
   
5924  /* Set this early so that early errors get offset 0. */  /* Set this early so that early errors get offset 0. */
5925    
5926  ptr = (const uschar *)pattern;  ptr = (const uschar *)pattern;
# Line 5096  if (errorcodeptr != NULL) *errorcodeptr Line 5943  if (errorcodeptr != NULL) *errorcodeptr
5943  if (erroroffset == NULL)  if (erroroffset == NULL)
5944    {    {
5945    errorcode = ERR16;    errorcode = ERR16;
5946    goto PCRE_EARLY_ERROR_RETURN;    goto PCRE_EARLY_ERROR_RETURN2;
5947    }    }
5948    
5949  *erroroffset = 0;  *erroroffset = 0;
# Line 5109  if (utf8 && (options & PCRE_NO_UTF8_CHEC Line 5956  if (utf8 && (options & PCRE_NO_UTF8_CHEC
5956       (*erroroffset = _pcre_valid_utf8((uschar *)pattern, -1)) >= 0)       (*erroroffset = _pcre_valid_utf8((uschar *)pattern, -1)) >= 0)
5957    {    {
5958    errorcode = ERR44;    errorcode = ERR44;
5959    goto PCRE_UTF8_ERROR_RETURN;    goto PCRE_EARLY_ERROR_RETURN2;
5960    }    }
5961  #else  #else
5962  if ((options & PCRE_UTF8) != 0)  if ((options & PCRE_UTF8) != 0)
# Line 5133  cd->fcc = tables + fcc_offset; Line 5980  cd->fcc = tables + fcc_offset;
5980  cd->cbits = tables + cbits_offset;  cd->cbits = tables + cbits_offset;
5981  cd->ctypes = tables + ctypes_offset;  cd->ctypes = tables + ctypes_offset;
5982    
5983    /* Check for global one-time settings at the start of the pattern, and remember
5984    the offset for later. */
5985    
5986    while (ptr[skipatstart] == '(' && ptr[skipatstart+1] == '*')
5987      {
5988      int newnl = 0;
5989      int newbsr = 0;
5990    
5991      if (strncmp((char *)(ptr+skipatstart+2), "CR)", 3) == 0)
5992        { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
5993      else if (strncmp((char *)(ptr+skipatstart+2), "LF)", 3)  == 0)
5994        { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
5995      else if (strncmp((char *)(ptr+skipatstart+2), "CRLF)", 5)  == 0)
5996        { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
5997      else if (strncmp((char *)(ptr+skipatstart+2), "ANY)", 4) == 0)
5998        { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
5999      else if (strncmp((char *)(ptr+skipatstart+2), "ANYCRLF)", 8)  == 0)
6000        { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
6001    
6002      else if (strncmp((char *)(ptr+skipatstart+2), "BSR_ANYCRLF)", 12) == 0)
6003        { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
6004      else if (strncmp((char *)(ptr+skipatstart+2), "BSR_UNICODE)", 12) == 0)
6005        { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
6006    
6007      if (newnl != 0)
6008        options = (options & ~PCRE_NEWLINE_BITS) | newnl;
6009      else if (newbsr != 0)
6010        options = (options & ~(PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) | newbsr;
6011      else break;
6012      }
6013    
6014    /* Check validity of \R options. */
6015    
6016    switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
6017      {
6018      case 0:
6019      case PCRE_BSR_ANYCRLF:
6020      case PCRE_BSR_UNICODE:
6021      break;
6022      default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
6023      }
6024    
6025  /* Handle different types of newline. The three bits give seven cases. The  /* Handle different types of newline. The three bits give seven cases. The
6026  current code allows for fixed one- or two-byte sequences, plus "any". */  current code allows for fixed one- or two-byte sequences, plus "any" and
6027    "anycrlf". */
6028    
6029  switch (options & (PCRE_NEWLINE_CRLF | PCRE_NEWLINE_ANY))  switch (options & PCRE_NEWLINE_BITS)
6030    {    {
6031    case 0: newline = NEWLINE; break;   /* Compile-time default */    case 0: newline = NEWLINE; break;   /* Build-time default */
6032    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = '\r'; break;
6033    case PCRE_NEWLINE_LF: newline = '\n'; break;    case PCRE_NEWLINE_LF: newline = '\n'; break;
6034    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
6035         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;
6036    case PCRE_NEWLINE_ANY: newline = -1; break;    case PCRE_NEWLINE_ANY: newline = -1; break;
6037      case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
6038    default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;    default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
6039    }    }
6040    
6041  if (newline < 0)  if (newline == -2)
6042      {
6043      cd->nltype = NLTYPE_ANYCRLF;
6044      }
6045    else if (newline < 0)
6046    {    {
6047    cd->nltype = NLTYPE_ANY;    cd->nltype = NLTYPE_ANY;
6048    }    }
# Line 5186  to compile parts of the pattern into; th Line 6081  to compile parts of the pattern into; th
6081  no longer needed, so hopefully this workspace will never overflow, though there  no longer needed, so hopefully this workspace will never overflow, though there
6082  is a test for its doing so. */  is a test for its doing so. */
6083    
6084  cd->bracount = 0;  cd->bracount = cd->final_bracount = 0;
6085  cd->names_found = 0;  cd->names_found = 0;
6086  cd->name_entry_size = 0;  cd->name_entry_size = 0;
6087  cd->name_table = NULL;  cd->name_table = NULL;
# Line 5196  cd->hwm = cworkspace; Line 6091  cd->hwm = cworkspace;
6091  cd->start_pattern = (const uschar *)pattern;  cd->start_pattern = (const uschar *)pattern;
6092  cd->end_pattern = (const uschar *)(pattern + strlen(pattern));  cd->end_pattern = (const uschar *)(pattern + strlen(pattern));
6093  cd->req_varyopt = 0;  cd->req_varyopt = 0;
 cd->nopartial = FALSE;  
6094  cd->external_options = options;  cd->external_options = options;
6095    cd->external_flags = 0;
6096    
6097  /* Now do the pre-compile. On error, errorcode will be set non-zero, so we  /* Now do the pre-compile. On error, errorcode will be set non-zero, so we
6098  don't need to look at the result of the function here. The initial options have  don't need to look at the result of the function here. The initial options have
# Line 5205  been put into the cd block so that they Line 6100  been put into the cd block so that they
6100  found within the regex right at the beginning. Bringing initial option settings  found within the regex right at the beginning. Bringing initial option settings
6101  outside can help speed up starting point checks. */  outside can help speed up starting point checks. */
6102    
6103    ptr += skipatstart;
6104  code = cworkspace;  code = cworkspace;
6105  *code = OP_BRA;  *code = OP_BRA;
6106  (void)compile_regex(cd->external_options, cd->external_options & PCRE_IMS,  (void)compile_regex(cd->external_options, cd->external_options & PCRE_IMS,
6107    &code, &ptr, &errorcode, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, &length);    &code, &ptr, &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd,
6108      &length);
6109  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
6110    
6111  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
# Line 5234  if (re == NULL) Line 6131  if (re == NULL)
6131    goto PCRE_EARLY_ERROR_RETURN;    goto PCRE_EARLY_ERROR_RETURN;
6132    }    }
6133    
6134  /* Put in the magic number, and save the sizes, initial options, and character  /* Put in the magic number, and save the sizes, initial options, internal
6135  table pointer. NULL is used for the default character tables. The nullpad field  flags, and character table pointer. NULL is used for the default character
6136  is at the end; it's there to help in the case when a regex compiled on a system  tables. The nullpad field is at the end; it's there to help in the case when a
6137  with 4-byte pointers is run on another with 8-byte pointers. */  regex compiled on a system with 4-byte pointers is run on another with 8-byte
6138    pointers. */
6139    
6140  re->magic_number = MAGIC_NUMBER;  re->magic_number = MAGIC_NUMBER;
6141  re->size = size;  re->size = size;
6142  re->options = cd->external_options;  re->options = cd->external_options;
6143    re->flags = cd->external_flags;
6144  re->dummy1 = 0;  re->dummy1 = 0;
6145  re->first_byte = 0;  re->first_byte = 0;
6146  re->req_byte = 0;  re->req_byte = 0;
# Line 5259  field. Reset the bracket count and the n Line 6158  field. Reset the bracket count and the n
6158  field; this time it's used for remembering forward references to subpatterns.  field; this time it's used for remembering forward references to subpatterns.
6159  */  */
6160    
6161    cd->final_bracount = cd->bracount;  /* Save for checking forward references */
6162  cd->bracount = 0;  cd->bracount = 0;
6163  cd->names_found = 0;  cd->names_found = 0;
6164  cd->name_table = (uschar *)re + re->name_table_offset;  cd->name_table = (uschar *)re + re->name_table_offset;
# Line 5266  codestart = cd->name_table + re->name_en Line 6166  codestart = cd->name_table + re->name_en
6166  cd->start_code = codestart;  cd->start_code = codestart;
6167  cd->hwm = cworkspace;  cd->hwm = cworkspace;
6168  cd->req_varyopt = 0;  cd->req_varyopt = 0;
6169  cd->nopartial = FALSE;  cd->had_accept = FALSE;
6170    
6171  /* Set up a starting, non-extracting bracket, then compile the expression. On  /* Set up a starting, non-extracting bracket, then compile the expression. On
6172  error, errorcode will be set non-zero, so we don't need to look at the result  error, errorcode will be set non-zero, so we don't need to look at the result
6173  of the function here. */  of the function here. */
6174    
6175  ptr = (const uschar *)pattern;  ptr = (const uschar *)pattern + skipatstart;
6176  code = (uschar *)codestart;  code = (uschar *)codestart;
6177  *code = OP_BRA;  *code = OP_BRA;
6178  (void)compile_regex(re->options, re->options & PCRE_IMS, &code, &ptr,  (void)compile_regex(re->options, re->options & PCRE_IMS, &code, &ptr,
6179    &errorcode, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, NULL);    &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, NULL);
6180  re->top_bracket = cd->bracount;  re->top_bracket = cd->bracount;
6181  re->top_backref = cd->top_backref;  re->top_backref = cd->top_backref;
6182    re->flags = cd->external_flags;
6183    
6184  if (cd->nopartial) re->options |= PCRE_NOPARTIAL;  if (cd->had_accept) reqbyte = -1;   /* Must disable after (*ACCEPT) */
6185    
6186  /* If not reached end of pattern on success, there's an excess bracket. */  /* If not reached end of pattern on success, there's an excess bracket. */
6187    
# Line 5308  while (errorcode == 0 && cd->hwm > cwork Line 6209  while (errorcode == 0 && cd->hwm > cwork
6209    if (groupptr == NULL) errorcode = ERR53;    if (groupptr == NULL) errorcode = ERR53;
6210      else PUT(((uschar *)codestart), offset, groupptr - codestart);      else PUT(((uschar *)codestart), offset, groupptr - codestart);
6211    }    }
6212    
6213  /* Give an error if there's back reference to a non-existent capturing  /* Give an error if there's back reference to a non-existent capturing
6214  subpattern. */  subpattern. */
6215    
# Line 5321  if (errorcode != 0) Line 6222  if (errorcode != 0)
6222    (pcre_free)(re);    (pcre_free)(re);
6223    PCRE_EARLY_ERROR_RETURN:    PCRE_EARLY_ERROR_RETURN:
6224    *erroroffset = ptr - (const uschar *)pattern;    *erroroffset = ptr - (const uschar *)pattern;
6225  #ifdef SUPPORT_UTF8    PCRE_EARLY_ERROR_RETURN2:
6226    PCRE_UTF8_ERROR_RETURN:    *errorptr = find_error_text(errorcode);
 #endif  
   *errorptr = error_texts[errorcode];  
6227    if (errorcodeptr != NULL) *errorcodeptr = errorcode;    if (errorcodeptr != NULL) *errorcodeptr = errorcode;
6228    return NULL;    return NULL;
6229    }    }
# Line 5353  if ((re->options & PCRE_ANCHORED) == 0) Line 6252  if ((re->options & PCRE_ANCHORED) == 0)
6252        int ch = firstbyte & 255;        int ch = firstbyte & 255;
6253        re->first_byte = ((firstbyte & REQ_CASELESS) != 0 &&        re->first_byte = ((firstbyte & REQ_CASELESS) != 0 &&
6254           cd->fcc[ch] == ch)? ch : firstbyte;           cd->fcc[ch] == ch)? ch : firstbyte;
6255        re->options |= PCRE_FIRSTSET;        re->flags |= PCRE_FIRSTSET;
6256        }        }
6257      else if (is_startline(codestart, 0, cd->backref_map))      else if (is_startline(codestart, 0, cd->backref_map))
6258        re->options |= PCRE_STARTLINE;        re->flags |= PCRE_STARTLINE;
6259      }      }
6260    }    }
6261    
# Line 5370  if (reqbyte >= 0 && Line 6269  if (reqbyte >= 0 &&
6269    int ch = reqbyte & 255;    int ch = reqbyte & 255;
6270    re->req_byte = ((reqbyte & REQ_CASELESS) != 0 &&    re->req_byte = ((reqbyte & REQ_CASELESS) != 0 &&
6271      cd->fcc[ch] == ch)? (reqbyte & ~REQ_CASELESS) : reqbyte;      cd->fcc[ch] == ch)? (reqbyte & ~REQ_CASELESS) : reqbyte;
6272    re->options |= PCRE_REQCHSET;    re->flags |= PCRE_REQCHSET;
6273    }    }
6274    
6275  /* Print out the compiled data if debugging is enabled. This is never the  /* Print out the compiled data if debugging is enabled. This is never the
# Line 5381  case when building a production library. Line 6280  case when building a production library.
6280  printf("Length = %d top_bracket = %d top_backref = %d\n",  printf("Length = %d top_bracket = %d top_backref = %d\n",
6281    length, re->top_bracket, re->top_backref);    length, re->top_bracket, re->top_backref);
6282    
6283  if (re->options != 0)  printf("Options=%08x\n", re->options);
   {  
   printf("%s%s%s%s%s%s%s%s%s\n",  
     ((re->options & PCRE_NOPARTIAL) != 0)? "nopartial " : "",  
     ((re->options & PCRE_ANCHORED) != 0)? "anchored " : "",  
     ((re->options & PCRE_CASELESS) != 0)? "caseless " : "",  
     ((re->options & PCRE_EXTENDED) != 0)? "extended " : "",  
     ((re->options & PCRE_MULTILINE) != 0)? "multiline " : "",  
     ((re->options & PCRE_DOTALL) != 0)? "dotall " : "",  
     ((re->options & PCRE_DOLLAR_ENDONLY) != 0)? "endonly " : "",  
     ((re->options & PCRE_EXTRA) != 0)? "extra " : "",  
     ((re->options & PCRE_UNGREEDY) != 0)? "ungreedy " : "");  
   }  
6284    
6285  if ((re->options & PCRE_FIRSTSET) != 0)  if ((re->flags & PCRE_FIRSTSET) != 0)
6286    {    {
6287    int ch = re->first_byte & 255;    int ch = re->first_byte & 255;
6288    const char *caseless = ((re->first_byte & REQ_CASELESS) == 0)?    const char *caseless = ((re->first_byte & REQ_CASELESS) == 0)?
# Line 5404  if ((re->options & PCRE_FIRSTSET) != 0) Line 6291  if ((re->options & PCRE_FIRSTSET) != 0)
6291      else printf("First char = \\x%02x%s\n", ch, caseless);      else printf("First char = \\x%02x%s\n", ch, caseless);
6292    }    }
6293    
6294  if ((re->options & PCRE_REQCHSET) != 0)  if ((re->flags & PCRE_REQCHSET) != 0)
6295    {    {
6296    int ch = re->req_byte & 255;    int ch = re->req_byte & 255;
6297    const char *caseless = ((re->req_byte & REQ_CASELESS) == 0)?    const char *caseless = ((re->req_byte & REQ_CASELESS) == 0)?
# Line 5413  if ((re->options & PCRE_REQCHSET) != 0) Line 6300  if ((re->options & PCRE_REQCHSET) != 0)
6300      else printf("Req char = \\x%02x%s\n", ch, caseless);      else printf("Req char = \\x%02x%s\n", ch, caseless);
6301    }    }
6302    
6303  pcre_printint(re, stdout);  pcre_printint(re, stdout, TRUE);
6304    
6305  /* This check is done here in the debugging case so that the code that  /* This check is done here in the debugging case so that the code that
6306  was compiled can be seen. */  was compiled can be seen. */
# Line 5421  was compiled can be seen. */ Line 6308  was compiled can be seen. */
6308  if (code - codestart > length)  if (code - codestart > length)
6309    {    {
6310    (pcre_free)(re);    (pcre_free)(re);
6311    *errorptr = error_texts[ERR23];    *errorptr = find_error_text(ERR23);
6312    *erroroffset = ptr - (uschar *)pattern;    *erroroffset = ptr - (uschar *)pattern;
6313    if (errorcodeptr != NULL) *errorcodeptr = ERR23;    if (errorcodeptr != NULL) *errorcodeptr = ERR23;
6314    return NULL;    return NULL;

Legend:
Removed from v.93  
changed lines
  Added in v.335

  ViewVC Help
Powered by ViewVC 1.1.5