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

Diff of /code/trunk/pcre_compile.c

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

revision 172 by ph10, Tue Jun 5 10:40:13 2007 UTC revision 300 by ph10, Mon Jan 14 19:43:19 2008 UTC
# Line 42  POSSIBILITY OF SUCH DAMAGE. Line 42  POSSIBILITY OF SUCH DAMAGE.
42  supporting internal functions that are not used by other modules. */  supporting internal functions that are not used by other modules. */
43    
44    
45    #ifdef HAVE_CONFIG_H
46    #include "config.h"
47    #endif
48    
49  #define NLBLOCK cd             /* Block containing newline information */  #define NLBLOCK cd             /* Block containing newline information */
50  #define PSSTART start_pattern  /* Field containing processed string start */  #define PSSTART start_pattern  /* Field containing processed string start */
51  #define PSEND   end_pattern    /* Field containing processed string end */  #define PSEND   end_pattern    /* Field containing processed string end */
52    
   
53  #include "pcre_internal.h"  #include "pcre_internal.h"
54    
55    
# Line 58  used by pcretest. DEBUG is not defined w Line 61  used by pcretest. DEBUG is not defined w
61  #endif  #endif
62    
63    
64    /* Macro for setting individual bits in class bitmaps. */
65    
66    #define SETBIT(a,b) a[b/8] |= (1 << (b%8))
67    
68    /* Maximum length value to check against when making sure that the integer that
69    holds the compiled pattern length does not overflow. We make it a bit less than
70    INT_MAX to allow for adding in group terminating bytes, so that we don't have
71    to check them every time. */
72    
73    #define OFLOW_MAX (INT_MAX - 20)
74    
75    
76  /*************************************************  /*************************************************
77  *      Code parameters and static tables         *  *      Code parameters and static tables         *
78  *************************************************/  *************************************************/
# Line 87  static const short int escapes[] = { Line 102  static const short int escapes[] = {
102       0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */       0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */
103       0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */       0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */
104     '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */     '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */
105       0,      0,      0, -ESC_K,      0,      0,      0,      0,   /* H - O */  -ESC_H,      0,      0, -ESC_K,      0,      0,      0,      0,   /* H - O */
106  -ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0,      0, -ESC_W,   /* P - W */  -ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0, -ESC_V, -ESC_W,   /* P - W */
107  -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */  -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */
108     '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */     '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */
109       0,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */  -ESC_h,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */
110  -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0,      0, -ESC_w,   /* p - w */  -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0, -ESC_v, -ESC_w,   /* p - w */
111       0,      0, -ESC_z                                            /* x - z */       0,      0, -ESC_z                                            /* x - z */
112  };  };
113    
# Line 106  static const short int escapes[] = { Line 121  static const short int escapes[] = {
121  /*  70 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  70 */     0,     0,      0,       0,      0,     0,      0,      0,
122  /*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',  /*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',
123  /*  80 */     0,     7, -ESC_b,       0, -ESC_d, ESC_e,  ESC_f,      0,  /*  80 */     0,     7, -ESC_b,       0, -ESC_d, ESC_e,  ESC_f,      0,
124  /*  88 */     0,     0,      0,     '{',      0,     0,      0,      0,  /*  88 */-ESC_h,     0,      0,     '{',      0,     0,      0,      0,
125  /*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,  /*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,
126  /*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,  /*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,
127  /*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,     0, -ESC_w,      0,  /*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,-ESC_v, -ESC_w,      0,
128  /*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,  /*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,
129  /*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,
130  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
131  /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,  /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,
132  /*  C8 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
133  /*  D0 */   '}',     0,      0,       0,      0,     0,      0, -ESC_P,  /*  D0 */   '}',     0, -ESC_K,       0,      0,     0,      0, -ESC_P,
134  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
135  /*  E0 */  '\\',     0, -ESC_S,       0,      0,     0, -ESC_W, -ESC_X,  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
136  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
137  /*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,  /*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,
138  /*  F8 */     0,     0,      0,       0,      0,     0,      0,      0  /*  F8 */     0,     0,      0,       0,      0,     0,      0,      0
# Line 125  static const short int escapes[] = { Line 140  static const short int escapes[] = {
140  #endif  #endif
141    
142    
143  /* Tables of names of POSIX character classes and their lengths. The list is  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is
144  terminated by a zero length entry. The first three must be alpha, lower, upper,  searched linearly. Put all the names into a single string, in order to reduce
145  as this is assumed for handling case independence. */  the number of relocations when a shared library is dynamically linked. */
146    
147  static const char *const posix_names[] = {  typedef struct verbitem {
148    "alpha", "lower", "upper",    int   len;
149    "alnum", "ascii", "blank", "cntrl", "digit", "graph",    int   op;
150    "print", "punct", "space", "word",  "xdigit" };  } verbitem;
151    
152    static const char verbnames[] =
153      "ACCEPT\0"
154      "COMMIT\0"
155      "F\0"
156      "FAIL\0"
157      "PRUNE\0"
158      "SKIP\0"
159      "THEN";
160    
161    static verbitem verbs[] = {
162      { 6, OP_ACCEPT },
163      { 6, OP_COMMIT },
164      { 1, OP_FAIL },
165      { 4, OP_FAIL },
166      { 5, OP_PRUNE },
167      { 4, OP_SKIP  },
168      { 4, OP_THEN  }
169    };
170    
171    static int verbcount = sizeof(verbs)/sizeof(verbitem);
172    
173    
174    /* Tables of names of POSIX character classes and their lengths. The names are
175    now all in a single string, to reduce the number of relocations when a shared
176    library is dynamically loaded. The list of lengths is terminated by a zero
177    length entry. The first three must be alpha, lower, upper, as this is assumed
178    for handling case independence. */
179    
180    static const char posix_names[] =
181      "alpha\0"  "lower\0"  "upper\0"  "alnum\0"  "ascii\0"  "blank\0"
182      "cntrl\0"  "digit\0"  "graph\0"  "print\0"  "punct\0"  "space\0"
183      "word\0"   "xdigit";
184    
185  static const uschar posix_name_lengths[] = {  static const uschar posix_name_lengths[] = {
186    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
# Line 171  static const int posix_class_maps[] = { Line 219  static const int posix_class_maps[] = {
219  /* The texts of compile-time error messages. These are "char *" because they  /* The texts of compile-time error messages. These are "char *" because they
220  are passed to the outside world. Do not ever re-use any error number, because  are passed to the outside world. Do not ever re-use any error number, because
221  they are documented. Always add a new error instead. Messages marked DEAD below  they are documented. Always add a new error instead. Messages marked DEAD below
222  are no longer used. */  are no longer used. This used to be a table of strings, but in order to reduce
223    the number of relocations needed when a shared library is loaded dynamically,
224  static const char *error_texts[] = {  it is now one long string. We cannot use a table of offsets, because the
225    "no error",  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
226    "\\ at end of pattern",  simply count through to the one we want - this isn't a performance issue
227    "\\c at end of pattern",  because these strings are used only when there is a compilation error. */
228    "unrecognized character follows \\",  
229    "numbers out of order in {} quantifier",  static const char error_texts[] =
230      "no error\0"
231      "\\ at end of pattern\0"
232      "\\c at end of pattern\0"
233      "unrecognized character follows \\\0"
234      "numbers out of order in {} quantifier\0"
235    /* 5 */    /* 5 */
236    "number too big in {} quantifier",    "number too big in {} quantifier\0"
237    "missing terminating ] for character class",    "missing terminating ] for character class\0"
238    "invalid escape sequence in character class",    "invalid escape sequence in character class\0"
239    "range out of order in character class",    "range out of order in character class\0"
240    "nothing to repeat",    "nothing to repeat\0"
241    /* 10 */    /* 10 */
242    "operand of unlimited repeat could match the empty string",  /** DEAD **/    "operand of unlimited repeat could match the empty string\0"  /** DEAD **/
243    "internal error: unexpected repeat",    "internal error: unexpected repeat\0"
244    "unrecognized character after (?",    "unrecognized character after (? or (?-\0"
245    "POSIX named classes are supported only within a class",    "POSIX named classes are supported only within a class\0"
246    "missing )",    "missing )\0"
247    /* 15 */    /* 15 */
248    "reference to non-existent subpattern",    "reference to non-existent subpattern\0"
249    "erroffset passed as NULL",    "erroffset passed as NULL\0"
250    "unknown option bit(s) set",    "unknown option bit(s) set\0"
251    "missing ) after comment",    "missing ) after comment\0"
252    "parentheses nested too deeply",  /** DEAD **/    "parentheses nested too deeply\0"  /** DEAD **/
253    /* 20 */    /* 20 */
254    "regular expression too large",    "regular expression is too large\0"
255    "failed to get memory",    "failed to get memory\0"
256    "unmatched parentheses",    "unmatched parentheses\0"
257    "internal error: code overflow",    "internal error: code overflow\0"
258    "unrecognized character after (?<",    "unrecognized character after (?<\0"
259    /* 25 */    /* 25 */
260    "lookbehind assertion is not fixed length",    "lookbehind assertion is not fixed length\0"
261    "malformed number or name after (?(",    "malformed number or name after (?(\0"
262    "conditional group contains more than two branches",    "conditional group contains more than two branches\0"
263    "assertion expected after (?(",    "assertion expected after (?(\0"
264    "(?R or (?[+-]digits must be followed by )",    "(?R or (?[+-]digits must be followed by )\0"
265    /* 30 */    /* 30 */
266    "unknown POSIX class name",    "unknown POSIX class name\0"
267    "POSIX collating elements are not supported",    "POSIX collating elements are not supported\0"
268    "this version of PCRE is not compiled with PCRE_UTF8 support",    "this version of PCRE is not compiled with PCRE_UTF8 support\0"
269    "spare error",  /** DEAD **/    "spare error\0"  /** DEAD **/
270    "character value in \\x{...} sequence is too large",    "character value in \\x{...} sequence is too large\0"
271    /* 35 */    /* 35 */
272    "invalid condition (?(0)",    "invalid condition (?(0)\0"
273    "\\C not allowed in lookbehind assertion",    "\\C not allowed in lookbehind assertion\0"
274    "PCRE does not support \\L, \\l, \\N, \\U, or \\u",    "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"
275    "number after (?C is > 255",    "number after (?C is > 255\0"
276    "closing ) for (?C expected",    "closing ) for (?C expected\0"
277    /* 40 */    /* 40 */
278    "recursive call could loop indefinitely",    "recursive call could loop indefinitely\0"
279    "unrecognized character after (?P",    "unrecognized character after (?P\0"
280    "syntax error in subpattern name (missing terminator)",    "syntax error in subpattern name (missing terminator)\0"
281    "two named subpatterns have the same name",    "two named subpatterns have the same name\0"
282    "invalid UTF-8 string",    "invalid UTF-8 string\0"
283    /* 45 */    /* 45 */
284    "support for \\P, \\p, and \\X has not been compiled",    "support for \\P, \\p, and \\X has not been compiled\0"
285    "malformed \\P or \\p sequence",    "malformed \\P or \\p sequence\0"
286    "unknown property name after \\P or \\p",    "unknown property name after \\P or \\p\0"
287    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)",    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
288    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")",    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
289    /* 50 */    /* 50 */
290    "repeated subpattern is too long",    "repeated subpattern is too long\0"    /** DEAD **/
291    "octal value is greater than \\377 (not in UTF-8 mode)",    "octal value is greater than \\377 (not in UTF-8 mode)\0"
292    "internal error: overran compiling workspace",    "internal error: overran compiling workspace\0"
293    "internal error: previously-checked referenced subpattern not found",    "internal error: previously-checked referenced subpattern not found\0"
294    "DEFINE group contains more than one branch",    "DEFINE group contains more than one branch\0"
295    /* 55 */    /* 55 */
296    "repeating a DEFINE group is not allowed",    "repeating a DEFINE group is not allowed\0"
297    "inconsistent NEWLINE options",    "inconsistent NEWLINE options\0"
298    "\\g is not followed by a braced name or an optionally braced non-zero number",    "\\g is not followed by a braced name or an optionally braced non-zero number\0"
299    "(?+ or (?- or (?(+ or (?(- must be followed by a non-zero number"    "(?+ or (?- or (?(+ or (?(- must be followed by a non-zero number\0"
300  };    "(*VERB) with an argument is not supported\0"
301      /* 60 */
302      "(*VERB) not recognized\0"
303      "number is too big\0"
304      "subpattern name expected\0"
305      "digit expected after (?+";
306    
307    
308  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
# Line 374  static const unsigned char ebcdic_charta Line 432  static const unsigned char ebcdic_charta
432  /* Definition to allow mutual recursion */  /* Definition to allow mutual recursion */
433    
434  static BOOL  static BOOL
435    compile_regex(int, int, uschar **, const uschar **, int *, BOOL, int, int *,    compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,
436      int *, branch_chain *, compile_data *, int *);      int *, int *, branch_chain *, compile_data *, int *);
437    
438    
439    
440  /*************************************************  /*************************************************
441    *            Find an error text                  *
442    *************************************************/
443    
444    /* The error texts are now all in one long string, to save on relocations. As
445    some of the text is of unknown length, we can't use a table of offsets.
446    Instead, just count through the strings. This is not a performance issue
447    because it happens only when there has been a compilation error.
448    
449    Argument:   the error number
450    Returns:    pointer to the error string
451    */
452    
453    static const char *
454    find_error_text(int n)
455    {
456    const char *s = error_texts;
457    for (; n > 0; n--) while (*s++ != 0);
458    return s;
459    }
460    
461    
462    /*************************************************
463  *            Handle escapes                      *  *            Handle escapes                      *
464  *************************************************/  *************************************************/
465    
# Line 400  Arguments: Line 480  Arguments:
480    
481  Returns:         zero or positive => a data character  Returns:         zero or positive => a data character
482                   negative => a special escape sequence                   negative => a special escape sequence
483                   on error, errorptr is set                   on error, errorcodeptr is set
484  */  */
485    
486  static int  static int
# Line 418  ptr--; /* Set Line 498  ptr--; /* Set
498    
499  if (c == 0) *errorcodeptr = ERR1;  if (c == 0) *errorcodeptr = ERR1;
500    
501  /* Non-alphamerics are literals. For digits or letters, do an initial lookup in  /* Non-alphanumerics are literals. For digits or letters, do an initial lookup
502  a table. A non-zero result is something that can be returned immediately.  in a table. A non-zero result is something that can be returned immediately.
503  Otherwise further processing may be required. */  Otherwise further processing may be required. */
504    
505  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII coding */
506  else if (c < '0' || c > 'z') {}                           /* Not alphameric */  else if (c < '0' || c > 'z') {}                           /* Not alphanumeric */
507  else if ((i = escapes[c - '0']) != 0) c = i;  else if ((i = escapes[c - '0']) != 0) c = i;
508    
509  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
510  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphameric */  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
511  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if ((i = escapes[c - 0x48]) != 0)  c = i;
512  #endif  #endif
513    
# Line 485  else Line 565  else
565      while ((digitab[ptr[1]] & ctype_digit) != 0)      while ((digitab[ptr[1]] & ctype_digit) != 0)
566        c = c * 10 + *(++ptr) - '0';        c = c * 10 + *(++ptr) - '0';
567    
568        if (c < 0)
569          {
570          *errorcodeptr = ERR61;
571          break;
572          }
573    
574      if (c == 0 || (braced && *(++ptr) != '}'))      if (c == 0 || (braced && *(++ptr) != '}'))
575        {        {
576        *errorcodeptr = ERR57;        *errorcodeptr = ERR57;
577        return 0;        break;
578        }        }
579    
580      if (negated)      if (negated)
# Line 496  else Line 582  else
582        if (c > bracount)        if (c > bracount)
583          {          {
584          *errorcodeptr = ERR15;          *errorcodeptr = ERR15;
585          return 0;          break;
586          }          }
587        c = bracount - (c - 1);        c = bracount - (c - 1);
588        }        }
# Line 525  else Line 611  else
611        c -= '0';        c -= '0';
612        while ((digitab[ptr[1]] & ctype_digit) != 0)        while ((digitab[ptr[1]] & ctype_digit) != 0)
613          c = c * 10 + *(++ptr) - '0';          c = c * 10 + *(++ptr) - '0';
614          if (c < 0)
615            {
616            *errorcodeptr = ERR61;
617            break;
618            }
619        if (c < 10 || c <= bracount)        if (c < 10 || c <= bracount)
620          {          {
621          c = -(ESC_REF + c);          c = -(ESC_REF + c);
# Line 620  else Line 711  else
711      if (c == 0)      if (c == 0)
712        {        {
713        *errorcodeptr = ERR2;        *errorcodeptr = ERR2;
714        return 0;        break;
715        }        }
716    
717  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII coding */
# Line 633  else Line 724  else
724      break;      break;
725    
726      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
727      other alphameric following \ is an error if PCRE_EXTRA was set; otherwise,      other alphanumeric following \ is an error if PCRE_EXTRA was set;
728      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
729      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
730      in future, so I haven't "optimized" it. */      be again in future, so I haven't "optimized" it. */
731    
732      default:      default:
733      if ((options & PCRE_EXTRA) != 0) switch(c)      if ((options & PCRE_EXTRA) != 0) switch(c)
# Line 696  if (c == '{') Line 787  if (c == '{')
787      *negptr = TRUE;      *negptr = TRUE;
788      ptr++;      ptr++;
789      }      }
790    for (i = 0; i < sizeof(name) - 1; i++)    for (i = 0; i < (int)sizeof(name) - 1; i++)
791      {      {
792      c = *(++ptr);      c = *(++ptr);
793      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
# Line 725  top = _pcre_utt_size; Line 816  top = _pcre_utt_size;
816  while (bot < top)  while (bot < top)
817    {    {
818    i = (bot + top) >> 1;    i = (bot + top) >> 1;
819    c = strcmp(name, _pcre_utt[i].name);    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);
820    if (c == 0)    if (c == 0)
821      {      {
822      *dptr = _pcre_utt[i].value;      *dptr = _pcre_utt[i].value;
# Line 899  for (; *ptr != 0; ptr++) Line 990  for (; *ptr != 0; ptr++)
990      {      {
991      while (*(++ptr) != ']')      while (*(++ptr) != ']')
992        {        {
993          if (*ptr == 0) return -1;
994        if (*ptr == '\\')        if (*ptr == '\\')
995          {          {
996          if (*(++ptr) == 0) return -1;          if (*(++ptr) == 0) return -1;
# Line 926  for (; *ptr != 0; ptr++) Line 1018  for (; *ptr != 0; ptr++)
1018    /* An opening parens must now be a real metacharacter */    /* An opening parens must now be a real metacharacter */
1019    
1020    if (*ptr != '(') continue;    if (*ptr != '(') continue;
1021    if (ptr[1] != '?')    if (ptr[1] != '?' && ptr[1] != '*')
1022      {      {
1023      count++;      count++;
1024      if (name == NULL && count == lorn) return count;      if (name == NULL && count == lorn) return count;
# Line 1054  for (;;) Line 1146  for (;;)
1146    {    {
1147    int d;    int d;
1148    register int op = *cc;    register int op = *cc;
   
1149    switch (op)    switch (op)
1150      {      {
1151      case OP_CBRA:      case OP_CBRA:
# Line 1143  for (;;) Line 1234  for (;;)
1234    
1235      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1236      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1237        if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;
1238      cc += 4;      cc += 4;
1239      break;      break;
1240    
# Line 1251  for (;;) Line 1343  for (;;)
1343      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1344      }      }
1345    
1346    /* In UTF-8 mode, opcodes that are followed by a character may be followed by    /* Otherwise, we can get the item's length from the table, except that for
1347    a multi-byte character. The length in the table is a minimum, so we have to    repeated character types, we have to test for \p and \P, which have an extra
1348    arrange to skip the extra bytes. */    two bytes of parameters. */
1349    
1350    else    else
1351      {      {
1352        switch(c)
1353          {
1354          case OP_TYPESTAR:
1355          case OP_TYPEMINSTAR:
1356          case OP_TYPEPLUS:
1357          case OP_TYPEMINPLUS:
1358          case OP_TYPEQUERY:
1359          case OP_TYPEMINQUERY:
1360          case OP_TYPEPOSSTAR:
1361          case OP_TYPEPOSPLUS:
1362          case OP_TYPEPOSQUERY:
1363          if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1364          break;
1365    
1366          case OP_TYPEUPTO:
1367          case OP_TYPEMINUPTO:
1368          case OP_TYPEEXACT:
1369          case OP_TYPEPOSUPTO:
1370          if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1371          break;
1372          }
1373    
1374        /* Add in the fixed length from the table */
1375    
1376      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1377    
1378      /* In UTF-8 mode, opcodes that are followed by a character may be followed by
1379      a multi-byte character. The length in the table is a minimum, so we have to
1380      arrange to skip the extra bytes. */
1381    
1382  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1383      if (utf8) switch(c)      if (utf8) switch(c)
1384        {        {
# Line 1315  for (;;) Line 1436  for (;;)
1436    
1437    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
1438    
1439    /* Otherwise, we get the item's length from the table. In UTF-8 mode, opcodes    /* Otherwise, we can get the item's length from the table, except that for
1440    that are followed by a character may be followed by a multi-byte character.    repeated character types, we have to test for \p and \P, which have an extra
1441    The length in the table is a minimum, so we have to arrange to skip the extra    two bytes of parameters. */
   bytes. */  
1442    
1443    else    else
1444      {      {
1445        switch(c)
1446          {
1447          case OP_TYPESTAR:
1448          case OP_TYPEMINSTAR:
1449          case OP_TYPEPLUS:
1450          case OP_TYPEMINPLUS:
1451          case OP_TYPEQUERY:
1452          case OP_TYPEMINQUERY:
1453          case OP_TYPEPOSSTAR:
1454          case OP_TYPEPOSPLUS:
1455          case OP_TYPEPOSQUERY:
1456          if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1457          break;
1458    
1459          case OP_TYPEPOSUPTO:
1460          case OP_TYPEUPTO:
1461          case OP_TYPEMINUPTO:
1462          case OP_TYPEEXACT:
1463          if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1464          break;
1465          }
1466    
1467        /* Add in the fixed length from the table */
1468    
1469      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1470    
1471        /* In UTF-8 mode, opcodes that are followed by a character may be followed
1472        by a multi-byte character. The length in the table is a minimum, so we have
1473        to arrange to skip the extra bytes. */
1474    
1475  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1476      if (utf8) switch(c)      if (utf8) switch(c)
1477        {        {
# Line 1359  for (;;) Line 1508  for (;;)
1508  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()
1509  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
1510  group that can match nothing. Note that first_significant_code() skips over  group that can match nothing. Note that first_significant_code() skips over
1511  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
1512  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
1513    bracket whose current branch will already have been scanned.
1514    
1515  Arguments:  Arguments:
1516    code        points to start of search    code        points to start of search
# Line 1382  for (code = first_significant_code(code Line 1532  for (code = first_significant_code(code
1532    
1533    c = *code;    c = *code;
1534    
1535      /* Skip over forward assertions; the other assertions are skipped by
1536      first_significant_code() with a TRUE final argument. */
1537    
1538      if (c == OP_ASSERT)
1539        {
1540        do code += GET(code, 1); while (*code == OP_ALT);
1541        c = *code;
1542        continue;
1543        }
1544    
1545    /* Groups with zero repeats can of course be empty; skip them. */    /* Groups with zero repeats can of course be empty; skip them. */
1546    
1547    if (c == OP_BRAZERO || c == OP_BRAMINZERO)    if (c == OP_BRAZERO || c == OP_BRAMINZERO)
# Line 1394  for (code = first_significant_code(code Line 1554  for (code = first_significant_code(code
1554    
1555    /* For other groups, scan the branches. */    /* For other groups, scan the branches. */
1556    
1557    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE)    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)
1558      {      {
1559      BOOL empty_branch;      BOOL empty_branch;
1560      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
# Line 1418  for (code = first_significant_code(code Line 1578  for (code = first_significant_code(code
1578    
1579    switch (c)    switch (c)
1580      {      {
1581      /* Check for quantifiers after a class */      /* Check for quantifiers after a class. XCLASS is used for classes that
1582        cannot be represented just by a bit map. This includes negated single
1583        high-valued characters. The length in _pcre_OP_lengths[] is zero; the
1584        actual length is stored in the compiled code, so we must update "code"
1585        here. */
1586    
1587  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1588      case OP_XCLASS:      case OP_XCLASS:
1589      ccode = code + GET(code, 1);      ccode = code += GET(code, 1);
1590      goto CHECK_CLASS_REPEAT;      goto CHECK_CLASS_REPEAT;
1591  #endif  #endif
1592    
# Line 1484  for (code = first_significant_code(code Line 1648  for (code = first_significant_code(code
1648      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1649      return FALSE;      return FALSE;
1650    
1651        /* These are going to continue, as they may be empty, but we have to
1652        fudge the length for the \p and \P cases. */
1653    
1654        case OP_TYPESTAR:
1655        case OP_TYPEMINSTAR:
1656        case OP_TYPEPOSSTAR:
1657        case OP_TYPEQUERY:
1658        case OP_TYPEMINQUERY:
1659        case OP_TYPEPOSQUERY:
1660        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1661        break;
1662    
1663        /* Same for these */
1664    
1665        case OP_TYPEUPTO:
1666        case OP_TYPEMINUPTO:
1667        case OP_TYPEPOSUPTO:
1668        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1669        break;
1670    
1671      /* End of branch */      /* End of branch */
1672    
1673      case OP_KET:      case OP_KET:
# Line 1553  return TRUE; Line 1737  return TRUE;
1737  *************************************************/  *************************************************/
1738    
1739  /* This function is called when the sequence "[:" or "[." or "[=" is  /* This function is called when the sequence "[:" or "[." or "[=" is
1740  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
1741  optional ^ and then a sequence of letters, terminated by a matching ":]" or  sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
1742  ".]" or "=]".  reach an unescaped ']' without the special preceding character, return FALSE.
1743    
1744    Originally, this function only recognized a sequence of letters between the
1745    terminators, but it seems that Perl recognizes any sequence of characters,
1746    though of course unknown POSIX names are subsequently rejected. Perl gives an
1747    "Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
1748    didn't consider this to be a POSIX class. Likewise for [:1234:].
1749    
1750    The problem in trying to be exactly like Perl is in the handling of escapes. We
1751    have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
1752    class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
1753    below handles the special case of \], but does not try to do any other escape
1754    processing. This makes it different from Perl for cases such as [:l\ower:]
1755    where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize
1756    "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
1757    I think.
1758    
1759  Argument:  Arguments:
1760    ptr      pointer to the initial [    ptr      pointer to the initial [
1761    endptr   where to return the end pointer    endptr   where to return the end pointer
   cd       pointer to compile data  
1762    
1763  Returns:   TRUE or FALSE  Returns:   TRUE or FALSE
1764  */  */
1765    
1766  static BOOL  static BOOL
1767  check_posix_syntax(const uschar *ptr, const uschar **endptr, compile_data *cd)  check_posix_syntax(const uschar *ptr, const uschar **endptr)
1768  {  {
1769  int terminator;          /* Don't combine these lines; the Solaris cc */  int terminator;          /* Don't combine these lines; the Solaris cc */
1770  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
1771  if (*(++ptr) == '^') ptr++;  for (++ptr; *ptr != 0; ptr++)
 while ((cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;  
 if (*ptr == terminator && ptr[1] == ']')  
1772    {    {
1773    *endptr = ptr;    if (*ptr == '\\' && ptr[1] == ']') ptr++; else
1774    return TRUE;      {
1775        if (*ptr == ']') return FALSE;
1776        if (*ptr == terminator && ptr[1] == ']')
1777          {
1778          *endptr = ptr;
1779          return TRUE;
1780          }
1781        }
1782    }    }
1783  return FALSE;  return FALSE;
1784  }  }
# Line 1600  Returns: a value representing the na Line 1803  Returns: a value representing the na
1803  static int  static int
1804  check_posix_name(const uschar *ptr, int len)  check_posix_name(const uschar *ptr, int len)
1805  {  {
1806    const char *pn = posix_names;
1807  register int yield = 0;  register int yield = 0;
1808  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
1809    {    {
1810    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
1811      strncmp((const char *)ptr, posix_names[yield], len) == 0) return yield;      strncmp((const char *)ptr, pn, len) == 0) return yield;
1812      pn += posix_name_lengths[yield] + 1;
1813    yield++;    yield++;
1814    }    }
1815  return -1;  return -1;
# Line 1646  adjust_recurse(uschar *group, int adjust Line 1851  adjust_recurse(uschar *group, int adjust
1851    uschar *save_hwm)    uschar *save_hwm)
1852  {  {
1853  uschar *ptr = group;  uschar *ptr = group;
1854    
1855  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)
1856    {    {
1857    int offset;    int offset;
# Line 1944  if (next >= 0) switch(op_code) Line 2150  if (next >= 0) switch(op_code)
2150    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
2151    return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;    return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;
2152    
2153      case OP_HSPACE:
2154      case OP_NOT_HSPACE:
2155      switch(next)
2156        {
2157        case 0x09:
2158        case 0x20:
2159        case 0xa0:
2160        case 0x1680:
2161        case 0x180e:
2162        case 0x2000:
2163        case 0x2001:
2164        case 0x2002:
2165        case 0x2003:
2166        case 0x2004:
2167        case 0x2005:
2168        case 0x2006:
2169        case 0x2007:
2170        case 0x2008:
2171        case 0x2009:
2172        case 0x200A:
2173        case 0x202f:
2174        case 0x205f:
2175        case 0x3000:
2176        return op_code != OP_HSPACE;
2177        default:
2178        return op_code == OP_HSPACE;
2179        }
2180    
2181      case OP_VSPACE:
2182      case OP_NOT_VSPACE:
2183      switch(next)
2184        {
2185        case 0x0a:
2186        case 0x0b:
2187        case 0x0c:
2188        case 0x0d:
2189        case 0x85:
2190        case 0x2028:
2191        case 0x2029:
2192        return op_code != OP_VSPACE;
2193        default:
2194        return op_code == OP_VSPACE;
2195        }
2196    
2197    default:    default:
2198    return FALSE;    return FALSE;
2199    }    }
# Line 1978  switch(op_code) Line 2228  switch(op_code)
2228      case ESC_W:      case ESC_W:
2229      return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;      return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;
2230    
2231        case ESC_h:
2232        case ESC_H:
2233        switch(item)
2234          {
2235          case 0x09:
2236          case 0x20:
2237          case 0xa0:
2238          case 0x1680:
2239          case 0x180e:
2240          case 0x2000:
2241          case 0x2001:
2242          case 0x2002:
2243          case 0x2003:
2244          case 0x2004:
2245          case 0x2005:
2246          case 0x2006:
2247          case 0x2007:
2248          case 0x2008:
2249          case 0x2009:
2250          case 0x200A:
2251          case 0x202f:
2252          case 0x205f:
2253          case 0x3000:
2254          return -next != ESC_h;
2255          default:
2256          return -next == ESC_h;
2257          }
2258    
2259        case ESC_v:
2260        case ESC_V:
2261        switch(item)
2262          {
2263          case 0x0a:
2264          case 0x0b:
2265          case 0x0c:
2266          case 0x0d:
2267          case 0x85:
2268          case 0x2028:
2269          case 0x2029:
2270          return -next != ESC_v;
2271          default:
2272          return -next == ESC_v;
2273          }
2274    
2275      default:      default:
2276      return FALSE;      return FALSE;
2277      }      }
2278    
2279    case OP_DIGIT:    case OP_DIGIT:
2280    return next == -ESC_D || next == -ESC_s || next == -ESC_W;    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
2281             next == -ESC_h || next == -ESC_v;
2282    
2283    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
2284    return next == -ESC_d;    return next == -ESC_d;
# Line 1992  switch(op_code) Line 2287  switch(op_code)
2287    return next == -ESC_S || next == -ESC_d || next == -ESC_w;    return next == -ESC_S || next == -ESC_d || next == -ESC_w;
2288    
2289    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
2290    return next == -ESC_s;    return next == -ESC_s || next == -ESC_h || next == -ESC_v;
2291    
2292      case OP_HSPACE:
2293      return next == -ESC_S || next == -ESC_H || next == -ESC_d || next == -ESC_w;
2294    
2295      case OP_NOT_HSPACE:
2296      return next == -ESC_h;
2297    
2298      /* Can't have \S in here because VT matches \S (Perl anomaly) */
2299      case OP_VSPACE:
2300      return next == -ESC_V || next == -ESC_d || next == -ESC_w;
2301    
2302      case OP_NOT_VSPACE:
2303      return next == -ESC_v;
2304    
2305    case OP_WORDCHAR:    case OP_WORDCHAR:
2306    return next == -ESC_W || next == -ESC_s;    return next == -ESC_W || next == -ESC_s || next == -ESC_h || next == -ESC_v;
2307    
2308    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
2309    return next == -ESC_w || next == -ESC_d;    return next == -ESC_w || next == -ESC_d;
# Line 2068  uschar classbits[32]; Line 2376  uschar classbits[32];
2376  BOOL class_utf8;  BOOL class_utf8;
2377  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf8 = (options & PCRE_UTF8) != 0;
2378  uschar *class_utf8data;  uschar *class_utf8data;
2379    uschar *class_utf8data_base;
2380  uschar utf8_char[6];  uschar utf8_char[6];
2381  #else  #else
2382  BOOL utf8 = FALSE;  BOOL utf8 = FALSE;
# Line 2107  req_caseopt = ((options & PCRE_CASELESS) Line 2416  req_caseopt = ((options & PCRE_CASELESS)
2416  for (;; ptr++)  for (;; ptr++)
2417    {    {
2418    BOOL negate_class;    BOOL negate_class;
2419      BOOL should_flip_negation;
2420    BOOL possessive_quantifier;    BOOL possessive_quantifier;
2421    BOOL is_quantifier;    BOOL is_quantifier;
2422    BOOL is_recurse;    BOOL is_recurse;
2423      BOOL reset_bracount;
2424    int class_charcount;    int class_charcount;
2425    int class_lastchar;    int class_lastchar;
2426    int newoptions;    int newoptions;
# Line 2147  for (;; ptr++) Line 2458  for (;; ptr++)
2458      */      */
2459    
2460      if (code < last_code) code = last_code;      if (code < last_code) code = last_code;
2461    
2462        /* Paranoid check for integer overflow */
2463    
2464        if (OFLOW_MAX - *lengthptr < code - last_code)
2465          {
2466          *errorcodeptr = ERR20;
2467          goto FAILED;
2468          }
2469    
2470      *lengthptr += code - last_code;      *lengthptr += code - last_code;
2471      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));
2472    
# Line 2259  for (;; ptr++) Line 2579  for (;; ptr++)
2579      *ptrptr = ptr;      *ptrptr = ptr;
2580      if (lengthptr != NULL)      if (lengthptr != NULL)
2581        {        {
2582          if (OFLOW_MAX - *lengthptr < code - last_code)
2583            {
2584            *errorcodeptr = ERR20;
2585            goto FAILED;
2586            }
2587        *lengthptr += code - last_code;   /* To include callout length */        *lengthptr += code - last_code;   /* To include callout length */
2588        DPRINTF((">> end branch\n"));        DPRINTF((">> end branch\n"));
2589        }        }
# Line 2315  for (;; ptr++) Line 2640  for (;; ptr++)
2640      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. */
2641    
2642      if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&      if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
2643          check_posix_syntax(ptr, &tempptr, cd))          check_posix_syntax(ptr, &tempptr))
2644        {        {
2645        *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;        *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;
2646        goto FAILED;        goto FAILED;
2647        }        }
2648    
2649      /* If the first character is '^', set the negation flag and skip it. */      /* If the first character is '^', set the negation flag and skip it. Also,
2650        if the first few characters (either before or after ^) are \Q\E or \E we
2651        skip them too. This makes for compatibility with Perl. */
2652    
2653      if ((c = *(++ptr)) == '^')      negate_class = FALSE;
2654        for (;;)
2655        {        {
       negate_class = TRUE;  
2656        c = *(++ptr);        c = *(++ptr);
2657        }        if (c == '\\')
2658      else          {
2659        {          if (ptr[1] == 'E') ptr++;
2660        negate_class = FALSE;            else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;
2661                else break;
2662            }
2663          else if (!negate_class && c == '^')
2664            negate_class = TRUE;
2665          else break;
2666        }        }
2667    
2668        /* If a class contains a negative special such as \S, we need to flip the
2669        negation flag at the end, so that support for characters > 255 works
2670        correctly (they are all included in the class). */
2671    
2672        should_flip_negation = FALSE;
2673    
2674      /* 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
2675      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
2676      valued UTF-8 characters, we don't yet do any optimization. */      valued UTF-8 characters, we don't yet do any optimization. */
# Line 2350  for (;; ptr++) Line 2688  for (;; ptr++)
2688  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2689      class_utf8 = FALSE;                       /* No chars >= 256 */      class_utf8 = FALSE;                       /* No chars >= 256 */
2690      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */
2691        class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */
2692  #endif  #endif
2693    
2694      /* 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 2365  for (;; ptr++) Line 2704  for (;; ptr++)
2704          {                           /* Braces are required because the */          {                           /* Braces are required because the */
2705          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
2706          }          }
2707    
2708          /* In the pre-compile phase, accumulate the length of any UTF-8 extra
2709          data and reset the pointer. This is so that very large classes that
2710          contain a zillion UTF-8 characters no longer overwrite the work space
2711          (which is on the stack). */
2712    
2713          if (lengthptr != NULL)
2714            {
2715            *lengthptr += class_utf8data - class_utf8data_base;
2716            class_utf8data = class_utf8data_base;
2717            }
2718    
2719  #endif  #endif
2720    
2721        /* Inside \Q...\E everything is literal except \E */        /* Inside \Q...\E everything is literal except \E */
# Line 2388  for (;; ptr++) Line 2739  for (;; ptr++)
2739    
2740        if (c == '[' &&        if (c == '[' &&
2741            (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&            (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
2742            check_posix_syntax(ptr, &tempptr, cd))            check_posix_syntax(ptr, &tempptr))
2743          {          {
2744          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
2745          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
# Line 2405  for (;; ptr++) Line 2756  for (;; ptr++)
2756          if (*ptr == '^')          if (*ptr == '^')
2757            {            {
2758            local_negate = TRUE;            local_negate = TRUE;
2759              should_flip_negation = TRUE;  /* Note negative special */
2760            ptr++;            ptr++;
2761            }            }
2762    
# Line 2471  for (;; ptr++) Line 2823  for (;; ptr++)
2823        of the specials, which just set a flag. The sequence \b is a special        of the specials, which just set a flag. The sequence \b is a special
2824        case. Inside a class (and only there) it is treated as backspace.        case. Inside a class (and only there) it is treated as backspace.
2825        Elsewhere it marks a word boundary. Other escapes have preset maps ready        Elsewhere it marks a word boundary. Other escapes have preset maps ready
2826        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
2827        character in them, so set class_charcount bigger than one. */        character in them, so set class_charcount bigger than one. */
2828    
2829        if (c == '\\')        if (c == '\\')
# Line 2479  for (;; ptr++) Line 2831  for (;; ptr++)
2831          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
2832          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
2833    
2834          if (-c == ESC_b) c = '\b';       /* \b is backslash in a class */          if (-c == ESC_b) c = '\b';       /* \b is backspace in a class */
2835          else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */          else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */
2836          else if (-c == ESC_R) c = 'R';   /* \R is literal R in a class */          else if (-c == ESC_R) c = 'R';   /* \R is literal R in a class */
2837          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
# Line 2491  for (;; ptr++) Line 2843  for (;; ptr++)
2843            else inescq = TRUE;            else inescq = TRUE;
2844            continue;            continue;
2845            }            }
2846            else if (-c == ESC_E) continue;  /* Ignore orphan \E */
2847    
2848          if (c < 0)          if (c < 0)
2849            {            {
# Line 2506  for (;; ptr++) Line 2859  for (;; ptr++)
2859              continue;              continue;
2860    
2861              case ESC_D:              case ESC_D:
2862                should_flip_negation = TRUE;
2863              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];
2864              continue;              continue;
2865    
# Line 2514  for (;; ptr++) Line 2868  for (;; ptr++)
2868              continue;              continue;
2869    
2870              case ESC_W:              case ESC_W:
2871                should_flip_negation = TRUE;
2872              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
2873              continue;              continue;
2874    
# Line 2523  for (;; ptr++) Line 2878  for (;; ptr++)
2878              continue;              continue;
2879    
2880              case ESC_S:              case ESC_S:
2881                should_flip_negation = TRUE;
2882              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
2883              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
2884              continue;              continue;
2885    
             case ESC_E: /* Perl ignores an orphan \E */  
             continue;  
   
2886              default:    /* Not recognized; fall through */              default:    /* Not recognized; fall through */
2887              break;      /* Need "default" setting to stop compiler warning. */              break;      /* Need "default" setting to stop compiler warning. */
2888              }              }
# Line 2539  for (;; ptr++) Line 2892  for (;; ptr++)
2892            else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||            else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||
2893                     c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;                     c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;
2894    
2895              /* We need to deal with \H, \h, \V, and \v in both phases because
2896              they use extra memory. */
2897    
2898              if (-c == ESC_h)
2899                {
2900                SETBIT(classbits, 0x09); /* VT */
2901                SETBIT(classbits, 0x20); /* SPACE */
2902                SETBIT(classbits, 0xa0); /* NSBP */
2903    #ifdef SUPPORT_UTF8
2904                if (utf8)
2905                  {
2906                  class_utf8 = TRUE;
2907                  *class_utf8data++ = XCL_SINGLE;
2908                  class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);
2909                  *class_utf8data++ = XCL_SINGLE;
2910                  class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);
2911                  *class_utf8data++ = XCL_RANGE;
2912                  class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);
2913                  class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);
2914                  *class_utf8data++ = XCL_SINGLE;
2915                  class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);
2916                  *class_utf8data++ = XCL_SINGLE;
2917                  class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);
2918                  *class_utf8data++ = XCL_SINGLE;
2919                  class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);
2920                  }
2921    #endif
2922                continue;
2923                }
2924    
2925              if (-c == ESC_H)
2926                {
2927                for (c = 0; c < 32; c++)
2928                  {
2929                  int x = 0xff;
2930                  switch (c)
2931                    {
2932                    case 0x09/8: x ^= 1 << (0x09%8); break;
2933                    case 0x20/8: x ^= 1 << (0x20%8); break;
2934                    case 0xa0/8: x ^= 1 << (0xa0%8); break;
2935                    default: break;
2936                    }
2937                  classbits[c] |= x;
2938                  }
2939    
2940    #ifdef SUPPORT_UTF8
2941                if (utf8)
2942                  {
2943                  class_utf8 = TRUE;
2944                  *class_utf8data++ = XCL_RANGE;
2945                  class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
2946                  class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);
2947                  *class_utf8data++ = XCL_RANGE;
2948                  class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);
2949                  class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);
2950                  *class_utf8data++ = XCL_RANGE;
2951                  class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);
2952                  class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);
2953                  *class_utf8data++ = XCL_RANGE;
2954                  class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);
2955                  class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);
2956                  *class_utf8data++ = XCL_RANGE;
2957                  class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);
2958                  class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);
2959                  *class_utf8data++ = XCL_RANGE;
2960                  class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);
2961                  class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);
2962                  *class_utf8data++ = XCL_RANGE;
2963                  class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);
2964                  class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
2965                  }
2966    #endif
2967                continue;
2968                }
2969    
2970              if (-c == ESC_v)
2971                {
2972                SETBIT(classbits, 0x0a); /* LF */
2973                SETBIT(classbits, 0x0b); /* VT */
2974                SETBIT(classbits, 0x0c); /* FF */
2975                SETBIT(classbits, 0x0d); /* CR */
2976                SETBIT(classbits, 0x85); /* NEL */
2977    #ifdef SUPPORT_UTF8
2978                if (utf8)
2979                  {
2980                  class_utf8 = TRUE;
2981                  *class_utf8data++ = XCL_RANGE;
2982                  class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);
2983                  class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
2984                  }
2985    #endif
2986                continue;
2987                }
2988    
2989              if (-c == ESC_V)
2990                {
2991                for (c = 0; c < 32; c++)
2992                  {
2993                  int x = 0xff;
2994                  switch (c)
2995                    {
2996                    case 0x0a/8: x ^= 1 << (0x0a%8);
2997                                 x ^= 1 << (0x0b%8);
2998                                 x ^= 1 << (0x0c%8);
2999                                 x ^= 1 << (0x0d%8);
3000                                 break;
3001                    case 0x85/8: x ^= 1 << (0x85%8); break;
3002                    default: break;
3003                    }
3004                  classbits[c] |= x;
3005                  }
3006    
3007    #ifdef SUPPORT_UTF8
3008                if (utf8)
3009                  {
3010                  class_utf8 = TRUE;
3011                  *class_utf8data++ = XCL_RANGE;
3012                  class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
3013                  class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);
3014                  *class_utf8data++ = XCL_RANGE;
3015                  class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
3016                  class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
3017                  }
3018    #endif
3019                continue;
3020                }
3021    
3022            /* We need to deal with \P and \p in both phases. */            /* We need to deal with \P and \p in both phases. */
3023    
3024  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 2590  for (;; ptr++) Line 3070  for (;; ptr++)
3070    
3071        oldptr = ptr;        oldptr = ptr;
3072    
3073          /* Remember \r or \n */
3074    
3075          if (c == '\r' || c == '\n') cd->external_flags |= PCRE_HASCRORLF;
3076    
3077          /* Check for range */
3078    
3079        if (!inescq && ptr[1] == '-')        if (!inescq && ptr[1] == '-')
3080          {          {
3081          int d;          int d;
# Line 2631  for (;; ptr++) Line 3117  for (;; ptr++)
3117            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3118            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
3119    
3120            /* \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
3121            special means the '-' was literal */            special means the '-' was literal */
3122    
3123            if (d < 0)            if (d < 0)
# Line 2657  for (;; ptr++) Line 3143  for (;; ptr++)
3143    
3144          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */
3145    
3146            /* Remember \r or \n */
3147    
3148            if (d == '\r' || d == '\n') cd->external_flags |= PCRE_HASCRORLF;
3149    
3150          /* 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
3151          matching, we have to use an XCLASS with extra data items. Caseless          matching, we have to use an XCLASS with extra data items. Caseless
3152          matching for characters > 127 is available only if UCP support is          matching for characters > 127 is available only if UCP support is
# Line 2679  for (;; ptr++) Line 3169  for (;; ptr++)
3169              unsigned int origd = d;              unsigned int origd = d;
3170              while (get_othercase_range(&cc, origd, &occ, &ocd))              while (get_othercase_range(&cc, origd, &occ, &ocd))
3171                {                {
3172                if (occ >= c && ocd <= d) continue;  /* Skip embedded ranges */                if (occ >= (unsigned int)c &&
3173                      ocd <= (unsigned int)d)
3174                    continue;                          /* Skip embedded ranges */
3175    
3176                if (occ < c  && ocd >= c - 1)        /* Extend the basic range */                if (occ < (unsigned int)c  &&
3177                      ocd >= (unsigned int)c - 1)      /* Extend the basic range */
3178                  {                                  /* if there is overlap,   */                  {                                  /* if there is overlap,   */
3179                  c = occ;                           /* noting that if occ < c */                  c = occ;                           /* noting that if occ < c */
3180                  continue;                          /* we can't have ocd > d  */                  continue;                          /* we can't have ocd > d  */
3181                  }                                  /* because a subrange is  */                  }                                  /* because a subrange is  */
3182                if (ocd > d && occ <= d + 1)         /* always shorter than    */                if (ocd > (unsigned int)d &&
3183                      occ <= (unsigned int)d + 1)      /* always shorter than    */
3184                  {                                  /* the basic range.       */                  {                                  /* the basic range.       */
3185                  d = ocd;                  d = ocd;
3186                  continue;                  continue;
# Line 2806  for (;; ptr++) Line 3300  for (;; ptr++)
3300        goto FAILED;        goto FAILED;
3301        }        }
3302    
3303    
3304    /* This code has been disabled because it would mean that \s counts as
3305    an explicit \r or \n reference, and that's not really what is wanted. Now
3306    we set the flag only if there is a literal "\r" or "\n" in the class. */
3307    
3308    #if 0
3309        /* Remember whether \r or \n are in this class */
3310    
3311        if (negate_class)
3312          {
3313          if ((classbits[1] & 0x24) != 0x24) cd->external_flags |= PCRE_HASCRORLF;
3314          }
3315        else
3316          {
3317          if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;
3318          }
3319    #endif
3320    
3321    
3322      /* 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
3323      less than 256. In non-UTF-8 mode we can always optimize. In UTF-8 mode, we      less than 256. As long as there were no characters >= 128 and there was no
3324      can optimize the negative case only if there were no characters >= 128      use of \p or \P, in other words, no use of any XCLASS features, we can
3325      because OP_NOT and the related opcodes like OP_NOTSTAR operate on      optimize.
3326      single-bytes only. This is an historical hangover. Maybe one day we can  
3327      tidy these opcodes to handle multi-byte characters.      In UTF-8 mode, we can optimize the negative case only if there were no
3328        characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
3329        operate on single-bytes only. This is an historical hangover. Maybe one day
3330        we can tidy these opcodes to handle multi-byte characters.
3331    
3332      The optimization throws away the bit map. We turn the item into a      The optimization throws away the bit map. We turn the item into a
3333      1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note      1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note
# Line 2821  for (;; ptr++) Line 3337  for (;; ptr++)
3337      reqbyte, save the previous value for reinstating. */      reqbyte, save the previous value for reinstating. */
3338    
3339  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3340      if (class_charcount == 1 &&      if (class_charcount == 1 && !class_utf8 &&
3341            (!utf8 ||        (!utf8 || !negate_class || class_lastchar < 128))
           (!class_utf8 && (!negate_class || class_lastchar < 128))))  
   
3342  #else  #else
3343      if (class_charcount == 1)      if (class_charcount == 1)
3344  #endif  #endif
# Line 2867  for (;; ptr++) Line 3381  for (;; ptr++)
3381      zeroreqbyte = reqbyte;      zeroreqbyte = reqbyte;
3382    
3383      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
3384      extended class, with its own opcode. If there are no characters < 256,      extended class, with its own opcode, unless there was a negated special
3385      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
3386        the class, so any that were explicitly given as well can be ignored. If
3387        (when there are explicit characters > 255 that must be listed) there are no
3388        characters < 256, we can omit the bitmap in the actual compiled code. */
3389    
3390  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3391      if (class_utf8)      if (class_utf8 && !should_flip_negation)
3392        {        {
3393        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
3394        *code++ = OP_XCLASS;        *code++ = OP_XCLASS;
# Line 2897  for (;; ptr++) Line 3414  for (;; ptr++)
3414        }        }
3415  #endif  #endif
3416    
3417      /* 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
3418      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
3419      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
3420      setting must remain unchanged after any kind of repeat. */      map into the code vector, negating it if necessary. */
3421    
3422        *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
3423      if (negate_class)      if (negate_class)
3424        {        {
       *code++ = OP_NCLASS;  
3425        if (lengthptr == NULL)    /* Save time in the pre-compile phase */        if (lengthptr == NULL)    /* Save time in the pre-compile phase */
3426          for (c = 0; c < 32; c++) code[c] = ~classbits[c];          for (c = 0; c < 32; c++) code[c] = ~classbits[c];
3427        }        }
3428      else      else
3429        {        {
       *code++ = OP_CLASS;  
3430        memcpy(code, classbits, 32);        memcpy(code, classbits, 32);
3431        }        }
3432      code += 32;      code += 32;
# Line 3096  for (;; ptr++) Line 3612  for (;; ptr++)
3612        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
3613        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
3614    
3615        if (repeat_max != 1) cd->nopartial = TRUE;        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
3616    
3617        /* Combine the op_type with the repeat_type */        /* Combine the op_type with the repeat_type */
3618    
# Line 3246  for (;; ptr++) Line 3762  for (;; ptr++)
3762        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
3763        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
3764    
3765        if (repeat_max != 1) cd->nopartial = TRUE;        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
3766    
3767        if (repeat_min == 0 && repeat_max == -1)        if (repeat_min == 0 && repeat_max == -1)
3768          *code++ = OP_CRSTAR + repeat_type;          *code++ = OP_CRSTAR + repeat_type;
# Line 3282  for (;; ptr++) Line 3798  for (;; ptr++)
3798          goto FAILED;          goto FAILED;
3799          }          }
3800    
       /* This is a paranoid check to stop integer overflow later on */  
   
       if (len > MAX_DUPLENGTH)  
         {  
         *errorcodeptr = ERR50;  
         goto FAILED;  
         }  
   
3801        /* If the maximum repeat count is unlimited, find the end of the bracket        /* If the maximum repeat count is unlimited, find the end of the bracket
3802        by scanning through from the start, and compute the offset back to it        by scanning through from the start, and compute the offset back to it
3803        from the current code pointer. There may be an OP_OPT setting following        from the current code pointer. There may be an OP_OPT setting following
# Line 3378  for (;; ptr++) Line 3886  for (;; ptr++)
3886          if (repeat_min > 1)          if (repeat_min > 1)
3887            {            {
3888            /* 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
3889            just adjust the length as if we had. */            just adjust the length as if we had. Do some paranoid checks for
3890              potential integer overflow. */
3891    
3892            if (lengthptr != NULL)            if (lengthptr != NULL)
3893              *lengthptr += (repeat_min - 1)*length_prevgroup;              {
3894                int delta = (repeat_min - 1)*length_prevgroup;
3895                if ((double)(repeat_min - 1)*(double)length_prevgroup >
3896                                                                (double)INT_MAX ||
3897                    OFLOW_MAX - *lengthptr < delta)
3898                  {
3899                  *errorcodeptr = ERR20;
3900                  goto FAILED;
3901                  }
3902                *lengthptr += delta;
3903                }
3904    
3905            /* This is compiling for real */            /* This is compiling for real */
3906    
# Line 3419  for (;; ptr++) Line 3938  for (;; ptr++)
3938          /* 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
3939          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
3940          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
3941          add 2 + 2*LINKSIZE to allow for the nesting that occurs. */          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
3942            paranoid checks to avoid integer overflow. */
3943    
3944          if (lengthptr != NULL && repeat_max > 0)          if (lengthptr != NULL && repeat_max > 0)
3945            *lengthptr += repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -            {
3946              2 - 2*LINK_SIZE;  /* Last one doesn't nest */            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
3947                          2 - 2*LINK_SIZE;   /* Last one doesn't nest */
3948              if ((double)repeat_max *
3949                    (double)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
3950                      > (double)INT_MAX ||
3951                  OFLOW_MAX - *lengthptr < delta)
3952                {
3953                *errorcodeptr = ERR20;
3954                goto FAILED;
3955                }
3956              *lengthptr += delta;
3957              }
3958    
3959          /* This is compiling for real */          /* This is compiling for real */
3960    
# Line 3531  for (;; ptr++) Line 4062  for (;; ptr++)
4062        int len;        int len;
4063        if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||        if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||
4064            *tempcode == OP_NOTEXACT)            *tempcode == OP_NOTEXACT)
4065          tempcode += _pcre_OP_lengths[*tempcode];          tempcode += _pcre_OP_lengths[*tempcode] +
4066              ((*tempcode == OP_TYPEEXACT &&
4067                 (tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP))? 2:0);
4068        len = code - tempcode;        len = code - tempcode;
4069        if (len > 0) switch (*tempcode)        if (len > 0) switch (*tempcode)
4070          {          {
# Line 3575  for (;; ptr++) Line 4108  for (;; ptr++)
4108      /* ===================================================================*/      /* ===================================================================*/
4109      /* Start of nested parenthesized sub-expression, or comment or lookahead or      /* Start of nested parenthesized sub-expression, or comment or lookahead or
4110      lookbehind or option setting or condition or all the other extended      lookbehind or option setting or condition or all the other extended
4111      parenthesis forms. First deal with the specials; all are introduced by ?,      parenthesis forms.  */
     and the appearance of any of them means that this is not a capturing  
     group. */  
4112    
4113      case '(':      case '(':
4114      newoptions = options;      newoptions = options;
4115      skipbytes = 0;      skipbytes = 0;
4116      bravalue = OP_CBRA;      bravalue = OP_CBRA;
4117      save_hwm = cd->hwm;      save_hwm = cd->hwm;
4118        reset_bracount = FALSE;
4119    
4120        /* First deal with various "verbs" that can be introduced by '*'. */
4121    
4122        if (*(++ptr) == '*' && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
4123          {
4124          int i, namelen;
4125          const char *vn = verbnames;
4126          const uschar *name = ++ptr;
4127          previous = NULL;
4128          while ((cd->ctypes[*++ptr] & ctype_letter) != 0);
4129          if (*ptr == ':')
4130            {
4131            *errorcodeptr = ERR59;   /* Not supported */
4132            goto FAILED;
4133            }
4134          if (*ptr != ')')
4135            {
4136            *errorcodeptr = ERR60;
4137            goto FAILED;
4138            }
4139          namelen = ptr - name;
4140          for (i = 0; i < verbcount; i++)
4141            {
4142            if (namelen == verbs[i].len &&
4143                strncmp((char *)name, vn, namelen) == 0)
4144              {
4145              *code = verbs[i].op;
4146              if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;
4147              break;
4148              }
4149            vn += verbs[i].len + 1;
4150            }
4151          if (i < verbcount) continue;
4152          *errorcodeptr = ERR60;
4153          goto FAILED;
4154          }
4155    
4156        /* Deal with the extended parentheses; all are introduced by '?', and the
4157        appearance of any of them means that this is not a capturing group. */
4158    
4159      if (*(++ptr) == '?')      else if (*ptr == '?')
4160        {        {
4161        int i, set, unset, namelen;        int i, set, unset, namelen;
4162        int *optset;        int *optset;
# Line 3606  for (;; ptr++) Line 4177  for (;; ptr++)
4177    
4178    
4179          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4180            case '|':                 /* Reset capture count for each branch */
4181            reset_bracount = TRUE;
4182            /* Fall through */
4183    
4184            /* ------------------------------------------------------------ */
4185          case ':':                 /* Non-capturing bracket */          case ':':                 /* Non-capturing bracket */
4186          bravalue = OP_BRA;          bravalue = OP_BRA;
4187          ptr++;          ptr++;
# Line 3715  for (;; ptr++) Line 4291  for (;; ptr++)
4291              *errorcodeptr = ERR58;              *errorcodeptr = ERR58;
4292              goto FAILED;              goto FAILED;
4293              }              }
4294            if (refsign == '-')            recno = (refsign == '-')?
4295                cd->bracount - recno + 1 : recno +cd->bracount;
4296              if (recno <= 0 || recno > cd->final_bracount)
4297              {              {
4298              recno = cd->bracount - recno + 1;              *errorcodeptr = ERR15;
4299              if (recno <= 0)              goto FAILED;
               {  
               *errorcodeptr = ERR15;  
               goto FAILED;  
               }  
4300              }              }
           else recno += cd->bracount;  
4301            PUT2(code, 2+LINK_SIZE, recno);            PUT2(code, 2+LINK_SIZE, recno);
4302            break;            break;
4303            }            }
# Line 3796  for (;; ptr++) Line 4369  for (;; ptr++)
4369            skipbytes = 1;            skipbytes = 1;
4370            }            }
4371    
4372          /* Check for the "name" actually being a subpattern number. */          /* Check for the "name" actually being a subpattern number. We are
4373            in the second pass here, so final_bracount is set. */
4374    
4375          else if (recno > 0)          else if (recno > 0 && recno <= cd->final_bracount)
4376            {            {
4377            PUT2(code, 2+LINK_SIZE, recno);            PUT2(code, 2+LINK_SIZE, recno);
4378            }            }
# Line 3822  for (;; ptr++) Line 4396  for (;; ptr++)
4396    
4397          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4398          case '!':                 /* Negative lookahead */          case '!':                 /* Negative lookahead */
         bravalue = OP_ASSERT_NOT;  
4399          ptr++;          ptr++;
4400            if (*ptr == ')')          /* Optimize (?!) */
4401              {
4402              *code++ = OP_FAIL;
4403              previous = NULL;
4404              continue;
4405              }
4406            bravalue = OP_ASSERT_NOT;
4407          break;          break;
4408    
4409    
# Line 3986  for (;; ptr++) Line 4566  for (;; ptr++)
4566    
4567          /* We come here from the Python syntax above that handles both          /* We come here from the Python syntax above that handles both
4568          references (?P=name) and recursion (?P>name), as well as falling          references (?P=name) and recursion (?P>name), as well as falling
4569          through from the Perl recursion syntax (?&name). */          through from the Perl recursion syntax (?&name). We also come here from
4570            the Perl \k<name> or \k'name' back reference syntax and the \k{name}
4571            .NET syntax. */
4572    
4573          NAMED_REF_OR_RECURSE:          NAMED_REF_OR_RECURSE:
4574          name = ++ptr;          name = ++ptr;
# Line 3998  for (;; ptr++) Line 4580  for (;; ptr++)
4580    
4581          if (lengthptr != NULL)          if (lengthptr != NULL)
4582            {            {
4583              if (namelen == 0)
4584                {
4585                *errorcodeptr = ERR62;
4586                goto FAILED;
4587                }
4588            if (*ptr != terminator)            if (*ptr != terminator)
4589              {              {
4590              *errorcodeptr = ERR42;              *errorcodeptr = ERR42;
# Line 4011  for (;; ptr++) Line 4598  for (;; ptr++)
4598            recno = 0;            recno = 0;
4599            }            }
4600    
4601          /* In the real compile, seek the name in the table */          /* In the real compile, seek the name in the table. We check the name
4602            first, and then check that we have reached the end of the name in the
4603            table. That way, if the name that is longer than any in the table,
4604            the comparison will fail without reading beyond the table entry. */
4605    
4606          else          else
4607            {            {
4608            slot = cd->name_table;            slot = cd->name_table;
4609            for (i = 0; i < cd->names_found; i++)            for (i = 0; i < cd->names_found; i++)
4610              {              {
4611              if (strncmp((char *)name, (char *)slot+2, namelen) == 0) break;              if (strncmp((char *)name, (char *)slot+2, namelen) == 0 &&
4612                    slot[2+namelen] == 0)
4613                  break;
4614              slot += cd->name_entry_size;              slot += cd->name_entry_size;
4615              }              }
4616    
# Line 4055  for (;; ptr++) Line 4647  for (;; ptr++)
4647            {            {
4648            const uschar *called;            const uschar *called;
4649    
4650            if ((refsign = *ptr) == '+') ptr++;            if ((refsign = *ptr) == '+')
4651                {
4652                ptr++;
4653                if ((digitab[*ptr] & ctype_digit) == 0)
4654                  {
4655                  *errorcodeptr = ERR63;
4656                  goto FAILED;
4657                  }
4658                }
4659            else if (refsign == '-')            else if (refsign == '-')
4660              {              {
4661              if ((digitab[ptr[1]] & ctype_digit) == 0)              if ((digitab[ptr[1]] & ctype_digit) == 0)
# Line 4181  for (;; ptr++) Line 4781  for (;; ptr++)
4781    
4782              case 'J':    /* Record that it changed in the external options */              case 'J':    /* Record that it changed in the external options */
4783              *optset |= PCRE_DUPNAMES;              *optset |= PCRE_DUPNAMES;
4784              cd->external_options |= PCRE_JCHANGED;              cd->external_flags |= PCRE_JCHANGED;
4785              break;              break;
4786    
4787              case 'i': *optset |= PCRE_CASELESS; break;              case 'i': *optset |= PCRE_CASELESS; break;
# Line 4304  for (;; ptr++) Line 4904  for (;; ptr++)
4904           errorcodeptr,                 /* Where to put an error message */           errorcodeptr,                 /* Where to put an error message */
4905           (bravalue == OP_ASSERTBACK ||           (bravalue == OP_ASSERTBACK ||
4906            bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */            bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */
4907             reset_bracount,               /* True if (?| group */
4908           skipbytes,                    /* Skip over bracket number */           skipbytes,                    /* Skip over bracket number */
4909           &subfirstbyte,                /* For possible first char */           &subfirstbyte,                /* For possible first char */
4910           &subreqbyte,                  /* For possible last char */           &subreqbyte,                  /* For possible last char */
# Line 4371  for (;; ptr++) Line 4972  for (;; ptr++)
4972        goto FAILED;        goto FAILED;
4973        }        }
4974    
4975      /* In the pre-compile phase, update the length by the length of the nested      /* In the pre-compile phase, update the length by the length of the group,
4976      group, less the brackets at either end. Then reduce the compiled code to      less the brackets at either end. Then reduce the compiled code to just a
4977      just the brackets so that it doesn't use much memory if it is duplicated by      set of non-capturing brackets so that it doesn't use much memory if it is
4978      a quantifier. */      duplicated by a quantifier.*/
4979    
4980      if (lengthptr != NULL)      if (lengthptr != NULL)
4981        {        {
4982          if (OFLOW_MAX - *lengthptr < length_prevgroup - 2 - 2*LINK_SIZE)
4983            {
4984            *errorcodeptr = ERR20;
4985            goto FAILED;
4986            }
4987        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
4988        code++;        *code++ = OP_BRA;
4989        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
4990        *code++ = OP_KET;        *code++ = OP_KET;
4991        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
4992          break;    /* No need to waste time with special character handling */
4993        }        }
4994    
4995      /* Otherwise update the main code pointer to the end of the group. */      /* Otherwise update the main code pointer to the end of the group. */
4996    
4997      else code = tempcode;      code = tempcode;
4998    
4999      /* For a DEFINE group, required and first character settings are not      /* For a DEFINE group, required and first character settings are not
5000      relevant. */      relevant. */
# Line 4591  for (;; ptr++) Line 5198  for (;; ptr++)
5198      *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;      *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;
5199      for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];      for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];
5200    
5201        /* Remember if \r or \n were seen */
5202    
5203        if (mcbuffer[0] == '\r' || mcbuffer[0] == '\n')
5204          cd->external_flags |= PCRE_HASCRORLF;
5205    
5206      /* Set the first and required bytes appropriately. If no previous first      /* Set the first and required bytes appropriately. If no previous first
5207      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.
5208      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 4663  Arguments: Line 5275  Arguments:
5275    ptrptr         -> the address of the current pattern pointer    ptrptr         -> the address of the current pattern pointer
5276    errorcodeptr   -> pointer to error code variable    errorcodeptr   -> pointer to error code variable
5277    lookbehind     TRUE if this is a lookbehind assertion    lookbehind     TRUE if this is a lookbehind assertion
5278      reset_bracount TRUE to reset the count for each branch
5279    skipbytes      skip this many bytes at start (for brackets and OP_COND)    skipbytes      skip this many bytes at start (for brackets and OP_COND)
5280    firstbyteptr   place to put the first required character, or a negative number    firstbyteptr   place to put the first required character, or a negative number
5281    reqbyteptr     place to put the last required character, or a negative number    reqbyteptr     place to put the last required character, or a negative number
# Line 4676  Returns: TRUE on success Line 5289  Returns: TRUE on success
5289    
5290  static BOOL  static BOOL
5291  compile_regex(int options, int oldims, uschar **codeptr, const uschar **ptrptr,  compile_regex(int options, int oldims, uschar **codeptr, const uschar **ptrptr,
5292    int *errorcodeptr, BOOL lookbehind, int skipbytes, int *firstbyteptr,    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
5293    int *reqbyteptr, branch_chain *bcptr, compile_data *cd, int *lengthptr)    int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr, compile_data *cd,
5294      int *lengthptr)
5295  {  {
5296  const uschar *ptr = *ptrptr;  const uschar *ptr = *ptrptr;
5297  uschar *code = *codeptr;  uschar *code = *codeptr;
# Line 4687  uschar *reverse_count = NULL; Line 5301  uschar *reverse_count = NULL;
5301  int firstbyte, reqbyte;  int firstbyte, reqbyte;
5302  int branchfirstbyte, branchreqbyte;  int branchfirstbyte, branchreqbyte;
5303  int length;  int length;
5304    int orig_bracount;
5305    int max_bracount;
5306  branch_chain bc;  branch_chain bc;
5307    
5308  bc.outer = bcptr;  bc.outer = bcptr;
# Line 4715  code += 1 + LINK_SIZE + skipbytes; Line 5331  code += 1 + LINK_SIZE + skipbytes;
5331    
5332  /* Loop for each alternative branch */  /* Loop for each alternative branch */
5333    
5334    orig_bracount = max_bracount = cd->bracount;
5335  for (;;)  for (;;)
5336    {    {
5337      /* For a (?| group, reset the capturing bracket count so that each branch
5338      uses the same numbers. */
5339    
5340      if (reset_bracount) cd->bracount = orig_bracount;
5341    
5342    /* Handle a change of ims options at the start of the branch */    /* Handle a change of ims options at the start of the branch */
5343    
5344    if ((options & PCRE_IMS) != oldims)    if ((options & PCRE_IMS) != oldims)
# Line 4746  for (;;) Line 5368  for (;;)
5368      return FALSE;      return FALSE;
5369      }      }
5370    
5371      /* Keep the highest bracket count in case (?| was used and some branch
5372      has fewer than the rest. */
5373    
5374      if (cd->bracount > max_bracount) max_bracount = cd->bracount;
5375    
5376    /* In the real compile phase, there is some post-processing to be done. */    /* In the real compile phase, there is some post-processing to be done. */
5377    
5378    if (lengthptr == NULL)    if (lengthptr == NULL)
# Line 4848  for (;;) Line 5475  for (;;)
5475        length += 2;        length += 2;
5476        }        }
5477    
5478        /* Retain the highest bracket number, in case resetting was used. */
5479    
5480        cd->bracount = max_bracount;
5481    
5482      /* Set values to pass back */      /* Set values to pass back */
5483    
5484      *codeptr = code;      *codeptr = code;
5485      *ptrptr = ptr;      *ptrptr = ptr;
5486      *firstbyteptr = firstbyte;      *firstbyteptr = firstbyte;
5487      *reqbyteptr = reqbyte;      *reqbyteptr = reqbyte;
5488      if (lengthptr != NULL) *lengthptr += length;      if (lengthptr != NULL)
5489          {
5490          if (OFLOW_MAX - *lengthptr < length)
5491            {
5492            *errorcodeptr = ERR20;
5493            return FALSE;
5494            }
5495          *lengthptr += length;
5496          }
5497      return TRUE;      return TRUE;
5498      }      }
5499    
# Line 5163  real_pcre *re; Line 5802  real_pcre *re;
5802  int length = 1;  /* For final END opcode */  int length = 1;  /* For final END opcode */
5803  int firstbyte, reqbyte, newline;  int firstbyte, reqbyte, newline;
5804  int errorcode = 0;  int errorcode = 0;
5805    int skipatstart = 0;
5806  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
5807  BOOL utf8;  BOOL utf8;
5808  #endif  #endif
# Line 5181  to fill in forward references to subpatt Line 5821  to fill in forward references to subpatt
5821    
5822  uschar cworkspace[COMPILE_WORK_SIZE];  uschar cworkspace[COMPILE_WORK_SIZE];
5823    
   
5824  /* Set this early so that early errors get offset 0. */  /* Set this early so that early errors get offset 0. */
5825    
5826  ptr = (const uschar *)pattern;  ptr = (const uschar *)pattern;
# Line 5241  cd->fcc = tables + fcc_offset; Line 5880  cd->fcc = tables + fcc_offset;
5880  cd->cbits = tables + cbits_offset;  cd->cbits = tables + cbits_offset;
5881  cd->ctypes = tables + ctypes_offset;  cd->ctypes = tables + ctypes_offset;
5882    
5883    /* Check for global one-time settings at the start of the pattern, and remember
5884    the offset for later. */
5885    
5886    while (ptr[skipatstart] == '(' && ptr[skipatstart+1] == '*')
5887      {
5888      int newnl = 0;
5889      int newbsr = 0;
5890    
5891      if (strncmp((char *)(ptr+skipatstart+2), "CR)", 3) == 0)
5892        { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
5893      else if (strncmp((char *)(ptr+skipatstart+2), "LF)", 3)  == 0)
5894        { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
5895      else if (strncmp((char *)(ptr+skipatstart+2), "CRLF)", 5)  == 0)
5896        { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
5897      else if (strncmp((char *)(ptr+skipatstart+2), "ANY)", 4) == 0)
5898        { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
5899      else if (strncmp((char *)(ptr+skipatstart+2), "ANYCRLF)", 8)  == 0)
5900        { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
5901    
5902      else if (strncmp((char *)(ptr+skipatstart+2), "BSR_ANYCRLF)", 12) == 0)
5903        { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
5904      else if (strncmp((char *)(ptr+skipatstart+2), "BSR_UNICODE)", 12) == 0)
5905        { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
5906    
5907      if (newnl != 0)
5908        options = (options & ~PCRE_NEWLINE_BITS) | newnl;
5909      else if (newbsr != 0)
5910        options = (options & ~(PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) | newbsr;
5911      else break;
5912      }
5913    
5914    /* Check validity of \R options. */
5915    
5916    switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
5917      {
5918      case 0:
5919      case PCRE_BSR_ANYCRLF:
5920      case PCRE_BSR_UNICODE:
5921      break;
5922      default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
5923      }
5924    
5925  /* Handle different types of newline. The three bits give seven cases. The  /* Handle different types of newline. The three bits give seven cases. The
5926  current code allows for fixed one- or two-byte sequences, plus "any" and  current code allows for fixed one- or two-byte sequences, plus "any" and
5927  "anycrlf". */  "anycrlf". */
5928    
5929  switch (options & (PCRE_NEWLINE_CRLF | PCRE_NEWLINE_ANY))  switch (options & PCRE_NEWLINE_BITS)
5930    {    {
5931    case 0: newline = NEWLINE; break;   /* Compile-time default */    case 0: newline = NEWLINE; break;   /* Build-time default */
5932    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = '\r'; break;
5933    case PCRE_NEWLINE_LF: newline = '\n'; break;    case PCRE_NEWLINE_LF: newline = '\n'; break;
5934    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
# Line 5300  to compile parts of the pattern into; th Line 5981  to compile parts of the pattern into; th
5981  no longer needed, so hopefully this workspace will never overflow, though there  no longer needed, so hopefully this workspace will never overflow, though there
5982  is a test for its doing so. */  is a test for its doing so. */
5983    
5984  cd->bracount = 0;  cd->bracount = cd->final_bracount = 0;
5985  cd->names_found = 0;  cd->names_found = 0;
5986  cd->name_entry_size = 0;  cd->name_entry_size = 0;
5987  cd->name_table = NULL;  cd->name_table = NULL;
# Line 5310  cd->hwm = cworkspace; Line 5991  cd->hwm = cworkspace;
5991  cd->start_pattern = (const uschar *)pattern;  cd->start_pattern = (const uschar *)pattern;
5992  cd->end_pattern = (const uschar *)(pattern + strlen(pattern));  cd->end_pattern = (const uschar *)(pattern + strlen(pattern));
5993  cd->req_varyopt = 0;  cd->req_varyopt = 0;
 cd->nopartial = FALSE;  
5994  cd->external_options = options;  cd->external_options = options;
5995    cd->external_flags = 0;
5996    
5997  /* Now do the pre-compile. On error, errorcode will be set non-zero, so we  /* Now do the pre-compile. On error, errorcode will be set non-zero, so we
5998  don't need to look at the result of the function here. The initial options have  don't need to look at the result of the function here. The initial options have
# Line 5319  been put into the cd block so that they Line 6000  been put into the cd block so that they
6000  found within the regex right at the beginning. Bringing initial option settings  found within the regex right at the beginning. Bringing initial option settings
6001  outside can help speed up starting point checks. */  outside can help speed up starting point checks. */
6002    
6003    ptr += skipatstart;
6004  code = cworkspace;  code = cworkspace;
6005  *code = OP_BRA;  *code = OP_BRA;
6006  (void)compile_regex(cd->external_options, cd->external_options & PCRE_IMS,  (void)compile_regex(cd->external_options, cd->external_options & PCRE_IMS,
6007    &code, &ptr, &errorcode, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, &length);    &code, &ptr, &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd,
6008      &length);
6009  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
6010    
6011  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
# Line 5348  if (re == NULL) Line 6031  if (re == NULL)
6031    goto PCRE_EARLY_ERROR_RETURN;    goto PCRE_EARLY_ERROR_RETURN;
6032    }    }
6033    
6034  /* Put in the magic number, and save the sizes, initial options, and character  /* Put in the magic number, and save the sizes, initial options, internal
6035  table pointer. NULL is used for the default character tables. The nullpad field  flags, and character table pointer. NULL is used for the default character
6036  is at the end; it's there to help in the case when a regex compiled on a system  tables. The nullpad field is at the end; it's there to help in the case when a
6037  with 4-byte pointers is run on another with 8-byte pointers. */  regex compiled on a system with 4-byte pointers is run on another with 8-byte
6038    pointers. */
6039    
6040  re->magic_number = MAGIC_NUMBER;  re->magic_number = MAGIC_NUMBER;
6041  re->size = size;  re->size = size;
6042  re->options = cd->external_options;  re->options = cd->external_options;
6043    re->flags = cd->external_flags;
6044  re->dummy1 = 0;  re->dummy1 = 0;
6045  re->first_byte = 0;  re->first_byte = 0;
6046  re->req_byte = 0;  re->req_byte = 0;
# Line 5373  field. Reset the bracket count and the n Line 6058  field. Reset the bracket count and the n
6058  field; this time it's used for remembering forward references to subpatterns.  field; this time it's used for remembering forward references to subpatterns.
6059  */  */
6060    
6061    cd->final_bracount = cd->bracount;  /* Save for checking forward references */
6062  cd->bracount = 0;  cd->bracount = 0;
6063  cd->names_found = 0;  cd->names_found = 0;
6064  cd->name_table = (uschar *)re + re->name_table_offset;  cd->name_table = (uschar *)re + re->name_table_offset;
# Line 5380  codestart = cd->name_table + re->name_en Line 6066  codestart = cd->name_table + re->name_en
6066  cd->start_code = codestart;  cd->start_code = codestart;
6067  cd->hwm = cworkspace;  cd->hwm = cworkspace;
6068  cd->req_varyopt = 0;  cd->req_varyopt = 0;
6069  cd->nopartial = FALSE;  cd->had_accept = FALSE;
6070    
6071  /* Set up a starting, non-extracting bracket, then compile the expression. On  /* Set up a starting, non-extracting bracket, then compile the expression. On
6072  error, errorcode will be set non-zero, so we don't need to look at the result  error, errorcode will be set non-zero, so we don't need to look at the result
6073  of the function here. */  of the function here. */
6074    
6075  ptr = (const uschar *)pattern;  ptr = (const uschar *)pattern + skipatstart;
6076  code = (uschar *)codestart;  code = (uschar *)codestart;
6077  *code = OP_BRA;  *code = OP_BRA;
6078  (void)compile_regex(re->options, re->options & PCRE_IMS, &code, &ptr,  (void)compile_regex(re->options, re->options & PCRE_IMS, &code, &ptr,
6079    &errorcode, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, NULL);    &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, NULL);
6080  re->top_bracket = cd->bracount;  re->top_bracket = cd->bracount;
6081  re->top_backref = cd->top_backref;  re->top_backref = cd->top_backref;
6082    re->flags = cd->external_flags;
6083    
6084  if (cd->nopartial) re->options |= PCRE_NOPARTIAL;  if (cd->had_accept) reqbyte = -1;   /* Must disable after (*ACCEPT) */
6085    
6086  /* If not reached end of pattern on success, there's an excess bracket. */  /* If not reached end of pattern on success, there's an excess bracket. */
6087    
# Line 5436  if (errorcode != 0) Line 6123  if (errorcode != 0)
6123    PCRE_EARLY_ERROR_RETURN:    PCRE_EARLY_ERROR_RETURN:
6124    *erroroffset = ptr - (const uschar *)pattern;    *erroroffset = ptr - (const uschar *)pattern;
6125    PCRE_EARLY_ERROR_RETURN2:    PCRE_EARLY_ERROR_RETURN2:
6126    *errorptr = error_texts[errorcode];    *errorptr = find_error_text(errorcode);
6127    if (errorcodeptr != NULL) *errorcodeptr = errorcode;    if (errorcodeptr != NULL) *errorcodeptr = errorcode;
6128    return NULL;    return NULL;
6129    }    }
# Line 5465  if ((re->options & PCRE_ANCHORED) == 0) Line 6152  if ((re->options & PCRE_ANCHORED) == 0)
6152        int ch = firstbyte & 255;        int ch = firstbyte & 255;
6153        re->first_byte = ((firstbyte & REQ_CASELESS) != 0 &&        re->first_byte = ((firstbyte & REQ_CASELESS) != 0 &&
6154           cd->fcc[ch] == ch)? ch : firstbyte;           cd->fcc[ch] == ch)? ch : firstbyte;
6155        re->options |= PCRE_FIRSTSET;        re->flags |= PCRE_FIRSTSET;
6156        }        }
6157      else if (is_startline(codestart, 0, cd->backref_map))      else if (is_startline(codestart, 0, cd->backref_map))
6158        re->options |= PCRE_STARTLINE;        re->flags |= PCRE_STARTLINE;
6159      }      }
6160    }    }
6161    
# Line 5482  if (reqbyte >= 0 && Line 6169  if (reqbyte >= 0 &&
6169    int ch = reqbyte & 255;    int ch = reqbyte & 255;
6170    re->req_byte = ((reqbyte & REQ_CASELESS) != 0 &&    re->req_byte = ((reqbyte & REQ_CASELESS) != 0 &&
6171      cd->fcc[ch] == ch)? (reqbyte & ~REQ_CASELESS) : reqbyte;      cd->fcc[ch] == ch)? (reqbyte & ~REQ_CASELESS) : reqbyte;
6172    re->options |= PCRE_REQCHSET;    re->flags |= PCRE_REQCHSET;
6173    }    }
6174    
6175  /* Print out the compiled data if debugging is enabled. This is never the  /* Print out the compiled data if debugging is enabled. This is never the
# Line 5493  case when building a production library. Line 6180  case when building a production library.
6180  printf("Length = %d top_bracket = %d top_backref = %d\n",  printf("Length = %d top_bracket = %d top_backref = %d\n",
6181    length, re->top_bracket, re->top_backref);    length, re->top_bracket, re->top_backref);
6182    
6183  if (re->options != 0)  printf("Options=%08x\n", re->options);
   {  
   printf("%s%s%s%s%s%s%s%s%s\n",  
     ((re->options & PCRE_NOPARTIAL) != 0)? "nopartial " : "",  
     ((re->options & PCRE_ANCHORED) != 0)? "anchored " : "",  
     ((re->options & PCRE_CASELESS) != 0)? "caseless " : "",  
     ((re->options & PCRE_EXTENDED) != 0)? "extended " : "",  
     ((re->options & PCRE_MULTILINE) != 0)? "multiline " : "",  
     ((re->options & PCRE_DOTALL) != 0)? "dotall " : "",  
     ((re->options & PCRE_DOLLAR_ENDONLY) != 0)? "endonly " : "",  
     ((re->options & PCRE_EXTRA) != 0)? "extra " : "",  
     ((re->options & PCRE_UNGREEDY) != 0)? "ungreedy " : "");  
   }  
6184    
6185  if ((re->options & PCRE_FIRSTSET) != 0)  if ((re->flags & PCRE_FIRSTSET) != 0)
6186    {    {
6187    int ch = re->first_byte & 255;    int ch = re->first_byte & 255;
6188    const char *caseless = ((re->first_byte & REQ_CASELESS) == 0)?    const char *caseless = ((re->first_byte & REQ_CASELESS) == 0)?
# Line 5516  if ((re->options & PCRE_FIRSTSET) != 0) Line 6191  if ((re->options & PCRE_FIRSTSET) != 0)
6191      else printf("First char = \\x%02x%s\n", ch, caseless);      else printf("First char = \\x%02x%s\n", ch, caseless);
6192    }    }
6193    
6194  if ((re->options & PCRE_REQCHSET) != 0)  if ((re->flags & PCRE_REQCHSET) != 0)
6195    {    {
6196    int ch = re->req_byte & 255;    int ch = re->req_byte & 255;
6197    const char *caseless = ((re->req_byte & REQ_CASELESS) == 0)?    const char *caseless = ((re->req_byte & REQ_CASELESS) == 0)?
# Line 5533  was compiled can be seen. */ Line 6208  was compiled can be seen. */
6208  if (code - codestart > length)  if (code - codestart > length)
6209    {    {
6210    (pcre_free)(re);    (pcre_free)(re);
6211    *errorptr = error_texts[ERR23];    *errorptr = find_error_text(ERR23);
6212    *erroroffset = ptr - (uschar *)pattern;    *erroroffset = ptr - (uschar *)pattern;
6213    if (errorcodeptr != NULL) *errorcodeptr = ERR23;    if (errorcodeptr != NULL) *errorcodeptr = ERR23;
6214    return NULL;    return NULL;

Legend:
Removed from v.172  
changed lines
  Added in v.300

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12