/[pcre]/code/trunk/pcre_compile.c
ViewVC logotype

Diff of /code/trunk/pcre_compile.c

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

revision 223 by ph10, Mon Aug 20 11:07:53 2007 UTC revision 512 by ph10, Tue Mar 30 11:11:52 2010 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-2010 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 43  supporting internal functions that are n Line 43  supporting internal functions that are n
43    
44    
45  #ifdef HAVE_CONFIG_H  #ifdef HAVE_CONFIG_H
46  #include <config.h>  #include "config.h"
47  #endif  #endif
48    
49  #define NLBLOCK cd             /* Block containing newline information */  #define NLBLOCK cd             /* Block containing newline information */
# Line 53  supporting internal functions that are n Line 53  supporting internal functions that are n
53  #include "pcre_internal.h"  #include "pcre_internal.h"
54    
55    
56  /* When DEBUG is defined, we need the pcre_printint() function, which is also  /* When PCRE_DEBUG is defined, we need the pcre_printint() function, which is
57  used by pcretest. DEBUG is not defined when building a production library. */  also used by pcretest. PCRE_DEBUG is not defined when building a production
58    library. */
59    
60  #ifdef DEBUG  #ifdef PCRE_DEBUG
61  #include "pcre_printint.src"  #include "pcre_printint.src"
62  #endif  #endif
63    
# Line 91  is 4 there is plenty of room. */ Line 92  is 4 there is plenty of room. */
92    
93  #define COMPILE_WORK_SIZE (4096)  #define COMPILE_WORK_SIZE (4096)
94    
95    /* The overrun tests check for a slightly smaller size so that they detect the
96    overrun before it actually does run off the end of the data block. */
97    
98    #define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100)
99    
100    
101  /* Table for handling escaped characters in the range '0'-'z'. Positive returns  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
102  are simple data values; negative values are for special things like \d and so  are simple data values; negative values are for special things like \d and so
103  on. Zero means further processing is needed (for things like \x), or the escape  on. Zero means further processing is needed (for things like \x), or the escape
104  is invalid. */  is invalid. */
105    
106  #ifndef EBCDIC  /* This is the "normal" table for ASCII systems */  #ifndef EBCDIC
107    
108    /* This is the "normal" table for ASCII systems or for EBCDIC systems running
109    in UTF-8 mode. */
110    
111  static const short int escapes[] = {  static const short int escapes[] = {
112       0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */       0,                       0,
113       0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */       0,                       0,
114     '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */       0,                       0,
115  -ESC_H,      0,      0, -ESC_K,      0,      0,      0,      0,   /* H - O */       0,                       0,
116  -ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0, -ESC_V, -ESC_W,   /* P - W */       0,                       0,
117  -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */       CHAR_COLON,              CHAR_SEMICOLON,
118     '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */       CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
119  -ESC_h,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */       CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
120  -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0, -ESC_v, -ESC_w,   /* p - w */       CHAR_COMMERCIAL_AT,      -ESC_A,
121       0,      0, -ESC_z                                            /* x - z */       -ESC_B,                  -ESC_C,
122         -ESC_D,                  -ESC_E,
123         0,                       -ESC_G,
124         -ESC_H,                  0,
125         0,                       -ESC_K,
126         0,                       0,
127         0,                       0,
128         -ESC_P,                  -ESC_Q,
129         -ESC_R,                  -ESC_S,
130         0,                       0,
131         -ESC_V,                  -ESC_W,
132         -ESC_X,                  0,
133         -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
134         CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
135         CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
136         CHAR_GRAVE_ACCENT,       7,
137         -ESC_b,                  0,
138         -ESC_d,                  ESC_e,
139         ESC_f,                   0,
140         -ESC_h,                  0,
141         0,                       -ESC_k,
142         0,                       0,
143         ESC_n,                   0,
144         -ESC_p,                  0,
145         ESC_r,                   -ESC_s,
146         ESC_tee,                 0,
147         -ESC_v,                  -ESC_w,
148         0,                       0,
149         -ESC_z
150  };  };
151    
152  #else           /* This is the "abnormal" table for EBCDIC systems */  #else
153    
154    /* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
155    
156  static const short int escapes[] = {  static const short int escapes[] = {
157  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
158  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
# Line 140  static const short int escapes[] = { Line 181  static const short int escapes[] = {
181  #endif  #endif
182    
183    
184  /* Table of special "verbs" like (*PRUNE) */  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is
185    searched linearly. Put all the names into a single string, in order to reduce
186    the number of relocations when a shared library is dynamically linked. The
187    string is built from string macros so that it works in UTF-8 mode on EBCDIC
188    platforms. */
189    
190  typedef struct verbitem {  typedef struct verbitem {
191    const char *name;    int   len;                 /* Length of verb name */
192    int   len;    int   op;                  /* Op when no arg, or -1 if arg mandatory */
193    int   op;    int   op_arg;              /* Op when arg present, or -1 if not allowed */
194  } verbitem;  } verbitem;
195    
196  static verbitem verbs[] = {  static const char verbnames[] =
197    { "ACCEPT", 6, OP_ACCEPT },    "\0"                       /* Empty name is a shorthand for MARK */
198    { "COMMIT", 6, OP_COMMIT },    STRING_MARK0
199    { "F",      1, OP_FAIL },    STRING_ACCEPT0
200    { "FAIL",   4, OP_FAIL },    STRING_COMMIT0
201    { "PRUNE",  5, OP_PRUNE },    STRING_F0
202    { "SKIP",   4, OP_SKIP  },    STRING_FAIL0
203    { "THEN",   4, OP_THEN  }    STRING_PRUNE0
204      STRING_SKIP0
205      STRING_THEN;
206    
207    static const verbitem verbs[] = {
208      { 0, -1,        OP_MARK },
209      { 4, -1,        OP_MARK },
210      { 6, OP_ACCEPT, -1 },
211      { 6, OP_COMMIT, -1 },
212      { 1, OP_FAIL,   -1 },
213      { 4, OP_FAIL,   -1 },
214      { 5, OP_PRUNE,  OP_PRUNE_ARG },
215      { 4, OP_SKIP,   OP_SKIP_ARG  },
216      { 4, OP_THEN,   OP_THEN_ARG  }
217  };  };
218    
219  static int verbcount = sizeof(verbs)/sizeof(verbitem);  static const int verbcount = sizeof(verbs)/sizeof(verbitem);
   
220    
 /* Tables of names of POSIX character classes and their lengths. The list is  
 terminated by a zero length entry. The first three must be alpha, lower, upper,  
 as this is assumed for handling case independence. */  
221    
222  static const char *const posix_names[] = {  /* Tables of names of POSIX character classes and their lengths. The names are
223    "alpha", "lower", "upper",  now all in a single string, to reduce the number of relocations when a shared
224    "alnum", "ascii", "blank", "cntrl", "digit", "graph",  library is dynamically loaded. The list of lengths is terminated by a zero
225    "print", "punct", "space", "word",  "xdigit" };  length entry. The first three must be alpha, lower, upper, as this is assumed
226    for handling case independence. */
227    
228    static const char posix_names[] =
229      STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
230      STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
231      STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
232      STRING_word0  STRING_xdigit;
233    
234  static const uschar posix_name_lengths[] = {  static const uschar posix_name_lengths[] = {
235    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
# Line 207  static const int posix_class_maps[] = { Line 268  static const int posix_class_maps[] = {
268  /* The texts of compile-time error messages. These are "char *" because they  /* The texts of compile-time error messages. These are "char *" because they
269  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
270  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
271  are no longer used. */  are no longer used. This used to be a table of strings, but in order to reduce
272    the number of relocations needed when a shared library is loaded dynamically,
273  static const char *error_texts[] = {  it is now one long string. We cannot use a table of offsets, because the
274    "no error",  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
275    "\\ at end of pattern",  simply count through to the one we want - this isn't a performance issue
276    "\\c at end of pattern",  because these strings are used only when there is a compilation error.
277    "unrecognized character follows \\",  
278    "numbers out of order in {} quantifier",  Each substring ends with \0 to insert a null character. This includes the final
279    substring, so that the whole string ends with \0\0, which can be detected when
280    counting through. */
281    
282    static const char error_texts[] =
283      "no error\0"
284      "\\ at end of pattern\0"
285      "\\c at end of pattern\0"
286      "unrecognized character follows \\\0"
287      "numbers out of order in {} quantifier\0"
288    /* 5 */    /* 5 */
289    "number too big in {} quantifier",    "number too big in {} quantifier\0"
290    "missing terminating ] for character class",    "missing terminating ] for character class\0"
291    "invalid escape sequence in character class",    "invalid escape sequence in character class\0"
292    "range out of order in character class",    "range out of order in character class\0"
293    "nothing to repeat",    "nothing to repeat\0"
294    /* 10 */    /* 10 */
295    "operand of unlimited repeat could match the empty string",  /** DEAD **/    "operand of unlimited repeat could match the empty string\0"  /** DEAD **/
296    "internal error: unexpected repeat",    "internal error: unexpected repeat\0"
297    "unrecognized character after (?",    "unrecognized character after (? or (?-\0"
298    "POSIX named classes are supported only within a class",    "POSIX named classes are supported only within a class\0"
299    "missing )",    "missing )\0"
300    /* 15 */    /* 15 */
301    "reference to non-existent subpattern",    "reference to non-existent subpattern\0"
302    "erroffset passed as NULL",    "erroffset passed as NULL\0"
303    "unknown option bit(s) set",    "unknown option bit(s) set\0"
304    "missing ) after comment",    "missing ) after comment\0"
305    "parentheses nested too deeply",  /** DEAD **/    "parentheses nested too deeply\0"  /** DEAD **/
306    /* 20 */    /* 20 */
307    "regular expression is too large",    "regular expression is too large\0"
308    "failed to get memory",    "failed to get memory\0"
309    "unmatched parentheses",    "unmatched parentheses\0"
310    "internal error: code overflow",    "internal error: code overflow\0"
311    "unrecognized character after (?<",    "unrecognized character after (?<\0"
312    /* 25 */    /* 25 */
313    "lookbehind assertion is not fixed length",    "lookbehind assertion is not fixed length\0"
314    "malformed number or name after (?(",    "malformed number or name after (?(\0"
315    "conditional group contains more than two branches",    "conditional group contains more than two branches\0"
316    "assertion expected after (?(",    "assertion expected after (?(\0"
317    "(?R or (?[+-]digits must be followed by )",    "(?R or (?[+-]digits must be followed by )\0"
318    /* 30 */    /* 30 */
319    "unknown POSIX class name",    "unknown POSIX class name\0"
320    "POSIX collating elements are not supported",    "POSIX collating elements are not supported\0"
321    "this version of PCRE is not compiled with PCRE_UTF8 support",    "this version of PCRE is not compiled with PCRE_UTF8 support\0"
322    "spare error",  /** DEAD **/    "spare error\0"  /** DEAD **/
323    "character value in \\x{...} sequence is too large",    "character value in \\x{...} sequence is too large\0"
324    /* 35 */    /* 35 */
325    "invalid condition (?(0)",    "invalid condition (?(0)\0"
326    "\\C not allowed in lookbehind assertion",    "\\C not allowed in lookbehind assertion\0"
327    "PCRE does not support \\L, \\l, \\N, \\U, or \\u",    "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"
328    "number after (?C is > 255",    "number after (?C is > 255\0"
329    "closing ) for (?C expected",    "closing ) for (?C expected\0"
330    /* 40 */    /* 40 */
331    "recursive call could loop indefinitely",    "recursive call could loop indefinitely\0"
332    "unrecognized character after (?P",    "unrecognized character after (?P\0"
333    "syntax error in subpattern name (missing terminator)",    "syntax error in subpattern name (missing terminator)\0"
334    "two named subpatterns have the same name",    "two named subpatterns have the same name\0"
335    "invalid UTF-8 string",    "invalid UTF-8 string\0"
336    /* 45 */    /* 45 */
337    "support for \\P, \\p, and \\X has not been compiled",    "support for \\P, \\p, and \\X has not been compiled\0"
338    "malformed \\P or \\p sequence",    "malformed \\P or \\p sequence\0"
339    "unknown property name after \\P or \\p",    "unknown property name after \\P or \\p\0"
340    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)",    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
341    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")",    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
342    /* 50 */    /* 50 */
343    "repeated subpattern is too long",    /** DEAD **/    "repeated subpattern is too long\0"    /** DEAD **/
344    "octal value is greater than \\377 (not in UTF-8 mode)",    "octal value is greater than \\377 (not in UTF-8 mode)\0"
345    "internal error: overran compiling workspace",    "internal error: overran compiling workspace\0"
346    "internal error: previously-checked referenced subpattern not found",    "internal error: previously-checked referenced subpattern not found\0"
347    "DEFINE group contains more than one branch",    "DEFINE group contains more than one branch\0"
348    /* 55 */    /* 55 */
349    "repeating a DEFINE group is not allowed",    "repeating a DEFINE group is not allowed\0"
350    "inconsistent NEWLINE options",    "inconsistent NEWLINE options\0"
351    "\\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"
352    "(?+ or (?- or (?(+ or (?(- must be followed by a non-zero number",    "a numbered reference must not be zero\0"
353    "(*VERB) with an argument is not supported",    "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
354    /* 60 */    /* 60 */
355    "(*VERB) not recognized",    "(*VERB) not recognized\0"
356    "number is too big"    "number is too big\0"
357  };    "subpattern name expected\0"
358      "digit expected after (?+\0"
359      "] is an invalid data character in JavaScript compatibility mode\0"
360      /* 65 */
361      "different names for subpatterns of the same number are not allowed\0"
362      "(*MARK) must have an argument\0"
363      ;
364    
365  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
366  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 303  For convenience, we use the same bit def Line 378  For convenience, we use the same bit def
378    
379  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
380    
381  #ifndef EBCDIC  /* This is the "normal" case, for ASCII systems */  #ifndef EBCDIC
382    
383    /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
384    UTF-8 mode. */
385    
386  static const unsigned char digitab[] =  static const unsigned char digitab[] =
387    {    {
388    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
# Line 339  static const unsigned char digitab[] = Line 418  static const unsigned char digitab[] =
418    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
419    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
420    
421  #else           /* This is the "abnormal" case, for EBCDIC systems */  #else
422    
423    /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
424    
425  static const unsigned char digitab[] =  static const unsigned char digitab[] =
426    {    {
427    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
# Line 420  static BOOL Line 502  static BOOL
502    
503    
504  /*************************************************  /*************************************************
505    *            Find an error text                  *
506    *************************************************/
507    
508    /* The error texts are now all in one long string, to save on relocations. As
509    some of the text is of unknown length, we can't use a table of offsets.
510    Instead, just count through the strings. This is not a performance issue
511    because it happens only when there has been a compilation error.
512    
513    Argument:   the error number
514    Returns:    pointer to the error string
515    */
516    
517    static const char *
518    find_error_text(int n)
519    {
520    const char *s = error_texts;
521    for (; n > 0; n--)
522      {
523      while (*s++ != 0) {};
524      if (*s == 0) return "Error text not found (please report)";
525      }
526    return s;
527    }
528    
529    
530    /*************************************************
531  *            Handle escapes                      *  *            Handle escapes                      *
532  *************************************************/  *************************************************/
533    
# Line 458  ptr--; /* Set Line 566  ptr--; /* Set
566    
567  if (c == 0) *errorcodeptr = ERR1;  if (c == 0) *errorcodeptr = ERR1;
568    
569  /* 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
570  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.
571  Otherwise further processing may be required. */  Otherwise further processing may be required. */
572    
573  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
574  else if (c < '0' || c > 'z') {}                           /* Not alphameric */  else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */
575  else if ((i = escapes[c - '0']) != 0) c = i;  else if ((i = escapes[c - CHAR_0]) != 0) c = i;
576    
577  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
578  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphameric */  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
579  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if ((i = escapes[c - 0x48]) != 0)  c = i;
580  #endif  #endif
581    
# Line 483  else Line 591  else
591      /* 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
592      error. */      error. */
593    
594      case 'l':      case CHAR_l:
595      case 'L':      case CHAR_L:
596      case 'N':      case CHAR_N:
597      case 'u':      case CHAR_u:
598      case 'U':      case CHAR_U:
599      *errorcodeptr = ERR37;      *errorcodeptr = ERR37;
600      break;      break;
601    
602      /* \g must be followed by a number, either plain or braced. If positive, it      /* \g must be followed by one of a number of specific things:
603      is an absolute backreference. If negative, it is a relative backreference.  
604      This is a Perl 5.10 feature. Perl 5.10 also supports \g{name} as a      (1) A number, either plain or braced. If positive, it is an absolute
605      reference to a named group. This is part of Perl's movement towards a      backreference. If negative, it is a relative backreference. This is a Perl
606      unified syntax for back references. As this is synonymous with \k{name}, we      5.10 feature.
607      fudge it up by pretending it really was \k. */  
608        (2) Perl 5.10 also supports \g{name} as a reference to a named group. This
609        is part of Perl's movement towards a unified syntax for back references. As
610        this is synonymous with \k{name}, we fudge it up by pretending it really
611        was \k.
612    
613        (3) For Oniguruma compatibility we also support \g followed by a name or a
614        number either in angle brackets or in single quotes. However, these are
615        (possibly recursive) subroutine calls, _not_ backreferences. Just return
616        the -ESC_g code (cf \k). */
617    
618      case 'g':      case CHAR_g:
619      if (ptr[1] == '{')      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
620          {
621          c = -ESC_g;
622          break;
623          }
624    
625        /* Handle the Perl-compatible cases */
626    
627        if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
628        {        {
629        const uschar *p;        const uschar *p;
630        for (p = ptr+2; *p != 0 && *p != '}'; p++)        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
631          if (*p != '-' && (digitab[*p] & ctype_digit) == 0) break;          if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;
632        if (*p != 0 && *p != '}')        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
633          {          {
634          c = -ESC_k;          c = -ESC_k;
635          break;          break;
# Line 514  else Line 639  else
639        }        }
640      else braced = FALSE;      else braced = FALSE;
641    
642      if (ptr[1] == '-')      if (ptr[1] == CHAR_MINUS)
643        {        {
644        negated = TRUE;        negated = TRUE;
645        ptr++;        ptr++;
# Line 523  else Line 648  else
648    
649      c = 0;      c = 0;
650      while ((digitab[ptr[1]] & ctype_digit) != 0)      while ((digitab[ptr[1]] & ctype_digit) != 0)
651        c = c * 10 + *(++ptr) - '0';        c = c * 10 + *(++ptr) - CHAR_0;
652    
653      if (c < 0)      if (c < 0)   /* Integer overflow */
654        {        {
655        *errorcodeptr = ERR61;        *errorcodeptr = ERR61;
656        break;        break;
657        }        }
658    
659      if (c == 0 || (braced && *(++ptr) != '}'))      if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
660        {        {
661        *errorcodeptr = ERR57;        *errorcodeptr = ERR57;
662        break;        break;
663        }        }
664    
665        if (c == 0)
666          {
667          *errorcodeptr = ERR58;
668          break;
669          }
670    
671      if (negated)      if (negated)
672        {        {
673        if (c > bracount)        if (c > bracount)
# Line 562  else Line 693  else
693      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
694      character class, \ followed by a digit is always an octal number. */      character class, \ followed by a digit is always an octal number. */
695    
696      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:
697      case '6': case '7': case '8': case '9':      case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
698    
699      if (!isclass)      if (!isclass)
700        {        {
701        oldptr = ptr;        oldptr = ptr;
702        c -= '0';        c -= CHAR_0;
703        while ((digitab[ptr[1]] & ctype_digit) != 0)        while ((digitab[ptr[1]] & ctype_digit) != 0)
704          c = c * 10 + *(++ptr) - '0';          c = c * 10 + *(++ptr) - CHAR_0;
705        if (c < 0)        if (c < 0)    /* Integer overflow */
706          {          {
707          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
708          break;          break;
# Line 588  else Line 719  else
719      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.
720      Thus we have to pull back the pointer by one. */      Thus we have to pull back the pointer by one. */
721    
722      if ((c = *ptr) >= '8')      if ((c = *ptr) >= CHAR_8)
723        {        {
724        ptr--;        ptr--;
725        c = 0;        c = 0;
# Line 601  else Line 732  else
732      to do). Nowadays we allow for larger numbers in UTF-8 mode, but no more      to do). Nowadays we allow for larger numbers in UTF-8 mode, but no more
733      than 3 octal digits. */      than 3 octal digits. */
734    
735      case '0':      case CHAR_0:
736      c -= '0';      c -= CHAR_0;
737      while(i++ < 2 && ptr[1] >= '0' && ptr[1] <= '7')      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
738          c = c * 8 + *(++ptr) - '0';          c = c * 8 + *(++ptr) - CHAR_0;
739      if (!utf8 && c > 255) *errorcodeptr = ERR51;      if (!utf8 && c > 255) *errorcodeptr = ERR51;
740      break;      break;
741    
# Line 612  else Line 743  else
743      than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is      than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is
744      treated as a data character. */      treated as a data character. */
745    
746      case 'x':      case CHAR_x:
747      if (ptr[1] == '{')      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
748        {        {
749        const uschar *pt = ptr + 2;        const uschar *pt = ptr + 2;
750        int count = 0;        int count = 0;
# Line 622  else Line 753  else
753        while ((digitab[*pt] & ctype_xdigit) != 0)        while ((digitab[*pt] & ctype_xdigit) != 0)
754          {          {
755          register int cc = *pt++;          register int cc = *pt++;
756          if (c == 0 && cc == '0') continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
757          count++;          count++;
758    
759  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
760          if (cc >= 'a') cc -= 32;               /* Convert to upper case */          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
761          c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
762  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
763          if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
764          c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
765  #endif  #endif
766          }          }
767    
768        if (*pt == '}')        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
769          {          {
770          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;
771          ptr = pt;          ptr = pt;
# Line 650  else Line 781  else
781      c = 0;      c = 0;
782      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)
783        {        {
784        int cc;                               /* Some compilers don't like ++ */        int cc;                                  /* Some compilers don't like */
785        cc = *(++ptr);                        /* in initializers */        cc = *(++ptr);                           /* ++ in initializers */
786  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
787        if (cc >= 'a') cc -= 32;              /* Convert to upper case */        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
788        c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
789  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
790        if (cc <= 'z') cc += 64;              /* Convert to upper case */        if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
791        c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
792  #endif  #endif
793        }        }
794      break;      break;
# Line 666  else Line 797  else
797      This coding is ASCII-specific, but then the whole concept of \cx is      This coding is ASCII-specific, but then the whole concept of \cx is
798      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
799    
800      case 'c':      case CHAR_c:
801      c = *(++ptr);      c = *(++ptr);
802      if (c == 0)      if (c == 0)
803        {        {
# Line 674  else Line 805  else
805        break;        break;
806        }        }
807    
808  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
809      if (c >= 'a' && c <= 'z') c -= 32;      if (c >= CHAR_a && c <= CHAR_z) c -= 32;
810      c ^= 0x40;      c ^= 0x40;
811  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
812      if (c >= 'a' && c <= 'z') c += 64;      if (c >= CHAR_a && c <= CHAR_z) c += 64;
813      c ^= 0xC0;      c ^= 0xC0;
814  #endif  #endif
815      break;      break;
816    
817      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
818      other alphameric following \ is an error if PCRE_EXTRA was set; otherwise,      other alphanumeric following \ is an error if PCRE_EXTRA was set;
819      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
820      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
821      in future, so I haven't "optimized" it. */      be again in future, so I haven't "optimized" it. */
822    
823      default:      default:
824      if ((options & PCRE_EXTRA) != 0) switch(c)      if ((options & PCRE_EXTRA) != 0) switch(c)
# Line 740  if (c == 0) goto ERROR_RETURN; Line 871  if (c == 0) goto ERROR_RETURN;
871  /* \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
872  negation. */  negation. */
873    
874  if (c == '{')  if (c == CHAR_LEFT_CURLY_BRACKET)
875    {    {
876    if (ptr[1] == '^')    if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
877      {      {
878      *negptr = TRUE;      *negptr = TRUE;
879      ptr++;      ptr++;
# Line 751  if (c == '{') Line 882  if (c == '{')
882      {      {
883      c = *(++ptr);      c = *(++ptr);
884      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
885      if (c == '}') break;      if (c == CHAR_RIGHT_CURLY_BRACKET) break;
886      name[i] = c;      name[i] = c;
887      }      }
888    if (c !='}') goto ERROR_RETURN;    if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
889    name[i] = 0;    name[i] = 0;
890    }    }
891    
# Line 776  top = _pcre_utt_size; Line 907  top = _pcre_utt_size;
907  while (bot < top)  while (bot < top)
908    {    {
909    i = (bot + top) >> 1;    i = (bot + top) >> 1;
910    c = strcmp(name, _pcre_utt[i].name);    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);
911    if (c == 0)    if (c == 0)
912      {      {
913      *dptr = _pcre_utt[i].value;      *dptr = _pcre_utt[i].value;
# Line 819  is_counted_repeat(const uschar *p) Line 950  is_counted_repeat(const uschar *p)
950  {  {
951  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
952  while ((digitab[*p] & ctype_digit) != 0) p++;  while ((digitab[*p] & ctype_digit) != 0) p++;
953  if (*p == '}') return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
954    
955  if (*p++ != ',') return FALSE;  if (*p++ != CHAR_COMMA) return FALSE;
956  if (*p == '}') return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
957    
958  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
959  while ((digitab[*p] & ctype_digit) != 0) p++;  while ((digitab[*p] & ctype_digit) != 0) p++;
960    
961  return (*p == '}');  return (*p == CHAR_RIGHT_CURLY_BRACKET);
962  }  }
963    
964    
# Line 860  int max = -1; Line 991  int max = -1;
991  /* 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
992  an integer overflow. */  an integer overflow. */
993    
994  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;
995  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
996    {    {
997    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 870  if (min < 0 || min > 65535) Line 1001  if (min < 0 || min > 65535)
1001  /* 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.
1002  Also, max must not be less than min. */  Also, max must not be less than min. */
1003    
1004  if (*p == '}') max = min; else  if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
1005    {    {
1006    if (*(++p) != '}')    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
1007      {      {
1008      max = 0;      max = 0;
1009      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;
1010      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
1011        {        {
1012        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 900  return p; Line 1031  return p;
1031    
1032    
1033  /*************************************************  /*************************************************
1034  *       Find forward referenced subpattern       *  *  Subroutine for finding forward reference      *
1035  *************************************************/  *************************************************/
1036    
1037  /* This function scans along a pattern's text looking for capturing  /* This recursive function is called only from find_parens() below. The
1038    top-level call starts at the beginning of the pattern. All other calls must
1039    start at a parenthesis. It scans along a pattern's text looking for capturing
1040  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
1041  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
1042  returns when it reaches a given numbered subpattern. This is used for forward  returns when it reaches a given numbered subpattern. We know that if (?P< is
1043  references to subpatterns. We know that if (?P< is encountered, the name will  encountered, the name will be terminated by '>' because that is checked in the
1044  be terminated by '>' because that is checked in the first pass.  first pass. Recursion is used to keep track of subpatterns that reset the
1045    capturing group numbers - the (?| feature.
1046    
1047  Arguments:  Arguments:
1048    ptr          current position in the pattern    ptrptr       address of the current character pointer (updated)
1049    count        current count of capturing parens so far encountered    cd           compile background data
1050    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1051    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1052    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1053      count        pointer to the current capturing subpattern number (updated)
1054    
1055  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1056  */  */
1057    
1058  static int  static int
1059  find_parens(const uschar *ptr, int count, const uschar *name, int lorn,  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,
1060    BOOL xmode)    BOOL xmode, int *count)
1061  {  {
1062  const uschar *thisname;  uschar *ptr = *ptrptr;
1063    int start_count = *count;
1064    int hwm_count = start_count;
1065    BOOL dup_parens = FALSE;
1066    
1067  for (; *ptr != 0; ptr++)  /* If the first character is a parenthesis, check on the type of group we are
1068    dealing with. The very first call may not start with a parenthesis. */
1069    
1070    if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1071    {    {
1072    int term;    if (ptr[1] == CHAR_QUESTION_MARK &&
1073          ptr[2] == CHAR_VERTICAL_LINE)
1074        {
1075        ptr += 3;
1076        dup_parens = TRUE;
1077        }
1078    
1079      /* Handle a normal, unnamed capturing parenthesis */
1080    
1081      else if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)
1082        {
1083        *count += 1;
1084        if (name == NULL && *count == lorn) return *count;
1085        ptr++;
1086        }
1087    
1088      /* Handle a condition. If it is an assertion, just carry on so that it
1089      is processed as normal. If not, skip to the closing parenthesis of the
1090      condition (there can't be any nested parens. */
1091    
1092      else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
1093        {
1094        ptr += 2;
1095        if (ptr[1] != CHAR_QUESTION_MARK)
1096          {
1097          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
1098          if (*ptr != 0) ptr++;
1099          }
1100        }
1101    
1102      /* We have either (? or (* and not a condition */
1103    
1104      else
1105        {
1106        ptr += 2;
1107        if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */
1108    
1109        /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */
1110    
1111        if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&
1112            ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1113          {
1114          int term;
1115          const uschar *thisname;
1116          *count += 1;
1117          if (name == NULL && *count == lorn) return *count;
1118          term = *ptr++;
1119          if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;
1120          thisname = ptr;
1121          while (*ptr != term) ptr++;
1122          if (name != NULL && lorn == ptr - thisname &&
1123              strncmp((const char *)name, (const char *)thisname, lorn) == 0)
1124            return *count;
1125          term++;
1126          }
1127        }
1128      }
1129    
1130    /* Past any initial parenthesis handling, scan for parentheses or vertical
1131    bars. */
1132    
1133    for (; *ptr != 0; ptr++)
1134      {
1135    /* Skip over backslashed characters and also entire \Q...\E */    /* Skip over backslashed characters and also entire \Q...\E */
1136    
1137    if (*ptr == '\\')    if (*ptr == CHAR_BACKSLASH)
1138      {      {
1139      if (*(++ptr) == 0) return -1;      if (*(++ptr) == 0) goto FAIL_EXIT;
1140      if (*ptr == 'Q') for (;;)      if (*ptr == CHAR_Q) for (;;)
1141        {        {
1142        while (*(++ptr) != 0 && *ptr != '\\');        while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1143        if (*ptr == 0) return -1;        if (*ptr == 0) goto FAIL_EXIT;
1144        if (*(++ptr) == 'E') break;        if (*(++ptr) == CHAR_E) break;
1145        }        }
1146      continue;      continue;
1147      }      }
1148    
1149    /* Skip over character classes */    /* Skip over character classes; this logic must be similar to the way they
1150      are handled for real. If the first character is '^', skip it. Also, if the
1151      first few characters (either before or after ^) are \Q\E or \E we skip them
1152      too. This makes for compatibility with Perl. Note the use of STR macros to
1153      encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */
1154    
1155    if (*ptr == '[')    if (*ptr == CHAR_LEFT_SQUARE_BRACKET)
1156      {      {
1157      while (*(++ptr) != ']')      BOOL negate_class = FALSE;
1158        for (;;)
1159          {
1160          if (ptr[1] == CHAR_BACKSLASH)
1161            {
1162            if (ptr[2] == CHAR_E)
1163              ptr+= 2;
1164            else if (strncmp((const char *)ptr+2,
1165                     STR_Q STR_BACKSLASH STR_E, 3) == 0)
1166              ptr += 4;
1167            else
1168              break;
1169            }
1170          else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
1171            {
1172            negate_class = TRUE;
1173            ptr++;
1174            }
1175          else break;
1176          }
1177    
1178        /* If the next character is ']', it is a data character that must be
1179        skipped, except in JavaScript compatibility mode. */
1180    
1181        if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&
1182            (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
1183          ptr++;
1184    
1185        while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)
1186        {        {
1187        if (*ptr == 0) return -1;        if (*ptr == 0) return -1;
1188        if (*ptr == '\\')        if (*ptr == CHAR_BACKSLASH)
1189          {          {
1190          if (*(++ptr) == 0) return -1;          if (*(++ptr) == 0) goto FAIL_EXIT;
1191          if (*ptr == 'Q') for (;;)          if (*ptr == CHAR_Q) for (;;)
1192            {            {
1193            while (*(++ptr) != 0 && *ptr != '\\');            while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1194            if (*ptr == 0) return -1;            if (*ptr == 0) goto FAIL_EXIT;
1195            if (*(++ptr) == 'E') break;            if (*(++ptr) == CHAR_E) break;
1196            }            }
1197          continue;          continue;
1198          }          }
# Line 968  for (; *ptr != 0; ptr++) Line 1202  for (; *ptr != 0; ptr++)
1202    
1203    /* Skip comments in /x mode */    /* Skip comments in /x mode */
1204    
1205    if (xmode && *ptr == '#')    if (xmode && *ptr == CHAR_NUMBER_SIGN)
1206      {      {
1207      while (*(++ptr) != 0 && *ptr != '\n');      while (*(++ptr) != 0 && *ptr != CHAR_NL) {};
1208      if (*ptr == 0) return -1;      if (*ptr == 0) goto FAIL_EXIT;
1209      continue;      continue;
1210      }      }
1211    
1212    /* An opening parens must now be a real metacharacter */    /* Check for the special metacharacters */
1213    
1214    if (*ptr != '(') continue;    if (*ptr == CHAR_LEFT_PARENTHESIS)
   if (ptr[1] != '?' && ptr[1] != '*')  
1215      {      {
1216      count++;      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, count);
1217      if (name == NULL && count == lorn) return count;      if (rc > 0) return rc;
1218      continue;      if (*ptr == 0) goto FAIL_EXIT;
1219      }      }
1220    
1221    ptr += 2;    else if (*ptr == CHAR_RIGHT_PARENTHESIS)
1222    if (*ptr == 'P') ptr++;                      /* Allow optional P */      {
1223        if (dup_parens && *count < hwm_count) *count = hwm_count;
1224        *ptrptr = ptr;
1225        return -1;
1226        }
1227    
1228    /* We have to disambiguate (?<! and (?<= from (?<name> */    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
1229        {
1230        if (*count > hwm_count) hwm_count = *count;
1231        *count = start_count;
1232        }
1233      }
1234    
1235    if ((*ptr != '<' || ptr[1] == '!' || ptr[1] == '=') &&  FAIL_EXIT:
1236         *ptr != '\'')  *ptrptr = ptr;
1237      continue;  return -1;
1238    }
1239    
1240    
1241    
1242    
1243    /*************************************************
1244    *       Find forward referenced subpattern       *
1245    *************************************************/
1246    
1247    count++;  /* This function scans along a pattern's text looking for capturing
1248    subpatterns, and counting them. If it finds a named pattern that matches the
1249    name it is given, it returns its number. Alternatively, if the name is NULL, it
1250    returns when it reaches a given numbered subpattern. This is used for forward
1251    references to subpatterns. We used to be able to start this scan from the
1252    current compiling point, using the current count value from cd->bracount, and
1253    do it all in a single loop, but the addition of the possibility of duplicate
1254    subpattern numbers means that we have to scan from the very start, in order to
1255    take account of such duplicates, and to use a recursive function to keep track
1256    of the different types of group.
1257    
1258    if (name == NULL && count == lorn) return count;  Arguments:
1259    term = *ptr++;    cd           compile background data
1260    if (term == '<') term = '>';    name         name to seek, or NULL if seeking a numbered subpattern
1261    thisname = ptr;    lorn         name length, or subpattern number if name is NULL
1262    while (*ptr != term) ptr++;    xmode        TRUE if we are in /x mode
1263    if (name != NULL && lorn == ptr - thisname &&  
1264        strncmp((const char *)name, (const char *)thisname, lorn) == 0)  Returns:       the number of the found subpattern, or -1 if not found
1265      return count;  */
1266    
1267    static int
1268    find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode)
1269    {
1270    uschar *ptr = (uschar *)cd->start_pattern;
1271    int count = 0;
1272    int rc;
1273    
1274    /* If the pattern does not start with an opening parenthesis, the first call
1275    to find_parens_sub() will scan right to the end (if necessary). However, if it
1276    does start with a parenthesis, find_parens_sub() will return when it hits the
1277    matching closing parens. That is why we have to have a loop. */
1278    
1279    for (;;)
1280      {
1281      rc = find_parens_sub(&ptr, cd, name, lorn, xmode, &count);
1282      if (rc > 0 || *ptr++ == 0) break;
1283    }    }
1284    
1285  return -1;  return rc;
1286  }  }
1287    
1288    
1289    
1290    
1291  /*************************************************  /*************************************************
1292  *      Find first significant op code            *  *      Find first significant op code            *
1293  *************************************************/  *************************************************/
# Line 1060  for (;;) Line 1337  for (;;)
1337    
1338      case OP_CALLOUT:      case OP_CALLOUT:
1339      case OP_CREF:      case OP_CREF:
1340        case OP_NCREF:
1341      case OP_RREF:      case OP_RREF:
1342        case OP_NRREF:
1343      case OP_DEF:      case OP_DEF:
1344      code += _pcre_OP_lengths[*code];      code += _pcre_OP_lengths[*code];
1345      break;      break;
# Line 1076  for (;;) Line 1355  for (;;)
1355    
1356    
1357  /*************************************************  /*************************************************
1358  *        Find the fixed length of a pattern      *  *        Find the fixed length of a branch       *
1359  *************************************************/  *************************************************/
1360    
1361  /* 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,
1362  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.
1363  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
1364    temporarily terminated with OP_END when this function is called.
1365    
1366    This function is called when a backward assertion is encountered, so that if it
1367    fails, the error message can point to the correct place in the pattern.
1368    However, we cannot do this when the assertion contains subroutine calls,
1369    because they can be forward references. We solve this by remembering this case
1370    and doing the check at the end; a flag specifies which mode we are running in.
1371    
1372  Arguments:  Arguments:
1373    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1374    options  the compiling options    options  the compiling options
1375      atend    TRUE if called when the pattern is complete
1376      cd       the "compile data" structure
1377    
1378  Returns:   the fixed length, or -1 if there is no fixed length,  Returns:   the fixed length,
1379                 or -1 if there is no fixed length,
1380               or -2 if \C was encountered               or -2 if \C was encountered
1381                 or -3 if an OP_RECURSE item was encountered and atend is FALSE
1382  */  */
1383    
1384  static int  static int
1385  find_fixedlength(uschar *code, int options)  find_fixedlength(uschar *code, int options, BOOL atend, compile_data *cd)
1386  {  {
1387  int length = -1;  int length = -1;
1388    
# Line 1105  branch, check the length against that of Line 1395  branch, check the length against that of
1395  for (;;)  for (;;)
1396    {    {
1397    int d;    int d;
1398      uschar *ce, *cs;
1399    register int op = *cc;    register int op = *cc;
1400    switch (op)    switch (op)
1401      {      {
# Line 1112  for (;;) Line 1403  for (;;)
1403      case OP_BRA:      case OP_BRA:
1404      case OP_ONCE:      case OP_ONCE:
1405      case OP_COND:      case OP_COND:
1406      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options, atend, cd);
1407      if (d < 0) return d;      if (d < 0) return d;
1408      branchlength += d;      branchlength += d;
1409      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
# Line 1135  for (;;) Line 1426  for (;;)
1426      branchlength = 0;      branchlength = 0;
1427      break;      break;
1428    
1429        /* A true recursion implies not fixed length, but a subroutine call may
1430        be OK. If the subroutine is a forward reference, we can't deal with
1431        it until the end of the pattern, so return -3. */
1432    
1433        case OP_RECURSE:
1434        if (!atend) return -3;
1435        cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1436        do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */
1437        if (cc > cs && cc < ce) return -1;                /* Recursion */
1438        d = find_fixedlength(cs + 2, options, atend, cd);
1439        if (d < 0) return d;
1440        branchlength += d;
1441        cc += 1 + LINK_SIZE;
1442        break;
1443    
1444      /* Skip over assertive subpatterns */      /* Skip over assertive subpatterns */
1445    
1446      case OP_ASSERT:      case OP_ASSERT:
# Line 1148  for (;;) Line 1454  for (;;)
1454    
1455      case OP_REVERSE:      case OP_REVERSE:
1456      case OP_CREF:      case OP_CREF:
1457        case OP_NCREF:
1458      case OP_RREF:      case OP_RREF:
1459        case OP_NRREF:
1460      case OP_DEF:      case OP_DEF:
1461      case OP_OPT:      case OP_OPT:
1462      case OP_CALLOUT:      case OP_CALLOUT:
1463      case OP_SOD:      case OP_SOD:
1464      case OP_SOM:      case OP_SOM:
1465        case OP_SET_SOM:
1466      case OP_EOD:      case OP_EOD:
1467      case OP_EODN:      case OP_EODN:
1468      case OP_CIRC:      case OP_CIRC:
# Line 1171  for (;;) Line 1480  for (;;)
1480      branchlength++;      branchlength++;
1481      cc += 2;      cc += 2;
1482  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1483      if ((options & PCRE_UTF8) != 0)      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)
1484        {        cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       while ((*cc & 0xc0) == 0x80) cc++;  
       }  
1485  #endif  #endif
1486      break;      break;
1487    
# Line 1185  for (;;) Line 1492  for (;;)
1492      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1493      cc += 4;      cc += 4;
1494  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1495      if ((options & PCRE_UTF8) != 0)      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)
1496        {        cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       while((*cc & 0x80) == 0x80) cc++;  
       }  
1497  #endif  #endif
1498      break;      break;
1499    
# Line 1212  for (;;) Line 1517  for (;;)
1517      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
1518      case OP_WORDCHAR:      case OP_WORDCHAR:
1519      case OP_ANY:      case OP_ANY:
1520        case OP_ALLANY:
1521      branchlength++;      branchlength++;
1522      cc++;      cc++;
1523      break;      break;
# Line 1266  for (;;) Line 1572  for (;;)
1572    
1573    
1574  /*************************************************  /*************************************************
1575  *    Scan compiled regex for numbered bracket    *  *    Scan compiled regex for specific bracket    *
1576  *************************************************/  *************************************************/
1577    
1578  /* This little function scans through a compiled pattern until it finds a  /* This little function scans through a compiled pattern until it finds a
1579  capturing bracket with the given number.  capturing bracket with the given number, or, if the number is negative, an
1580    instance of OP_REVERSE for a lookbehind. The function is global in the C sense
1581    so that it can be called from pcre_study() when finding the minimum matching
1582    length.
1583    
1584  Arguments:  Arguments:
1585    code        points to start of expression    code        points to start of expression
1586    utf8        TRUE in UTF-8 mode    utf8        TRUE in UTF-8 mode
1587    number      the required bracket number    number      the required bracket number or negative to find a lookbehind
1588    
1589  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
1590  */  */
1591    
1592  static const uschar *  const uschar *
1593  find_bracket(const uschar *code, BOOL utf8, int number)  _pcre_find_bracket(const uschar *code, BOOL utf8, int number)
1594  {  {
1595  for (;;)  for (;;)
1596    {    {
# Line 1294  for (;;) Line 1603  for (;;)
1603    
1604    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
1605    
1606      /* Handle recursion */
1607    
1608      else if (c == OP_REVERSE)
1609        {
1610        if (number < 0) return (uschar *)code;
1611        code += _pcre_OP_lengths[c];
1612        }
1613    
1614    /* Handle capturing bracket */    /* Handle capturing bracket */
1615    
1616    else if (c == OP_CBRA)    else if (c == OP_CBRA)
# Line 1305  for (;;) Line 1622  for (;;)
1622    
1623    /* Otherwise, we can get the item's length from the table, except that for    /* Otherwise, we can get the item's length from the table, except that for
1624    repeated character types, we have to test for \p and \P, which have an extra    repeated character types, we have to test for \p and \P, which have an extra
1625    two bytes of parameters. */    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
1626      must add in its length. */
1627    
1628    else    else
1629      {      {
# Line 1329  for (;;) Line 1647  for (;;)
1647        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
1648        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1649        break;        break;
1650    
1651          case OP_MARK:
1652          case OP_PRUNE_ARG:
1653          case OP_SKIP_ARG:
1654          case OP_THEN_ARG:
1655          code += code[1];
1656          break;
1657        }        }
1658    
1659      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
# Line 1360  for (;;) Line 1685  for (;;)
1685        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1686        break;        break;
1687        }        }
1688    #else
1689        (void)(utf8);  /* Keep compiler happy by referencing function argument */
1690  #endif  #endif
1691      }      }
1692    }    }
# Line 1398  for (;;) Line 1725  for (;;)
1725    
1726    /* Otherwise, we can get the item's length from the table, except that for    /* Otherwise, we can get the item's length from the table, except that for
1727    repeated character types, we have to test for \p and \P, which have an extra    repeated character types, we have to test for \p and \P, which have an extra
1728    two bytes of parameters. */    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
1729      must add in its length. */
1730    
1731    else    else
1732      {      {
# Line 1422  for (;;) Line 1750  for (;;)
1750        case OP_TYPEEXACT:        case OP_TYPEEXACT:
1751        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1752        break;        break;
1753    
1754          case OP_MARK:
1755          case OP_PRUNE_ARG:
1756          case OP_SKIP_ARG:
1757          case OP_THEN_ARG:
1758          code += code[1];
1759          break;
1760        }        }
1761    
1762      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
# Line 1453  for (;;) Line 1788  for (;;)
1788        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1789        break;        break;
1790        }        }
1791    #else
1792        (void)(utf8);  /* Keep compiler happy by referencing function argument */
1793  #endif  #endif
1794      }      }
1795    }    }
# Line 1468  for (;;) Line 1805  for (;;)
1805  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()
1806  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
1807  group that can match nothing. Note that first_significant_code() skips over  group that can match nothing. Note that first_significant_code() skips over
1808  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
1809  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
1810    bracket whose current branch will already have been scanned.
1811    
1812  Arguments:  Arguments:
1813    code        points to start of search    code        points to start of search
1814    endcode     points to where to stop    endcode     points to where to stop
1815    utf8        TRUE if in UTF8 mode    utf8        TRUE if in UTF8 mode
1816      cd          contains pointers to tables etc.
1817    
1818  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
1819  */  */
1820    
1821  static BOOL  static BOOL
1822  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8)  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8,
1823      compile_data *cd)
1824  {  {
1825  register int c;  register int c;
1826  for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);  for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);
# Line 1491  for (code = first_significant_code(code Line 1831  for (code = first_significant_code(code
1831    
1832    c = *code;    c = *code;
1833    
1834      /* Skip over forward assertions; the other assertions are skipped by
1835      first_significant_code() with a TRUE final argument. */
1836    
1837      if (c == OP_ASSERT)
1838        {
1839        do code += GET(code, 1); while (*code == OP_ALT);
1840        c = *code;
1841        continue;
1842        }
1843    
1844    /* Groups with zero repeats can of course be empty; skip them. */    /* Groups with zero repeats can of course be empty; skip them. */
1845    
1846    if (c == OP_BRAZERO || c == OP_BRAMINZERO)    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)
1847      {      {
1848      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1849      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
# Line 1501  for (code = first_significant_code(code Line 1851  for (code = first_significant_code(code
1851      continue;      continue;
1852      }      }
1853    
1854      /* For a recursion/subroutine call, if its end has been reached, which
1855      implies a subroutine call, we can scan it. */
1856    
1857      if (c == OP_RECURSE)
1858        {
1859        BOOL empty_branch = FALSE;
1860        const uschar *scode = cd->start_code + GET(code, 1);
1861        if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
1862        do
1863          {
1864          if (could_be_empty_branch(scode, endcode, utf8, cd))
1865            {
1866            empty_branch = TRUE;
1867            break;
1868            }
1869          scode += GET(scode, 1);
1870          }
1871        while (*scode == OP_ALT);
1872        if (!empty_branch) return FALSE;  /* All branches are non-empty */
1873        continue;
1874        }
1875    
1876    /* For other groups, scan the branches. */    /* For other groups, scan the branches. */
1877    
1878    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)
# Line 1508  for (code = first_significant_code(code Line 1880  for (code = first_significant_code(code
1880      BOOL empty_branch;      BOOL empty_branch;
1881      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
1882    
1883      /* Scan a closed bracket */      /* If a conditional group has only one branch, there is a second, implied,
1884        empty branch, so just skip over the conditional, because it could be empty.
1885        Otherwise, scan the individual branches of the group. */
1886    
1887      empty_branch = FALSE;      if (c == OP_COND && code[GET(code, 1)] != OP_ALT)
     do  
       {  
       if (!empty_branch && could_be_empty_branch(code, endcode, utf8))  
         empty_branch = TRUE;  
1888        code += GET(code, 1);        code += GET(code, 1);
1889        else
1890          {
1891          empty_branch = FALSE;
1892          do
1893            {
1894            if (!empty_branch && could_be_empty_branch(code, endcode, utf8, cd))
1895              empty_branch = TRUE;
1896            code += GET(code, 1);
1897            }
1898          while (*code == OP_ALT);
1899          if (!empty_branch) return FALSE;   /* All branches are non-empty */
1900        }        }
1901      while (*code == OP_ALT);  
     if (!empty_branch) return FALSE;   /* All branches are non-empty */  
1902      c = *code;      c = *code;
1903      continue;      continue;
1904      }      }
# Line 1579  for (code = first_significant_code(code Line 1959  for (code = first_significant_code(code
1959      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
1960      case OP_WORDCHAR:      case OP_WORDCHAR:
1961      case OP_ANY:      case OP_ANY:
1962        case OP_ALLANY:
1963      case OP_ANYBYTE:      case OP_ANYBYTE:
1964      case OP_CHAR:      case OP_CHAR:
1965      case OP_CHARNC:      case OP_CHARNC:
# Line 1597  for (code = first_significant_code(code Line 1978  for (code = first_significant_code(code
1978      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1979      return FALSE;      return FALSE;
1980    
1981        /* These are going to continue, as they may be empty, but we have to
1982        fudge the length for the \p and \P cases. */
1983    
1984        case OP_TYPESTAR:
1985        case OP_TYPEMINSTAR:
1986        case OP_TYPEPOSSTAR:
1987        case OP_TYPEQUERY:
1988        case OP_TYPEMINQUERY:
1989        case OP_TYPEPOSQUERY:
1990        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1991        break;
1992    
1993        /* Same for these */
1994    
1995        case OP_TYPEUPTO:
1996        case OP_TYPEMINUPTO:
1997        case OP_TYPEPOSUPTO:
1998        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1999        break;
2000    
2001      /* End of branch */      /* End of branch */
2002    
2003      case OP_KET:      case OP_KET:
# Line 1615  for (code = first_significant_code(code Line 2016  for (code = first_significant_code(code
2016      case OP_QUERY:      case OP_QUERY:
2017      case OP_MINQUERY:      case OP_MINQUERY:
2018      case OP_POSQUERY:      case OP_POSQUERY:
2019        if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];
2020        break;
2021    
2022      case OP_UPTO:      case OP_UPTO:
2023      case OP_MINUPTO:      case OP_MINUPTO:
2024      case OP_POSUPTO:      case OP_POSUPTO:
2025      if (utf8) while ((code[2] & 0xc0) == 0x80) code++;      if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];
2026      break;      break;
2027  #endif  #endif
2028    
2029        /* MARK, and PRUNE/SKIP/THEN with an argument must skip over the argument
2030        string. */
2031    
2032        case OP_MARK:
2033        case OP_PRUNE_ARG:
2034        case OP_SKIP_ARG:
2035        case OP_THEN_ARG:
2036        code += code[1];
2037        break;
2038    
2039        /* None of the remaining opcodes are required to match a character. */
2040    
2041        default:
2042        break;
2043      }      }
2044    }    }
2045    
# Line 1643  Arguments: Line 2062  Arguments:
2062    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2063    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2064    utf8        TRUE if in UTF-8 mode    utf8        TRUE if in UTF-8 mode
2065      cd          pointers to tables etc
2066    
2067  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2068  */  */
2069    
2070  static BOOL  static BOOL
2071  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,
2072    BOOL utf8)    BOOL utf8, compile_data *cd)
2073  {  {
2074  while (bcptr != NULL && bcptr->current >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2075    {    {
2076    if (!could_be_empty_branch(bcptr->current, endcode, utf8)) return FALSE;    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8, cd))
2077        return FALSE;
2078    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2079    }    }
2080  return TRUE;  return TRUE;
# Line 1666  return TRUE; Line 2087  return TRUE;
2087  *************************************************/  *************************************************/
2088    
2089  /* This function is called when the sequence "[:" or "[." or "[=" is  /* This function is called when the sequence "[:" or "[." or "[=" is
2090  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
2091  optional ^ and then a sequence of letters, terminated by a matching ":]" or  sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
2092  ".]" or "=]".  reach an unescaped ']' without the special preceding character, return FALSE.
2093    
2094    Originally, this function only recognized a sequence of letters between the
2095    terminators, but it seems that Perl recognizes any sequence of characters,
2096    though of course unknown POSIX names are subsequently rejected. Perl gives an
2097    "Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
2098    didn't consider this to be a POSIX class. Likewise for [:1234:].
2099    
2100    The problem in trying to be exactly like Perl is in the handling of escapes. We
2101    have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
2102    class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
2103    below handles the special case of \], but does not try to do any other escape
2104    processing. This makes it different from Perl for cases such as [:l\ower:]
2105    where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize
2106    "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
2107    I think.
2108    
2109  Argument:  Arguments:
2110    ptr      pointer to the initial [    ptr      pointer to the initial [
2111    endptr   where to return the end pointer    endptr   where to return the end pointer
   cd       pointer to compile data  
2112    
2113  Returns:   TRUE or FALSE  Returns:   TRUE or FALSE
2114  */  */
2115    
2116  static BOOL  static BOOL
2117  check_posix_syntax(const uschar *ptr, const uschar **endptr, compile_data *cd)  check_posix_syntax(const uschar *ptr, const uschar **endptr)
2118  {  {
2119  int terminator;          /* Don't combine these lines; the Solaris cc */  int terminator;          /* Don't combine these lines; the Solaris cc */
2120  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2121  if (*(++ptr) == '^') ptr++;  for (++ptr; *ptr != 0; ptr++)
 while ((cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;  
 if (*ptr == terminator && ptr[1] == ']')  
2122    {    {
2123    *endptr = ptr;    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else
2124    return TRUE;      {
2125        if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2126        if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2127          {
2128          *endptr = ptr;
2129          return TRUE;
2130          }
2131        }
2132    }    }
2133  return FALSE;  return FALSE;
2134  }  }
# Line 1713  Returns: a value representing the na Line 2153  Returns: a value representing the na
2153  static int  static int
2154  check_posix_name(const uschar *ptr, int len)  check_posix_name(const uschar *ptr, int len)
2155  {  {
2156    const char *pn = posix_names;
2157  register int yield = 0;  register int yield = 0;
2158  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
2159    {    {
2160    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
2161      strncmp((const char *)ptr, posix_names[yield], len) == 0) return yield;      strncmp((const char *)ptr, pn, len) == 0) return yield;
2162      pn += posix_name_lengths[yield] + 1;
2163    yield++;    yield++;
2164    }    }
2165  return -1;  return -1;
# Line 1732  return -1; Line 2174  return -1;
2174  that is referenced. This means that groups can be replicated for fixed  that is referenced. This means that groups can be replicated for fixed
2175  repetition simply by copying (because the recursion is allowed to refer to  repetition simply by copying (because the recursion is allowed to refer to
2176  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
2177  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
2178  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
2179  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
2180  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
2181  the partially compiled regex must be temporarily terminated with OP_END.  is called, the partially compiled regex must be temporarily terminated with
2182    OP_END.
2183    
2184  This function has been extended with the possibility of forward references for  This function has been extended with the possibility of forward references for
2185  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 1759  adjust_recurse(uschar *group, int adjust Line 2202  adjust_recurse(uschar *group, int adjust
2202    uschar *save_hwm)    uschar *save_hwm)
2203  {  {
2204  uschar *ptr = group;  uschar *ptr = group;
2205    
2206  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)
2207    {    {
2208    int offset;    int offset;
# Line 1870  get_othercase_range(unsigned int *cptr, Line 2314  get_othercase_range(unsigned int *cptr,
2314  unsigned int c, othercase, next;  unsigned int c, othercase, next;
2315    
2316  for (c = *cptr; c <= d; c++)  for (c = *cptr; c <= d; c++)
2317    { if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR) break; }    { if ((othercase = UCD_OTHERCASE(c)) != c) break; }
2318    
2319  if (c > d) return FALSE;  if (c > d) return FALSE;
2320    
# Line 1879  next = othercase + 1; Line 2323  next = othercase + 1;
2323    
2324  for (++c; c <= d; c++)  for (++c; c <= d; c++)
2325    {    {
2326    if (_pcre_ucp_othercase(c) != next) break;    if (UCD_OTHERCASE(c) != next) break;
2327    next++;    next++;
2328    }    }
2329    
# Line 1925  if ((options & PCRE_EXTENDED) != 0) Line 2369  if ((options & PCRE_EXTENDED) != 0)
2369    for (;;)    for (;;)
2370      {      {
2371      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2372      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
2373        {        {
2374        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2375          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
# Line 1937  if ((options & PCRE_EXTENDED) != 0) Line 2381  if ((options & PCRE_EXTENDED) != 0)
2381  /* 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
2382  value is a character, a negative value is an escape value. */  value is a character, a negative value is an escape value. */
2383    
2384  if (*ptr == '\\')  if (*ptr == CHAR_BACKSLASH)
2385    {    {
2386    int temperrorcode = 0;    int temperrorcode = 0;
2387    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);
# Line 1962  if ((options & PCRE_EXTENDED) != 0) Line 2406  if ((options & PCRE_EXTENDED) != 0)
2406    for (;;)    for (;;)
2407      {      {
2408      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2409      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
2410        {        {
2411        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2412          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
# Line 1973  if ((options & PCRE_EXTENDED) != 0) Line 2417  if ((options & PCRE_EXTENDED) != 0)
2417    
2418  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
2419    
2420  if (*ptr == '*' || *ptr == '?' || strncmp((char *)ptr, "{0,", 3) == 0)  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
2421    return FALSE;    strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
2422        return FALSE;
2423    
2424  /* Now compare the next item with the previous opcode. If the previous is a  /* Now compare the next item with the previous opcode. If the previous is a
2425  positive single character match, "item" either contains the character or, if  positive single character match, "item" either contains the character or, if
# Line 1989  if (next >= 0) switch(op_code) Line 2434  if (next >= 0) switch(op_code)
2434    case OP_CHAR:    case OP_CHAR:
2435  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2436    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
2437    #else
2438      (void)(utf8_char);  /* Keep compiler happy by referencing function argument */
2439  #endif  #endif
2440    return item != next;    return item != next;
2441    
# Line 2007  if (next >= 0) switch(op_code) Line 2454  if (next >= 0) switch(op_code)
2454      unsigned int othercase;      unsigned int othercase;
2455      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2456  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2457      othercase = _pcre_ucp_othercase((unsigned int)next);      othercase = UCD_OTHERCASE((unsigned int)next);
2458  #else  #else
2459      othercase = NOTACHAR;      othercase = NOTACHAR;
2460  #endif  #endif
# Line 2020  if (next >= 0) switch(op_code) Line 2467  if (next >= 0) switch(op_code)
2467    /* For OP_NOT, "item" must be a single-byte character. */    /* For OP_NOT, "item" must be a single-byte character. */
2468    
2469    case OP_NOT:    case OP_NOT:
   if (next < 0) return FALSE;  /* Not a character */  
2470    if (item == next) return TRUE;    if (item == next) return TRUE;
2471    if ((options & PCRE_CASELESS) == 0) return FALSE;    if ((options & PCRE_CASELESS) == 0) return FALSE;
2472  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
# Line 2029  if (next >= 0) switch(op_code) Line 2475  if (next >= 0) switch(op_code)
2475      unsigned int othercase;      unsigned int othercase;
2476      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2477  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2478      othercase = _pcre_ucp_othercase(next);      othercase = UCD_OTHERCASE(next);
2479  #else  #else
2480      othercase = NOTACHAR;      othercase = NOTACHAR;
2481  #endif  #endif
# Line 2283  uschar classbits[32]; Line 2729  uschar classbits[32];
2729  BOOL class_utf8;  BOOL class_utf8;
2730  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf8 = (options & PCRE_UTF8) != 0;
2731  uschar *class_utf8data;  uschar *class_utf8data;
2732    uschar *class_utf8data_base;
2733  uschar utf8_char[6];  uschar utf8_char[6];
2734  #else  #else
2735  BOOL utf8 = FALSE;  BOOL utf8 = FALSE;
2736  uschar *utf8_char = NULL;  uschar *utf8_char = NULL;
2737  #endif  #endif
2738    
2739  #ifdef DEBUG  #ifdef PCRE_DEBUG
2740  if (lengthptr != NULL) DPRINTF((">> start branch\n"));  if (lengthptr != NULL) DPRINTF((">> start branch\n"));
2741  #endif  #endif
2742    
# Line 2322  req_caseopt = ((options & PCRE_CASELESS) Line 2769  req_caseopt = ((options & PCRE_CASELESS)
2769  for (;; ptr++)  for (;; ptr++)
2770    {    {
2771    BOOL negate_class;    BOOL negate_class;
2772      BOOL should_flip_negation;
2773    BOOL possessive_quantifier;    BOOL possessive_quantifier;
2774    BOOL is_quantifier;    BOOL is_quantifier;
2775    BOOL is_recurse;    BOOL is_recurse;
# Line 2347  for (;; ptr++) Line 2795  for (;; ptr++)
2795    
2796    if (lengthptr != NULL)    if (lengthptr != NULL)
2797      {      {
2798  #ifdef DEBUG  #ifdef PCRE_DEBUG
2799      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
2800  #endif  #endif
2801      if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */      if (code > cd->start_workspace + WORK_SIZE_CHECK)   /* Check for overrun */
2802        {        {
2803        *errorcodeptr = ERR52;        *errorcodeptr = ERR52;
2804        goto FAILED;        goto FAILED;
# Line 2399  for (;; ptr++) Line 2847  for (;; ptr++)
2847    /* In the real compile phase, just check the workspace used by the forward    /* In the real compile phase, just check the workspace used by the forward
2848    reference list. */    reference list. */
2849    
2850    else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)    else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK)
2851      {      {
2852      *errorcodeptr = ERR52;      *errorcodeptr = ERR52;
2853      goto FAILED;      goto FAILED;
# Line 2409  for (;; ptr++) Line 2857  for (;; ptr++)
2857    
2858    if (inescq && c != 0)    if (inescq && c != 0)
2859      {      {
2860      if (c == '\\' && ptr[1] == 'E')      if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
2861        {        {
2862        inescq = FALSE;        inescq = FALSE;
2863        ptr++;        ptr++;
# Line 2435  for (;; ptr++) Line 2883  for (;; ptr++)
2883    /* Fill in length of a previous callout, except when the next thing is    /* Fill in length of a previous callout, except when the next thing is
2884    a quantifier. */    a quantifier. */
2885    
2886    is_quantifier = c == '*' || c == '+' || c == '?' ||    is_quantifier =
2887      (c == '{' && is_counted_repeat(ptr+1));      c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
2888        (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
2889    
2890    if (!is_quantifier && previous_callout != NULL &&    if (!is_quantifier && previous_callout != NULL &&
2891         after_manual_callout-- <= 0)         after_manual_callout-- <= 0)
# Line 2451  for (;; ptr++) Line 2900  for (;; ptr++)
2900    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
2901      {      {
2902      if ((cd->ctypes[c] & ctype_space) != 0) continue;      if ((cd->ctypes[c] & ctype_space) != 0) continue;
2903      if (c == '#')      if (c == CHAR_NUMBER_SIGN)
2904        {        {
2905        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2906          {          {
# Line 2476  for (;; ptr++) Line 2925  for (;; ptr++)
2925      {      {
2926      /* ===================================================================*/      /* ===================================================================*/
2927      case 0:                        /* The branch terminates at string end */      case 0:                        /* The branch terminates at string end */
2928      case '|':                      /* or | or ) */      case CHAR_VERTICAL_LINE:       /* or | or ) */
2929      case ')':      case CHAR_RIGHT_PARENTHESIS:
2930      *firstbyteptr = firstbyte;      *firstbyteptr = firstbyte;
2931      *reqbyteptr = reqbyte;      *reqbyteptr = reqbyte;
2932      *codeptr = code;      *codeptr = code;
# Line 2499  for (;; ptr++) Line 2948  for (;; ptr++)
2948      /* Handle single-character metacharacters. In multiline mode, ^ disables      /* Handle single-character metacharacters. In multiline mode, ^ disables
2949      the setting of any following char as a first character. */      the setting of any following char as a first character. */
2950    
2951      case '^':      case CHAR_CIRCUMFLEX_ACCENT:
2952      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
2953        {        {
2954        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
# Line 2508  for (;; ptr++) Line 2957  for (;; ptr++)
2957      *code++ = OP_CIRC;      *code++ = OP_CIRC;
2958      break;      break;
2959    
2960      case '$':      case CHAR_DOLLAR_SIGN:
2961      previous = NULL;      previous = NULL;
2962      *code++ = OP_DOLL;      *code++ = OP_DOLL;
2963      break;      break;
# Line 2516  for (;; ptr++) Line 2965  for (;; ptr++)
2965      /* There can never be a first char if '.' is first, whatever happens about      /* There can never be a first char if '.' is first, whatever happens about
2966      repeats. The value of reqbyte doesn't change either. */      repeats. The value of reqbyte doesn't change either. */
2967    
2968      case '.':      case CHAR_DOT:
2969      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
2970      zerofirstbyte = firstbyte;      zerofirstbyte = firstbyte;
2971      zeroreqbyte = reqbyte;      zeroreqbyte = reqbyte;
2972      previous = code;      previous = code;
2973      *code++ = OP_ANY;      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
2974      break;      break;
2975    
2976    
# Line 2536  for (;; ptr++) Line 2985  for (;; ptr++)
2985      opcode is compiled. It may optionally have a bit map for characters < 256,      opcode is compiled. It may optionally have a bit map for characters < 256,
2986      but those above are are explicitly listed afterwards. A flag byte tells      but those above are are explicitly listed afterwards. A flag byte tells
2987      whether the bitmap is present, and whether this is a negated class or not.      whether the bitmap is present, and whether this is a negated class or not.
     */  
2988    
2989      case '[':      In JavaScript compatibility mode, an isolated ']' causes an error. In
2990        default (Perl) mode, it is treated as a data character. */
2991    
2992        case CHAR_RIGHT_SQUARE_BRACKET:
2993        if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
2994          {
2995          *errorcodeptr = ERR64;
2996          goto FAILED;
2997          }
2998        goto NORMAL_CHAR;
2999    
3000        case CHAR_LEFT_SQUARE_BRACKET:
3001      previous = code;      previous = code;
3002    
3003      /* PCRE supports POSIX class stuff inside a class. Perl gives an error if      /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
3004      they are encountered at the top level, so we'll do that too. */      they are encountered at the top level, so we'll do that too. */
3005    
3006      if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&      if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
3007          check_posix_syntax(ptr, &tempptr, cd))           ptr[1] == CHAR_EQUALS_SIGN) &&
3008            check_posix_syntax(ptr, &tempptr))
3009        {        {
3010        *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;        *errorcodeptr = (ptr[1] == CHAR_COLON)? ERR13 : ERR31;
3011        goto FAILED;        goto FAILED;
3012        }        }
3013    
# Line 2559  for (;; ptr++) Line 3019  for (;; ptr++)
3019      for (;;)      for (;;)
3020        {        {
3021        c = *(++ptr);        c = *(++ptr);
3022        if (c == '\\')        if (c == CHAR_BACKSLASH)
3023          {          {
3024          if (ptr[1] == 'E') ptr++;          if (ptr[1] == CHAR_E)
3025            else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;            ptr++;
3026              else break;          else if (strncmp((const char *)ptr+1,
3027                              STR_Q STR_BACKSLASH STR_E, 3) == 0)
3028              ptr += 3;
3029            else
3030              break;
3031          }          }
3032        else if (!negate_class && c == '^')        else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
3033          negate_class = TRUE;          negate_class = TRUE;
3034        else break;        else break;
3035        }        }
3036    
3037        /* Empty classes are allowed in JavaScript compatibility mode. Otherwise,
3038        an initial ']' is taken as a data character -- the code below handles
3039        that. In JS mode, [] must always fail, so generate OP_FAIL, whereas
3040        [^] must match any character, so generate OP_ALLANY. */
3041    
3042        if (c == CHAR_RIGHT_SQUARE_BRACKET &&
3043            (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
3044          {
3045          *code++ = negate_class? OP_ALLANY : OP_FAIL;
3046          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
3047          zerofirstbyte = firstbyte;
3048          break;
3049          }
3050    
3051        /* If a class contains a negative special such as \S, we need to flip the
3052        negation flag at the end, so that support for characters > 255 works
3053        correctly (they are all included in the class). */
3054    
3055        should_flip_negation = FALSE;
3056    
3057      /* Keep a count of chars with values < 256 so that we can optimize the case      /* Keep a count of chars with values < 256 so that we can optimize the case
3058      of just a single character (as long as it's < 256). However, For higher      of just a single character (as long as it's < 256). However, For higher
3059      valued UTF-8 characters, we don't yet do any optimization. */      valued UTF-8 characters, we don't yet do any optimization. */
# Line 2587  for (;; ptr++) Line 3071  for (;; ptr++)
3071  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3072      class_utf8 = FALSE;                       /* No chars >= 256 */      class_utf8 = FALSE;                       /* No chars >= 256 */
3073      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */
3074        class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */
3075  #endif  #endif
3076    
3077      /* Process characters until ] is reached. By writing this as a "do" it      /* Process characters until ] is reached. By writing this as a "do" it
# Line 2602  for (;; ptr++) Line 3087  for (;; ptr++)
3087          {                           /* Braces are required because the */          {                           /* Braces are required because the */
3088          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
3089          }          }
3090    
3091          /* In the pre-compile phase, accumulate the length of any UTF-8 extra
3092          data and reset the pointer. This is so that very large classes that
3093          contain a zillion UTF-8 characters no longer overwrite the work space
3094          (which is on the stack). */
3095    
3096          if (lengthptr != NULL)
3097            {
3098            *lengthptr += class_utf8data - class_utf8data_base;
3099            class_utf8data = class_utf8data_base;
3100            }
3101    
3102  #endif  #endif
3103    
3104        /* Inside \Q...\E everything is literal except \E */        /* Inside \Q...\E everything is literal except \E */
3105    
3106        if (inescq)        if (inescq)
3107          {          {
3108          if (c == '\\' && ptr[1] == 'E')     /* If we are at \E */          if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)  /* If we are at \E */
3109            {            {
3110            inescq = FALSE;                   /* Reset literal state */            inescq = FALSE;                   /* Reset literal state */
3111            ptr++;                            /* Skip the 'E' */            ptr++;                            /* Skip the 'E' */
# Line 2623  for (;; ptr++) Line 3120  for (;; ptr++)
3120        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
3121        5.6 and 5.8 do. */        5.6 and 5.8 do. */
3122    
3123        if (c == '[' &&        if (c == CHAR_LEFT_SQUARE_BRACKET &&
3124            (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&            (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
3125            check_posix_syntax(ptr, &tempptr, cd))             ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))
3126          {          {
3127          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
3128          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
3129          register const uschar *cbits = cd->cbits;          register const uschar *cbits = cd->cbits;
3130          uschar pbits[32];          uschar pbits[32];
3131    
3132          if (ptr[1] != ':')          if (ptr[1] != CHAR_COLON)
3133            {            {
3134            *errorcodeptr = ERR31;            *errorcodeptr = ERR31;
3135            goto FAILED;            goto FAILED;
3136            }            }
3137    
3138          ptr += 2;          ptr += 2;
3139          if (*ptr == '^')          if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
3140            {            {
3141            local_negate = TRUE;            local_negate = TRUE;
3142              should_flip_negation = TRUE;  /* Note negative special */
3143            ptr++;            ptr++;
3144            }            }
3145    
# Line 2711  for (;; ptr++) Line 3209  for (;; ptr++)
3209        to 'or' into the one we are building. We assume they have more than one        to 'or' into the one we are building. We assume they have more than one
3210        character in them, so set class_charcount bigger than one. */        character in them, so set class_charcount bigger than one. */
3211    
3212        if (c == '\\')        if (c == CHAR_BACKSLASH)
3213          {          {
3214          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3215          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
3216    
3217          if (-c == ESC_b) c = '\b';       /* \b is backslash in a class */          if (-c == ESC_b) c = CHAR_BS;       /* \b is backspace in a class */
3218          else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */          else if (-c == ESC_X) c = CHAR_X;   /* \X is literal X in a class */
3219          else if (-c == ESC_R) c = 'R';   /* \R is literal R in a class */          else if (-c == ESC_R) c = CHAR_R;   /* \R is literal R in a class */
3220          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
3221            {            {
3222            if (ptr[1] == '\\' && ptr[2] == 'E')            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
3223              {              {
3224              ptr += 2; /* avoid empty string */              ptr += 2; /* avoid empty string */
3225              }              }
# Line 2744  for (;; ptr++) Line 3242  for (;; ptr++)
3242              continue;              continue;
3243    
3244              case ESC_D:              case ESC_D:
3245                should_flip_negation = TRUE;
3246              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];
3247              continue;              continue;
3248    
# Line 2752  for (;; ptr++) Line 3251  for (;; ptr++)
3251              continue;              continue;
3252    
3253              case ESC_W:              case ESC_W:
3254                should_flip_negation = TRUE;
3255              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
3256              continue;              continue;
3257    
# Line 2761  for (;; ptr++) Line 3261  for (;; ptr++)
3261              continue;              continue;
3262    
3263              case ESC_S:              case ESC_S:
3264                should_flip_negation = TRUE;
3265              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
3266              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
3267              continue;              continue;
3268    
             case ESC_E: /* Perl ignores an orphan \E */  
             continue;  
   
3269              default:    /* Not recognized; fall through */              default:    /* Not recognized; fall through */
3270              break;      /* Need "default" setting to stop compiler warning. */              break;      /* Need "default" setting to stop compiler warning. */
3271              }              }
# Line 2947  for (;; ptr++) Line 3445  for (;; ptr++)
3445        entirely. The code for handling \Q and \E is messy. */        entirely. The code for handling \Q and \E is messy. */
3446    
3447        CHECK_RANGE:        CHECK_RANGE:
3448        while (ptr[1] == '\\' && ptr[2] == 'E')        while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
3449          {          {
3450          inescq = FALSE;          inescq = FALSE;
3451          ptr += 2;          ptr += 2;
# Line 2955  for (;; ptr++) Line 3453  for (;; ptr++)
3453    
3454        oldptr = ptr;        oldptr = ptr;
3455    
3456        if (!inescq && ptr[1] == '-')        /* Remember \r or \n */
3457    
3458          if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
3459    
3460          /* Check for range */
3461    
3462          if (!inescq && ptr[1] == CHAR_MINUS)
3463          {          {
3464          int d;          int d;
3465          ptr += 2;          ptr += 2;
3466          while (*ptr == '\\' && ptr[1] == 'E') ptr += 2;          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;
3467    
3468          /* If we hit \Q (not followed by \E) at this point, go into escaped          /* If we hit \Q (not followed by \E) at this point, go into escaped
3469          mode. */          mode. */
3470    
3471          while (*ptr == '\\' && ptr[1] == 'Q')          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
3472            {            {
3473            ptr += 2;            ptr += 2;
3474            if (*ptr == '\\' && ptr[1] == 'E') { ptr += 2; continue; }            if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)
3475                { ptr += 2; continue; }
3476            inescq = TRUE;            inescq = TRUE;
3477            break;            break;
3478            }            }
3479    
3480          if (*ptr == 0 || (!inescq && *ptr == ']'))          if (*ptr == 0 || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
3481            {            {
3482            ptr = oldptr;            ptr = oldptr;
3483            goto LONE_SINGLE_CHARACTER;            goto LONE_SINGLE_CHARACTER;
# Line 2991  for (;; ptr++) Line 3496  for (;; ptr++)
3496          not any of the other escapes. Perl 5.6 treats a hyphen as a literal          not any of the other escapes. Perl 5.6 treats a hyphen as a literal
3497          in such circumstances. */          in such circumstances. */
3498    
3499          if (!inescq && d == '\\')          if (!inescq && d == CHAR_BACKSLASH)
3500            {            {
3501            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3502            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
3503    
3504            /* \b is backslash; \X is literal X; \R is literal R; any other            /* \b is backspace; \X is literal X; \R is literal R; any other
3505            special means the '-' was literal */            special means the '-' was literal */
3506    
3507            if (d < 0)            if (d < 0)
3508              {              {
3509              if (d == -ESC_b) d = '\b';              if (d == -ESC_b) d = CHAR_BS;
3510              else if (d == -ESC_X) d = 'X';              else if (d == -ESC_X) d = CHAR_X;
3511              else if (d == -ESC_R) d = 'R'; else              else if (d == -ESC_R) d = CHAR_R; else
3512                {                {
3513                ptr = oldptr;                ptr = oldptr;
3514                goto LONE_SINGLE_CHARACTER;  /* A few lines below */                goto LONE_SINGLE_CHARACTER;  /* A few lines below */
# Line 3022  for (;; ptr++) Line 3527  for (;; ptr++)
3527    
3528          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */
3529    
3530            /* Remember \r or \n */
3531    
3532            if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
3533    
3534          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
3535          matching, we have to use an XCLASS with extra data items. Caseless          matching, we have to use an XCLASS with extra data items. Caseless
3536          matching for characters > 127 is available only if UCP support is          matching for characters > 127 is available only if UCP support is
# Line 3140  for (;; ptr++) Line 3649  for (;; ptr++)
3649          if ((options & PCRE_CASELESS) != 0)          if ((options & PCRE_CASELESS) != 0)
3650            {            {
3651            unsigned int othercase;            unsigned int othercase;
3652            if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR)            if ((othercase = UCD_OTHERCASE(c)) != c)
3653              {              {
3654              *class_utf8data++ = XCL_SINGLE;              *class_utf8data++ = XCL_SINGLE;
3655              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);
# Line 3167  for (;; ptr++) Line 3676  for (;; ptr++)
3676    
3677      /* Loop until ']' reached. This "while" is the end of the "do" above. */      /* Loop until ']' reached. This "while" is the end of the "do" above. */
3678    
3679      while ((c = *(++ptr)) != 0 && (c != ']' || inescq));      while ((c = *(++ptr)) != 0 && (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
3680    
3681      if (c == 0)                          /* Missing terminating ']' */      if (c == 0)                          /* Missing terminating ']' */
3682        {        {
# Line 3175  for (;; ptr++) Line 3684  for (;; ptr++)
3684        goto FAILED;        goto FAILED;
3685        }        }
3686    
3687    
3688    /* This code has been disabled because it would mean that \s counts as
3689    an explicit \r or \n reference, and that's not really what is wanted. Now
3690    we set the flag only if there is a literal "\r" or "\n" in the class. */
3691    
3692    #if 0
3693        /* Remember whether \r or \n are in this class */
3694    
3695        if (negate_class)
3696          {
3697          if ((classbits[1] & 0x24) != 0x24) cd->external_flags |= PCRE_HASCRORLF;
3698          }
3699        else
3700          {
3701          if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;
3702          }
3703    #endif
3704    
3705    
3706      /* If class_charcount is 1, we saw precisely one character whose value is      /* If class_charcount is 1, we saw precisely one character whose value is
3707      less than 256. As long as there were no characters >= 128 and there was no      less than 256. As long as there were no characters >= 128 and there was no
3708      use of \p or \P, in other words, no use of any XCLASS features, we can      use of \p or \P, in other words, no use of any XCLASS features, we can
3709      optimize.      optimize.
3710    
3711      In UTF-8 mode, we can optimize the negative case only if there were no      In UTF-8 mode, we can optimize the negative case only if there were no
3712      characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR      characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
3713      operate on single-bytes only. This is an historical hangover. Maybe one day      operate on single-bytes only. This is an historical hangover. Maybe one day
# Line 3193  for (;; ptr++) Line 3721  for (;; ptr++)
3721      reqbyte, save the previous value for reinstating. */      reqbyte, save the previous value for reinstating. */
3722    
3723  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3724      if (class_charcount == 1 && !class_utf8 &&      if (class_charcount == 1 && !class_utf8 &&
3725        (!utf8 || !negate_class || class_lastchar < 128))        (!utf8 || !negate_class || class_lastchar < 128))
3726  #else  #else
3727      if (class_charcount == 1)      if (class_charcount == 1)
# Line 3237  for (;; ptr++) Line 3765  for (;; ptr++)
3765      zeroreqbyte = reqbyte;      zeroreqbyte = reqbyte;
3766    
3767      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
3768      extended class, with its own opcode. If there are no characters < 256,      extended class, with its own opcode, unless there was a negated special
3769      we can omit the bitmap in the actual compiled code. */      such as \S in the class, because in that case all characters > 255 are in
3770        the class, so any that were explicitly given as well can be ignored. If
3771        (when there are explicit characters > 255 that must be listed) there are no
3772        characters < 256, we can omit the bitmap in the actual compiled code. */
3773    
3774  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3775      if (class_utf8)      if (class_utf8 && !should_flip_negation)
3776        {        {
3777        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
3778        *code++ = OP_XCLASS;        *code++ = OP_XCLASS;
# Line 3267  for (;; ptr++) Line 3798  for (;; ptr++)
3798        }        }
3799  #endif  #endif
3800    
3801      /* If there are no characters > 255, negate the 32-byte map if necessary,      /* If there are no characters > 255, set the opcode to OP_CLASS or
3802      and copy it into the code vector. If this is the first thing in the branch,      OP_NCLASS, depending on whether the whole class was negated and whether
3803      there can be no first char setting, whatever the repeat count. Any reqbyte      there were negative specials such as \S in the class. Then copy the 32-byte
3804      setting must remain unchanged after any kind of repeat. */      map into the code vector, negating it if necessary. */
3805    
3806        *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
3807      if (negate_class)      if (negate_class)
3808        {        {
       *code++ = OP_NCLASS;  
3809        if (lengthptr == NULL)    /* Save time in the pre-compile phase */        if (lengthptr == NULL)    /* Save time in the pre-compile phase */
3810          for (c = 0; c < 32; c++) code[c] = ~classbits[c];          for (c = 0; c < 32; c++) code[c] = ~classbits[c];
3811        }        }
3812      else      else
3813        {        {
       *code++ = OP_CLASS;  
3814        memcpy(code, classbits, 32);        memcpy(code, classbits, 32);
3815        }        }
3816      code += 32;      code += 32;
# Line 3291  for (;; ptr++) Line 3821  for (;; ptr++)
3821      /* Various kinds of repeat; '{' is not necessarily a quantifier, but this      /* Various kinds of repeat; '{' is not necessarily a quantifier, but this
3822      has been tested above. */      has been tested above. */
3823    
3824      case '{':      case CHAR_LEFT_CURLY_BRACKET:
3825      if (!is_quantifier) goto NORMAL_CHAR;      if (!is_quantifier) goto NORMAL_CHAR;
3826      ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);      ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);
3827      if (*errorcodeptr != 0) goto FAILED;      if (*errorcodeptr != 0) goto FAILED;
3828      goto REPEAT;      goto REPEAT;
3829    
3830      case '*':      case CHAR_ASTERISK:
3831      repeat_min = 0;      repeat_min = 0;
3832      repeat_max = -1;      repeat_max = -1;
3833      goto REPEAT;      goto REPEAT;
3834    
3835      case '+':      case CHAR_PLUS:
3836      repeat_min = 1;      repeat_min = 1;
3837      repeat_max = -1;      repeat_max = -1;
3838      goto REPEAT;      goto REPEAT;
3839    
3840      case '?':      case CHAR_QUESTION_MARK:
3841      repeat_min = 0;      repeat_min = 0;
3842      repeat_max = 1;      repeat_max = 1;
3843    
# Line 3342  for (;; ptr++) Line 3872  for (;; ptr++)
3872      but if PCRE_UNGREEDY is set, it works the other way round. We change the      but if PCRE_UNGREEDY is set, it works the other way round. We change the
3873      repeat type to the non-default. */      repeat type to the non-default. */
3874    
3875      if (ptr[1] == '+')      if (ptr[1] == CHAR_PLUS)
3876        {        {
3877        repeat_type = 0;                  /* Force greedy */        repeat_type = 0;                  /* Force greedy */
3878        possessive_quantifier = TRUE;        possessive_quantifier = TRUE;
3879        ptr++;        ptr++;
3880        }        }
3881      else if (ptr[1] == '?')      else if (ptr[1] == CHAR_QUESTION_MARK)
3882        {        {
3883        repeat_type = greedy_non_default;        repeat_type = greedy_non_default;
3884        ptr++;        ptr++;
# Line 3463  for (;; ptr++) Line 3993  for (;; ptr++)
3993    
3994        if (repeat_max == 0) goto END_REPEAT;        if (repeat_max == 0) goto END_REPEAT;
3995    
3996          /*--------------------------------------------------------------------*/
3997          /* This code is obsolete from release 8.00; the restriction was finally
3998          removed: */
3999    
4000        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
4001        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
4002    
4003        if (repeat_max != 1) cd->nopartial = TRUE;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
4004          /*--------------------------------------------------------------------*/
4005    
4006        /* Combine the op_type with the repeat_type */        /* Combine the op_type with the repeat_type */
4007    
# Line 3613  for (;; ptr++) Line 4148  for (;; ptr++)
4148          goto END_REPEAT;          goto END_REPEAT;
4149          }          }
4150    
4151          /*--------------------------------------------------------------------*/
4152          /* This code is obsolete from release 8.00; the restriction was finally
4153          removed: */
4154    
4155        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
4156        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
4157    
4158        if (repeat_max != 1) cd->nopartial = TRUE;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
4159          /*--------------------------------------------------------------------*/
4160    
4161        if (repeat_min == 0 && repeat_max == -1)        if (repeat_min == 0 && repeat_max == -1)
4162          *code++ = OP_CRSTAR + repeat_type;          *code++ = OP_CRSTAR + repeat_type;
# Line 3674  for (;; ptr++) Line 4214  for (;; ptr++)
4214    
4215        if (repeat_min == 0)        if (repeat_min == 0)
4216          {          {
4217          /* If the maximum is also zero, we just omit the group from the output          /* If the maximum is also zero, we used to just omit the group from the
4218          altogether. */          output altogether, like this:
   
         if (repeat_max == 0)  
           {  
           code = previous;  
           goto END_REPEAT;  
           }  
4219    
4220          /* If the maximum is 1 or unlimited, we just have to stick in the          ** if (repeat_max == 0)
4221          BRAZERO and do no more at this point. However, we do need to adjust          **   {
4222          any OP_RECURSE calls inside the group that refer to the group itself or          **   code = previous;
4223          any internal or forward referenced group, because the offset is from          **   goto END_REPEAT;
4224          the start of the whole regex. Temporarily terminate the pattern while          **   }
4225          doing this. */  
4226            However, that fails when a group is referenced as a subroutine from
4227            elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it
4228            so that it is skipped on execution. As we don't have a list of which
4229            groups are referenced, we cannot do this selectively.
4230    
4231            If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
4232            and do no more at this point. However, we do need to adjust any
4233            OP_RECURSE calls inside the group that refer to the group itself or any
4234            internal or forward referenced group, because the offset is from the
4235            start of the whole regex. Temporarily terminate the pattern while doing
4236            this. */
4237    
4238          if (repeat_max <= 1)          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
4239            {            {
4240            *code = OP_END;            *code = OP_END;
4241            adjust_recurse(previous, 1, utf8, cd, save_hwm);            adjust_recurse(previous, 1, utf8, cd, save_hwm);
4242            memmove(previous+1, previous, len);            memmove(previous+1, previous, len);
4243            code++;            code++;
4244              if (repeat_max == 0)
4245                {
4246                *previous++ = OP_SKIPZERO;
4247                goto END_REPEAT;
4248                }
4249            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
4250            }            }
4251    
# Line 3741  for (;; ptr++) Line 4291  for (;; ptr++)
4291            {            {
4292            /* In the pre-compile phase, we don't actually do the replication. We            /* In the pre-compile phase, we don't actually do the replication. We
4293            just adjust the length as if we had. Do some paranoid checks for            just adjust the length as if we had. Do some paranoid checks for
4294            potential integer overflow. */            potential integer overflow. The INT64_OR_DOUBLE type is a 64-bit
4295              integer type when available, otherwise double. */
4296    
4297            if (lengthptr != NULL)            if (lengthptr != NULL)
4298              {              {
4299              int delta = (repeat_min - 1)*length_prevgroup;              int delta = (repeat_min - 1)*length_prevgroup;
4300              if ((double)(repeat_min - 1)*(double)length_prevgroup >              if ((INT64_OR_DOUBLE)(repeat_min - 1)*
4301                                                              (double)INT_MAX ||                    (INT64_OR_DOUBLE)length_prevgroup >
4302                        (INT64_OR_DOUBLE)INT_MAX ||
4303                  OFLOW_MAX - *lengthptr < delta)                  OFLOW_MAX - *lengthptr < delta)
4304                {                {
4305                *errorcodeptr = ERR20;                *errorcodeptr = ERR20;
# Line 3793  for (;; ptr++) Line 4345  for (;; ptr++)
4345          just adjust the length as if we had. For each repetition we must add 1          just adjust the length as if we had. For each repetition we must add 1
4346          to the length for BRAZERO and for all but the last repetition we must          to the length for BRAZERO and for all but the last repetition we must
4347          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
4348          paranoid checks to avoid integer overflow. */          paranoid checks to avoid integer overflow. The INT64_OR_DOUBLE type is
4349            a 64-bit integer type when available, otherwise double. */
4350    
4351          if (lengthptr != NULL && repeat_max > 0)          if (lengthptr != NULL && repeat_max > 0)
4352            {            {
4353            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
4354                        2 - 2*LINK_SIZE;   /* Last one doesn't nest */                        2 - 2*LINK_SIZE;   /* Last one doesn't nest */
4355            if ((double)repeat_max *            if ((INT64_OR_DOUBLE)repeat_max *
4356                  (double)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)                  (INT64_OR_DOUBLE)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
4357                    > (double)INT_MAX ||                    > (INT64_OR_DOUBLE)INT_MAX ||
4358                OFLOW_MAX - *lengthptr < delta)                OFLOW_MAX - *lengthptr < delta)
4359              {              {
4360              *errorcodeptr = ERR20;              *errorcodeptr = ERR20;
# Line 3878  for (;; ptr++) Line 4431  for (;; ptr++)
4431            uschar *scode = bracode;            uschar *scode = bracode;
4432            do            do
4433              {              {
4434              if (could_be_empty_branch(scode, ketcode, utf8))              if (could_be_empty_branch(scode, ketcode, utf8, cd))
4435                {                {
4436                *bracode += OP_SBRA - OP_BRA;                *bracode += OP_SBRA - OP_BRA;
4437                break;                break;
# Line 3890  for (;; ptr++) Line 4443  for (;; ptr++)
4443          }          }
4444        }        }
4445    
4446        /* If previous is OP_FAIL, it was generated by an empty class [] in
4447        JavaScript mode. The other ways in which OP_FAIL can be generated, that is
4448        by (*FAIL) or (?!) set previous to NULL, which gives a "nothing to repeat"
4449        error above. We can just ignore the repeat in JS case. */
4450    
4451        else if (*previous == OP_FAIL) goto END_REPEAT;
4452    
4453      /* Else there's some kind of shambles */      /* Else there's some kind of shambles */
4454    
4455      else      else
# Line 3914  for (;; ptr++) Line 4474  for (;; ptr++)
4474      if (possessive_quantifier)      if (possessive_quantifier)
4475        {        {
4476        int len;        int len;
4477        if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||  
4478            *tempcode == OP_NOTEXACT)        if (*tempcode == OP_TYPEEXACT)
4479            tempcode += _pcre_OP_lengths[*tempcode] +
4480              ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);
4481    
4482          else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
4483            {
4484          tempcode += _pcre_OP_lengths[*tempcode];          tempcode += _pcre_OP_lengths[*tempcode];
4485    #ifdef SUPPORT_UTF8
4486            if (utf8 && tempcode[-1] >= 0xc0)
4487              tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];
4488    #endif
4489            }
4490    
4491        len = code - tempcode;        len = code - tempcode;
4492        if (len > 0) switch (*tempcode)        if (len > 0) switch (*tempcode)
4493          {          {
# Line 3935  for (;; ptr++) Line 4506  for (;; ptr++)
4506          case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;          case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;
4507          case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;          case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;
4508    
4509            /* Because we are moving code along, we must ensure that any
4510            pending recursive references are updated. */
4511    
4512          default:          default:
4513            *code = OP_END;
4514            adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);
4515          memmove(tempcode + 1+LINK_SIZE, tempcode, len);          memmove(tempcode + 1+LINK_SIZE, tempcode, len);
4516          code += 1 + LINK_SIZE;          code += 1 + LINK_SIZE;
4517          len += 1 + LINK_SIZE;          len += 1 + LINK_SIZE;
# Line 3962  for (;; ptr++) Line 4538  for (;; ptr++)
4538      lookbehind or option setting or condition or all the other extended      lookbehind or option setting or condition or all the other extended
4539      parenthesis forms.  */      parenthesis forms.  */
4540    
4541      case '(':      case CHAR_LEFT_PARENTHESIS:
4542      newoptions = options;      newoptions = options;
4543      skipbytes = 0;      skipbytes = 0;
4544      bravalue = OP_CBRA;      bravalue = OP_CBRA;
# Line 3971  for (;; ptr++) Line 4547  for (;; ptr++)
4547    
4548      /* First deal with various "verbs" that can be introduced by '*'. */      /* First deal with various "verbs" that can be introduced by '*'. */
4549    
4550      if (*(++ptr) == '*' && (cd->ctypes[ptr[1]] & ctype_letter) != 0)      if (*(++ptr) == CHAR_ASTERISK &&
4551             ((cd->ctypes[ptr[1]] & ctype_letter) != 0 || ptr[1] == ':'))
4552        {        {
4553        int i, namelen;        int i, namelen;
4554        const uschar *name = ++ptr;        int arglen = 0;
4555          const char *vn = verbnames;
4556          const uschar *name = ptr + 1;
4557          const uschar *arg = NULL;
4558        previous = NULL;        previous = NULL;
4559        while ((cd->ctypes[*++ptr] & ctype_letter) != 0);        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
4560        if (*ptr == ':')        namelen = ptr - name;
4561    
4562          if (*ptr == CHAR_COLON)
4563          {          {
4564          *errorcodeptr = ERR59;   /* Not supported */          arg = ++ptr;
4565          goto FAILED;          while ((cd->ctypes[*ptr] & (ctype_letter|ctype_digit)) != 0
4566              || *ptr == '_') ptr++;
4567            arglen = ptr - arg;
4568          }          }
4569        if (*ptr != ')')  
4570          if (*ptr != CHAR_RIGHT_PARENTHESIS)
4571          {          {
4572          *errorcodeptr = ERR60;          *errorcodeptr = ERR60;
4573          goto FAILED;          goto FAILED;
4574          }          }
4575        namelen = ptr - name;  
4576          /* Scan the table of verb names */
4577    
4578        for (i = 0; i < verbcount; i++)        for (i = 0; i < verbcount; i++)
4579          {          {
4580          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
4581              strncmp((char *)name, verbs[i].name, namelen) == 0)              strncmp((char *)name, vn, namelen) == 0)
4582            {            {
4583            *code = verbs[i].op;            /* Check for open captures before ACCEPT */
4584            if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;  
4585            break;            if (verbs[i].op == OP_ACCEPT)
4586                {
4587                open_capitem *oc;
4588                cd->had_accept = TRUE;
4589                for (oc = cd->open_caps; oc != NULL; oc = oc->next)
4590                  {
4591                  *code++ = OP_CLOSE;
4592                  PUT2INC(code, 0, oc->number);
4593                  }
4594                }
4595    
4596              /* Handle the cases with/without an argument */
4597    
4598              if (arglen == 0)
4599                {
4600                if (verbs[i].op < 0)   /* Argument is mandatory */
4601                  {
4602                  *errorcodeptr = ERR66;
4603                  goto FAILED;
4604                  }
4605                *code++ = verbs[i].op;
4606                }
4607    
4608              else
4609                {
4610                if (verbs[i].op_arg < 0)   /* Argument is forbidden */
4611                  {
4612                  *errorcodeptr = ERR59;
4613                  goto FAILED;
4614                  }
4615                *code++ = verbs[i].op_arg;
4616                *code++ = arglen;
4617                memcpy(code, arg, arglen);
4618                code += arglen;
4619                *code++ = 0;
4620                }
4621    
4622              break;  /* Found verb, exit loop */
4623            }            }
4624    
4625            vn += verbs[i].len + 1;
4626          }          }
4627        if (i < verbcount) continue;  
4628        *errorcodeptr = ERR60;        if (i < verbcount) continue;    /* Successfully handled a verb */
4629          *errorcodeptr = ERR60;          /* Verb not recognized */
4630        goto FAILED;        goto FAILED;
4631        }        }
4632    
4633      /* Deal with the extended parentheses; all are introduced by '?', and the      /* Deal with the extended parentheses; all are introduced by '?', and the
4634      appearance of any of them means that this is not a capturing group. */      appearance of any of them means that this is not a capturing group. */
4635    
4636      else if (*ptr == '?')      else if (*ptr == CHAR_QUESTION_MARK)
4637        {        {
4638        int i, set, unset, namelen;        int i, set, unset, namelen;
4639        int *optset;        int *optset;
# Line 4015  for (;; ptr++) Line 4642  for (;; ptr++)
4642    
4643        switch (*(++ptr))        switch (*(++ptr))
4644          {          {
4645          case '#':                 /* Comment; skip to ket */          case CHAR_NUMBER_SIGN:                 /* Comment; skip to ket */
4646          ptr++;          ptr++;
4647          while (*ptr != 0 && *ptr != ')') ptr++;          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
4648          if (*ptr == 0)          if (*ptr == 0)
4649            {            {
4650            *errorcodeptr = ERR18;            *errorcodeptr = ERR18;
# Line 4027  for (;; ptr++) Line 4654  for (;; ptr++)
4654    
4655    
4656          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4657          case '|':                 /* Reset capture count for each branch */          case CHAR_VERTICAL_LINE:  /* Reset capture count for each branch */
4658          reset_bracount = TRUE;          reset_bracount = TRUE;
4659          /* Fall through */          /* Fall through */
4660    
4661          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4662          case ':':                 /* Non-capturing bracket */          case CHAR_COLON:          /* Non-capturing bracket */
4663          bravalue = OP_BRA;          bravalue = OP_BRA;
4664          ptr++;          ptr++;
4665          break;          break;
4666    
4667    
4668          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4669          case '(':          case CHAR_LEFT_PARENTHESIS:
4670          bravalue = OP_COND;       /* Conditional group */          bravalue = OP_COND;       /* Conditional group */
4671    
4672          /* A condition can be an assertion, a number (referring to a numbered          /* A condition can be an assertion, a number (referring to a numbered
# Line 4059  for (;; ptr++) Line 4686  for (;; ptr++)
4686          the switch. This will take control down to where bracketed groups,          the switch. This will take control down to where bracketed groups,
4687          including assertions, are processed. */          including assertions, are processed. */
4688    
4689          if (ptr[1] == '?' && (ptr[2] == '=' || ptr[2] == '!' || ptr[2] == '<'))          if (ptr[1] == CHAR_QUESTION_MARK && (ptr[2] == CHAR_EQUALS_SIGN ||
4690                ptr[2] == CHAR_EXCLAMATION_MARK || ptr[2] == CHAR_LESS_THAN_SIGN))
4691            break;            break;
4692    
4693          /* Most other conditions use OP_CREF (a couple change to OP_RREF          /* Most other conditions use OP_CREF (a couple change to OP_RREF
# Line 4071  for (;; ptr++) Line 4699  for (;; ptr++)
4699    
4700          /* Check for a test for recursion in a named group. */          /* Check for a test for recursion in a named group. */
4701    
4702          if (ptr[1] == 'R' && ptr[2] == '&')          if (ptr[1] == CHAR_R && ptr[2] == CHAR_AMPERSAND)
4703            {            {
4704            terminator = -1;            terminator = -1;
4705            ptr += 2;            ptr += 2;
# Line 4081  for (;; ptr++) Line 4709  for (;; ptr++)
4709          /* Check for a test for a named group's having been set, using the Perl          /* Check for a test for a named group's having been set, using the Perl
4710          syntax (?(<name>) or (?('name') */          syntax (?(<name>) or (?('name') */
4711    
4712          else if (ptr[1] == '<')          else if (ptr[1] == CHAR_LESS_THAN_SIGN)
4713            {            {
4714            terminator = '>';            terminator = CHAR_GREATER_THAN_SIGN;
4715            ptr++;            ptr++;
4716            }            }
4717          else if (ptr[1] == '\'')          else if (ptr[1] == CHAR_APOSTROPHE)
4718            {            {
4719            terminator = '\'';            terminator = CHAR_APOSTROPHE;
4720            ptr++;            ptr++;
4721            }            }
4722          else          else
4723            {            {
4724            terminator = 0;            terminator = 0;
4725            if (ptr[1] == '-' || ptr[1] == '+') refsign = *(++ptr);            if (ptr[1] == CHAR_MINUS || ptr[1] == CHAR_PLUS) refsign = *(++ptr);
4726            }            }
4727    
4728          /* We now expect to read a name; any thing else is an error */          /* We now expect to read a name; any thing else is an error */
# Line 4114  for (;; ptr++) Line 4742  for (;; ptr++)
4742            {            {
4743            if (recno >= 0)            if (recno >= 0)
4744              recno = ((digitab[*ptr] & ctype_digit) != 0)?              recno = ((digitab[*ptr] & ctype_digit) != 0)?
4745                recno * 10 + *ptr - '0' : -1;                recno * 10 + *ptr - CHAR_0 : -1;
4746            ptr++;            ptr++;
4747            }            }
4748          namelen = ptr - name;          namelen = ptr - name;
4749    
4750          if ((terminator > 0 && *ptr++ != terminator) || *ptr++ != ')')          if ((terminator > 0 && *ptr++ != terminator) ||
4751                *ptr++ != CHAR_RIGHT_PARENTHESIS)
4752            {            {
4753            ptr--;      /* Error offset */            ptr--;      /* Error offset */
4754            *errorcodeptr = ERR26;            *errorcodeptr = ERR26;
# Line 4141  for (;; ptr++) Line 4770  for (;; ptr++)
4770              *errorcodeptr = ERR58;              *errorcodeptr = ERR58;
4771              goto FAILED;              goto FAILED;
4772              }              }
4773            if (refsign == '-')            recno = (refsign == CHAR_MINUS)?
4774                cd->bracount - recno + 1 : recno +cd->bracount;
4775              if (recno <= 0 || recno > cd->final_bracount)
4776              {              {
4777              recno = cd->bracount - recno + 1;              *errorcodeptr = ERR15;
4778              if (recno <= 0)              goto FAILED;
               {  
               *errorcodeptr = ERR15;  
               goto FAILED;  
               }  
4779              }              }
           else recno += cd->bracount;  
4780            PUT2(code, 2+LINK_SIZE, recno);            PUT2(code, 2+LINK_SIZE, recno);
4781            break;            break;
4782            }            }
4783    
4784          /* Otherwise (did not start with "+" or "-"), start by looking for the          /* Otherwise (did not start with "+" or "-"), start by looking for the
4785          name. */          name. If we find a name, add one to the opcode to change OP_CREF or
4786            OP_RREF into OP_NCREF or OP_NRREF. These behave exactly the same,
4787            except they record that the reference was originally to a name. The
4788            information is used to check duplicate names. */
4789    
4790          slot = cd->name_table;          slot = cd->name_table;
4791          for (i = 0; i < cd->names_found; i++)          for (i = 0; i < cd->names_found; i++)
# Line 4171  for (;; ptr++) Line 4800  for (;; ptr++)
4800            {            {
4801            recno = GET2(slot, 0);            recno = GET2(slot, 0);
4802            PUT2(code, 2+LINK_SIZE, recno);            PUT2(code, 2+LINK_SIZE, recno);
4803              code[1+LINK_SIZE]++;
4804            }            }
4805    
4806          /* Search the pattern for a forward reference */          /* Search the pattern for a forward reference */
4807    
4808          else if ((i = find_parens(ptr, cd->bracount, name, namelen,          else if ((i = find_parens(cd, name, namelen,
4809                          (options & PCRE_EXTENDED) != 0)) > 0)                          (options & PCRE_EXTENDED) != 0)) > 0)
4810            {            {
4811            PUT2(code, 2+LINK_SIZE, i);            PUT2(code, 2+LINK_SIZE, i);
4812              code[1+LINK_SIZE]++;
4813            }            }
4814    
4815          /* If terminator == 0 it means that the name followed directly after          /* If terminator == 0 it means that the name followed directly after
# Line 4196  for (;; ptr++) Line 4827  for (;; ptr++)
4827          /* Check for (?(R) for recursion. Allow digits after R to specify a          /* Check for (?(R) for recursion. Allow digits after R to specify a
4828          specific group number. */          specific group number. */
4829    
4830          else if (*name == 'R')          else if (*name == CHAR_R)
4831            {            {
4832            recno = 0;            recno = 0;
4833            for (i = 1; i < namelen; i++)            for (i = 1; i < namelen; i++)
# Line 4206  for (;; ptr++) Line 4837  for (;; ptr++)
4837                *errorcodeptr = ERR15;                *errorcodeptr = ERR15;
4838                goto FAILED;                goto FAILED;
4839                }                }
4840              recno = recno * 10 + name[i] - '0';              recno = recno * 10 + name[i] - CHAR_0;
4841              }              }
4842            if (recno == 0) recno = RREF_ANY;            if (recno == 0) recno = RREF_ANY;
4843            code[1+LINK_SIZE] = OP_RREF;      /* Change test type */            code[1+LINK_SIZE] = OP_RREF;      /* Change test type */
# Line 4216  for (;; ptr++) Line 4847  for (;; ptr++)
4847          /* Similarly, check for the (?(DEFINE) "condition", which is always          /* Similarly, check for the (?(DEFINE) "condition", which is always
4848          false. */          false. */
4849    
4850          else if (namelen == 6 && strncmp((char *)name, "DEFINE", 6) == 0)          else if (namelen == 6 && strncmp((char *)name, STRING_DEFINE, 6) == 0)
4851            {            {
4852            code[1+LINK_SIZE] = OP_DEF;            code[1+LINK_SIZE] = OP_DEF;
4853            skipbytes = 1;            skipbytes = 1;
4854            }            }
4855    
4856          /* Check for the "name" actually being a subpattern number. */          /* Check for the "name" actually being a subpattern number. We are
4857            in the second pass here, so final_bracount is set. */
4858    
4859          else if (recno > 0)          else if (recno > 0 && recno <= cd->final_bracount)
4860            {            {
4861            PUT2(code, 2+LINK_SIZE, recno);            PUT2(code, 2+LINK_SIZE, recno);
4862            }            }
# Line 4240  for (;; ptr++) Line 4872  for (;; ptr++)
4872    
4873    
4874          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4875          case '=':                 /* Positive lookahead */          case CHAR_EQUALS_SIGN:                 /* Positive lookahead */
4876          bravalue = OP_ASSERT;          bravalue = OP_ASSERT;
4877          ptr++;          ptr++;
4878          break;          break;
4879    
4880    
4881          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4882          case '!':                 /* Negative lookahead */          case CHAR_EXCLAMATION_MARK:            /* Negative lookahead */
4883          ptr++;          ptr++;
4884          if (*ptr == ')')          /* Optimize (?!) */          if (*ptr == CHAR_RIGHT_PARENTHESIS)    /* Optimize (?!) */
4885            {            {
4886            *code++ = OP_FAIL;            *code++ = OP_FAIL;
4887            previous = NULL;            previous = NULL;
# Line 4260  for (;; ptr++) Line 4892  for (;; ptr++)
4892    
4893    
4894          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4895          case '<':                 /* Lookbehind or named define */          case CHAR_LESS_THAN_SIGN:              /* Lookbehind or named define */
4896          switch (ptr[1])          switch (ptr[1])
4897            {            {
4898            case '=':               /* Positive lookbehind */            case CHAR_EQUALS_SIGN:               /* Positive lookbehind */
4899            bravalue = OP_ASSERTBACK;            bravalue = OP_ASSERTBACK;
4900            ptr += 2;            ptr += 2;
4901            break;            break;
4902    
4903            case '!':               /* Negative lookbehind */            case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */
4904            bravalue = OP_ASSERTBACK_NOT;            bravalue = OP_ASSERTBACK_NOT;
4905            ptr += 2;            ptr += 2;
4906            break;            break;
# Line 4283  for (;; ptr++) Line 4915  for (;; ptr++)
4915    
4916    
4917          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4918          case '>':                 /* One-time brackets */          case CHAR_GREATER_THAN_SIGN:           /* One-time brackets */
4919          bravalue = OP_ONCE;          bravalue = OP_ONCE;
4920          ptr++;          ptr++;
4921          break;          break;
4922    
4923    
4924          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4925          case 'C':                 /* Callout - may be followed by digits; */          case CHAR_C:                 /* Callout - may be followed by digits; */
4926          previous_callout = code;  /* Save for later completion */          previous_callout = code;  /* Save for later completion */
4927          after_manual_callout = 1; /* Skip one item before completing */          after_manual_callout = 1; /* Skip one item before completing */
4928          *code++ = OP_CALLOUT;          *code++ = OP_CALLOUT;
4929            {            {
4930            int n = 0;            int n = 0;
4931            while ((digitab[*(++ptr)] & ctype_digit) != 0)            while ((digitab[*(++ptr)] & ctype_digit) != 0)
4932              n = n * 10 + *ptr - '0';              n = n * 10 + *ptr - CHAR_0;
4933            if (*ptr != ')')            if (*ptr != CHAR_RIGHT_PARENTHESIS)
4934              {              {
4935              *errorcodeptr = ERR39;              *errorcodeptr = ERR39;
4936              goto FAILED;              goto FAILED;
# Line 4318  for (;; ptr++) Line 4950  for (;; ptr++)
4950    
4951    
4952          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4953          case 'P':                 /* Python-style named subpattern handling */          case CHAR_P:              /* Python-style named subpattern handling */
4954          if (*(++ptr) == '=' || *ptr == '>')  /* Reference or recursion */          if (*(++ptr) == CHAR_EQUALS_SIGN ||
4955                *ptr == CHAR_GREATER_THAN_SIGN)  /* Reference or recursion */
4956            {            {
4957            is_recurse = *ptr == '>';            is_recurse = *ptr == CHAR_GREATER_THAN_SIGN;
4958            terminator = ')';            terminator = CHAR_RIGHT_PARENTHESIS;
4959            goto NAMED_REF_OR_RECURSE;            goto NAMED_REF_OR_RECURSE;
4960            }            }
4961          else if (*ptr != '<')    /* Test for Python-style definition */          else if (*ptr != CHAR_LESS_THAN_SIGN)  /* Test for Python-style defn */
4962            {            {
4963            *errorcodeptr = ERR41;            *errorcodeptr = ERR41;
4964            goto FAILED;            goto FAILED;
# Line 4335  for (;; ptr++) Line 4968  for (;; ptr++)
4968    
4969          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4970          DEFINE_NAME:    /* Come here from (?< handling */          DEFINE_NAME:    /* Come here from (?< handling */
4971          case '\'':          case CHAR_APOSTROPHE:
4972            {            {
4973            terminator = (*ptr == '<')? '>' : '\'';            terminator = (*ptr == CHAR_LESS_THAN_SIGN)?
4974                CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
4975            name = ++ptr;            name = ++ptr;
4976    
4977            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
# Line 4368  for (;; ptr++) Line 5002  for (;; ptr++)
5002                }                }
5003              }              }
5004    
5005            /* In the real compile, create the entry in the table */            /* In the real compile, create the entry in the table, maintaining
5006              alphabetical order. Duplicate names for different numbers are
5007              permitted only if PCRE_DUPNAMES is set. Duplicate names for the same
5008              number are always OK. (An existing number can be re-used if (?|
5009              appears in the pattern.) In either event, a duplicate name results in
5010              a duplicate entry in the table, even if the number is the same. This
5011              is because the number of names, and hence the table size, is computed
5012              in the pre-compile, and it affects various numbers and pointers which
5013              would all have to be modified, and the compiled code moved down, if
5014              duplicates with the same number were omitted from the table. This
5015              doesn't seem worth the hassle. However, *different* names for the
5016              same number are not permitted. */
5017    
5018            else            else
5019              {              {
5020                BOOL dupname = FALSE;
5021              slot = cd->name_table;              slot = cd->name_table;
5022    
5023              for (i = 0; i < cd->names_found; i++)              for (i = 0; i < cd->names_found; i++)
5024                {                {
5025                int crc = memcmp(name, slot+2, namelen);                int crc = memcmp(name, slot+2, namelen);
# Line 4380  for (;; ptr++) Line 5027  for (;; ptr++)
5027                  {                  {
5028                  if (slot[2+namelen] == 0)                  if (slot[2+namelen] == 0)
5029                    {                    {
5030                    if ((options & PCRE_DUPNAMES) == 0)                    if (GET2(slot, 0) != cd->bracount + 1 &&
5031                          (options & PCRE_DUPNAMES) == 0)
5032                      {                      {
5033                      *errorcodeptr = ERR43;                      *errorcodeptr = ERR43;
5034                      goto FAILED;                      goto FAILED;
5035                      }                      }
5036                      else dupname = TRUE;
5037                    }                    }
5038                  else crc = -1;      /* Current name is substring */                  else crc = -1;      /* Current name is a substring */
5039                  }                  }
5040    
5041                  /* Make space in the table and break the loop for an earlier
5042                  name. For a duplicate or later name, carry on. We do this for
5043                  duplicates so that in the simple case (when ?(| is not used) they
5044                  are in order of their numbers. */
5045    
5046                if (crc < 0)                if (crc < 0)
5047                  {                  {
5048                  memmove(slot + cd->name_entry_size, slot,                  memmove(slot + cd->name_entry_size, slot,
5049                    (cd->names_found - i) * cd->name_entry_size);                    (cd->names_found - i) * cd->name_entry_size);
5050                  break;                  break;
5051                  }                  }
5052    
5053                  /* Continue the loop for a later or duplicate name */
5054    
5055                slot += cd->name_entry_size;                slot += cd->name_entry_size;
5056                }                }
5057    
5058                /* For non-duplicate names, check for a duplicate number before
5059                adding the new name. */
5060    
5061                if (!dupname)
5062                  {
5063                  uschar *cslot = cd->name_table;
5064                  for (i = 0; i < cd->names_found; i++)
5065                    {
5066                    if (cslot != slot)
5067                      {
5068                      if (GET2(cslot, 0) == cd->bracount + 1)
5069                        {
5070                        *errorcodeptr = ERR65;
5071                        goto FAILED;
5072                        }
5073                      }
5074                    else i--;
5075                    cslot += cd->name_entry_size;
5076                    }
5077                  }
5078    
5079              PUT2(slot, 0, cd->bracount + 1);              PUT2(slot, 0, cd->bracount + 1);
5080              memcpy(slot + 2, name, namelen);              memcpy(slot + 2, name, namelen);
5081              slot[2+namelen] = 0;              slot[2+namelen] = 0;
5082              }              }
5083            }            }
5084    
5085          /* In both cases, count the number of names we've encountered. */          /* In both pre-compile and compile, count the number of names we've
5086            encountered. */
5087    
         ptr++;                    /* Move past > or ' */  
5088          cd->names_found++;          cd->names_found++;
5089            ptr++;                    /* Move past > or ' */
5090          goto NUMBERED_GROUP;          goto NUMBERED_GROUP;
5091    
5092    
5093          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5094          case '&':                 /* Perl recursion/subroutine syntax */          case CHAR_AMPERSAND:            /* Perl recursion/subroutine syntax */
5095          terminator = ')';          terminator = CHAR_RIGHT_PARENTHESIS;
5096          is_recurse = TRUE;          is_recurse = TRUE;
5097          /* Fall through */          /* Fall through */
5098    
5099          /* We come here from the Python syntax above that handles both          /* We come here from the Python syntax above that handles both
5100          references (?P=name) and recursion (?P>name), as well as falling          references (?P=name) and recursion (?P>name), as well as falling
5101          through from the Perl recursion syntax (?&name). */          through from the Perl recursion syntax (?&name). We also come here from
5102            the Perl \k<name> or \k'name' back reference syntax and the \k{name}
5103            .NET syntax, and the Oniguruma \g<...> and \g'...' subroutine syntax. */
5104    
5105          NAMED_REF_OR_RECURSE:          NAMED_REF_OR_RECURSE:
5106          name = ++ptr;          name = ++ptr;
# Line 4430  for (;; ptr++) Line 5112  for (;; ptr++)
5112    
5113          if (lengthptr != NULL)          if (lengthptr != NULL)
5114            {            {
5115              if (namelen == 0)
5116                {
5117                *errorcodeptr = ERR62;
5118                goto FAILED;
5119                }
5120            if (*ptr != terminator)            if (*ptr != terminator)
5121              {              {
5122              *errorcodeptr = ERR42;              *errorcodeptr = ERR42;
# Line 4443  for (;; ptr++) Line 5130  for (;; ptr++)
5130            recno = 0;            recno = 0;
5131            }            }
5132    
5133          /* In the real compile, seek the name in the table */          /* In the real compile, seek the name in the table. We check the name
5134            first, and then check that we have reached the end of the name in the
5135            table. That way, if the name that is longer than any in the table,
5136            the comparison will fail without reading beyond the table entry. */
5137    
5138          else          else
5139            {            {
5140            slot = cd->name_table;            slot = cd->name_table;
5141            for (i = 0; i < cd->names_found; i++)            for (i = 0; i < cd->names_found; i++)
5142              {              {
5143              if (strncmp((char *)name, (char *)slot+2, namelen) == 0) break;              if (strncmp((char *)name, (char *)slot+2, namelen) == 0 &&
5144                    slot[2+namelen] == 0)
5145                  break;
5146              slot += cd->name_entry_size;              slot += cd->name_entry_size;
5147              }              }
5148    
# Line 4459  for (;; ptr++) Line 5151  for (;; ptr++)
5151              recno = GET2(slot, 0);              recno = GET2(slot, 0);
5152              }              }
5153            else if ((recno =                /* Forward back reference */            else if ((recno =                /* Forward back reference */
5154                      find_parens(ptr, cd->bracount, name, namelen,                      find_parens(cd, name, namelen,
5155                        (options & PCRE_EXTENDED) != 0)) <= 0)                        (options & PCRE_EXTENDED) != 0)) <= 0)
5156              {              {
5157              *errorcodeptr = ERR15;              *errorcodeptr = ERR15;
# Line 4475  for (;; ptr++) Line 5167  for (;; ptr++)
5167    
5168    
5169          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5170          case 'R':                 /* Recursion */          case CHAR_R:              /* Recursion */
5171          ptr++;                    /* Same as (?0)      */          ptr++;                    /* Same as (?0)      */
5172          /* Fall through */          /* Fall through */
5173    
5174    
5175          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5176          case '-': case '+':          case CHAR_MINUS: case CHAR_PLUS:  /* Recursion or subroutine */
5177          case '0': case '1': case '2': case '3': case '4':   /* Recursion or */          case CHAR_0: case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4:
5178          case '5': case '6': case '7': case '8': case '9':   /* subroutine */          case CHAR_5: case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
5179            {            {
5180            const uschar *called;            const uschar *called;
5181              terminator = CHAR_RIGHT_PARENTHESIS;
5182    
5183            if ((refsign = *ptr) == '+') ptr++;            /* Come here from the \g<...> and \g'...' code (Oniguruma
5184            else if (refsign == '-')            compatibility). However, the syntax has been checked to ensure that
5185              the ... are a (signed) number, so that neither ERR63 nor ERR29 will
5186              be called on this path, nor with the jump to OTHER_CHAR_AFTER_QUERY
5187              ever be taken. */
5188    
5189              HANDLE_NUMERICAL_RECURSION:
5190    
5191              if ((refsign = *ptr) == CHAR_PLUS)
5192                {
5193                ptr++;
5194                if ((digitab[*ptr] & ctype_digit) == 0)
5195                  {
5196                  *errorcodeptr = ERR63;
5197                  goto FAILED;
5198                  }
5199                }
5200              else if (refsign == CHAR_MINUS)
5201              {              {
5202              if ((digitab[ptr[1]] & ctype_digit) == 0)              if ((digitab[ptr[1]] & ctype_digit) == 0)
5203                goto OTHER_CHAR_AFTER_QUERY;                goto OTHER_CHAR_AFTER_QUERY;
# Line 4497  for (;; ptr++) Line 5206  for (;; ptr++)
5206    
5207            recno = 0;            recno = 0;
5208            while((digitab[*ptr] & ctype_digit) != 0)            while((digitab[*ptr] & ctype_digit) != 0)
5209              recno = recno * 10 + *ptr++ - '0';              recno = recno * 10 + *ptr++ - CHAR_0;
5210    
5211            if (*ptr != ')')            if (*ptr != terminator)
5212              {              {
5213              *errorcodeptr = ERR29;              *errorcodeptr = ERR29;
5214              goto FAILED;              goto FAILED;
5215              }              }
5216    
5217            if (refsign == '-')            if (refsign == CHAR_MINUS)
5218              {              {
5219              if (recno == 0)              if (recno == 0)
5220                {                {
# Line 4519  for (;; ptr++) Line 5228  for (;; ptr++)
5228                goto FAILED;                goto FAILED;
5229                }                }
5230              }              }
5231            else if (refsign == '+')            else if (refsign == CHAR_PLUS)
5232              {              {
5233              if (recno == 0)              if (recno == 0)
5234                {                {
# Line 4546  for (;; ptr++) Line 5255  for (;; ptr++)
5255            if (lengthptr == NULL)            if (lengthptr == NULL)
5256              {              {
5257              *code = OP_END;              *code = OP_END;
5258              if (recno != 0) called = find_bracket(cd->start_code, utf8, recno);              if (recno != 0)
5259                  called = _pcre_find_bracket(cd->start_code, utf8, recno);
5260    
5261              /* Forward reference */              /* Forward reference */
5262    
5263              if (called == NULL)              if (called == NULL)
5264                {                {
5265                if (find_parens(ptr, cd->bracount, NULL, recno,                if (find_parens(cd, NULL, recno,
5266                     (options & PCRE_EXTENDED) != 0) < 0)                      (options & PCRE_EXTENDED) != 0) < 0)
5267                  {                  {
5268                  *errorcodeptr = ERR15;                  *errorcodeptr = ERR15;
5269                  goto FAILED;                  goto FAILED;
5270                  }                  }
5271    
5272                  /* Fudge the value of "called" so that when it is inserted as an
5273                  offset below, what it actually inserted is the reference number
5274                  of the group. */
5275    
5276                called = cd->start_code + recno;                called = cd->start_code + recno;
5277                PUTINC(cd->hwm, 0, code + 2 + LINK_SIZE - cd->start_code);                PUTINC(cd->hwm, 0, code + 2 + LINK_SIZE - cd->start_code);
5278                }                }
# Line 4567  for (;; ptr++) Line 5282  for (;; ptr++)
5282              recursion that could loop for ever, and diagnose that case. */              recursion that could loop for ever, and diagnose that case. */
5283    
5284              else if (GET(called, 1) == 0 &&              else if (GET(called, 1) == 0 &&
5285                       could_be_empty(called, code, bcptr, utf8))                       could_be_empty(called, code, bcptr, utf8, cd))
5286                {                {
5287                *errorcodeptr = ERR40;                *errorcodeptr = ERR40;
5288                goto FAILED;                goto FAILED;
# Line 4605  for (;; ptr++) Line 5320  for (;; ptr++)
5320          set = unset = 0;          set = unset = 0;
5321          optset = &set;          optset = &set;
5322    
5323          while (*ptr != ')' && *ptr != ':')          while (*ptr != CHAR_RIGHT_PARENTHESIS && *ptr != CHAR_COLON)
5324            {            {
5325            switch (*ptr++)            switch (*ptr++)
5326              {              {
5327              case '-': optset = &unset; break;              case CHAR_MINUS: optset = &unset; break;
5328    
5329              case 'J':    /* Record that it changed in the external options */              case CHAR_J:    /* Record that it changed in the external options */
5330              *optset |= PCRE_DUPNAMES;              *optset |= PCRE_DUPNAMES;
5331              cd->external_options |= PCRE_JCHANGED;              cd->external_flags |= PCRE_JCHANGED;
5332              break;              break;
5333    
5334              case 'i': *optset |= PCRE_CASELESS; break;              case CHAR_i: *optset |= PCRE_CASELESS; break;
5335              case 'm': *optset |= PCRE_MULTILINE; break;              case CHAR_m: *optset |= PCRE_MULTILINE; break;
5336              case 's': *optset |= PCRE_DOTALL; break;              case CHAR_s: *optset |= PCRE_DOTALL; break;
5337              case 'x': *optset |= PCRE_EXTENDED; break;              case CHAR_x: *optset |= PCRE_EXTENDED; break;
5338              case 'U': *optset |= PCRE_UNGREEDY; break;              case CHAR_U: *optset |= PCRE_UNGREEDY; break;
5339              case 'X': *optset |= PCRE_EXTRA; break;              case CHAR_X: *optset |= PCRE_EXTRA; break;
5340    
5341              default:  *errorcodeptr = ERR12;              default:  *errorcodeptr = ERR12;
5342                        ptr--;    /* Correct the offset */                        ptr--;    /* Correct the offset */
# Line 4652  for (;; ptr++) Line 5367  for (;; ptr++)
5367          both phases.          both phases.
5368    
5369          If we are not at the pattern start, compile code to change the ims          If we are not at the pattern start, compile code to change the ims
5370          options if this setting actually changes any of them. We also pass the          options if this setting actually changes any of them, and reset the
5371          new setting back so that it can be put at the start of any following          greedy defaults and the case value for firstbyte and reqbyte. */
         branches, and when this group ends (if we are in a group), a resetting  
         item can be compiled. */  
5372    
5373          if (*ptr == ')')          if (*ptr == CHAR_RIGHT_PARENTHESIS)
5374            {            {
5375            if (code == cd->start_code + 1 + LINK_SIZE &&            if (code == cd->start_code + 1 + LINK_SIZE &&
5376                 (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))                 (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
5377              {              {
5378              cd->external_options = newoptions;              cd->external_options = newoptions;
             options = newoptions;  
5379              }              }
5380           else            else
5381              {              {
5382              if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))              if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
5383                {                {
5384                *code++ = OP_OPT;                *code++ = OP_OPT;
5385                *code++ = newoptions & PCRE_IMS;                *code++ = newoptions & PCRE_IMS;
5386                }                }
   
             /* Change options at this level, and pass them back for use  
             in subsequent branches. Reset the greedy defaults and the case  
             value for firstbyte and reqbyte. */  
   
             *optionsptr = options = newoptions;  
5387              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
5388              greedy_non_default = greedy_default ^ 1;              greedy_non_default = greedy_default ^ 1;
5389              req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;              req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
5390              }              }
5391    
5392              /* Change options at this level, and pass them back for use
5393              in subsequent branches. When not at the start of the pattern, this
5394              information is also necessary so that a resetting item can be
5395              compiled at the end of a group (if we are in a group). */
5396    
5397              *optionsptr = options = newoptions;
5398            previous = NULL;       /* This item can't be repeated */            previous = NULL;       /* This item can't be repeated */
5399            continue;              /* It is complete */            continue;              /* It is complete */
5400            }            }
# Line 4697  for (;; ptr++) Line 5409  for (;; ptr++)
5409          }     /* End of switch for character following (? */          }     /* End of switch for character following (? */
5410        }       /* End of (? handling */        }       /* End of (? handling */
5411    
5412      /* Opening parenthesis not followed by '?'. If PCRE_NO_AUTO_CAPTURE is set,      /* Opening parenthesis not followed by '*' or '?'. If PCRE_NO_AUTO_CAPTURE
5413      all unadorned brackets become non-capturing and behave like (?:...)      is set, all unadorned brackets become non-capturing and behave like (?:...)
5414      brackets. */      brackets. */
5415    
5416      else if ((options & PCRE_NO_AUTO_CAPTURE) != 0)      else if ((options & PCRE_NO_AUTO_CAPTURE) != 0)
# Line 4798  for (;; ptr++) Line 5510  for (;; ptr++)
5510    
5511      /* Error if hit end of pattern */      /* Error if hit end of pattern */
5512    
5513      if (*ptr != ')')      if (*ptr != CHAR_RIGHT_PARENTHESIS)
5514        {        {
5515        *errorcodeptr = ERR14;        *errorcodeptr = ERR14;
5516        goto FAILED;        goto FAILED;
# Line 4896  for (;; ptr++) Line 5608  for (;; ptr++)
5608      We can test for values between ESC_b and ESC_Z for the latter; this may      We can test for values between ESC_b and ESC_Z for the latter; this may
5609      have to change if any new ones are ever created. */      have to change if any new ones are ever created. */
5610    
5611      case '\\':      case CHAR_BACKSLASH:
5612      tempptr = ptr;      tempptr = ptr;
5613      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);
5614      if (*errorcodeptr != 0) goto FAILED;      if (*errorcodeptr != 0) goto FAILED;
# Line 4905  for (;; ptr++) Line 5617  for (;; ptr++)
5617        {        {
5618        if (-c == ESC_Q)            /* Handle start of quoted string */        if (-c == ESC_Q)            /* Handle start of quoted string */
5619          {          {
5620          if (ptr[1] == '\\' && ptr[2] == 'E') ptr += 2; /* avoid empty string */          if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
5621            else inescq = TRUE;            ptr += 2;               /* avoid empty string */
5622                else inescq = TRUE;
5623          continue;          continue;
5624          }          }
5625    
# Line 4923  for (;; ptr++) Line 5636  for (;; ptr++)
5636        zerofirstbyte = firstbyte;        zerofirstbyte = firstbyte;
5637        zeroreqbyte = reqbyte;        zeroreqbyte = reqbyte;
5638    
5639          /* \g<name> or \g'name' is a subroutine call by name and \g<n> or \g'n'
5640          is a subroutine call by number (Oniguruma syntax). In fact, the value
5641          -ESC_g is returned only for these cases. So we don't need to check for <
5642          or ' if the value is -ESC_g. For the Perl syntax \g{n} the value is
5643          -ESC_REF+n, and for the Perl syntax \g{name} the result is -ESC_k (as
5644          that is a synonym for a named back reference). */
5645    
5646          if (-c == ESC_g)
5647            {
5648            const uschar *p;
5649            save_hwm = cd->hwm;   /* Normally this is set when '(' is read */
5650            terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
5651              CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
5652    
5653            /* These two statements stop the compiler for warning about possibly
5654            unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In
5655            fact, because we actually check for a number below, the paths that
5656            would actually be in error are never taken. */
5657    
5658            skipbytes = 0;
5659            reset_bracount = FALSE;
5660    
5661            /* Test for a name */
5662    
5663            if (ptr[1] != CHAR_PLUS && ptr[1] != CHAR_MINUS)
5664              {
5665              BOOL isnumber = TRUE;
5666              for (p = ptr + 1; *p != 0 && *p != terminator; p++)
5667                {
5668                if ((cd->ctypes[*p] & ctype_digit) == 0) isnumber = FALSE;
5669                if ((cd->ctypes[*p] & ctype_word) == 0) break;
5670                }
5671              if (*p != terminator)
5672                {
5673                *errorcodeptr = ERR57;
5674                break;
5675                }
5676              if (isnumber)
5677                {
5678                ptr++;
5679                goto HANDLE_NUMERICAL_RECURSION;
5680                }
5681              is_recurse = TRUE;
5682              goto NAMED_REF_OR_RECURSE;
5683              }
5684    
5685            /* Test a signed number in angle brackets or quotes. */
5686    
5687            p = ptr + 2;
5688            while ((digitab[*p] & ctype_digit) != 0) p++;
5689            if (*p != terminator)
5690              {
5691              *errorcodeptr = ERR57;
5692              break;
5693              }
5694            ptr++;
5695            goto HANDLE_NUMERICAL_RECURSION;
5696            }
5697    
5698        /* \k<name> or \k'name' is a back reference by name (Perl syntax).        /* \k<name> or \k'name' is a back reference by name (Perl syntax).
5699        We also support \k{name} (.NET syntax) */        We also support \k{name} (.NET syntax) */
5700    
5701        if (-c == ESC_k && (ptr[1] == '<' || ptr[1] == '\'' || ptr[1] == '{'))        if (-c == ESC_k && (ptr[1] == CHAR_LESS_THAN_SIGN ||
5702              ptr[1] == CHAR_APOSTROPHE || ptr[1] == CHAR_LEFT_CURLY_BRACKET))
5703          {          {
5704          is_recurse = FALSE;          is_recurse = FALSE;
5705          terminator = (*(++ptr) == '<')? '>' : (*ptr == '\'')? '\'' : '}';          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
5706              CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?
5707              CHAR_APOSTROPHE : CHAR_RIGHT_CURLY_BRACKET;
5708          goto NAMED_REF_OR_RECURSE;          goto NAMED_REF_OR_RECURSE;
5709          }          }
5710    
# Line 4939  for (;; ptr++) Line 5714  for (;; ptr++)
5714    
5715        if (-c >= ESC_REF)        if (-c >= ESC_REF)
5716          {          {
5717            open_capitem *oc;
5718          recno = -c - ESC_REF;          recno = -c - ESC_REF;
5719    
5720          HANDLE_REFERENCE:    /* Come here from named backref handling */          HANDLE_REFERENCE:    /* Come here from named backref handling */
# Line 4948  for (;; ptr++) Line 5724  for (;; ptr++)
5724          PUT2INC(code, 0, recno);          PUT2INC(code, 0, recno);
5725          cd->backref_map |= (recno < 32)? (1 << recno) : 1;          cd->backref_map |= (recno < 32)? (1 << recno) : 1;
5726          if (recno > cd->top_backref) cd->top_backref = recno;          if (recno > cd->top_backref) cd->top_backref = recno;
5727    
5728            /* Check to see if this back reference is recursive, that it, it
5729            is inside the group that it references. A flag is set so that the
5730            group can be made atomic. */
5731    
5732            for (oc = cd->open_caps; oc != NULL; oc = oc->next)
5733              {
5734              if (oc->number == recno)
5735                {
5736                oc->flag = TRUE;
5737                break;
5738                }
5739              }
5740          }          }
5741    
5742        /* So are Unicode property matches, if supported. */        /* So are Unicode property matches, if supported. */
# Line 5030  for (;; ptr++) Line 5819  for (;; ptr++)
5819      *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;      *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;
5820      for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];      for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];
5821    
5822        /* Remember if \r or \n were seen */
5823    
5824        if (mcbuffer[0] == CHAR_CR || mcbuffer[0] == CHAR_NL)
5825          cd->external_flags |= PCRE_HASCRORLF;
5826    
5827      /* Set the first and required bytes appropriately. If no previous first      /* Set the first and required bytes appropriately. If no previous first
5828      byte, set it from this character, but revert to none on a zero repeat.      byte, set it from this character, but revert to none on a zero repeat.
5829      Otherwise, leave the firstbyte value alone, and don't change it on a zero      Otherwise, leave the firstbyte value alone, and don't change it on a zero
# Line 5125  uschar *code = *codeptr; Line 5919  uschar *code = *codeptr;
5919  uschar *last_branch = code;  uschar *last_branch = code;
5920  uschar *start_bracket = code;  uschar *start_bracket = code;
5921  uschar *reverse_count = NULL;  uschar *reverse_count = NULL;
5922    open_capitem capitem;
5923    int capnumber = 0;
5924  int firstbyte, reqbyte;  int firstbyte, reqbyte;
5925  int branchfirstbyte, branchreqbyte;  int branchfirstbyte, branchreqbyte;
5926  int length;  int length;
5927  int orig_bracount;  int orig_bracount;
5928  int max_bracount;  int max_bracount;
5929    int old_external_options = cd->external_options;
5930  branch_chain bc;  branch_chain bc;
5931    
5932  bc.outer = bcptr;  bc.outer = bcptr;
5933  bc.current = code;  bc.current_branch = code;
5934    
5935  firstbyte = reqbyte = REQ_UNSET;  firstbyte = reqbyte = REQ_UNSET;
5936    
# Line 5151  the code that abstracts option settings Line 5948  the code that abstracts option settings
5948  them global. It tests the value of length for (2 + 2*LINK_SIZE) in the  them global. It tests the value of length for (2 + 2*LINK_SIZE) in the
5949  pre-compile phase to find out whether anything has yet been compiled or not. */  pre-compile phase to find out whether anything has yet been compiled or not. */
5950    
5951    /* If this is a capturing subpattern, add to the chain of open capturing items
5952    so that we can detect them if (*ACCEPT) is encountered. This is also used to
5953    detect groups that contain recursive back references to themselves. */
5954    
5955    if (*code == OP_CBRA)
5956      {
5957      capnumber = GET2(code, 1 + LINK_SIZE);
5958      capitem.number = capnumber;
5959      capitem.next = cd->open_caps;
5960      capitem.flag = FALSE;
5961      cd->open_caps = &capitem;
5962      }
5963    
5964  /* Offset is set zero to mark that this bracket is still open */  /* Offset is set zero to mark that this bracket is still open */
5965    
5966  PUT(code, 1, 0);  PUT(code, 1, 0);
# Line 5195  for (;;) Line 6005  for (;;)
6005      return FALSE;      return FALSE;
6006      }      }
6007    
6008      /* If the external options have changed during this branch, it means that we
6009      are at the top level, and a leading option setting has been encountered. We
6010      need to re-set the original option values to take account of this so that,
6011      during the pre-compile phase, we know to allow for a re-set at the start of
6012      subsequent branches. */
6013    
6014      if (old_external_options != cd->external_options)
6015        oldims = cd->external_options & PCRE_IMS;
6016    
6017    /* Keep the highest bracket count in case (?| was used and some branch    /* Keep the highest bracket count in case (?| was used and some branch
6018    has fewer than the rest. */    has fewer than the rest. */
6019    
# Line 5245  for (;;) Line 6064  for (;;)
6064    
6065      /* If lookbehind, check that this branch matches a fixed-length string, and      /* If lookbehind, check that this branch matches a fixed-length string, and
6066      put the length into the OP_REVERSE item. Temporarily mark the end of the      put the length into the OP_REVERSE item. Temporarily mark the end of the
6067      branch with OP_END. */      branch with OP_END. If the branch contains OP_RECURSE, the result is -3
6068        because there may be forward references that we can't check here. Set a
6069        flag to cause another lookbehind check at the end. Why not do it all at the
6070        end? Because common, erroneous checks are picked up here and the offset of
6071        the problem can be shown. */
6072    
6073      if (lookbehind)      if (lookbehind)
6074        {        {
6075        int fixed_length;        int fixed_length;
6076        *code = OP_END;        *code = OP_END;
6077        fixed_length = find_fixedlength(last_branch, options);        fixed_length = find_fixedlength(last_branch, options, FALSE, cd);
6078        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
6079        if (fixed_length < 0)        if (fixed_length == -3)
6080            {
6081            cd->check_lookbehind = TRUE;
6082            }
6083          else if (fixed_length < 0)
6084          {          {
6085          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;
6086          *ptrptr = ptr;          *ptrptr = ptr;
6087          return FALSE;          return FALSE;
6088          }          }
6089        PUT(reverse_count, 0, fixed_length);        else { PUT(reverse_count, 0, fixed_length); }
6090        }        }
6091      }      }
6092    
# Line 5272  for (;;) Line 6099  for (;;)
6099    compile a resetting op-code following, except at the very end of the pattern.    compile a resetting op-code following, except at the very end of the pattern.
6100    Return leaving the pointer at the terminating char. */    Return leaving the pointer at the terminating char. */
6101    
6102    if (*ptr != '|')    if (*ptr != CHAR_VERTICAL_LINE)
6103      {      {
6104      if (lengthptr == NULL)      if (lengthptr == NULL)
6105        {        {
# Line 5293  for (;;) Line 6120  for (;;)
6120      PUT(code, 1, code - start_bracket);      PUT(code, 1, code - start_bracket);
6121      code += 1 + LINK_SIZE;      code += 1 + LINK_SIZE;
6122    
6123      /* Resetting option if needed */      /* If it was a capturing subpattern, check to see if it contained any
6124        recursive back references. If so, we must wrap it in atomic brackets.
6125        In any event, remove the block from the chain. */
6126    
6127        if (capnumber > 0)
6128          {
6129          if (cd->open_caps->flag)
6130            {
6131            memmove(start_bracket + 1 + LINK_SIZE, start_bracket,
6132              code - start_bracket);
6133            *start_bracket = OP_ONCE;
6134            code += 1 + LINK_SIZE;
6135            PUT(start_bracket, 1, code - start_bracket);
6136            *code = OP_KET;
6137            PUT(code, 1, code - start_bracket);
6138            code += 1 + LINK_SIZE;
6139            length += 2 + 2*LINK_SIZE;
6140            }
6141          cd->open_caps = cd->open_caps->next;
6142          }
6143    
6144        /* Reset options if needed. */
6145    
6146      if ((options & PCRE_IMS) != oldims && *ptr == ')')      if ((options & PCRE_IMS) != oldims && *ptr == CHAR_RIGHT_PARENTHESIS)
6147        {        {
6148        *code++ = OP_OPT;        *code++ = OP_OPT;
6149        *code++ = oldims;        *code++ = oldims;
# Line 5342  for (;;) Line 6190  for (;;)
6190      {      {
6191      *code = OP_ALT;      *code = OP_ALT;
6192      PUT(code, 1, code - last_branch);      PUT(code, 1, code - last_branch);
6193      bc.current = last_branch = code;      bc.current_branch = last_branch = code;
6194      code += 1 + LINK_SIZE;      code += 1 + LINK_SIZE;
6195      }      }
6196    
# Line 5424  do { Line 6272  do {
6272       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;
6273       }       }
6274    
6275     /* .* is not anchored unless DOTALL is set and it isn't in brackets that     /* .* is not anchored unless DOTALL is set (which generates OP_ALLANY) and
6276     are or may be referenced. */     it isn't in brackets that are or may be referenced. */
6277    
6278     else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||     else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||
6279               op == OP_TYPEPOSSTAR) &&               op == OP_TYPEPOSSTAR))
             (*options & PCRE_DOTALL) != 0)  
6280       {       {
6281       if (scode[1] != OP_ANY || (bracket_map & backref_map) != 0) return FALSE;       if (scode[1] != OP_ALLANY || (bracket_map & backref_map) != 0)
6282           return FALSE;
6283       }       }
6284    
6285     /* Check for explicit anchoring */     /* Check for explicit anchoring */
# Line 5477  do { Line 6325  do {
6325       NULL, 0, FALSE);       NULL, 0, FALSE);
6326     register int op = *scode;     register int op = *scode;
6327    
6328       /* If we are at the start of a conditional assertion group, *both* the
6329       conditional assertion *and* what follows the condition must satisfy the test
6330       for start of line. Other kinds of condition fail. Note that there may be an
6331       auto-callout at the start of a condition. */
6332    
6333       if (op == OP_COND)
6334         {
6335         scode += 1 + LINK_SIZE;
6336         if (*scode == OP_CALLOUT) scode += _pcre_OP_lengths[OP_CALLOUT];
6337         switch (*scode)
6338           {
6339           case OP_CREF:
6340           case OP_NCREF:
6341           case OP_RREF:
6342           case OP_NRREF:
6343           case OP_DEF:
6344           return FALSE;
6345    
6346           default:     /* Assertion */
6347           if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
6348           do scode += GET(scode, 1); while (*scode == OP_ALT);
6349           scode += 1 + LINK_SIZE;
6350           break;
6351           }
6352         scode = first_significant_code(scode, NULL, 0, FALSE);
6353         op = *scode;
6354         }
6355    
6356     /* Non-capturing brackets */     /* Non-capturing brackets */
6357    
6358     if (op == OP_BRA)     if (op == OP_BRA)
# Line 5495  do { Line 6371  do {
6371    
6372     /* Other brackets */     /* Other brackets */
6373    
6374     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)     else if (op == OP_ASSERT || op == OP_ONCE)
6375       { if (!is_startline(scode, bracket_map, backref_map)) return FALSE; }       {
6376         if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
6377         }
6378    
6379     /* .* means "start at start or after \n" if it isn't in brackets that     /* .* means "start at start or after \n" if it isn't in brackets that
6380     may be referenced. */     may be referenced. */
# Line 5613  Returns: pointer to compiled data Line 6491  Returns: pointer to compiled data
6491                  with errorptr and erroroffset set                  with errorptr and erroroffset set
6492  */  */
6493    
6494  PCRE_EXP_DEFN pcre *  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
6495  pcre_compile(const char *pattern, int options, const char **errorptr,  pcre_compile(const char *pattern, int options, const char **errorptr,
6496    int *erroroffset, const unsigned char *tables)    int *erroroffset, const unsigned char *tables)
6497  {  {
# Line 5621  return pcre_compile2(pattern, options, N Line 6499  return pcre_compile2(pattern, options, N
6499  }  }
6500    
6501    
6502  PCRE_EXP_DEFN pcre *  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
6503  pcre_compile2(const char *pattern, int options, int *errorcodeptr,  pcre_compile2(const char *pattern, int options, int *errorcodeptr,
6504    const char **errorptr, int *erroroffset, const unsigned char *tables)    const char **errorptr, int *erroroffset, const unsigned char *tables)
6505  {  {
# Line 5629  real_pcre *re; Line 6507  real_pcre *re;
6507  int length = 1;  /* For final END opcode */  int length = 1;  /* For final END opcode */
6508  int firstbyte, reqbyte, newline;  int firstbyte, reqbyte, newline;
6509  int errorcode = 0;  int errorcode = 0;
6510  #ifdef SUPPORT_UTF8  int skipatstart = 0;
6511  BOOL utf8;  BOOL utf8 = (options & PCRE_UTF8) != 0;
 #endif  
6512  size_t size;  size_t size;
6513  uschar *code;  uschar *code;
6514  const uschar *codestart;  const uschar *codestart;
# Line 5647  to fill in forward references to subpatt Line 6524  to fill in forward references to subpatt
6524    
6525  uschar cworkspace[COMPILE_WORK_SIZE];  uschar cworkspace[COMPILE_WORK_SIZE];
6526    
   
6527  /* Set this early so that early errors get offset 0. */  /* Set this early so that early errors get offset 0. */
6528