/[pcre]/code/branches/pcre16/pcre_compile.c
ViewVC logotype

Diff of /code/branches/pcre16/pcre_compile.c

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

revision 334 by ph10, Fri Apr 11 15:48:14 2008 UTC revision 457 by ph10, Sat Oct 3 16:24:08 2009 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2008 University of Cambridge             Copyright (c) 1997-2009 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 97  are simple data values; negative values Line 97  are simple data values; negative values
97  on. Zero means further processing is needed (for things like \x), or the escape  on. Zero means further processing is needed (for things like \x), or the escape
98  is invalid. */  is invalid. */
99    
100  #ifndef EBCDIC  /* This is the "normal" table for ASCII systems */  #ifndef EBCDIC
101    
102    /* This is the "normal" table for ASCII systems or for EBCDIC systems running
103    in UTF-8 mode. */
104    
105  static const short int escapes[] = {  static const short int escapes[] = {
106       0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */       0,                       0,
107       0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */       0,                       0,
108     '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */       0,                       0,
109  -ESC_H,      0,      0, -ESC_K,      0,      0,      0,      0,   /* H - O */       0,                       0,
110  -ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0, -ESC_V, -ESC_W,   /* P - W */       0,                       0,
111  -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */       CHAR_COLON,              CHAR_SEMICOLON,
112     '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */       CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
113  -ESC_h,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */       CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
114  -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0, -ESC_v, -ESC_w,   /* p - w */       CHAR_COMMERCIAL_AT,      -ESC_A,
115       0,      0, -ESC_z                                            /* x - z */       -ESC_B,                  -ESC_C,
116         -ESC_D,                  -ESC_E,
117         0,                       -ESC_G,
118         -ESC_H,                  0,
119         0,                       -ESC_K,
120         0,                       0,
121         0,                       0,
122         -ESC_P,                  -ESC_Q,
123         -ESC_R,                  -ESC_S,
124         0,                       0,
125         -ESC_V,                  -ESC_W,
126         -ESC_X,                  0,
127         -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
128         CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
129         CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
130         CHAR_GRAVE_ACCENT,       7,
131         -ESC_b,                  0,
132         -ESC_d,                  ESC_e,
133         ESC_f,                   0,
134         -ESC_h,                  0,
135         0,                       -ESC_k,
136         0,                       0,
137         ESC_n,                   0,
138         -ESC_p,                  0,
139         ESC_r,                   -ESC_s,
140         ESC_tee,                 0,
141         -ESC_v,                  -ESC_w,
142         0,                       0,
143         -ESC_z
144  };  };
145    
146  #else           /* This is the "abnormal" table for EBCDIC systems */  #else
147    
148    /* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
149    
150  static const short int escapes[] = {  static const short int escapes[] = {
151  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
152  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
# Line 142  static const short int escapes[] = { Line 177  static const short int escapes[] = {
177    
178  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is
179  searched linearly. Put all the names into a single string, in order to reduce  searched linearly. Put all the names into a single string, in order to reduce
180  the number of relocations when a shared library is dynamically linked. */  the number of relocations when a shared library is dynamically linked. The
181    string is built from string macros so that it works in UTF-8 mode on EBCDIC
182    platforms. */
183    
184  typedef struct verbitem {  typedef struct verbitem {
185    int   len;    int   len;
# Line 150  typedef struct verbitem { Line 187  typedef struct verbitem {
187  } verbitem;  } verbitem;
188    
189  static const char verbnames[] =  static const char verbnames[] =
190    "ACCEPT\0"    STRING_ACCEPT0
191    "COMMIT\0"    STRING_COMMIT0
192    "F\0"    STRING_F0
193    "FAIL\0"    STRING_FAIL0
194    "PRUNE\0"    STRING_PRUNE0
195    "SKIP\0"    STRING_SKIP0
196    "THEN";    STRING_THEN;
197    
198  static const verbitem verbs[] = {  static const verbitem verbs[] = {
199    { 6, OP_ACCEPT },    { 6, OP_ACCEPT },
# Line 178  length entry. The first three must be al Line 215  length entry. The first three must be al
215  for handling case independence. */  for handling case independence. */
216    
217  static const char posix_names[] =  static const char posix_names[] =
218    "alpha\0"  "lower\0"  "upper\0"  "alnum\0"  "ascii\0"  "blank\0"    STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
219    "cntrl\0"  "digit\0"  "graph\0"  "print\0"  "punct\0"  "space\0"    STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
220    "word\0"   "xdigit";    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
221      STRING_word0  STRING_xdigit;
222    
223  static const uschar posix_name_lengths[] = {  static const uschar posix_name_lengths[] = {
224    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 302  static const char error_texts[] = Line 340  static const char error_texts[] =
340    "(*VERB) not recognized\0"    "(*VERB) not recognized\0"
341    "number is too big\0"    "number is too big\0"
342    "subpattern name expected\0"    "subpattern name expected\0"
343    "digit expected after (?+";    "digit expected after (?+\0"
344      "] is an invalid data character in JavaScript compatibility mode\0"
345      /* 65 */
346      "different names for subpatterns of the same number are not allowed";
347    
348    
349  /* 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 321  For convenience, we use the same bit def Line 362  For convenience, we use the same bit def
362    
363  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
364    
365  #ifndef EBCDIC  /* This is the "normal" case, for ASCII systems */  #ifndef EBCDIC
366    
367    /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
368    UTF-8 mode. */
369    
370  static const unsigned char digitab[] =  static const unsigned char digitab[] =
371    {    {
372    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
# Line 357  static const unsigned char digitab[] = Line 402  static const unsigned char digitab[] =
402    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
403    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
404    
405  #else           /* This is the "abnormal" case, for EBCDIC systems */  #else
406    
407    /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
408    
409  static const unsigned char digitab[] =  static const unsigned char digitab[] =
410    {    {
411    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
# Line 454  static const char * Line 502  static const char *
502  find_error_text(int n)  find_error_text(int n)
503  {  {
504  const char *s = error_texts;  const char *s = error_texts;
505  for (; n > 0; n--) while (*s++ != 0);  for (; n > 0; n--) while (*s++ != 0) {};
506  return s;  return s;
507  }  }
508    
# Line 502  if (c == 0) *errorcodeptr = ERR1; Line 550  if (c == 0) *errorcodeptr = ERR1;
550  in 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.
551  Otherwise further processing may be required. */  Otherwise further processing may be required. */
552    
553  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
554  else if (c < '0' || c > 'z') {}                           /* Not alphanumeric */  else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */
555  else if ((i = escapes[c - '0']) != 0) c = i;  else if ((i = escapes[c - CHAR_0]) != 0) c = i;
556    
557  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
558  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
# Line 523  else Line 571  else
571      /* A number of Perl escapes are not handled by PCRE. We give an explicit      /* A number of Perl escapes are not handled by PCRE. We give an explicit
572      error. */      error. */
573    
574      case 'l':      case CHAR_l:
575      case 'L':      case CHAR_L:
576      case 'N':      case CHAR_N:
577      case 'u':      case CHAR_u:
578      case 'U':      case CHAR_U:
579      *errorcodeptr = ERR37;      *errorcodeptr = ERR37;
580      break;      break;
581    
582      /* \g must be followed by one of a number of specific things:      /* \g must be followed by one of a number of specific things:
583    
584      (1) A number, either plain or braced. If positive, it is an absolute      (1) A number, either plain or braced. If positive, it is an absolute
585      backreference. If negative, it is a relative backreference. This is a Perl      backreference. If negative, it is a relative backreference. This is a Perl
586      5.10 feature.      5.10 feature.
587    
588      (2) Perl 5.10 also supports \g{name} as a reference to a named group. This      (2) Perl 5.10 also supports \g{name} as a reference to a named group. This
589      is part of Perl's movement towards a unified syntax for back references. As      is part of Perl's movement towards a unified syntax for back references. As
590      this is synonymous with \k{name}, we fudge it up by pretending it really      this is synonymous with \k{name}, we fudge it up by pretending it really
591      was \k.      was \k.
592    
593      (3) For Oniguruma compatibility we also support \g followed by a name or a      (3) For Oniguruma compatibility we also support \g followed by a name or a
594      number either in angle brackets or in single quotes. However, these are      number either in angle brackets or in single quotes. However, these are
595      (possibly recursive) subroutine calls, _not_ backreferences. Just return      (possibly recursive) subroutine calls, _not_ backreferences. Just return
596      the -ESC_g code (cf \k). */      the -ESC_g code (cf \k). */
597    
598      case 'g':      case CHAR_g:
599      if (ptr[1] == '<' || ptr[1] == '\'')      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
600        {        {
601        c = -ESC_g;        c = -ESC_g;
602        break;        break;
603        }        }
604    
605      /* Handle the Perl-compatible cases */      /* Handle the Perl-compatible cases */
606    
607      if (ptr[1] == '{')      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
608        {        {
609        const uschar *p;        const uschar *p;
610        for (p = ptr+2; *p != 0 && *p != '}'; p++)        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
611          if (*p != '-' && (digitab[*p] & ctype_digit) == 0) break;          if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;
612        if (*p != 0 && *p != '}')        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
613          {          {
614          c = -ESC_k;          c = -ESC_k;
615          break;          break;
# Line 571  else Line 619  else
619        }        }
620      else braced = FALSE;      else braced = FALSE;
621    
622      if (ptr[1] == '-')      if (ptr[1] == CHAR_MINUS)
623        {        {
624        negated = TRUE;        negated = TRUE;
625        ptr++;        ptr++;
# Line 580  else Line 628  else
628    
629      c = 0;      c = 0;
630      while ((digitab[ptr[1]] & ctype_digit) != 0)      while ((digitab[ptr[1]] & ctype_digit) != 0)
631        c = c * 10 + *(++ptr) - '0';        c = c * 10 + *(++ptr) - CHAR_0;
632    
633      if (c < 0)   /* Integer overflow */      if (c < 0)   /* Integer overflow */
634        {        {
635        *errorcodeptr = ERR61;        *errorcodeptr = ERR61;
636        break;        break;
637        }        }
638    
639      if (braced && *(++ptr) != '}')      if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
640        {        {
641        *errorcodeptr = ERR57;        *errorcodeptr = ERR57;
642        break;        break;
643        }        }
644    
645      if (c == 0)      if (c == 0)
646        {        {
647        *errorcodeptr = ERR58;        *errorcodeptr = ERR58;
648        break;        break;
649        }        }
650    
651      if (negated)      if (negated)
652        {        {
# Line 625  else Line 673  else
673      value is greater than 377, the least significant 8 bits are taken. Inside a      value is greater than 377, the least significant 8 bits are taken. Inside a
674      character class, \ followed by a digit is always an octal number. */      character class, \ followed by a digit is always an octal number. */
675    
676      case '1': case '2': case '3': case '4': case '5':      case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4: case CHAR_5:
677      case '6': case '7': case '8': case '9':      case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
678    
679      if (!isclass)      if (!isclass)
680        {        {
681        oldptr = ptr;        oldptr = ptr;
682        c -= '0';        c -= CHAR_0;
683        while ((digitab[ptr[1]] & ctype_digit) != 0)        while ((digitab[ptr[1]] & ctype_digit) != 0)
684          c = c * 10 + *(++ptr) - '0';          c = c * 10 + *(++ptr) - CHAR_0;
685        if (c < 0)    /* Integer overflow */        if (c < 0)    /* Integer overflow */
686          {          {
687          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
# Line 651  else Line 699  else
699      generates a binary zero byte and treats the digit as a following literal.      generates a binary zero byte and treats the digit as a following literal.
700      Thus we have to pull back the pointer by one. */      Thus we have to pull back the pointer by one. */
701    
702      if ((c = *ptr) >= '8')      if ((c = *ptr) >= CHAR_8)
703        {        {
704        ptr--;        ptr--;
705        c = 0;        c = 0;
# Line 664  else Line 712  else
712      to do). Nowadays we allow for larger numbers in UTF-8 mode, but no more      to do). Nowadays we allow for larger numbers in UTF-8 mode, but no more
713      than 3 octal digits. */      than 3 octal digits. */
714    
715      case '0':      case CHAR_0:
716      c -= '0';      c -= CHAR_0;
717      while(i++ < 2 && ptr[1] >= '0' && ptr[1] <= '7')      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
718          c = c * 8 + *(++ptr) - '0';          c = c * 8 + *(++ptr) - CHAR_0;
719      if (!utf8 && c > 255) *errorcodeptr = ERR51;      if (!utf8 && c > 255) *errorcodeptr = ERR51;
720      break;      break;
721    
# Line 675  else Line 723  else
723      than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is      than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is
724      treated as a data character. */      treated as a data character. */
725    
726      case 'x':      case CHAR_x:
727      if (ptr[1] == '{')      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
728        {        {
729        const uschar *pt = ptr + 2;        const uschar *pt = ptr + 2;
730        int count = 0;        int count = 0;
# Line 685  else Line 733  else
733        while ((digitab[*pt] & ctype_xdigit) != 0)        while ((digitab[*pt] & ctype_xdigit) != 0)
734          {          {
735          register int cc = *pt++;          register int cc = *pt++;
736          if (c == 0 && cc == '0') continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
737          count++;          count++;
738    
739  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
740          if (cc >= 'a') cc -= 32;               /* Convert to upper case */          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
741          c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
742  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
743          if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
744          c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
745  #endif  #endif
746          }          }
747    
748        if (*pt == '}')        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
749          {          {
750          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;
751          ptr = pt;          ptr = pt;
# Line 713  else Line 761  else
761      c = 0;      c = 0;
762      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)
763        {        {
764        int cc;                               /* Some compilers don't like ++ */        int cc;                                  /* Some compilers don't like */
765        cc = *(++ptr);                        /* in initializers */        cc = *(++ptr);                           /* ++ in initializers */
766  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
767        if (cc >= 'a') cc -= 32;              /* Convert to upper case */        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
768        c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
769  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
770        if (cc <= 'z') cc += 64;              /* Convert to upper case */        if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
771        c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
772  #endif  #endif
773        }        }
774      break;      break;
# Line 729  else Line 777  else
777      This coding is ASCII-specific, but then the whole concept of \cx is      This coding is ASCII-specific, but then the whole concept of \cx is
778      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
779    
780      case 'c':      case CHAR_c:
781      c = *(++ptr);      c = *(++ptr);
782      if (c == 0)      if (c == 0)
783        {        {
# Line 737  else Line 785  else
785        break;        break;
786        }        }
787    
788  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
789      if (c >= 'a' && c <= 'z') c -= 32;      if (c >= CHAR_a && c <= CHAR_z) c -= 32;
790      c ^= 0x40;      c ^= 0x40;
791  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
792      if (c >= 'a' && c <= 'z') c += 64;      if (c >= CHAR_a && c <= CHAR_z) c += 64;
793      c ^= 0xC0;      c ^= 0xC0;
794  #endif  #endif
795      break;      break;
# Line 803  if (c == 0) goto ERROR_RETURN; Line 851  if (c == 0) goto ERROR_RETURN;
851  /* \P or \p can be followed by a name in {}, optionally preceded by ^ for  /* \P or \p can be followed by a name in {}, optionally preceded by ^ for
852  negation. */  negation. */
853    
854  if (c == '{')  if (c == CHAR_LEFT_CURLY_BRACKET)
855    {    {
856    if (ptr[1] == '^')    if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
857      {      {
858      *negptr = TRUE;      *negptr = TRUE;
859      ptr++;      ptr++;
# Line 814  if (c == '{') Line 862  if (c == '{')
862      {      {
863      c = *(++ptr);      c = *(++ptr);
864      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
865      if (c == '}') break;      if (c == CHAR_RIGHT_CURLY_BRACKET) break;
866      name[i] = c;      name[i] = c;
867      }      }
868    if (c !='}') goto ERROR_RETURN;    if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
869    name[i] = 0;    name[i] = 0;
870    }    }
871    
# Line 882  is_counted_repeat(const uschar *p) Line 930  is_counted_repeat(const uschar *p)
930  {  {
931  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
932  while ((digitab[*p] & ctype_digit) != 0) p++;  while ((digitab[*p] & ctype_digit) != 0) p++;
933  if (*p == '}') return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
934    
935  if (*p++ != ',') return FALSE;  if (*p++ != CHAR_COMMA) return FALSE;
936  if (*p == '}') return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
937    
938  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
939  while ((digitab[*p] & ctype_digit) != 0) p++;  while ((digitab[*p] & ctype_digit) != 0) p++;
940    
941  return (*p == '}');  return (*p == CHAR_RIGHT_CURLY_BRACKET);
942  }  }
943    
944    
# Line 923  int max = -1; Line 971  int max = -1;
971  /* Read the minimum value and do a paranoid check: a negative value indicates  /* Read the minimum value and do a paranoid check: a negative value indicates
972  an integer overflow. */  an integer overflow. */
973    
974  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;
975  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
976    {    {
977    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 933  if (min < 0 || min > 65535) Line 981  if (min < 0 || min > 65535)
981  /* Read the maximum value if there is one, and again do a paranoid on its size.  /* Read the maximum value if there is one, and again do a paranoid on its size.
982  Also, max must not be less than min. */  Also, max must not be less than min. */
983    
984  if (*p == '}') max = min; else  if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
985    {    {
986    if (*(++p) != '}')    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
987      {      {
988      max = 0;      max = 0;
989      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;
990      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
991        {        {
992        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 963  return p; Line 1011  return p;
1011    
1012    
1013  /*************************************************  /*************************************************
1014  *       Find forward referenced subpattern       *  *  Subroutine for finding forward reference      *
1015  *************************************************/  *************************************************/
1016    
1017  /* This function scans along a pattern's text looking for capturing  /* This recursive function is called only from find_parens() below. The
1018    top-level call starts at the beginning of the pattern. All other calls must
1019    start at a parenthesis. It scans along a pattern's text looking for capturing
1020  subpatterns, and counting them. If it finds a named pattern that matches the  subpatterns, and counting them. If it finds a named pattern that matches the
1021  name it is given, it returns its number. Alternatively, if the name is NULL, it  name it is given, it returns its number. Alternatively, if the name is NULL, it
1022  returns when it reaches a given numbered subpattern. This is used for forward  returns when it reaches a given numbered subpattern. We know that if (?P< is
1023  references to subpatterns. We know that if (?P< is encountered, the name will  encountered, the name will be terminated by '>' because that is checked in the
1024  be terminated by '>' because that is checked in the first pass.  first pass. Recursion is used to keep track of subpatterns that reset the
1025    capturing group numbers - the (?| feature.
1026    
1027  Arguments:  Arguments:
1028    ptr          current position in the pattern    ptrptr       address of the current character pointer (updated)
1029    count        current count of capturing parens so far encountered    cd           compile background data
1030    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1031    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1032    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1033      count        pointer to the current capturing subpattern number (updated)
1034    
1035  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1036  */  */
1037    
1038  static int  static int
1039  find_parens(const uschar *ptr, int count, const uschar *name, int lorn,  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,
1040    BOOL xmode)    BOOL xmode, int *count)
1041  {  {
1042  const uschar *thisname;  uschar *ptr = *ptrptr;
1043    int start_count = *count;
1044    int hwm_count = start_count;
1045    BOOL dup_parens = FALSE;
1046    
1047  for (; *ptr != 0; ptr++)  /* If the first character is a parenthesis, check on the type of group we are
1048    dealing with. The very first call may not start with a parenthesis. */
1049    
1050    if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1051    {    {
1052    int term;    if (ptr[1] == CHAR_QUESTION_MARK &&
1053          ptr[2] == CHAR_VERTICAL_LINE)
1054        {
1055        ptr += 3;
1056        dup_parens = TRUE;
1057        }
1058    
1059      /* Handle a normal, unnamed capturing parenthesis */
1060    
1061      else if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)
1062        {
1063        *count += 1;
1064        if (name == NULL && *count == lorn) return *count;
1065        ptr++;
1066        }
1067    
1068      /* Handle a condition. If it is an assertion, just carry on so that it
1069      is processed as normal. If not, skip to the closing parenthesis of the
1070      condition (there can't be any nested parens. */
1071    
1072      else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
1073        {
1074        ptr += 2;
1075        if (ptr[1] != CHAR_QUESTION_MARK)
1076          {
1077          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
1078          if (*ptr != 0) ptr++;
1079          }
1080        }
1081    
1082      /* We have either (? or (* and not a condition */
1083    
1084      else
1085        {
1086        ptr += 2;
1087        if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */
1088    
1089        /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */
1090    
1091        if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&
1092            ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1093          {
1094          int term;
1095          const uschar *thisname;
1096          *count += 1;
1097          if (name == NULL && *count == lorn) return *count;
1098          term = *ptr++;
1099          if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;
1100          thisname = ptr;
1101          while (*ptr != term) ptr++;
1102          if (name != NULL && lorn == ptr - thisname &&
1103              strncmp((const char *)name, (const char *)thisname, lorn) == 0)
1104            return *count;
1105          term++;
1106          }
1107        }
1108      }
1109    
1110    /* Past any initial parenthesis handling, scan for parentheses or vertical
1111    bars. */
1112    
1113    for (; *ptr != 0; ptr++)
1114      {
1115    /* Skip over backslashed characters and also entire \Q...\E */    /* Skip over backslashed characters and also entire \Q...\E */
1116    
1117    if (*ptr == '\\')    if (*ptr == CHAR_BACKSLASH)
1118      {      {
1119      if (*(++ptr) == 0) return -1;      if (*(++ptr) == 0) goto FAIL_EXIT;
1120      if (*ptr == 'Q') for (;;)      if (*ptr == CHAR_Q) for (;;)
1121        {        {
1122        while (*(++ptr) != 0 && *ptr != '\\');        while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1123        if (*ptr == 0) return -1;        if (*ptr == 0) goto FAIL_EXIT;
1124        if (*(++ptr) == 'E') break;        if (*(++ptr) == CHAR_E) break;
1125        }        }
1126      continue;      continue;
1127      }      }
1128    
1129    /* Skip over character classes */    /* Skip over character classes; this logic must be similar to the way they
1130      are handled for real. If the first character is '^', skip it. Also, if the
1131      first few characters (either before or after ^) are \Q\E or \E we skip them
1132      too. This makes for compatibility with Perl. Note the use of STR macros to
1133      encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */
1134    
1135    if (*ptr == '[')    if (*ptr == CHAR_LEFT_SQUARE_BRACKET)
1136      {      {
1137      while (*(++ptr) != ']')      BOOL negate_class = FALSE;
1138        for (;;)
1139          {
1140          if (ptr[1] == CHAR_BACKSLASH)
1141            {
1142            if (ptr[2] == CHAR_E)
1143              ptr+= 2;
1144            else if (strncmp((const char *)ptr+2,
1145                     STR_Q STR_BACKSLASH STR_E, 3) == 0)
1146              ptr += 4;
1147            else
1148              break;
1149            }
1150          else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
1151            {
1152            negate_class = TRUE;
1153            ptr++;
1154            }
1155          else break;
1156          }
1157    
1158        /* If the next character is ']', it is a data character that must be
1159        skipped, except in JavaScript compatibility mode. */
1160    
1161        if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&
1162            (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
1163          ptr++;
1164    
1165        while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)
1166        {        {
1167        if (*ptr == 0) return -1;        if (*ptr == 0) return -1;
1168        if (*ptr == '\\')        if (*ptr == CHAR_BACKSLASH)
1169          {          {
1170          if (*(++ptr) == 0) return -1;          if (*(++ptr) == 0) goto FAIL_EXIT;
1171          if (*ptr == 'Q') for (;;)          if (*ptr == CHAR_Q) for (;;)
1172            {            {
1173            while (*(++ptr) != 0 && *ptr != '\\');            while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1174            if (*ptr == 0) return -1;            if (*ptr == 0) goto FAIL_EXIT;
1175            if (*(++ptr) == 'E') break;            if (*(++ptr) == CHAR_E) break;
1176            }            }
1177          continue;          continue;
1178          }          }
# Line 1031  for (; *ptr != 0; ptr++) Line 1182  for (; *ptr != 0; ptr++)
1182    
1183    /* Skip comments in /x mode */    /* Skip comments in /x mode */
1184    
1185    if (xmode && *ptr == '#')    if (xmode && *ptr == CHAR_NUMBER_SIGN)
1186      {      {
1187      while (*(++ptr) != 0 && *ptr != '\n');      while (*(++ptr) != 0 && *ptr != CHAR_NL) {};
1188      if (*ptr == 0) return -1;      if (*ptr == 0) goto FAIL_EXIT;
1189      continue;      continue;
1190      }      }
1191    
1192    /* An opening parens must now be a real metacharacter */    /* Check for the special metacharacters */
1193    
1194    if (*ptr != '(') continue;    if (*ptr == CHAR_LEFT_PARENTHESIS)
   if (ptr[1] != '?' && ptr[1] != '*')  
1195      {      {
1196      count++;      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, count);
1197      if (name == NULL && count == lorn) return count;      if (rc > 0) return rc;
1198      continue;      if (*ptr == 0) goto FAIL_EXIT;
1199        }
1200    
1201      else if (*ptr == CHAR_RIGHT_PARENTHESIS)
1202        {
1203        if (dup_parens && *count < hwm_count) *count = hwm_count;
1204        *ptrptr = ptr;
1205        return -1;
1206        }
1207    
1208      else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
1209        {
1210        if (*count > hwm_count) hwm_count = *count;
1211        *count = start_count;
1212      }      }
1213      }
1214    
1215    ptr += 2;  FAIL_EXIT:
1216    if (*ptr == 'P') ptr++;                      /* Allow optional P */  *ptrptr = ptr;
1217    return -1;
1218    }
1219    
   /* We have to disambiguate (?<! and (?<= from (?<name> */  
1220    
   if ((*ptr != '<' || ptr[1] == '!' || ptr[1] == '=') &&  
        *ptr != '\'')  
     continue;  
1221    
   count++;  
1222    
1223    if (name == NULL && count == lorn) return count;  /*************************************************
1224    term = *ptr++;  *       Find forward referenced subpattern       *
1225    if (term == '<') term = '>';  *************************************************/
1226    thisname = ptr;  
1227    while (*ptr != term) ptr++;  /* This function scans along a pattern's text looking for capturing
1228    if (name != NULL && lorn == ptr - thisname &&  subpatterns, and counting them. If it finds a named pattern that matches the
1229        strncmp((const char *)name, (const char *)thisname, lorn) == 0)  name it is given, it returns its number. Alternatively, if the name is NULL, it
1230      return count;  returns when it reaches a given numbered subpattern. This is used for forward
1231    references to subpatterns. We used to be able to start this scan from the
1232    current compiling point, using the current count value from cd->bracount, and
1233    do it all in a single loop, but the addition of the possibility of duplicate
1234    subpattern numbers means that we have to scan from the very start, in order to
1235    take account of such duplicates, and to use a recursive function to keep track
1236    of the different types of group.
1237    
1238    Arguments:
1239      cd           compile background data
1240      name         name to seek, or NULL if seeking a numbered subpattern
1241      lorn         name length, or subpattern number if name is NULL
1242      xmode        TRUE if we are in /x mode
1243    
1244    Returns:       the number of the found subpattern, or -1 if not found
1245    */
1246    
1247    static int
1248    find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode)
1249    {
1250    uschar *ptr = (uschar *)cd->start_pattern;
1251    int count = 0;
1252    int rc;
1253    
1254    /* If the pattern does not start with an opening parenthesis, the first call
1255    to find_parens_sub() will scan right to the end (if necessary). However, if it
1256    does start with a parenthesis, find_parens_sub() will return when it hits the
1257    matching closing parens. That is why we have to have a loop. */
1258    
1259    for (;;)
1260      {
1261      rc = find_parens_sub(&ptr, cd, name, lorn, xmode, &count);
1262      if (rc > 0 || *ptr++ == 0) break;
1263    }    }
1264    
1265  return -1;  return rc;
1266  }  }
1267    
1268    
1269    
1270    
1271  /*************************************************  /*************************************************
1272  *      Find first significant op code            *  *      Find first significant op code            *
1273  *************************************************/  *************************************************/
# Line 1139  for (;;) Line 1333  for (;;)
1333    
1334    
1335  /*************************************************  /*************************************************
1336  *        Find the fixed length of a pattern      *  *        Find the fixed length of a branch       *
1337  *************************************************/  *************************************************/
1338    
1339  /* Scan a pattern and compute the fixed length of subject that will match it,  /* Scan a branch and compute the fixed length of subject that will match it,
1340  if the length is fixed. This is needed for dealing with backward assertions.  if the length is fixed. This is needed for dealing with backward assertions.
1341  In UTF8 mode, the result is in characters rather than bytes.  In UTF8 mode, the result is in characters rather than bytes. The branch is
1342    temporarily terminated with OP_END when this function is called.
1343    
1344    This function is called when a backward assertion is encountered, so that if it
1345    fails, the error message can point to the correct place in the pattern.
1346    However, we cannot do this when the assertion contains subroutine calls,
1347    because they can be forward references. We solve this by remembering this case
1348    and doing the check at the end; a flag specifies which mode we are running in.
1349    
1350  Arguments:  Arguments:
1351    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1352    options  the compiling options    options  the compiling options
1353      atend    TRUE if called when the pattern is complete
1354      cd       the "compile data" structure
1355    
1356  Returns:   the fixed length, or -1 if there is no fixed length,  Returns:   the fixed length,
1357                 or -1 if there is no fixed length,
1358               or -2 if \C was encountered               or -2 if \C was encountered
1359                 or -3 if an OP_RECURSE item was encountered and atend is FALSE
1360  */  */
1361    
1362  static int  static int
1363  find_fixedlength(uschar *code, int options)  find_fixedlength(uschar *code, int options, BOOL atend, compile_data *cd)
1364  {  {
1365  int length = -1;  int length = -1;
1366    
# Line 1168  branch, check the length against that of Line 1373  branch, check the length against that of
1373  for (;;)  for (;;)
1374    {    {
1375    int d;    int d;
1376      uschar *ce, *cs;
1377    register int op = *cc;    register int op = *cc;
1378    switch (op)    switch (op)
1379      {      {
# Line 1175  for (;;) Line 1381  for (;;)
1381      case OP_BRA:      case OP_BRA:
1382      case OP_ONCE:      case OP_ONCE:
1383      case OP_COND:      case OP_COND:
1384      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options, atend, cd);
1385      if (d < 0) return d;      if (d < 0) return d;
1386      branchlength += d;      branchlength += d;
1387      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
# Line 1197  for (;;) Line 1403  for (;;)
1403      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1404      branchlength = 0;      branchlength = 0;
1405      break;      break;
1406    
1407        /* A true recursion implies not fixed length, but a subroutine call may
1408        be OK. If the subroutine is a forward reference, we can't deal with
1409        it until the end of the pattern, so return -3. */
1410    
1411        case OP_RECURSE:
1412        if (!atend) return -3;
1413        cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1414        do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */
1415        if (cc > cs && cc < ce) return -1;                /* Recursion */
1416        d = find_fixedlength(cs + 2, options, atend, cd);
1417        if (d < 0) return d;
1418        branchlength += d;
1419        cc += 1 + LINK_SIZE;
1420        break;
1421    
1422      /* Skip over assertive subpatterns */      /* Skip over assertive subpatterns */
1423    
# Line 1234  for (;;) Line 1455  for (;;)
1455      branchlength++;      branchlength++;
1456      cc += 2;      cc += 2;
1457  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1458      if ((options & PCRE_UTF8) != 0)      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)
1459        {        cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       while ((*cc & 0xc0) == 0x80) cc++;  
       }  
1460  #endif  #endif
1461      break;      break;
1462    
# Line 1248  for (;;) Line 1467  for (;;)
1467      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1468      cc += 4;      cc += 4;
1469  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1470      if ((options & PCRE_UTF8) != 0)      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)
1471        {        cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       while((*cc & 0x80) == 0x80) cc++;  
       }  
1472  #endif  #endif
1473      break;      break;
1474    
# Line 1275  for (;;) Line 1492  for (;;)
1492      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
1493      case OP_WORDCHAR:      case OP_WORDCHAR:
1494      case OP_ANY:      case OP_ANY:
1495        case OP_ALLANY:
1496      branchlength++;      branchlength++;
1497      cc++;      cc++;
1498      break;      break;
# Line 1329  for (;;) Line 1547  for (;;)
1547    
1548    
1549  /*************************************************  /*************************************************
1550  *    Scan compiled regex for numbered bracket    *  *    Scan compiled regex for specific bracket    *
1551  *************************************************/  *************************************************/
1552    
1553  /* This little function scans through a compiled pattern until it finds a  /* This little function scans through a compiled pattern until it finds a
1554  capturing bracket with the given number.  capturing bracket with the given number, or, if the number is negative, an
1555    instance of OP_REVERSE for a lookbehind. The function is global in the C sense
1556    so that it can be called from pcre_study() when finding the minimum matching
1557    length.
1558    
1559  Arguments:  Arguments:
1560    code        points to start of expression    code        points to start of expression
1561    utf8        TRUE in UTF-8 mode    utf8        TRUE in UTF-8 mode
1562    number      the required bracket number    number      the required bracket number or negative to find a lookbehind
1563    
1564  Returns:      pointer to the opcode for the bracket, or NULL if not found  Returns:      pointer to the opcode for the bracket, or NULL if not found
1565  */  */
1566    
1567  static const uschar *  const uschar *
1568  find_bracket(const uschar *code, BOOL utf8, int number)  _pcre_find_bracket(const uschar *code, BOOL utf8, int number)
1569  {  {
1570  for (;;)  for (;;)
1571    {    {
# Line 1356  for (;;) Line 1577  for (;;)
1577    the table is zero; the actual length is stored in the compiled code. */    the table is zero; the actual length is stored in the compiled code. */
1578    
1579    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
1580    
1581      /* Handle recursion */
1582    
1583      else if (c == OP_REVERSE)
1584        {
1585        if (number < 0) return (uschar *)code;
1586        code += _pcre_OP_lengths[c];
1587        }
1588    
1589    /* Handle capturing bracket */    /* Handle capturing bracket */
1590    
# Line 1423  for (;;) Line 1652  for (;;)
1652        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1653        break;        break;
1654        }        }
1655    #else
1656        (void)(utf8);  /* Keep compiler happy by referencing function argument */
1657  #endif  #endif
1658      }      }
1659    }    }
# Line 1516  for (;;) Line 1747  for (;;)
1747        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1748        break;        break;
1749        }        }
1750    #else
1751        (void)(utf8);  /* Keep compiler happy by referencing function argument */
1752  #endif  #endif
1753      }      }
1754    }    }
# Line 1567  for (code = first_significant_code(code Line 1800  for (code = first_significant_code(code
1800    
1801    /* Groups with zero repeats can of course be empty; skip them. */    /* Groups with zero repeats can of course be empty; skip them. */
1802    
1803    if (c == OP_BRAZERO || c == OP_BRAMINZERO)    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)
1804      {      {
1805      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1806      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
# Line 1582  for (code = first_significant_code(code Line 1815  for (code = first_significant_code(code
1815      BOOL empty_branch;      BOOL empty_branch;
1816      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
1817    
1818      /* Scan a closed bracket */      /* If a conditional group has only one branch, there is a second, implied,
1819        empty branch, so just skip over the conditional, because it could be empty.
1820        Otherwise, scan the individual branches of the group. */
1821    
1822      empty_branch = FALSE;      if (c == OP_COND && code[GET(code, 1)] != OP_ALT)
     do  
       {  
       if (!empty_branch && could_be_empty_branch(code, endcode, utf8))  
         empty_branch = TRUE;  
1823        code += GET(code, 1);        code += GET(code, 1);
1824        else
1825          {
1826          empty_branch = FALSE;
1827          do
1828            {
1829            if (!empty_branch && could_be_empty_branch(code, endcode, utf8))
1830              empty_branch = TRUE;
1831            code += GET(code, 1);
1832            }
1833          while (*code == OP_ALT);
1834          if (!empty_branch) return FALSE;   /* All branches are non-empty */
1835        }        }
1836      while (*code == OP_ALT);  
     if (!empty_branch) return FALSE;   /* All branches are non-empty */  
1837      c = *code;      c = *code;
1838      continue;      continue;
1839      }      }
# Line 1653  for (code = first_significant_code(code Line 1894  for (code = first_significant_code(code
1894      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
1895      case OP_WORDCHAR:      case OP_WORDCHAR:
1896      case OP_ANY:      case OP_ANY:
1897        case OP_ALLANY:
1898      case OP_ANYBYTE:      case OP_ANYBYTE:
1899      case OP_CHAR:      case OP_CHAR:
1900      case OP_CHARNC:      case OP_CHARNC:
# Line 1709  for (code = first_significant_code(code Line 1951  for (code = first_significant_code(code
1951      case OP_QUERY:      case OP_QUERY:
1952      case OP_MINQUERY:      case OP_MINQUERY:
1953      case OP_POSQUERY:      case OP_POSQUERY:
1954        if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];
1955        break;
1956    
1957      case OP_UPTO:      case OP_UPTO:
1958      case OP_MINUPTO:      case OP_MINUPTO:
1959      case OP_POSUPTO:      case OP_POSUPTO:
1960      if (utf8) while ((code[2] & 0xc0) == 0x80) code++;      if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];
1961      break;      break;
1962  #endif  #endif
1963      }      }
# Line 1793  int terminator; /* Don't combin Line 2038  int terminator; /* Don't combin
2038  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2039  for (++ptr; *ptr != 0; ptr++)  for (++ptr; *ptr != 0; ptr++)
2040    {    {
2041    if (*ptr == '\\' && ptr[1] == ']') ptr++; else    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else
2042      {      {
2043      if (*ptr == ']') return FALSE;      if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2044      if (*ptr == terminator && ptr[1] == ']')      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2045        {        {
2046        *endptr = ptr;        *endptr = ptr;
2047        return TRUE;        return TRUE;
# Line 1847  return -1; Line 2092  return -1;
2092  that is referenced. This means that groups can be replicated for fixed  that is referenced. This means that groups can be replicated for fixed
2093  repetition simply by copying (because the recursion is allowed to refer to  repetition simply by copying (because the recursion is allowed to refer to
2094  earlier groups that are outside the current group). However, when a group is  earlier groups that are outside the current group). However, when a group is
2095  optional (i.e. the minimum quantifier is zero), OP_BRAZERO is inserted before  optional (i.e. the minimum quantifier is zero), OP_BRAZERO or OP_SKIPZERO is
2096  it, after it has been compiled. This means that any OP_RECURSE items within it  inserted before it, after it has been compiled. This means that any OP_RECURSE
2097  that refer to the group itself or any contained groups have to have their  items within it that refer to the group itself or any contained groups have to
2098  offsets adjusted. That one of the jobs of this function. Before it is called,  have their offsets adjusted. That one of the jobs of this function. Before it
2099  the partially compiled regex must be temporarily terminated with OP_END.  is called, the partially compiled regex must be temporarily terminated with
2100    OP_END.
2101    
2102  This function has been extended with the possibility of forward references for  This function has been extended with the possibility of forward references for
2103  recursions and subroutine calls. It must also check the list of such references  recursions and subroutine calls. It must also check the list of such references
# Line 1882  while ((ptr = (uschar *)find_recurse(ptr Line 2128  while ((ptr = (uschar *)find_recurse(ptr
2128    
2129    /* See if this recursion is on the forward reference list. If so, adjust the    /* See if this recursion is on the forward reference list. If so, adjust the
2130    reference. */    reference. */
2131    
2132    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
2133      {      {
2134      offset = GET(hc, 0);      offset = GET(hc, 0);
# Line 1986  get_othercase_range(unsigned int *cptr, Line 2232  get_othercase_range(unsigned int *cptr,
2232  unsigned int c, othercase, next;  unsigned int c, othercase, next;
2233    
2234  for (c = *cptr; c <= d; c++)  for (c = *cptr; c <= d; c++)
2235    { if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR) break; }    { if ((othercase = UCD_OTHERCASE(c)) != c) break; }
2236    
2237  if (c > d) return FALSE;  if (c > d) return FALSE;
2238    
# Line 1995  next = othercase + 1; Line 2241  next = othercase + 1;
2241    
2242  for (++c; c <= d; c++)  for (++c; c <= d; c++)
2243    {    {
2244    if (_pcre_ucp_othercase(c) != next) break;    if (UCD_OTHERCASE(c) != next) break;
2245    next++;    next++;
2246    }    }
2247    
# Line 2041  if ((options & PCRE_EXTENDED) != 0) Line 2287  if ((options & PCRE_EXTENDED) != 0)
2287    for (;;)    for (;;)
2288      {      {
2289      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2290      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
2291        {        {
2292        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2293          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
# Line 2053  if ((options & PCRE_EXTENDED) != 0) Line 2299  if ((options & PCRE_EXTENDED) != 0)
2299  /* If the next item is one that we can handle, get its value. A non-negative  /* If the next item is one that we can handle, get its value. A non-negative
2300  value is a character, a negative value is an escape value. */  value is a character, a negative value is an escape value. */
2301    
2302  if (*ptr == '\\')  if (*ptr == CHAR_BACKSLASH)
2303    {    {
2304    int temperrorcode = 0;    int temperrorcode = 0;
2305    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);
# Line 2078  if ((options & PCRE_EXTENDED) != 0) Line 2324  if ((options & PCRE_EXTENDED) != 0)
2324    for (;;)    for (;;)
2325      {      {
2326      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2327      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
2328        {        {
2329        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2330          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
# Line 2089  if ((options & PCRE_EXTENDED) != 0) Line 2335  if ((options & PCRE_EXTENDED) != 0)
2335    
2336  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
2337    
2338  if (*ptr == '*' || *ptr == '?' || strncmp((char *)ptr, "{0,", 3) == 0)  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
2339    return FALSE;    strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
2340        return FALSE;
2341    
2342  /* Now compare the next item with the previous opcode. If the previous is a  /* Now compare the next item with the previous opcode. If the previous is a
2343  positive single character match, "item" either contains the character or, if  positive single character match, "item" either contains the character or, if
# Line 2105  if (next >= 0) switch(op_code) Line 2352  if (next >= 0) switch(op_code)
2352    case OP_CHAR:    case OP_CHAR:
2353  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2354    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
2355    #else
2356      (void)(utf8_char);  /* Keep compiler happy by referencing function argument */
2357  #endif  #endif
2358    return item != next;    return item != next;
2359    
# Line 2123  if (next >= 0) switch(op_code) Line 2372  if (next >= 0) switch(op_code)
2372      unsigned int othercase;      unsigned int othercase;
2373      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2374  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2375      othercase = _pcre_ucp_othercase((unsigned int)next);      othercase = UCD_OTHERCASE((unsigned int)next);
2376  #else  #else
2377      othercase = NOTACHAR;      othercase = NOTACHAR;
2378  #endif  #endif
# Line 2144  if (next >= 0) switch(op_code) Line 2393  if (next >= 0) switch(op_code)
2393      unsigned int othercase;      unsigned int othercase;
2394      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2395  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2396      othercase = _pcre_ucp_othercase(next);      othercase = UCD_OTHERCASE(next);
2397  #else  #else
2398      othercase = NOTACHAR;      othercase = NOTACHAR;
2399  #endif  #endif
# Line 2458  for (;; ptr++) Line 2707  for (;; ptr++)
2707    /* Get next byte in the pattern */    /* Get next byte in the pattern */
2708    
2709    c = *ptr;    c = *ptr;
2710    
2711    /* If we are in the pre-compile phase, accumulate the length used for the    /* If we are in the pre-compile phase, accumulate the length used for the
2712    previous cycle of this loop. */    previous cycle of this loop. */
2713    
# Line 2526  for (;; ptr++) Line 2775  for (;; ptr++)
2775    
2776    if (inescq && c != 0)    if (inescq && c != 0)
2777      {      {
2778      if (c == '\\' && ptr[1] == 'E')      if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
2779        {        {
2780        inescq = FALSE;        inescq = FALSE;
2781        ptr++;        ptr++;
# Line 2552  for (;; ptr++) Line 2801  for (;; ptr++)
2801    /* Fill in length of a previous callout, except when the next thing is    /* Fill in length of a previous callout, except when the next thing is
2802    a quantifier. */    a quantifier. */
2803    
2804    is_quantifier = c == '*' || c == '+' || c == '?' ||    is_quantifier =
2805      (c == '{' && is_counted_repeat(ptr+1));      c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
2806        (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
2807    
2808    if (!is_quantifier && previous_callout != NULL &&    if (!is_quantifier && previous_callout != NULL &&
2809         after_manual_callout-- <= 0)         after_manual_callout-- <= 0)
# Line 2568  for (;; ptr++) Line 2818  for (;; ptr++)
2818    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
2819      {      {
2820      if ((cd->ctypes[c] & ctype_space) != 0) continue;      if ((cd->ctypes[c] & ctype_space) != 0) continue;
2821      if (c == '#')      if (c == CHAR_NUMBER_SIGN)
2822        {        {
2823        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2824          {          {
# Line 2593  for (;; ptr++) Line 2843  for (;; ptr++)
2843      {      {
2844      /* ===================================================================*/      /* ===================================================================*/
2845      case 0:                        /* The branch terminates at string end */      case 0:                        /* The branch terminates at string end */
2846      case '|':                      /* or | or ) */      case CHAR_VERTICAL_LINE:       /* or | or ) */
2847      case ')':      case CHAR_RIGHT_PARENTHESIS:
2848      *firstbyteptr = firstbyte;      *firstbyteptr = firstbyte;
2849      *reqbyteptr = reqbyte;      *reqbyteptr = reqbyte;
2850      *codeptr = code;      *codeptr = code;
# Line 2616  for (;; ptr++) Line 2866  for (;; ptr++)
2866      /* Handle single-character metacharacters. In multiline mode, ^ disables      /* Handle single-character metacharacters. In multiline mode, ^ disables
2867      the setting of any following char as a first character. */      the setting of any following char as a first character. */
2868    
2869      case '^':      case CHAR_CIRCUMFLEX_ACCENT:
2870      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
2871        {        {
2872        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
# Line 2625  for (;; ptr++) Line 2875  for (;; ptr++)
2875      *code++ = OP_CIRC;      *code++ = OP_CIRC;
2876      break;      break;
2877    
2878      case '$':      case CHAR_DOLLAR_SIGN:
2879      previous = NULL;      previous = NULL;
2880      *code++ = OP_DOLL;      *code++ = OP_DOLL;
2881      break;      break;
# Line 2633  for (;; ptr++) Line 2883  for (;; ptr++)
2883      /* There can never be a first char if '.' is first, whatever happens about      /* There can never be a first char if '.' is first, whatever happens about
2884      repeats. The value of reqbyte doesn't change either. */      repeats. The value of reqbyte doesn't change either. */
2885    
2886      case '.':      case CHAR_DOT:
2887      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
2888      zerofirstbyte = firstbyte;      zerofirstbyte = firstbyte;
2889      zeroreqbyte = reqbyte;      zeroreqbyte = reqbyte;
2890      previous = code;      previous = code;
2891      *code++ = OP_ANY;      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
2892      break;      break;
2893    
2894    
# Line 2653  for (;; ptr++) Line 2903  for (;; ptr++)
2903      opcode is compiled. It may optionally have a bit map for characters < 256,      opcode is compiled. It may optionally have a bit map for characters < 256,
2904      but those above are are explicitly listed afterwards. A flag byte tells      but those above are are explicitly listed afterwards. A flag byte tells
2905      whether the bitmap is present, and whether this is a negated class or not.      whether the bitmap is present, and whether this is a negated class or not.
     */  
2906    
2907      case '[':      In JavaScript compatibility mode, an isolated ']' causes an error. In
2908        default (Perl) mode, it is treated as a data character. */
2909    
2910        case CHAR_RIGHT_SQUARE_BRACKET:
2911        if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
2912          {
2913          *errorcodeptr = ERR64;
2914          goto FAILED;
2915          }
2916        goto NORMAL_CHAR;
2917    
2918        case CHAR_LEFT_SQUARE_BRACKET:
2919      previous = code;      previous = code;
2920    
2921      /* PCRE supports POSIX class stuff inside a class. Perl gives an error if      /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
2922      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. */
2923    
2924      if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&      if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
2925             ptr[1] == CHAR_EQUALS_SIGN) &&
2926          check_posix_syntax(ptr, &tempptr))          check_posix_syntax(ptr, &tempptr))
2927        {        {
2928        *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;        *errorcodeptr = (ptr[1] == CHAR_COLON)? ERR13 : ERR31;
2929        goto FAILED;        goto FAILED;
2930        }        }
2931    
# Line 2676  for (;; ptr++) Line 2937  for (;; ptr++)
2937      for (;;)      for (;;)
2938        {        {
2939        c = *(++ptr);        c = *(++ptr);
2940        if (c == '\\')        if (c == CHAR_BACKSLASH)
2941          {          {
2942          if (ptr[1] == 'E') ptr++;          if (ptr[1] == CHAR_E)
2943            else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;            ptr++;
2944              else break;          else if (strncmp((const char *)ptr+1,
2945                              STR_Q STR_BACKSLASH STR_E, 3) == 0)
2946              ptr += 3;
2947            else
2948              break;
2949          }          }
2950        else if (!negate_class && c == '^')        else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
2951          negate_class = TRUE;          negate_class = TRUE;
2952        else break;        else break;
2953        }        }
2954    
2955        /* Empty classes are allowed in JavaScript compatibility mode. Otherwise,
2956        an initial ']' is taken as a data character -- the code below handles
2957        that. In JS mode, [] must always fail, so generate OP_FAIL, whereas
2958        [^] must match any character, so generate OP_ALLANY. */
2959    
2960        if (c == CHAR_RIGHT_SQUARE_BRACKET &&
2961            (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
2962          {
2963          *code++ = negate_class? OP_ALLANY : OP_FAIL;
2964          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
2965          zerofirstbyte = firstbyte;
2966          break;
2967          }
2968    
2969      /* If a class contains a negative special such as \S, we need to flip the      /* If a class contains a negative special such as \S, we need to flip the
2970      negation flag at the end, so that support for characters > 255 works      negation flag at the end, so that support for characters > 255 works
2971      correctly (they are all included in the class). */      correctly (they are all included in the class). */
# Line 2744  for (;; ptr++) Line 3023  for (;; ptr++)
3023    
3024        if (inescq)        if (inescq)
3025          {          {
3026          if (c == '\\' && ptr[1] == 'E')     /* If we are at \E */          if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)  /* If we are at \E */
3027            {            {
3028            inescq = FALSE;                   /* Reset literal state */            inescq = FALSE;                   /* Reset literal state */
3029            ptr++;                            /* Skip the 'E' */            ptr++;                            /* Skip the 'E' */
# Line 2759  for (;; ptr++) Line 3038  for (;; ptr++)
3038        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
3039        5.6 and 5.8 do. */        5.6 and 5.8 do. */
3040    
3041        if (c == '[' &&        if (c == CHAR_LEFT_SQUARE_BRACKET &&
3042            (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&            (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
3043            check_posix_syntax(ptr, &tempptr))             ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))
3044          {          {
3045          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
3046          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
3047          register const uschar *cbits = cd->cbits;          register const uschar *cbits = cd->cbits;
3048          uschar pbits[32];          uschar pbits[32];
3049    
3050          if (ptr[1] != ':')          if (ptr[1] != CHAR_COLON)
3051            {            {
3052            *errorcodeptr = ERR31;            *errorcodeptr = ERR31;
3053            goto FAILED;            goto FAILED;
3054            }            }
3055    
3056          ptr += 2;          ptr += 2;
3057          if (*ptr == '^')          if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
3058            {            {
3059            local_negate = TRUE;            local_negate = TRUE;
3060            should_flip_negation = TRUE;  /* Note negative special */            should_flip_negation = TRUE;  /* Note negative special */
# Line 2848  for (;; ptr++) Line 3127  for (;; ptr++)
3127        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
3128        character in them, so set class_charcount bigger than one. */        character in them, so set class_charcount bigger than one. */
3129    
3130        if (c == '\\')        if (c == CHAR_BACKSLASH)
3131          {          {
3132          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3133          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
3134    
3135          if (-c == ESC_b) c = '\b';       /* \b is backspace in a class */          if (-c == ESC_b) c = CHAR_BS;       /* \b is backspace in a class */
3136          else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */          else if (-c == ESC_X) c = CHAR_X;   /* \X is literal X in a class */
3137          else if (-c == ESC_R) c = 'R';   /* \R is literal R in a class */          else if (-c == ESC_R) c = CHAR_R;   /* \R is literal R in a class */
3138          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
3139            {            {
3140            if (ptr[1] == '\\' && ptr[2] == 'E')            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
3141              {              {
3142              ptr += 2; /* avoid empty string */              ptr += 2; /* avoid empty string */
3143              }              }
# Line 3084  for (;; ptr++) Line 3363  for (;; ptr++)
3363        entirely. The code for handling \Q and \E is messy. */        entirely. The code for handling \Q and \E is messy. */
3364    
3365        CHECK_RANGE:        CHECK_RANGE:
3366        while (ptr[1] == '\\' && ptr[2] == 'E')        while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
3367          {          {
3368          inescq = FALSE;          inescq = FALSE;
3369          ptr += 2;          ptr += 2;
# Line 3094  for (;; ptr++) Line 3373  for (;; ptr++)
3373    
3374        /* Remember \r or \n */        /* Remember \r or \n */
3375    
3376        if (c == '\r' || c == '\n') cd->external_flags |= PCRE_HASCRORLF;        if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
3377    
3378        /* Check for range */        /* Check for range */
3379    
3380        if (!inescq && ptr[1] == '-')        if (!inescq && ptr[1] == CHAR_MINUS)
3381          {          {
3382          int d;          int d;
3383          ptr += 2;          ptr += 2;
3384          while (*ptr == '\\' && ptr[1] == 'E') ptr += 2;          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;
3385    
3386          /* If we hit \Q (not followed by \E) at this point, go into escaped          /* If we hit \Q (not followed by \E) at this point, go into escaped
3387          mode. */          mode. */
3388    
3389          while (*ptr == '\\' && ptr[1] == 'Q')          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
3390            {            {
3391            ptr += 2;            ptr += 2;
3392            if (*ptr == '\\' && ptr[1] == 'E') { ptr += 2; continue; }            if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)
3393                { ptr += 2; continue; }
3394            inescq = TRUE;            inescq = TRUE;
3395            break;            break;
3396            }            }
3397    
3398          if (*ptr == 0 || (!inescq && *ptr == ']'))          if (*ptr == 0 || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
3399            {            {
3400            ptr = oldptr;            ptr = oldptr;
3401            goto LONE_SINGLE_CHARACTER;            goto LONE_SINGLE_CHARACTER;
# Line 3134  for (;; ptr++) Line 3414  for (;; ptr++)
3414          not any of the other escapes. Perl 5.6 treats a hyphen as a literal          not any of the other escapes. Perl 5.6 treats a hyphen as a literal
3415          in such circumstances. */          in such circumstances. */
3416    
3417          if (!inescq && d == '\\')          if (!inescq && d == CHAR_BACKSLASH)
3418            {            {
3419            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3420            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
# Line 3144  for (;; ptr++) Line 3424  for (;; ptr++)
3424    
3425            if (d < 0)            if (d < 0)
3426              {              {
3427              if (d == -ESC_b) d = '\b';              if (d == -ESC_b) d = CHAR_BS;
3428              else if (d == -ESC_X) d = 'X';              else if (d == -ESC_X) d = CHAR_X;
3429              else if (d == -ESC_R) d = 'R'; else              else if (d == -ESC_R) d = CHAR_R; else
3430                {                {
3431                ptr = oldptr;                ptr = oldptr;
3432                goto LONE_SINGLE_CHARACTER;  /* A few lines below */                goto LONE_SINGLE_CHARACTER;  /* A few lines below */
# Line 3167  for (;; ptr++) Line 3447  for (;; ptr++)
3447    
3448          /* Remember \r or \n */          /* Remember \r or \n */
3449    
3450          if (d == '\r' || d == '\n') cd->external_flags |= PCRE_HASCRORLF;          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
3451    
3452          /* 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
3453          matching, we have to use an XCLASS with extra data items. Caseless          matching, we have to use an XCLASS with extra data items. Caseless
# Line 3287  for (;; ptr++) Line 3567  for (;; ptr++)
3567          if ((options & PCRE_CASELESS) != 0)          if ((options & PCRE_CASELESS) != 0)
3568            {            {
3569            unsigned int othercase;            unsigned int othercase;
3570            if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR)            if ((othercase = UCD_OTHERCASE(c)) != c)
3571              {              {
3572              *class_utf8data++ = XCL_SINGLE;              *class_utf8data++ = XCL_SINGLE;
3573              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);
# Line 3314  for (;; ptr++) Line 3594  for (;; ptr++)
3594    
3595      /* Loop until ']' reached. This "while" is the end of the "do" above. */      /* Loop until ']' reached. This "while" is the end of the "do" above. */
3596    
3597      while ((c = *(++ptr)) != 0 && (c != ']' || inescq));      while ((c = *(++ptr)) != 0 && (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
3598    
3599      if (c == 0)                          /* Missing terminating ']' */      if (c == 0)                          /* Missing terminating ']' */
3600        {        {
# Line 3459  we set the flag only if there is a liter Line 3739  we set the flag only if there is a liter
3739      /* Various kinds of repeat; '{' is not necessarily a quantifier, but this      /* Various kinds of repeat; '{' is not necessarily a quantifier, but this
3740      has been tested above. */      has been tested above. */
3741    
3742      case '{':      case CHAR_LEFT_CURLY_BRACKET:
3743      if (!is_quantifier) goto NORMAL_CHAR;      if (!is_quantifier) goto NORMAL_CHAR;
3744      ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);      ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);
3745      if (*errorcodeptr != 0) goto FAILED;      if (*errorcodeptr != 0) goto FAILED;
3746      goto REPEAT;      goto REPEAT;
3747    
3748      case '*':      case CHAR_ASTERISK:
3749      repeat_min = 0;      repeat_min = 0;
3750      repeat_max = -1;      repeat_max = -1;
3751      goto REPEAT;      goto REPEAT;
3752    
3753      case '+':      case CHAR_PLUS:
3754      repeat_min = 1;      repeat_min = 1;
3755      repeat_max = -1;      repeat_max = -1;
3756      goto REPEAT;      goto REPEAT;
3757    
3758      case '?':      case CHAR_QUESTION_MARK:
3759      repeat_min = 0;      repeat_min = 0;
3760      repeat_max = 1;      repeat_max = 1;
3761    
# Line 3510  we set the flag only if there is a liter Line 3790  we set the flag only if there is a liter
3790      but if PCRE_UNGREEDY is set, it works the other way round. We change the      but if PCRE_UNGREEDY is set, it works the other way round. We change the
3791      repeat type to the non-default. */      repeat type to the non-default. */
3792    
3793      if (ptr[1] == '+')      if (ptr[1] == CHAR_PLUS)
3794        {        {
3795        repeat_type = 0;                  /* Force greedy */        repeat_type = 0;                  /* Force greedy */
3796        possessive_quantifier = TRUE;        possessive_quantifier = TRUE;
3797        ptr++;        ptr++;
3798        }        }
3799      else if (ptr[1] == '?')      else if (ptr[1] == CHAR_QUESTION_MARK)
3800        {        {
3801        repeat_type = greedy_non_default;        repeat_type = greedy_non_default;
3802        ptr++;        ptr++;
# Line 3631  we set the flag only if there is a liter Line 3911  we set the flag only if there is a liter
3911    
3912        if (repeat_max == 0) goto END_REPEAT;        if (repeat_max == 0) goto END_REPEAT;
3913    
3914          /*--------------------------------------------------------------------*/
3915          /* This code is obsolete from release 8.00; the restriction was finally
3916          removed: */
3917    
3918        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
3919        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
3920    
3921        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
3922          /*--------------------------------------------------------------------*/
3923    
3924        /* Combine the op_type with the repeat_type */        /* Combine the op_type with the repeat_type */
3925    
# Line 3781  we set the flag only if there is a liter Line 4066  we set the flag only if there is a liter
4066          goto END_REPEAT;          goto END_REPEAT;
4067          }          }
4068    
4069          /*--------------------------------------------------------------------*/
4070          /* This code is obsolete from release 8.00; the restriction was finally
4071          removed: */
4072    
4073        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
4074        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
4075    
4076        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
4077          /*--------------------------------------------------------------------*/
4078    
4079        if (repeat_min == 0 && repeat_max == -1)        if (repeat_min == 0 && repeat_max == -1)
4080          *code++ = OP_CRSTAR + repeat_type;          *code++ = OP_CRSTAR + repeat_type;
# Line 3842  we set the flag only if there is a liter Line 4132  we set the flag only if there is a liter
4132    
4133        if (repeat_min == 0)        if (repeat_min == 0)
4134          {          {
4135          /* If the maximum is also zero, we just omit the group from the output          /* If the maximum is also zero, we used to just omit the group from the
4136          altogether. */          output altogether, like this:
4137    
4138          if (repeat_max == 0)          ** if (repeat_max == 0)
4139            {          **   {
4140            code = previous;          **   code = previous;
4141            goto END_REPEAT;          **   goto END_REPEAT;
4142            }          **   }
4143    
4144            However, that fails when a group is referenced as a subroutine from
4145            elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it
4146            so that it is skipped on execution. As we don't have a list of which
4147            groups are referenced, we cannot do this selectively.
4148    
4149            If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
4150            and do no more at this point. However, we do need to adjust any
4151            OP_RECURSE calls inside the group that refer to the group itself or any
4152            internal or forward referenced group, because the offset is from the
4153            start of the whole regex. Temporarily terminate the pattern while doing
4154            this. */
4155    
4156          /* If the maximum is 1 or unlimited, we just have to stick in the          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
         BRAZERO and do no more at this point. However, we do need to adjust  
         any OP_RECURSE calls inside the group that refer to the group itself or  
         any internal or forward referenced group, because the offset is from  
         the start of the whole regex. Temporarily terminate the pattern while  
         doing this. */  
   
         if (repeat_max <= 1)  
4157            {            {
4158            *code = OP_END;            *code = OP_END;
4159            adjust_recurse(previous, 1, utf8, cd, save_hwm);            adjust_recurse(previous, 1, utf8, cd, save_hwm);
4160            memmove(previous+1, previous, len);            memmove(previous+1, previous, len);
4161            code++;            code++;
4162              if (repeat_max == 0)
4163                {
4164                *previous++ = OP_SKIPZERO;
4165                goto END_REPEAT;
4166                }
4167            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
4168            }            }
4169    
# Line 4058  we set the flag only if there is a liter Line 4358  we set the flag only if there is a liter
4358          }          }
4359        }        }
4360    
4361        /* If previous is OP_FAIL, it was generated by an empty class [] in
4362        JavaScript mode. The other ways in which OP_FAIL can be generated, that is
4363        by (*FAIL) or (?!) set previous to NULL, which gives a "nothing to repeat"
4364        error above. We can just ignore the repeat in JS case. */
4365    
4366        else if (*previous == OP_FAIL) goto END_REPEAT;
4367    
4368      /* Else there's some kind of shambles */      /* Else there's some kind of shambles */
4369    
4370      else      else
# Line 4082  we set the flag only if there is a liter Line 4389  we set the flag only if there is a liter
4389      if (possessive_quantifier)      if (possessive_quantifier)
4390        {        {
4391        int len;        int len;
4392        if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||  
4393            *tempcode == OP_NOTEXACT)        if (*tempcode == OP_TYPEEXACT)
4394          tempcode += _pcre_OP_lengths[*tempcode] +          tempcode += _pcre_OP_lengths[*tempcode] +
4395            ((*tempcode == OP_TYPEEXACT &&            ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);
4396               (tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP))? 2:0);  
4397          else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
4398            {
4399            tempcode += _pcre_OP_lengths[*tempcode];
4400    #ifdef SUPPORT_UTF8
4401            if (utf8 && tempcode[-1] >= 0xc0)
4402              tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];
4403    #endif
4404            }
4405    
4406        len = code - tempcode;        len = code - tempcode;
4407        if (len > 0) switch (*tempcode)        if (len > 0) switch (*tempcode)
4408          {          {
# Line 4132  we set the flag only if there is a liter Line 4448  we set the flag only if there is a liter
4448      lookbehind or option setting or condition or all the other extended      lookbehind or option setting or condition or all the other extended
4449      parenthesis forms.  */      parenthesis forms.  */
4450    
4451      case '(':      case CHAR_LEFT_PARENTHESIS:
4452      newoptions = options;      newoptions = options;
4453      skipbytes = 0;      skipbytes = 0;
4454      bravalue = OP_CBRA;      bravalue = OP_CBRA;
4455      save_hwm = cd->hwm;      save_hwm = cd->hwm;
4456      reset_bracount = FALSE;      reset_bracount = FALSE;
4457    
4458      /* First deal with various "verbs" that can be introduced by '*'. */      /* First deal with various "verbs" that can be introduced by '*'. */
4459    
4460      if (*(++ptr) == '*' && (cd->ctypes[ptr[1]] & ctype_letter) != 0)      if (*(++ptr) == CHAR_ASTERISK && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
4461        {        {
4462        int i, namelen;        int i, namelen;
4463        const char *vn = verbnames;        const char *vn = verbnames;
4464        const uschar *name = ++ptr;        const uschar *name = ++ptr;
4465        previous = NULL;        previous = NULL;
4466        while ((cd->ctypes[*++ptr] & ctype_letter) != 0);        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
4467        if (*ptr == ':')        if (*ptr == CHAR_COLON)
4468          {          {
4469          *errorcodeptr = ERR59;   /* Not supported */          *errorcodeptr = ERR59;   /* Not supported */
4470          goto FAILED;          goto FAILED;
4471          }          }
4472        if (*ptr != ')')        if (*ptr != CHAR_RIGHT_PARENTHESIS)
4473          {          {
4474          *errorcodeptr = ERR60;          *errorcodeptr = ERR60;
4475          goto FAILED;          goto FAILED;
# Line 4164  we set the flag only if there is a liter Line 4480  we set the flag only if there is a liter
4480          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
4481              strncmp((char *)name, vn, namelen) == 0)              strncmp((char *)name, vn, namelen) == 0)
4482            {            {
4483            *code = verbs[i].op;            /* Check for open captures before ACCEPT */
4484            if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;  
4485              if (verbs[i].op == OP_ACCEPT)
4486                {
4487                open_capitem *oc;
4488                cd->had_accept = TRUE;
4489                for (oc = cd->open_caps; oc != NULL; oc = oc->next)
4490                  {
4491                  *code++ = OP_CLOSE;
4492                  PUT2INC(code, 0, oc->number);
4493                  }
4494                }
4495              *code++ = verbs[i].op;
4496            break;            break;
4497            }            }
4498          vn += verbs[i].len + 1;          vn += verbs[i].len + 1;
# Line 4178  we set the flag only if there is a liter Line 4505  we set the flag only if there is a liter
4505      /* Deal with the extended parentheses; all are introduced by '?', and the      /* Deal with the extended parentheses; all are introduced by '?', and the
4506      appearance of any of them means that this is not a capturing group. */      appearance of any of them means that this is not a capturing group. */
4507    
4508      else if (*ptr == '?')      else if (*ptr == CHAR_QUESTION_MARK)
4509        {        {
4510        int i, set, unset, namelen;        int i, set, unset, namelen;
4511        int *optset;        int *optset;
# Line 4187  we set the flag only if there is a liter Line 4514  we set the flag only if there is a liter
4514    
4515        switch (*(++ptr))        switch (*(++ptr))
4516          {          {
4517          case '#':                 /* Comment; skip to ket */          case CHAR_NUMBER_SIGN:                 /* Comment; skip to ket */
4518          ptr++;          ptr++;
4519          while (*ptr != 0 && *ptr != ')') ptr++;          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
4520          if (*ptr == 0)          if (*ptr == 0)
4521            {            {
4522            *errorcodeptr = ERR18;            *errorcodeptr = ERR18;
# Line 4199  we set the flag only if there is a liter Line 4526  we set the flag only if there is a liter
4526    
4527    
4528          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4529          case '|':                 /* Reset capture count for each branch */          case CHAR_VERTICAL_LINE:  /* Reset capture count for each branch */
4530          reset_bracount = TRUE;          reset_bracount = TRUE;
4531          /* Fall through */          /* Fall through */
4532    
4533          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4534          case ':':                 /* Non-capturing bracket */          case CHAR_COLON:          /* Non-capturing bracket */
4535          bravalue = OP_BRA;          bravalue = OP_BRA;
4536          ptr++;          ptr++;
4537          break;          break;
4538    
4539    
4540          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4541          case '(':          case CHAR_LEFT_PARENTHESIS:
4542          bravalue = OP_COND;       /* Conditional group */          bravalue = OP_COND;       /* Conditional group */
4543    
4544          /* A condition can be an assertion, a number (referring to a numbered          /* A condition can be an assertion, a number (referring to a numbered
# Line 4231  we set the flag only if there is a liter Line 4558  we set the flag only if there is a liter
4558          the switch. This will take control down to where bracketed groups,          the switch. This will take control down to where bracketed groups,
4559          including assertions, are processed. */          including assertions, are processed. */
4560    
4561          if (ptr[1] == '?' && (ptr[2] == '=' || ptr[2] == '!' || ptr[2] == '<'))          if (ptr[1] == CHAR_QUESTION_MARK && (ptr[2] == CHAR_EQUALS_SIGN ||
4562                ptr[2] == CHAR_EXCLAMATION_MARK || ptr[2] == CHAR_LESS_THAN_SIGN))
4563            break;            break;
4564    
4565          /* Most other conditions use OP_CREF (a couple change to OP_RREF          /* Most other conditions use OP_CREF (a couple change to OP_RREF
# Line 4243  we set the flag only if there is a liter Line 4571  we set the flag only if there is a liter
4571    
4572          /* Check for a test for recursion in a named group. */          /* Check for a test for recursion in a named group. */
4573    
4574          if (ptr[1] == 'R' && ptr[2] == '&')          if (ptr[1] == CHAR_R && ptr[2] == CHAR_AMPERSAND)
4575            {            {
4576            terminator = -1;            terminator = -1;
4577            ptr += 2;            ptr += 2;
# Line 4253  we set the flag only if there is a liter Line 4581  we set the flag only if there is a liter
4581          /* Check for a test for a named group's having been set, using the Perl          /* Check for a test for a named group's having been set, using the Perl
4582          syntax (?(<name>) or (?('name') */          syntax (?(<name>) or (?('name') */
4583    
4584          else if (ptr[1] == '<')          else if (ptr[1] == CHAR_LESS_THAN_SIGN)
4585            {            {
4586            terminator = '>';            terminator = CHAR_GREATER_THAN_SIGN;
4587            ptr++;            ptr++;
4588            }            }
4589          else if (ptr[1] == '\'')          else if (ptr[1] == CHAR_APOSTROPHE)
4590            {            {
4591            terminator = '\'';            terminator = CHAR_APOSTROPHE;
4592            ptr++;            ptr++;
4593            }            }
4594          else          else
4595            {            {
4596            terminator = 0;            terminator = 0;
4597            if (ptr[1] == '-' || ptr[1] == '+') refsign = *(++ptr);            if (ptr[1] == CHAR_MINUS || ptr[1] == CHAR_PLUS) refsign = *(++ptr);
4598            }            }
4599    
4600          /* We now expect to read a name; any thing else is an error */          /* We now expect to read a name; any thing else is an error */
# Line 4286  we set the flag only if there is a liter Line 4614  we set the flag only if there is a liter
4614            {            {
4615            if (recno >= 0)            if (recno >= 0)
4616              recno = ((digitab[*ptr] & ctype_digit) != 0)?              recno = ((digitab[*ptr] & ctype_digit) != 0)?
4617                recno * 10 + *ptr - '0' : -1;                recno * 10 + *ptr - CHAR_0 : -1;
4618            ptr++;            ptr++;
4619            }            }
4620          namelen = ptr - name;          namelen = ptr - name;
4621    
4622          if ((terminator > 0 && *ptr++ != terminator) || *ptr++ != ')')          if ((terminator > 0 && *ptr++ != terminator) ||
4623                *ptr++ != CHAR_RIGHT_PARENTHESIS)
4624            {            {
4625            ptr--;      /* Error offset */            ptr--;      /* Error offset */
4626            *errorcodeptr = ERR26;            *errorcodeptr = ERR26;
# Line 4313  we set the flag only if there is a liter Line 4642  we set the flag only if there is a liter
4642              *errorcodeptr = ERR58;              *errorcodeptr = ERR58;
4643              goto FAILED;              goto FAILED;
4644              }              }
4645            recno = (refsign == '-')?            recno = (refsign == CHAR_MINUS)?
4646              cd->bracount - recno + 1 : recno +cd->bracount;              cd->bracount - recno + 1 : recno +cd->bracount;
4647            if (recno <= 0 || recno > cd->final_bracount)            if (recno <= 0 || recno > cd->final_bracount)
4648              {              {
# Line 4344  we set the flag only if there is a liter Line 4673  we set the flag only if there is a liter
4673    
4674          /* Search the pattern for a forward reference */          /* Search the pattern for a forward reference */
4675    
4676          else if ((i = find_parens(ptr, cd->bracount, name, namelen,          else if ((i = find_parens(cd, name, namelen,
4677                          (options & PCRE_EXTENDED) != 0)) > 0)                          (options & PCRE_EXTENDED) != 0)) > 0)
4678            {            {
4679            PUT2(code, 2+LINK_SIZE, i);            PUT2(code, 2+LINK_SIZE, i);
# Line 4365  we set the flag only if there is a liter Line 4694  we set the flag only if there is a liter
4694          /* Check for (?(R) for recursion. Allow digits after R to specify a          /* Check for (?(R) for recursion. Allow digits after R to specify a
4695          specific group number. */          specific group number. */
4696    
4697          else if (*name == 'R')          else if (*name == CHAR_R)
4698            {            {
4699            recno = 0;            recno = 0;
4700            for (i = 1; i < namelen; i++)            for (i = 1; i < namelen; i++)
# Line 4375  we set the flag only if there is a liter Line 4704  we set the flag only if there is a liter
4704                *errorcodeptr = ERR15;                *errorcodeptr = ERR15;
4705                goto FAILED;                goto FAILED;
4706                }                }
4707              recno = recno * 10 + name[i] - '0';              recno = recno * 10 + name[i] - CHAR_0;
4708              }              }
4709            if (recno == 0) recno = RREF_ANY;            if (recno == 0) recno = RREF_ANY;
4710            code[1+LINK_SIZE] = OP_RREF;      /* Change test type */            code[1+LINK_SIZE] = OP_RREF;      /* Change test type */
# Line 4385  we set the flag only if there is a liter Line 4714  we set the flag only if there is a liter
4714          /* Similarly, check for the (?(DEFINE) "condition", which is always          /* Similarly, check for the (?(DEFINE) "condition", which is always
4715          false. */          false. */
4716    
4717          else if (namelen == 6 && strncmp((char *)name, "DEFINE", 6) == 0)          else if (namelen == 6 && strncmp((char *)name, STRING_DEFINE, 6) == 0)
4718            {            {
4719            code[1+LINK_SIZE] = OP_DEF;            code[1+LINK_SIZE] = OP_DEF;
4720            skipbytes = 1;            skipbytes = 1;
# Line 4410  we set the flag only if there is a liter Line 4739  we set the flag only if there is a liter
4739    
4740    
4741          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4742          case '=':                 /* Positive lookahead */          case CHAR_EQUALS_SIGN:                 /* Positive lookahead */
4743          bravalue = OP_ASSERT;          bravalue = OP_ASSERT;
4744          ptr++;          ptr++;
4745          break;          break;
4746    
4747    
4748          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4749          case '!':                 /* Negative lookahead */          case CHAR_EXCLAMATION_MARK:            /* Negative lookahead */
4750          ptr++;          ptr++;
4751          if (*ptr == ')')          /* Optimize (?!) */          if (*ptr == CHAR_RIGHT_PARENTHESIS)    /* Optimize (?!) */
4752            {            {
4753            *code++ = OP_FAIL;            *code++ = OP_FAIL;
4754            previous = NULL;            previous = NULL;
# Line 4430  we set the flag only if there is a liter Line 4759  we set the flag only if there is a liter
4759    
4760    
4761          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4762          case '<':                 /* Lookbehind or named define */          case CHAR_LESS_THAN_SIGN:              /* Lookbehind or named define */
4763          switch (ptr[1])          switch (ptr[1])
4764            {            {
4765            case '=':               /* Positive lookbehind */            case CHAR_EQUALS_SIGN:               /* Positive lookbehind */
4766            bravalue = OP_ASSERTBACK;            bravalue = OP_ASSERTBACK;
4767            ptr += 2;            ptr += 2;
4768            break;            break;
4769    
4770            case '!':               /* Negative lookbehind */            case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */
4771            bravalue = OP_ASSERTBACK_NOT;            bravalue = OP_ASSERTBACK_NOT;
4772            ptr += 2;            ptr += 2;
4773            break;            break;
# Line 4453  we set the flag only if there is a liter Line 4782  we set the flag only if there is a liter
4782    
4783    
4784          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4785          case '>':                 /* One-time brackets */          case CHAR_GREATER_THAN_SIGN:           /* One-time brackets */
4786          bravalue = OP_ONCE;          bravalue = OP_ONCE;
4787          ptr++;          ptr++;
4788          break;          break;
4789    
4790    
4791          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4792          case 'C':                 /* Callout - may be followed by digits; */          case CHAR_C:                 /* Callout - may be followed by digits; */
4793          previous_callout = code;  /* Save for later completion */          previous_callout = code;  /* Save for later completion */
4794          after_manual_callout = 1; /* Skip one item before completing */          after_manual_callout = 1; /* Skip one item before completing */
4795          *code++ = OP_CALLOUT;          *code++ = OP_CALLOUT;
4796            {            {
4797            int n = 0;            int n = 0;
4798            while ((digitab[*(++ptr)] & ctype_digit) != 0)            while ((digitab[*(++ptr)] & ctype_digit) != 0)
4799              n = n * 10 + *ptr - '0';              n = n * 10 + *ptr - CHAR_0;
4800            if (*ptr != ')')            if (*ptr != CHAR_RIGHT_PARENTHESIS)
4801              {              {
4802              *errorcodeptr = ERR39;              *errorcodeptr = ERR39;
4803              goto FAILED;              goto FAILED;
# Line 4488  we set the flag only if there is a liter Line 4817  we set the flag only if there is a liter
4817    
4818    
4819          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4820          case 'P':                 /* Python-style named subpattern handling */          case CHAR_P:              /* Python-style named subpattern handling */
4821          if (*(++ptr) == '=' || *ptr == '>')  /* Reference or recursion */          if (*(++ptr) == CHAR_EQUALS_SIGN ||
4822                *ptr == CHAR_GREATER_THAN_SIGN)  /* Reference or recursion */
4823            {            {
4824            is_recurse = *ptr == '>';            is_recurse = *ptr == CHAR_GREATER_THAN_SIGN;
4825            terminator = ')';            terminator = CHAR_RIGHT_PARENTHESIS;
4826            goto NAMED_REF_OR_RECURSE;            goto NAMED_REF_OR_RECURSE;
4827            }            }
4828          else if (*ptr != '<')    /* Test for Python-style definition */          else if (*ptr != CHAR_LESS_THAN_SIGN)  /* Test for Python-style defn */
4829            {            {
4830            *errorcodeptr = ERR41;            *errorcodeptr = ERR41;
4831            goto FAILED;            goto FAILED;
# Line 4505  we set the flag only if there is a liter Line 4835  we set the flag only if there is a liter
4835    
4836          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4837          DEFINE_NAME:    /* Come here from (?< handling */          DEFINE_NAME:    /* Come here from (?< handling */
4838          case '\'':          case CHAR_APOSTROPHE:
4839            {            {
4840            terminator = (*ptr == '<')? '>' : '\'';            terminator = (*ptr == CHAR_LESS_THAN_SIGN)?
4841                CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
4842            name = ++ptr;            name = ++ptr;
4843    
4844            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
# Line 4538  we set the flag only if there is a liter Line 4869  we set the flag only if there is a liter
4869                }                }
4870              }              }
4871    
4872            /* In the real compile, create the entry in the table */            /* In the real compile, create the entry in the table, maintaining
4873              alphabetical order. Duplicate names for different numbers are
4874              permitted only if PCRE_DUPNAMES is set. Duplicate names for the same
4875              number are always OK. (An existing number can be re-used if (?|
4876              appears in the pattern.) In either event, a duplicate name results in
4877              a duplicate entry in the table, even if the number is the same. This
4878              is because the number of names, and hence the table size, is computed
4879              in the pre-compile, and it affects various numbers and pointers which
4880              would all have to be modified, and the compiled code moved down, if
4881              duplicates with the same number were omitted from the table. This
4882              doesn't seem worth the hassle. However, *different* names for the
4883              same number are not permitted. */
4884    
4885            else            else
4886              {              {
4887                BOOL dupname = FALSE;
4888              slot = cd->name_table;              slot = cd->name_table;
4889    
4890              for (i = 0; i < cd->names_found; i++)              for (i = 0; i < cd->names_found; i++)
4891                {                {
4892                int crc = memcmp(name, slot+2, namelen);                int crc = memcmp(name, slot+2, namelen);
# Line 4550  we set the flag only if there is a liter Line 4894  we set the flag only if there is a liter
4894                  {                  {
4895                  if (slot[2+namelen] == 0)                  if (slot[2+namelen] == 0)
4896                    {                    {
4897                    if ((options & PCRE_DUPNAMES) == 0)                    if (GET2(slot, 0) != cd->bracount + 1 &&
4898                          (options & PCRE_DUPNAMES) == 0)
4899                      {                      {
4900                      *errorcodeptr = ERR43;                      *errorcodeptr = ERR43;
4901                      goto FAILED;                      goto FAILED;
4902                      }                      }
4903                      else dupname = TRUE;
4904                    }                    }
4905                  else crc = -1;      /* Current name is substring */                  else crc = -1;      /* Current name is a substring */
4906                  }                  }
4907    
4908                  /* Make space in the table and break the loop for an earlier
4909                  name. For a duplicate or later name, carry on. We do this for
4910                  duplicates so that in the simple case (when ?(| is not used) they
4911                  are in order of their numbers. */
4912    
4913                if (crc < 0)                if (crc < 0)
4914                  {                  {
4915                  memmove(slot + cd->name_entry_size, slot,                  memmove(slot + cd->name_entry_size, slot,
4916                    (cd->names_found - i) * cd->name_entry_size);                    (cd->names_found - i) * cd->name_entry_size);
4917                  break;                  break;
4918                  }                  }
4919    
4920                  /* Continue the loop for a later or duplicate name */
4921    
4922                slot += cd->name_entry_size;                slot += cd->name_entry_size;
4923                }                }
4924    
4925                /* For non-duplicate names, check for a duplicate number before
4926                adding the new name. */
4927    
4928                if (!dupname)
4929                  {
4930                  uschar *cslot = cd->name_table;
4931                  for (i = 0; i < cd->names_found; i++)
4932                    {
4933                    if (cslot != slot)
4934                      {
4935                      if (GET2(cslot, 0) == cd->bracount + 1)
4936                        {
4937                        *errorcodeptr = ERR65;
4938                        goto FAILED;
4939                        }
4940                      }
4941                    else i--;
4942                    cslot += cd->name_entry_size;
4943                    }
4944                  }
4945    
4946              PUT2(slot, 0, cd->bracount + 1);              PUT2(slot, 0, cd->bracount + 1);
4947              memcpy(slot + 2, name, namelen);              memcpy(slot + 2, name, namelen);
# Line 4573  we set the flag only if there is a liter Line 4949  we set the flag only if there is a liter
4949              }              }
4950            }            }
4951    
4952          /* In both cases, count the number of names we've encountered. */          /* In both pre-compile and compile, count the number of names we've
4953            encountered. */
4954    
         ptr++;                    /* Move past > or ' */  
4955          cd->names_found++;          cd->names_found++;
4956            ptr++;                    /* Move past > or ' */
4957          goto NUMBERED_GROUP;          goto NUMBERED_GROUP;
4958    
4959    
4960          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4961          case '&':                 /* Perl recursion/subroutine syntax */          case CHAR_AMPERSAND:            /* Perl recursion/subroutine syntax */
4962          terminator = ')';          terminator = CHAR_RIGHT_PARENTHESIS;
4963          is_recurse = TRUE;          is_recurse = TRUE;
4964          /* Fall through */          /* Fall through */
4965    
# Line 4641  we set the flag only if there is a liter Line 5018  we set the flag only if there is a liter
5018              recno = GET2(slot, 0);              recno = GET2(slot, 0);
5019              }              }
5020            else if ((recno =                /* Forward back reference */            else if ((recno =                /* Forward back reference */
5021                      find_parens(ptr, cd->bracount, name, namelen,                      find_parens(cd, name, namelen,
5022                        (options & PCRE_EXTENDED) != 0)) <= 0)                        (options & PCRE_EXTENDED) != 0)) <= 0)
5023              {              {
5024              *errorcodeptr = ERR15;              *errorcodeptr = ERR15;
# Line 4657  we set the flag only if there is a liter Line 5034  we set the flag only if there is a liter
5034    
5035    
5036          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5037          case 'R':                 /* Recursion */          case CHAR_R:              /* Recursion */
5038          ptr++;                    /* Same as (?0)      */          ptr++;                    /* Same as (?0)      */
5039          /* Fall through */          /* Fall through */
5040    
5041    
5042          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5043          case '-': case '+':          case CHAR_MINUS: case CHAR_PLUS:  /* Recursion or subroutine */
5044          case '0': case '1': case '2': case '3': case '4':   /* Recursion or */          case CHAR_0: case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4:
5045          case '5': case '6': case '7': case '8': case '9':   /* subroutine */          case CHAR_5: case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
5046            {            {
5047            const uschar *called;            const uschar *called;
5048            terminator = ')';            terminator = CHAR_RIGHT_PARENTHESIS;
5049    
5050            /* Come here from the \g<...> and \g'...' code (Oniguruma            /* Come here from the \g<...> and \g'...' code (Oniguruma
5051            compatibility). However, the syntax has been checked to ensure that            compatibility). However, the syntax has been checked to ensure that
5052            the ... are a (signed) number, so that neither ERR63 nor ERR29 will            the ... are a (signed) number, so that neither ERR63 nor ERR29 will
5053            be called on this path, nor with the jump to OTHER_CHAR_AFTER_QUERY            be called on this path, nor with the jump to OTHER_CHAR_AFTER_QUERY
5054            ever be taken. */            ever be taken. */
   
           HANDLE_NUMERICAL_RECURSION:  
5055    
5056            if ((refsign = *ptr) == '+')            HANDLE_NUMERICAL_RECURSION:
5057    
5058              if ((refsign = *ptr) == CHAR_PLUS)
5059              {              {
5060              ptr++;              ptr++;
5061              if ((digitab[*ptr] & ctype_digit) == 0)              if ((digitab[*ptr] & ctype_digit) == 0)
# Line 4687  we set the flag only if there is a liter Line 5064  we set the flag only if there is a liter
5064                goto FAILED;                goto FAILED;
5065                }                }
5066              }              }
5067            else if (refsign == '-')            else if (refsign == CHAR_MINUS)
5068              {              {
5069              if ((digitab[ptr[1]] & ctype_digit) == 0)              if ((digitab[ptr[1]] & ctype_digit) == 0)
5070                goto OTHER_CHAR_AFTER_QUERY;                goto OTHER_CHAR_AFTER_QUERY;
# Line 4696  we set the flag only if there is a liter Line 5073  we set the flag only if there is a liter
5073    
5074            recno = 0;            recno = 0;
5075            while((digitab[*ptr] & ctype_digit) != 0)            while((digitab[*ptr] & ctype_digit) != 0)
5076              recno = recno * 10 + *ptr++ - '0';              recno = recno * 10 + *ptr++ - CHAR_0;
5077    
5078            if (*ptr != terminator)            if (*ptr != terminator)
5079              {              {
# Line 4704  we set the flag only if there is a liter Line 5081  we set the flag only if there is a liter
5081              goto FAILED;              goto FAILED;
5082              }              }
5083    
5084            if (refsign == '-')            if (refsign == CHAR_MINUS)
5085              {              {
5086              if (recno == 0)              if (recno == 0)
5087                {                {
# Line 4718  we set the flag only if there is a liter Line 5095  we set the flag only if there is a liter
5095                goto FAILED;                goto FAILED;
5096                }                }
5097              }              }
5098            else if (refsign == '+')            else if (refsign == CHAR_PLUS)
5099              {              {
5100              if (recno == 0)              if (recno == 0)
5101                {                {
# Line 4745  we set the flag only if there is a liter Line 5122  we set the flag only if there is a liter
5122            if (lengthptr == NULL)            if (lengthptr == NULL)
5123              {              {
5124              *code = OP_END;              *code = OP_END;
5125              if (recno != 0) called = find_bracket(cd->start_code, utf8, recno);              if (recno != 0)
5126                  called = _pcre_find_bracket(cd->start_code, utf8, recno);
5127    
5128              /* Forward reference */              /* Forward reference */
5129    
5130              if (called == NULL)              if (called == NULL)
5131                {                {
5132                if (find_parens(ptr, cd->bracount, NULL, recno,                if (find_parens(cd, NULL, recno,
5133                     (options & PCRE_EXTENDED) != 0) < 0)                      (options & PCRE_EXTENDED) != 0) < 0)
5134                  {                  {
5135                  *errorcodeptr = ERR15;                  *errorcodeptr = ERR15;
5136                  goto FAILED;                  goto FAILED;
# Line 4804  we set the flag only if there is a liter Line 5182  we set the flag only if there is a liter
5182          set = unset = 0;          set = unset = 0;
5183          optset = &set;          optset = &set;
5184    
5185          while (*ptr != ')' && *ptr != ':')          while (*ptr != CHAR_RIGHT_PARENTHESIS && *ptr != CHAR_COLON)
5186            {            {
5187            switch (*ptr++)            switch (*ptr++)
5188              {              {
5189              case '-': optset = &unset; break;              case CHAR_MINUS: optset = &unset; break;
5190    
5191              case 'J':    /* Record that it changed in the external options */              case CHAR_J:    /* Record that it changed in the external options */
5192              *optset |= PCRE_DUPNAMES;              *optset |= PCRE_DUPNAMES;
5193              cd->external_flags |= PCRE_JCHANGED;              cd->external_flags |= PCRE_JCHANGED;
5194              break;              break;
5195    
5196              case 'i': *optset |= PCRE_CASELESS; break;              case CHAR_i: *optset |= PCRE_CASELESS; break;
5197              case 'm': *optset |= PCRE_MULTILINE; break;              case CHAR_m: *optset |= PCRE_MULTILINE; break;
5198              case 's': *optset |= PCRE_DOTALL; break;              case CHAR_s: *optset |= PCRE_DOTALL; break;
5199              case 'x': *optset |= PCRE_EXTENDED; break;              case CHAR_x: *optset |= PCRE_EXTENDED; break;
5200              case 'U': *optset |= PCRE_UNGREEDY; break;              case CHAR_U: *optset |= PCRE_UNGREEDY; break;
5201              case 'X': *optset |= PCRE_EXTRA; break;              case CHAR_X: *optset |= PCRE_EXTRA; break;
5202    
5203              default:  *errorcodeptr = ERR12;              default:  *errorcodeptr = ERR12;
5204                        ptr--;    /* Correct the offset */                        ptr--;    /* Correct the offset */
# Line 4851  we set the flag only if there is a liter Line 5229  we set the flag only if there is a liter
5229          both phases.          both phases.
5230    
5231          If we are not at the pattern start, compile code to change the ims          If we are not at the pattern start, compile code to change the ims
5232          options if this setting actually changes any of them. We also pass the          options if this setting actually changes any of them, and reset the
5233          new setting back so that it can be put at the start of any following          greedy defaults and the case value for firstbyte and reqbyte. */
         branches, and when this group ends (if we are in a group), a resetting  
         item can be compiled. */  
5234    
5235          if (*ptr == ')')          if (*ptr == CHAR_RIGHT_PARENTHESIS)
5236            {            {
5237            if (code == cd->start_code + 1 + LINK_SIZE &&            if (code == cd->start_code + 1 + LINK_SIZE &&
5238                 (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))                 (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
5239              {              {
5240              cd->external_options = newoptions;              cd->external_options = newoptions;
             options = newoptions;  
5241              }              }
5242           else           else
5243              {              {
# Line 4871  we set the flag only if there is a liter Line 5246  we set the flag only if there is a liter
5246                *code++ = OP_OPT;                *code++ = OP_OPT;
5247                *code++ = newoptions & PCRE_IMS;                *code++ = newoptions & PCRE_IMS;
5248                }                }
   
             /* Change options at this level, and pass them back for use  
             in subsequent branches. Reset the greedy defaults and the case  
             value for firstbyte and reqbyte. */  
   
             *optionsptr = options = newoptions;  
5249              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
5250              greedy_non_default = greedy_default ^ 1;              greedy_non_default = greedy_default ^ 1;
5251              req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;              req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
5252              }              }
5253    
5254              /* Change options at this level, and pass them back for use
5255              in subsequent branches. When not at the start of the pattern, this
5256              information is also necessary so that a resetting item can be
5257              compiled at the end of a group (if we are in a group). */
5258    
5259              *optionsptr = options = newoptions;
5260            previous = NULL;       /* This item can't be repeated */            previous = NULL;       /* This item can't be repeated */
5261            continue;              /* It is complete */            continue;              /* It is complete */
5262            }            }
# Line 4997  we set the flag only if there is a liter Line 5372  we set the flag only if there is a liter
5372    
5373      /* Error if hit end of pattern */      /* Error if hit end of pattern */
5374    
5375      if (*ptr != ')')      if (*ptr != CHAR_RIGHT_PARENTHESIS)
5376        {        {
5377        *errorcodeptr = ERR14;        *errorcodeptr = ERR14;
5378        goto FAILED;        goto FAILED;
# Line 5094  we set the flag only if there is a liter Line 5469  we set the flag only if there is a liter
5469      back references and those types that consume a character may be repeated.      back references and those types that consume a character may be repeated.
5470      We can test for values between ESC_b and ESC_Z for the latter; this may      We can test for values between ESC_b and ESC_Z for the latter; this may
5471      have to change if any new ones are ever created. */      have to change if any new ones are ever created. */
5472    
5473      case '\\':      case CHAR_BACKSLASH:
5474      tempptr = ptr;      tempptr = ptr;
5475      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);
5476      if (*errorcodeptr != 0) goto FAILED;      if (*errorcodeptr != 0) goto FAILED;
# Line 5104  we set the flag only if there is a liter Line 5479  we set the flag only if there is a liter
5479        {        {
5480        if (-c == ESC_Q)            /* Handle start of quoted string */        if (-c == ESC_Q)            /* Handle start of quoted string */
5481          {          {
5482          if (ptr[1] == '\\' && ptr[2] == 'E') ptr += 2; /* avoid empty string */          if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
5483            else inescq = TRUE;            ptr += 2;               /* avoid empty string */
5484                else inescq = TRUE;
5485          continue;          continue;
5486          }          }
5487    
# Line 5121  we set the flag only if there is a liter Line 5497  we set the flag only if there is a liter
5497    
5498        zerofirstbyte = firstbyte;        zerofirstbyte = firstbyte;
5499        zeroreqbyte = reqbyte;        zeroreqbyte = reqbyte;
5500    
5501        /* \g<name> or \g'name' is a subroutine call by name and \g<n> or \g'n'        /* \g<name> or \g'name' is a subroutine call by name and \g<n> or \g'n'
5502        is a subroutine call by number (Oniguruma syntax). In fact, the value        is a subroutine call by number (Oniguruma syntax). In fact, the value
5503        -ESC_g is returned only for these cases. So we don't need to check for <        -ESC_g is returned only for these cases. So we don't need to check for <
5504        or ' if the value is -ESC_g. For the Perl syntax \g{n} the value is        or ' if the value is -ESC_g. For the Perl syntax \g{n} the value is
5505        -ESC_REF+n, and for the Perl syntax \g{name} the result is -ESC_k (as        -ESC_REF+n, and for the Perl syntax \g{name} the result is -ESC_k (as
5506        that is a synonym for a named back reference). */        that is a synonym for a named back reference). */
5507    
5508        if (-c == ESC_g)        if (-c == ESC_g)
5509          {          {
5510          const uschar *p;          const uschar *p;
5511          save_hwm = cd->hwm;   /* Normally this is set when '(' is read */          save_hwm = cd->hwm;   /* Normally this is set when '(' is read */
5512          terminator = (*(++ptr) == '<')? '>' : '\'';          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
5513              CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
5514    
5515          /* These two statements stop the compiler for warning about possibly          /* These two statements stop the compiler for warning about possibly
5516          unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In          unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In
5517          fact, because we actually check for a number below, the paths that          fact, because we actually check for a number below, the paths that
5518          would actually be in error are never taken. */          would actually be in error are never taken. */
5519    
5520          skipbytes = 0;          skipbytes = 0;
5521          reset_bracount = FALSE;          reset_bracount = FALSE;
5522    
5523          /* Test for a name */          /* Test for a name */
5524    
5525          if (ptr[1] != '+' && ptr[1] != '-')          if (ptr[1] != CHAR_PLUS && ptr[1] != CHAR_MINUS)
5526            {            {
5527            BOOL isnumber = TRUE;            BOOL isnumber = TRUE;
5528            for (p = ptr + 1; *p != 0 && *p != terminator; p++)            for (p = ptr + 1; *p != 0 && *p != terminator; p++)
5529              {              {
5530              if ((cd->ctypes[*p] & ctype_digit) == 0) isnumber = FALSE;              if ((cd->ctypes[*p] & ctype_digit) == 0) isnumber = FALSE;
5531              if ((cd->ctypes[*p] & ctype_word) == 0) break;              if ((cd->ctypes[*p] & ctype_word) == 0) break;
5532              }              }
5533            if (*p != terminator)            if (*p != terminator)
5534              {              {
5535              *errorcodeptr = ERR57;              *errorcodeptr = ERR57;
5536              break;              break;
5537              }              }
5538            if (isnumber)            if (isnumber)
5539              {              {
5540              ptr++;              ptr++;
5541              goto HANDLE_NUMERICAL_RECURSION;              goto HANDLE_NUMERICAL_RECURSION;
5542              }              }
5543            is_recurse = TRUE;            is_recurse = TRUE;
5544            goto NAMED_REF_OR_RECURSE;            goto NAMED_REF_OR_RECURSE;
5545            }            }
5546    
5547          /* Test a signed number in angle brackets or quotes. */          /* Test a signed number in angle brackets or quotes. */
5548    
5549          p = ptr + 2;          p = ptr + 2;
5550          while ((digitab[*p] & ctype_digit) != 0) p++;          while ((digitab[*p] & ctype_digit) != 0) p++;
5551          if (*p != terminator)          if (*p != terminator)
# Line 5176  we set the flag only if there is a liter Line 5553  we set the flag only if there is a liter
5553            *errorcodeptr = ERR57;            *errorcodeptr = ERR57;
5554            break;            break;
5555            }            }
5556          ptr++;          ptr++;
5557          goto HANDLE_NUMERICAL_RECURSION;          goto HANDLE_NUMERICAL_RECURSION;
5558          }          }
5559    
5560        /* \k<name> or \k'name' is a back reference by name (Perl syntax).        /* \k<name> or \k'name' is a back reference by name (Perl syntax).
5561        We also support \k{name} (.NET syntax) */        We also support \k{name} (.NET syntax) */
5562    
5563        if (-c == ESC_k && (ptr[1] == '<' || ptr[1] == '\'' || ptr[1] == '{'))        if (-c == ESC_k && (ptr[1] == CHAR_LESS_THAN_SIGN ||
5564              ptr[1] == CHAR_APOSTROPHE || ptr[1] == CHAR_LEFT_CURLY_BRACKET))
5565          {          {
5566          is_recurse = FALSE;          is_recurse = FALSE;
5567          terminator = (*(++ptr) == '<')? '>' : (*ptr == '\'')? '\'' : '}';          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
5568              CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?
5569              CHAR_APOSTROPHE : CHAR_RIGHT_CURLY_BRACKET;
5570          goto NAMED_REF_OR_RECURSE;          goto NAMED_REF_OR_RECURSE;
5571          }          }
5572    
# Line 5289  we set the flag only if there is a liter Line 5669  we set the flag only if there is a liter
5669    
5670      /* Remember if \r or \n were seen */      /* Remember if \r or \n were seen */
5671    
5672      if (mcbuffer[0] == '\r' || mcbuffer[0] == '\n')      if (mcbuffer[0] == CHAR_CR || mcbuffer[0] == CHAR_NL)
5673        cd->external_flags |= PCRE_HASCRORLF;        cd->external_flags |= PCRE_HASCRORLF;
5674    
5675      /* Set the first and required bytes appropriately. If no previous first      /* Set the first and required bytes appropriately. If no previous first
# Line 5387  uschar *code = *codeptr; Line 5767  uschar *code = *codeptr;
5767  uschar *last_branch = code;  uschar *last_branch = code;
5768  uschar *start_bracket = code;  uschar *start_bracket = code;
5769  uschar *reverse_count = NULL;  uschar *reverse_count = NULL;
5770    open_capitem capitem;
5771    int capnumber = 0;
5772  int firstbyte, reqbyte;  int firstbyte, reqbyte;
5773  int branchfirstbyte, branchreqbyte;  int branchfirstbyte, branchreqbyte;
5774  int length;  int length;
# Line 5413  the code that abstracts option settings Line 5795  the code that abstracts option settings
5795  them global. It tests the value of length for (2 + 2*LINK_SIZE) in the  them global. It tests the value of length for (2 + 2*LINK_SIZE) in the
5796  pre-compile phase to find out whether anything has yet been compiled or not. */  pre-compile phase to find out whether anything has yet been compiled or not. */
5797    
5798    /* If this is a capturing subpattern, add to the chain of open capturing items
5799    so that we can detect them if (*ACCEPT) is encountered. */
5800    
5801    if (*code == OP_CBRA)
5802      {
5803      capnumber = GET2(code, 1 + LINK_SIZE);
5804      capitem.number = capnumber;
5805      capitem.next = cd->open_caps;
5806      cd->open_caps = &capitem;
5807      }
5808    
5809  /* Offset is set zero to mark that this bracket is still open */  /* Offset is set zero to mark that this bracket is still open */
5810    
5811  PUT(code, 1, 0);  PUT(code, 1, 0);
# Line 5507  for (;;) Line 5900  for (;;)
5900    
5901      /* If lookbehind, check that this branch matches a fixed-length string, and      /* If lookbehind, check that this branch matches a fixed-length string, and
5902      put the length into the OP_REVERSE item. Temporarily mark the end of the      put the length into the OP_REVERSE item. Temporarily mark the end of the
5903      branch with OP_END. */      branch with OP_END. If the branch contains OP_RECURSE, the result is -3
5904        because there may be forward references that we can't check here. Set a
5905        flag to cause another lookbehind check at the end. Why not do it all at the
5906        end? Because common, erroneous checks are picked up here and the offset of
5907        the problem can be shown. */
5908    
5909      if (lookbehind)      if (lookbehind)
5910        {        {
5911        int fixed_length;        int fixed_length;
5912        *code = OP_END;        *code = OP_END;
5913        fixed_length = find_fixedlength(last_branch, options);        fixed_length = find_fixedlength(last_branch, options, FALSE, cd);
5914        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
5915        if (fixed_length < 0)        if (fixed_length == -3)
5916            {
5917            cd->check_lookbehind = TRUE;
5918            }
5919          else if (fixed_length < 0)
5920          {          {
5921          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;
5922          *ptrptr = ptr;          *ptrptr = ptr;
5923          return FALSE;          return FALSE;
5924          }          }
5925        PUT(reverse_count, 0, fixed_length);        else { PUT(reverse_count, 0, fixed_length); }
5926        }        }
5927      }      }
5928    
# Line 5534  for (;;) Line 5935  for (;;)
5935    compile a resetting op-code following, except at the very end of the pattern.    compile a resetting op-code following, except at the very end of the pattern.
5936    Return leaving the pointer at the terminating char. */    Return leaving the pointer at the terminating char. */
5937    
5938    if (*ptr != '|')    if (*ptr != CHAR_VERTICAL_LINE)
5939      {      {
5940      if (lengthptr == NULL)      if (lengthptr == NULL)
5941        {        {
# Line 5548  for (;;) Line 5949  for (;;)
5949          }          }
5950        while (branch_length > 0);        while (branch_length > 0);
5951        }        }
5952    
5953        /* If it was a capturing subpattern, remove it from the chain. */
5954    
5955        if (capnumber > 0) cd->open_caps = cd->open_caps->next;
5956    
5957      /* Fill in the ket */      /* Fill in the ket */
5958    
# Line 5557  for (;;) Line 5962  for (;;)
5962    
5963      /* Resetting option if needed */      /* Resetting option if needed */
5964    
5965      if ((options & PCRE_IMS) != oldims && *ptr == ')')      if ((options & PCRE_IMS) != oldims && *ptr == CHAR_RIGHT_PARENTHESIS)
5966        {        {
5967        *code++ = OP_OPT;        *code++ = OP_OPT;
5968        *code++ = oldims;        *code++ = oldims;
# Line 5686  do { Line 6091  do {
6091       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;
6092       }       }
6093    
6094     /* .* is not anchored unless DOTALL is set and it isn't in brackets that     /* .* is not anchored unless DOTALL is set (which generates OP_ALLANY) and
6095     are or may be referenced. */     it isn't in brackets that are or may be referenced. */
6096    
6097     else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||     else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||
6098               op == OP_TYPEPOSSTAR) &&               op == OP_TYPEPOSSTAR))
             (*options & PCRE_DOTALL) != 0)  
6099       {       {
6100       if (scode[1] != OP_ANY || (bracket_map & backref_map) != 0) return FALSE;       if (scode[1] != OP_ALLANY || (bracket_map & backref_map) != 0)
6101           return FALSE;
6102       }       }
6103    
6104     /* Check for explicit anchoring */     /* Check for explicit anchoring */
# Line 5739  do { Line 6144  do {
6144       NULL, 0, FALSE);       NULL, 0, FALSE);
6145     register int op = *scode;     register int op = *scode;
6146    
6147       /* If we are at the start of a conditional assertion group, *both* the
6148       conditional assertion *and* what follows the condition must satisfy the test
6149       for start of line. Other kinds of condition fail. Note that there may be an
6150       auto-callout at the start of a condition. */
6151    
6152       if (op == OP_COND)
6153         {
6154         scode += 1 + LINK_SIZE;
6155         if (*scode == OP_CALLOUT) scode += _pcre_OP_lengths[OP_CALLOUT];
6156         switch (*scode)
6157           {
6158           case OP_CREF:
6159           case OP_RREF:
6160           case OP_DEF:
6161           return FALSE;
6162    
6163           default:     /* Assertion */
6164           if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
6165           do scode += GET(scode, 1); while (*scode == OP_ALT);
6166           scode += 1 + LINK_SIZE;
6167           break;
6168           }
6169         scode = first_significant_code(scode, NULL, 0, FALSE);
6170         op = *scode;
6171         }
6172    
6173     /* Non-capturing brackets */     /* Non-capturing brackets */
6174    
6175     if (op == OP_BRA)     if (op == OP_BRA)
# Line 5757  do { Line 6188  do {
6188    
6189     /* Other brackets */     /* Other brackets */
6190    
6191     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)     else if (op == OP_ASSERT || op == OP_ONCE)
6192       { if (!is_startline(scode, bracket_map, backref_map)) return FALSE; }       {
6193         if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
6194         }
6195    
6196     /* .* means "start at start or after \n" if it isn't in brackets that     /* .* means "start at start or after \n" if it isn't in brackets that
6197     may be referenced. */     may be referenced. */
# Line 5875  Returns: pointer to compiled data Line 6308  Returns: pointer to compiled data
6308                  with errorptr and erroroffset set                  with errorptr and erroroffset set
6309  */  */
6310    
6311  PCRE_EXP_DEFN pcre *  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
6312  pcre_compile(const char *pattern, int options, const char **errorptr,  pcre_compile(const char *pattern, int options, const char **errorptr,
6313    int *erroroffset, const unsigned char *tables)    int *erroroffset, const unsigned char *tables)
6314  {  {
# Line 5883  return pcre_compile2(pattern, options, N Line 6316  return pcre_compile2(pattern, options, N
6316  }  }
6317    
6318    
6319  PCRE_EXP_DEFN pcre *  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
6320  pcre_compile2(const char *pattern, int options, int *errorcodeptr,  pcre_compile2(const char *pattern, int options, int *errorcodeptr,
6321    const char **errorptr, int *erroroffset, const unsigned char *tables)    const char **errorptr, int *erroroffset, const unsigned char *tables)
6322  {  {
# Line 5892  int length = 1; /* For final END opcode Line 6325  int length = 1; /* For final END opcode
6325  int firstbyte, reqbyte, newline;  int firstbyte, reqbyte, newline;
6326  int errorcode = 0;  int errorcode = 0;
6327  int skipatstart = 0;  int skipatstart = 0;
6328  #ifdef SUPPORT_UTF8  BOOL utf8 = (options & PCRE_UTF8) != 0;
 BOOL utf8;  
 #endif  
6329  size_t size;  size_t size;
6330  uschar *code;  uschar *code;
6331  const uschar *codestart;  const uschar *codestart;
# Line 5937  if (erroroffset == NULL) Line 6368  if (erroroffset == NULL)
6368    
6369  *erroroffset = 0;  *erroroffset = 0;
6370    
 /* Can't support UTF8 unless PCRE has been compiled to include the code. */  
   
 #ifdef SUPPORT_UTF8  
 utf8 = (options & PCRE_UTF8) != 0;  
 if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&  
      (*erroroffset = _pcre_valid_utf8((uschar *)pattern, -1)) >= 0)  
   {  
   errorcode = ERR44;  
   goto PCRE_EARLY_ERROR_RETURN2;  
   }  
 #else  
 if ((options & PCRE_UTF8) != 0)  
   {  
   errorcode = ERR32;  
   goto PCRE_EARLY_ERROR_RETURN;  
   }  
 #endif  
   
 if ((options & ~PUBLIC_OPTIONS) != 0)  
   {  
   errorcode = ERR17;  
   goto PCRE_EARLY_ERROR_RETURN;  
   }  
   
6371  /* Set up pointers to the individual character tables */  /* Set up pointers to the individual character tables */
6372    
6373  if (tables == NULL) tables = _pcre_default_tables;  if (tables == NULL) tables = _pcre_default_tables;
# Line 5969  cd->fcc = tables + fcc_offset; Line 6376  cd->fcc = tables + fcc_offset;
6376  cd->cbits = tables + cbits_offset;  cd->cbits = tables + cbits_offset;
6377  cd->ctypes = tables + ctypes_offset;  cd->ctypes = tables + ctypes_offset;
6378    
6379    /* Check that all undefined public option bits are zero */
6380    
6381    if ((options & ~PUBLIC_COMPILE_OPTIONS) != 0)
6382      {
6383      errorcode = ERR17;
6384      goto PCRE_EARLY_ERROR_RETURN;
6385      }
6386    
6387  /* Check for global one-time settings at the start of the pattern, and remember  /* Check for global one-time settings at the start of the pattern, and remember
6388  the offset for later. */  the offset for later. */
6389    
6390  while (ptr[skipatstart] == '(' && ptr[skipatstart+1] == '*')  while (ptr[skipatstart] == CHAR_LEFT_PARENTHESIS &&
6391           ptr[skipatstart+1] == CHAR_ASTERISK)
6392    {    {
6393    int newnl = 0;    int newnl = 0;
6394    int newbsr = 0;    int newbsr = 0;
6395    
6396    if (strncmp((char *)(ptr+skipatstart+2), "CR)", 3) == 0)    if (strncmp((char *)(ptr+skipatstart+2), STRING_UTF8_RIGHTPAR, 5) == 0)
6397        { skipatstart += 7; options |= PCRE_UTF8; continue; }
6398    
6399      if (strncmp((char *)(ptr+skipatstart+2), STRING_CR_RIGHTPAR, 3) == 0)
6400      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
6401    else if (strncmp((char *)(ptr+skipatstart+2), "LF)", 3)  == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_LF_RIGHTPAR, 3)  == 0)
6402      { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }      { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
6403    else if (strncmp((char *)(ptr+skipatstart+2), "CRLF)", 5)  == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_CRLF_RIGHTPAR, 5)  == 0)
6404      { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }      { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
6405    else if (strncmp((char *)(ptr+skipatstart+2), "ANY)", 4) == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_ANY_RIGHTPAR, 4) == 0)
6406      { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }      { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
6407    else if (strncmp((char *)(ptr+skipatstart+2), "ANYCRLF)", 8)  == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_ANYCRLF_RIGHTPAR, 8) == 0)
6408      { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }      { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
6409    
6410    else if (strncmp((char *)(ptr+skipatstart+2), "BSR_ANYCRLF)", 12) == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_BSR_ANYCRLF_RIGHTPAR, 12) == 0)
6411      { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }      { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
6412    else if (strncmp((char *)(ptr+skipatstart+2), "BSR_UNICODE)", 12) == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_BSR_UNICODE_RIGHTPAR, 12) == 0)
6413      { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }      { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
6414    
6415    if (newnl != 0)    if (newnl != 0)
# Line 6000  while (ptr[skipatstart] == '(' && ptr[sk Line 6419  while (ptr[skipatstart] == '(' && ptr[sk
6419    else break;    else break;
6420    }    }
6421    
6422    /* Can't support UTF8 unless PCRE has been compiled to include the code. */
6423    
6424    #ifdef SUPPORT_UTF8
6425    if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&
6426         (*erroroffset = _pcre_valid_utf8((uschar *)pattern, -1)) >= 0)
6427      {
6428      errorcode = ERR44;
6429      goto PCRE_EARLY_ERROR_RETURN2;
6430      }
6431    #else
6432    if (utf8)
6433      {
6434      errorcode = ERR32;
6435      goto PCRE_EARLY_ERROR_RETURN;
6436      }
6437    #endif
6438    
6439  /* Check validity of \R options. */  /* Check validity of \R options. */
6440    
6441  switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))  switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
# Line 6018  current code allows for fixed one- or tw Line 6454  current code allows for fixed one- or tw
6454  switch (options & PCRE_NEWLINE_BITS)  switch (options & PCRE_NEWLINE_BITS)
6455    {    {
6456    case 0: newline = NEWLINE; break;   /* Build-time default */    case 0: newline = NEWLINE; break;   /* Build-time default */
6457    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
6458    case PCRE_NEWLINE_LF: newline = '\n'; break;    case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
6459    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
6460         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;         PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
6461    case PCRE_NEWLINE_ANY: newline = -1; break;    case PCRE_NEWLINE_ANY: newline = -1; break;
6462    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
6463    default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;    default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
# Line 6082  cd->end_pattern = (const uschar *)(patte Line 6518  cd->end_pattern = (const uschar *)(patte
6518  cd->req_varyopt = 0;  cd->req_varyopt = 0;
6519  cd->external_options = options;  cd->external_options = options;
6520  cd->external_flags = 0;  cd->external_flags = 0;
6521    cd->open_caps = NULL;
6522    
6523  /* 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
6524  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 6156  cd->start_code = codestart; Line 6593  cd->start_code = codestart;
6593  cd->hwm = cworkspace;  cd->hwm = cworkspace;
6594  cd->req_varyopt = 0;  cd->req_varyopt = 0;
6595  cd->had_accept = FALSE;  cd->had_accept = FALSE;
6596    cd->check_lookbehind = FALSE;
6597    cd->open_caps = NULL;
6598    
6599  /* Set up a starting, non-extracting bracket, then compile the expression. On  /* Set up a starting, non-extracting bracket, then compile the expression. On
6600  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
# Line 6194  while (errorcode == 0 && cd->hwm > cwork Line 6633  while (errorcode == 0 && cd->hwm > cwork
6633    cd->hwm -= LINK_SIZE;    cd->hwm -= LINK_SIZE;
6634    offset = GET(cd->hwm, 0);    offset = GET(cd->hwm, 0);
6635    recno = GET(codestart, offset);    recno = GET(codestart, offset);
6636    groupptr = find_bracket(codestart, (re->options & PCRE_UTF8) != 0, recno);    groupptr = _pcre_find_bracket(codestart, utf8, recno);
6637    if (groupptr == NULL) errorcode = ERR53;    if (groupptr == NULL) errorcode = ERR53;
6638      else PUT(((uschar *)codestart), offset, groupptr - codestart);      else PUT(((uschar *)codestart), offset, groupptr - codestart);
6639    }    }
# Line 6204  subpattern. */ Line 6643  subpattern. */
6643    
6644  if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;  if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;
6645    
6646    /* If there were any lookbehind assertions that contained OP_RECURSE
6647    (recursions or subroutine calls), a flag is set for them to be checked here,
6648    because they may contain forward references. Actual recursions can't be fixed
6649    length, but subroutine calls can. It is done like this so that those without
6650    OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
6651    exceptional ones forgo this. We scan the pattern to check that they are fixed
6652    length, and set their lengths. */
6653    
6654    if (cd->check_lookbehind)
6655      {
6656      uschar *cc = (uschar *)codestart;
6657    
6658      /* Loop, searching for OP_REVERSE items, and process those that do not have
6659      their length set. (Actually, it will also re-process any that have a length
6660      of zero, but that is a pathological case, and it does no harm.) When we find
6661      one, we temporarily terminate the branch it is in while we scan it. */
6662    
6663      for (cc = (uschar *)_pcre_find_bracket(codestart, utf8, -1);
6664           cc != NULL;
6665           cc = (uschar *)_pcre_find_bracket(cc, utf8, -1))
6666        {
6667        if (GET(cc, 1) == 0)
6668          {
6669          int fixed_length;
6670          uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);
6671          int end_op = *be;
6672          *be = OP_END;
6673          fixed_length = find_fixedlength(cc, re->options, TRUE, cd);
6674          *be = end_op;
6675          DPRINTF(("fixed length = %d\n", fixed_length));
6676          if (fixed_length < 0)
6677            {
6678            errorcode = (fixed_length == -2)? ERR36 : ERR25;
6679            break;
6680            }
6681          PUT(cc, 1, fixed_length);
6682          }
6683        cc += 1 + LINK_SIZE;
6684        }
6685      }
6686    
6687  /* Failed to compile, or error while post-processing */  /* Failed to compile, or error while post-processing */
6688    
6689  if (errorcode != 0)  if (errorcode != 0)

Legend:
Removed from v.334  
changed lines
  Added in v.457

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12