/[pcre]/code/tags/pcre-8.33/pcre_compile.c
ViewVC logotype

Diff of /code/tags/pcre-8.33/pcre_compile.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

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