/[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 341 by ph10, Sat Apr 19 16:41:04 2008 UTC revision 454 by ph10, Tue Sep 22 09:42:11 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 303  static const char error_texts[] = Line 341  static const char error_texts[] =
341    "number is too big\0"    "number is too big\0"
342    "subpattern name expected\0"    "subpattern name expected\0"
343    "digit expected after (?+\0"    "digit expected after (?+\0"
344    "] is an invalid data character in JavaScript compatibility mode";    "] is an invalid data character in JavaScript compatibility mode";
345    
346    
347  /* 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 322  For convenience, we use the same bit def Line 360  For convenience, we use the same bit def
360    
361  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
362    
363  #ifndef EBCDIC  /* This is the "normal" case, for ASCII systems */  #ifndef EBCDIC
364    
365    /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
366    UTF-8 mode. */
367    
368  static const unsigned char digitab[] =  static const unsigned char digitab[] =
369    {    {
370    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
# Line 358  static const unsigned char digitab[] = Line 400  static const unsigned char digitab[] =
400    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
401    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
402    
403  #else           /* This is the "abnormal" case, for EBCDIC systems */  #else
404    
405    /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
406    
407  static const unsigned char digitab[] =  static const unsigned char digitab[] =
408    {    {
409    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
# Line 455  static const char * Line 500  static const char *
500  find_error_text(int n)  find_error_text(int n)
501  {  {
502  const char *s = error_texts;  const char *s = error_texts;
503  for (; n > 0; n--) while (*s++ != 0);  for (; n > 0; n--) while (*s++ != 0) {};
504  return s;  return s;
505  }  }
506    
# Line 503  if (c == 0) *errorcodeptr = ERR1; Line 548  if (c == 0) *errorcodeptr = ERR1;
548  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.
549  Otherwise further processing may be required. */  Otherwise further processing may be required. */
550    
551  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
552  else if (c < '0' || c > 'z') {}                           /* Not alphanumeric */  else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */
553  else if ((i = escapes[c - '0']) != 0) c = i;  else if ((i = escapes[c - CHAR_0]) != 0) c = i;
554    
555  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
556  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
# Line 524  else Line 569  else
569      /* 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
570      error. */      error. */
571    
572      case 'l':      case CHAR_l:
573      case 'L':      case CHAR_L:
574      case 'N':      case CHAR_N:
575      case 'u':      case CHAR_u:
576      case 'U':      case CHAR_U:
577      *errorcodeptr = ERR37;      *errorcodeptr = ERR37;
578      break;      break;
579    
580      /* \g must be followed by one of a number of specific things:      /* \g must be followed by one of a number of specific things:
581    
582      (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
583      backreference. If negative, it is a relative backreference. This is a Perl      backreference. If negative, it is a relative backreference. This is a Perl
584      5.10 feature.      5.10 feature.
585    
586      (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
587      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
588      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
589      was \k.      was \k.
590    
591      (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
592      number either in angle brackets or in single quotes. However, these are      number either in angle brackets or in single quotes. However, these are
593      (possibly recursive) subroutine calls, _not_ backreferences. Just return      (possibly recursive) subroutine calls, _not_ backreferences. Just return
594      the -ESC_g code (cf \k). */      the -ESC_g code (cf \k). */
595    
596      case 'g':      case CHAR_g:
597      if (ptr[1] == '<' || ptr[1] == '\'')      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
598        {        {
599        c = -ESC_g;        c = -ESC_g;
600        break;        break;
601        }        }
602    
603      /* Handle the Perl-compatible cases */      /* Handle the Perl-compatible cases */
604    
605      if (ptr[1] == '{')      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
606        {        {
607        const uschar *p;        const uschar *p;
608        for (p = ptr+2; *p != 0 && *p != '}'; p++)        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
609          if (*p != '-' && (digitab[*p] & ctype_digit) == 0) break;          if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;
610        if (*p != 0 && *p != '}')        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
611          {          {
612          c = -ESC_k;          c = -ESC_k;
613          break;          break;
# Line 572  else Line 617  else
617        }        }
618      else braced = FALSE;      else braced = FALSE;
619    
620      if (ptr[1] == '-')      if (ptr[1] == CHAR_MINUS)
621        {        {
622        negated = TRUE;        negated = TRUE;
623        ptr++;        ptr++;
# Line 581  else Line 626  else
626    
627      c = 0;      c = 0;
628      while ((digitab[ptr[1]] & ctype_digit) != 0)      while ((digitab[ptr[1]] & ctype_digit) != 0)
629        c = c * 10 + *(++ptr) - '0';        c = c * 10 + *(++ptr) - CHAR_0;
630    
631      if (c < 0)   /* Integer overflow */      if (c < 0)   /* Integer overflow */
632        {        {
633        *errorcodeptr = ERR61;        *errorcodeptr = ERR61;
634        break;        break;
635        }        }
636    
637      if (braced && *(++ptr) != '}')      if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
638        {        {
639        *errorcodeptr = ERR57;        *errorcodeptr = ERR57;
640        break;        break;
641        }        }
642    
643      if (c == 0)      if (c == 0)
644        {        {
645        *errorcodeptr = ERR58;        *errorcodeptr = ERR58;
646        break;        break;
647        }        }
648    
649      if (negated)      if (negated)
650        {        {
# Line 626  else Line 671  else
671      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
672      character class, \ followed by a digit is always an octal number. */      character class, \ followed by a digit is always an octal number. */
673    
674      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:
675      case '6': case '7': case '8': case '9':      case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
676    
677      if (!isclass)      if (!isclass)
678        {        {
679        oldptr = ptr;        oldptr = ptr;
680        c -= '0';        c -= CHAR_0;
681        while ((digitab[ptr[1]] & ctype_digit) != 0)        while ((digitab[ptr[1]] & ctype_digit) != 0)
682          c = c * 10 + *(++ptr) - '0';          c = c * 10 + *(++ptr) - CHAR_0;
683        if (c < 0)    /* Integer overflow */        if (c < 0)    /* Integer overflow */
684          {          {
685          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
# Line 652  else Line 697  else
697      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.
698      Thus we have to pull back the pointer by one. */      Thus we have to pull back the pointer by one. */
699    
700      if ((c = *ptr) >= '8')      if ((c = *ptr) >= CHAR_8)
701        {        {
702        ptr--;        ptr--;
703        c = 0;        c = 0;
# Line 665  else Line 710  else
710      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
711      than 3 octal digits. */      than 3 octal digits. */
712    
713      case '0':      case CHAR_0:
714      c -= '0';      c -= CHAR_0;
715      while(i++ < 2 && ptr[1] >= '0' && ptr[1] <= '7')      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
716          c = c * 8 + *(++ptr) - '0';          c = c * 8 + *(++ptr) - CHAR_0;
717      if (!utf8 && c > 255) *errorcodeptr = ERR51;      if (!utf8 && c > 255) *errorcodeptr = ERR51;
718      break;      break;
719    
# Line 676  else Line 721  else
721      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
722      treated as a data character. */      treated as a data character. */
723    
724      case 'x':      case CHAR_x:
725      if (ptr[1] == '{')      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
726        {        {
727        const uschar *pt = ptr + 2;        const uschar *pt = ptr + 2;
728        int count = 0;        int count = 0;
# Line 686  else Line 731  else
731        while ((digitab[*pt] & ctype_xdigit) != 0)        while ((digitab[*pt] & ctype_xdigit) != 0)
732          {          {
733          register int cc = *pt++;          register int cc = *pt++;
734          if (c == 0 && cc == '0') continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
735          count++;          count++;
736    
737  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
738          if (cc >= 'a') cc -= 32;               /* Convert to upper case */          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
739          c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
740  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
741          if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
742          c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
743  #endif  #endif
744          }          }
745    
746        if (*pt == '}')        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
747          {          {
748          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;
749          ptr = pt;          ptr = pt;
# Line 714  else Line 759  else
759      c = 0;      c = 0;
760      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)
761        {        {
762        int cc;                               /* Some compilers don't like ++ */        int cc;                                  /* Some compilers don't like */
763        cc = *(++ptr);                        /* in initializers */        cc = *(++ptr);                           /* ++ in initializers */
764  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
765        if (cc >= 'a') cc -= 32;              /* Convert to upper case */        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
766        c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
767  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
768        if (cc <= 'z') cc += 64;              /* Convert to upper case */        if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
769        c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
770  #endif  #endif
771        }        }
772      break;      break;
# Line 730  else Line 775  else
775      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
776      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
777    
778      case 'c':      case CHAR_c:
779      c = *(++ptr);      c = *(++ptr);
780      if (c == 0)      if (c == 0)
781        {        {
# Line 738  else Line 783  else
783        break;        break;
784        }        }
785    
786  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
787      if (c >= 'a' && c <= 'z') c -= 32;      if (c >= CHAR_a && c <= CHAR_z) c -= 32;
788      c ^= 0x40;      c ^= 0x40;
789  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
790      if (c >= 'a' && c <= 'z') c += 64;      if (c >= CHAR_a && c <= CHAR_z) c += 64;
791      c ^= 0xC0;      c ^= 0xC0;
792  #endif  #endif
793      break;      break;
# Line 804  if (c == 0) goto ERROR_RETURN; Line 849  if (c == 0) goto ERROR_RETURN;
849  /* \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
850  negation. */  negation. */
851    
852  if (c == '{')  if (c == CHAR_LEFT_CURLY_BRACKET)
853    {    {
854    if (ptr[1] == '^')    if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
855      {      {
856      *negptr = TRUE;      *negptr = TRUE;
857      ptr++;      ptr++;
# Line 815  if (c == '{') Line 860  if (c == '{')
860      {      {
861      c = *(++ptr);      c = *(++ptr);
862      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
863      if (c == '}') break;      if (c == CHAR_RIGHT_CURLY_BRACKET) break;
864      name[i] = c;      name[i] = c;
865      }      }
866    if (c !='}') goto ERROR_RETURN;    if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
867    name[i] = 0;    name[i] = 0;
868    }    }
869    
# Line 883  is_counted_repeat(const uschar *p) Line 928  is_counted_repeat(const uschar *p)
928  {  {
929  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
930  while ((digitab[*p] & ctype_digit) != 0) p++;  while ((digitab[*p] & ctype_digit) != 0) p++;
931  if (*p == '}') return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
932    
933  if (*p++ != ',') return FALSE;  if (*p++ != CHAR_COMMA) return FALSE;
934  if (*p == '}') return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
935    
936  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
937  while ((digitab[*p] & ctype_digit) != 0) p++;  while ((digitab[*p] & ctype_digit) != 0) p++;
938    
939  return (*p == '}');  return (*p == CHAR_RIGHT_CURLY_BRACKET);
940  }  }
941    
942    
# Line 924  int max = -1; Line 969  int max = -1;
969  /* 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
970  an integer overflow. */  an integer overflow. */
971    
972  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;
973  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
974    {    {
975    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 934  if (min < 0 || min > 65535) Line 979  if (min < 0 || min > 65535)
979  /* 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.
980  Also, max must not be less than min. */  Also, max must not be less than min. */
981    
982  if (*p == '}') max = min; else  if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
983    {    {
984    if (*(++p) != '}')    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
985      {      {
986      max = 0;      max = 0;
987      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;
988      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
989        {        {
990        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 964  return p; Line 1009  return p;
1009    
1010    
1011  /*************************************************  /*************************************************
1012  *       Find forward referenced subpattern       *  *  Subroutine for finding forward reference      *
1013  *************************************************/  *************************************************/
1014    
1015  /* This function scans along a pattern's text looking for capturing  /* This recursive function is called only from find_parens() below. The
1016    top-level call starts at the beginning of the pattern. All other calls must
1017    start at a parenthesis. It scans along a pattern's text looking for capturing
1018  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
1019  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
1020  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
1021  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
1022  be terminated by '>' because that is checked in the first pass.  first pass. Recursion is used to keep track of subpatterns that reset the
1023    capturing group numbers - the (?| feature.
1024    
1025  Arguments:  Arguments:
1026    ptr          current position in the pattern    ptrptr       address of the current character pointer (updated)
1027    cd           compile background data    cd           compile background data
1028    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1029    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1030    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1031      count        pointer to the current capturing subpattern number (updated)
1032    
1033  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1034  */  */
1035    
1036  static int  static int
1037  find_parens(const uschar *ptr, compile_data *cd, const uschar *name, int lorn,  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,
1038    BOOL xmode)    BOOL xmode, int *count)
1039  {  {
1040  const uschar *thisname;  uschar *ptr = *ptrptr;
1041  int count = cd->bracount;  int start_count = *count;
1042    int hwm_count = start_count;
1043    BOOL dup_parens = FALSE;
1044    
1045  for (; *ptr != 0; ptr++)  /* If the first character is a parenthesis, check on the type of group we are
1046    dealing with. The very first call may not start with a parenthesis. */
1047    
1048    if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1049    {    {
1050    int term;    if (ptr[1] == CHAR_QUESTION_MARK &&
1051          ptr[2] == CHAR_VERTICAL_LINE)
1052        {
1053        ptr += 3;
1054        dup_parens = TRUE;
1055        }
1056    
1057      /* Handle a normal, unnamed capturing parenthesis */
1058    
1059      else if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)
1060        {
1061        *count += 1;
1062        if (name == NULL && *count == lorn) return *count;
1063        ptr++;
1064        }
1065    
1066      /* Handle a condition. If it is an assertion, just carry on so that it
1067      is processed as normal. If not, skip to the closing parenthesis of the
1068      condition (there can't be any nested parens. */
1069    
1070      else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
1071        {
1072        ptr += 2;
1073        if (ptr[1] != CHAR_QUESTION_MARK)
1074          {
1075          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
1076          if (*ptr != 0) ptr++;
1077          }
1078        }
1079    
1080      /* We have either (? or (* and not a condition */
1081    
1082      else
1083        {
1084        ptr += 2;
1085        if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */
1086    
1087        /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */
1088    
1089        if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&
1090            ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1091          {
1092          int term;
1093          const uschar *thisname;
1094          *count += 1;
1095          if (name == NULL && *count == lorn) return *count;
1096          term = *ptr++;
1097          if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;
1098          thisname = ptr;
1099          while (*ptr != term) ptr++;
1100          if (name != NULL && lorn == ptr - thisname &&
1101              strncmp((const char *)name, (const char *)thisname, lorn) == 0)
1102            return *count;
1103          term++;
1104          }
1105        }
1106      }
1107    
1108    /* Past any initial parenthesis handling, scan for parentheses or vertical
1109    bars. */
1110    
1111    for (; *ptr != 0; ptr++)
1112      {
1113    /* Skip over backslashed characters and also entire \Q...\E */    /* Skip over backslashed characters and also entire \Q...\E */
1114    
1115    if (*ptr == '\\')    if (*ptr == CHAR_BACKSLASH)
1116      {      {
1117      if (*(++ptr) == 0) return -1;      if (*(++ptr) == 0) goto FAIL_EXIT;
1118      if (*ptr == 'Q') for (;;)      if (*ptr == CHAR_Q) for (;;)
1119        {        {
1120        while (*(++ptr) != 0 && *ptr != '\\');        while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1121        if (*ptr == 0) return -1;        if (*ptr == 0) goto FAIL_EXIT;
1122        if (*(++ptr) == 'E') break;        if (*(++ptr) == CHAR_E) break;
1123        }        }
1124      continue;      continue;
1125      }      }
# Line 1012  for (; *ptr != 0; ptr++) Line 1127  for (; *ptr != 0; ptr++)
1127    /* Skip over character classes; this logic must be similar to the way they    /* Skip over character classes; this logic must be similar to the way they
1128    are handled for real. If the first character is '^', skip it. Also, if the    are handled for real. If the first character is '^', skip it. Also, if the
1129    first few characters (either before or after ^) are \Q\E or \E we skip them    first few characters (either before or after ^) are \Q\E or \E we skip them
1130    too. This makes for compatibility with Perl. */    too. This makes for compatibility with Perl. Note the use of STR macros to
1131      encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */
1132    
1133    if (*ptr == '[')    if (*ptr == CHAR_LEFT_SQUARE_BRACKET)
1134      {      {
1135      BOOL negate_class = FALSE;      BOOL negate_class = FALSE;
1136      for (;;)      for (;;)
1137        {        {
1138        int c = *(++ptr);        if (ptr[1] == CHAR_BACKSLASH)
       if (c == '\\')  
1139          {          {
1140          if (ptr[1] == 'E') ptr++;          if (ptr[2] == CHAR_E)
1141            else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;            ptr+= 2;
1142              else break;          else if (strncmp((const char *)ptr+2,
1143                     STR_Q STR_BACKSLASH STR_E, 3) == 0)
1144              ptr += 4;
1145            else
1146              break;
1147          }          }
1148        else if (!negate_class && c == '^')        else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
1149            {
1150          negate_class = TRUE;          negate_class = TRUE;
1151            ptr++;
1152            }
1153        else break;        else break;
1154        }        }
1155    
1156      /* If the next character is ']', it is a data character that must be      /* If the next character is ']', it is a data character that must be
1157      skipped, except in JavaScript compatibility mode. */      skipped, except in JavaScript compatibility mode. */
1158    
1159      if (ptr[1] == ']' && (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)      if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&
1160        ptr++;          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
1161          ptr++;
1162      while (*(++ptr) != ']')  
1163        while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)
1164        {        {
1165        if (*ptr == 0) return -1;        if (*ptr == 0) return -1;
1166        if (*ptr == '\\')        if (*ptr == CHAR_BACKSLASH)
1167          {          {
1168          if (*(++ptr) == 0) return -1;          if (*(++ptr) == 0) goto FAIL_EXIT;
1169          if (*ptr == 'Q') for (;;)          if (*ptr == CHAR_Q) for (;;)
1170            {            {
1171            while (*(++ptr) != 0 && *ptr != '\\');            while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1172            if (*ptr == 0) return -1;            if (*ptr == 0) goto FAIL_EXIT;
1173            if (*(++ptr) == 'E') break;            if (*(++ptr) == CHAR_E) break;
1174            }            }
1175          continue;          continue;
1176          }          }
# Line 1057  for (; *ptr != 0; ptr++) Line 1180  for (; *ptr != 0; ptr++)
1180    
1181    /* Skip comments in /x mode */    /* Skip comments in /x mode */
1182    
1183    if (xmode && *ptr == '#')    if (xmode && *ptr == CHAR_NUMBER_SIGN)
1184      {      {
1185      while (*(++ptr) != 0 && *ptr != '\n');      while (*(++ptr) != 0 && *ptr != CHAR_NL) {};
1186      if (*ptr == 0) return -1;      if (*ptr == 0) goto FAIL_EXIT;
1187      continue;      continue;
1188      }      }
1189    
1190    /* An opening parens must now be a real metacharacter */    /* Check for the special metacharacters */
1191    
1192    if (*ptr != '(') continue;    if (*ptr == CHAR_LEFT_PARENTHESIS)
   if (ptr[1] != '?' && ptr[1] != '*')  
1193      {      {
1194      count++;      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, count);
1195      if (name == NULL && count == lorn) return count;      if (rc > 0) return rc;
1196      continue;      if (*ptr == 0) goto FAIL_EXIT;
1197      }      }
1198    
1199    ptr += 2;    else if (*ptr == CHAR_RIGHT_PARENTHESIS)
1200    if (*ptr == 'P') ptr++;                      /* Allow optional P */      {
1201        if (dup_parens && *count < hwm_count) *count = hwm_count;
1202        *ptrptr = ptr;
1203        return -1;
1204        }
1205    
1206      else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
1207        {
1208        if (*count > hwm_count) hwm_count = *count;
1209        *count = start_count;
1210        }
1211      }
1212    
1213    FAIL_EXIT:
1214    *ptrptr = ptr;
1215    return -1;
1216    }
1217    
   /* We have to disambiguate (?<! and (?<= from (?<name> */  
1218    
   if ((*ptr != '<' || ptr[1] == '!' || ptr[1] == '=') &&  
        *ptr != '\'')  
     continue;  
1219    
   count++;  
1220    
1221    if (name == NULL && count == lorn) return count;  /*************************************************
1222    term = *ptr++;  *       Find forward referenced subpattern       *
1223    if (term == '<') term = '>';  *************************************************/
1224    thisname = ptr;  
1225    while (*ptr != term) ptr++;  /* This function scans along a pattern's text looking for capturing
1226    if (name != NULL && lorn == ptr - thisname &&  subpatterns, and counting them. If it finds a named pattern that matches the
1227        strncmp((const char *)name, (const char *)thisname, lorn) == 0)  name it is given, it returns its number. Alternatively, if the name is NULL, it
1228      return count;  returns when it reaches a given numbered subpattern. This is used for forward
1229    references to subpatterns. We used to be able to start this scan from the
1230    current compiling point, using the current count value from cd->bracount, and
1231    do it all in a single loop, but the addition of the possibility of duplicate
1232    subpattern numbers means that we have to scan from the very start, in order to
1233    take account of such duplicates, and to use a recursive function to keep track
1234    of the different types of group.
1235    
1236    Arguments:
1237      cd           compile background data
1238      name         name to seek, or NULL if seeking a numbered subpattern
1239      lorn         name length, or subpattern number if name is NULL
1240      xmode        TRUE if we are in /x mode
1241    
1242    Returns:       the number of the found subpattern, or -1 if not found
1243    */
1244    
1245    static int
1246    find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode)
1247    {
1248    uschar *ptr = (uschar *)cd->start_pattern;
1249    int count = 0;
1250    int rc;
1251    
1252    /* If the pattern does not start with an opening parenthesis, the first call
1253    to find_parens_sub() will scan right to the end (if necessary). However, if it
1254    does start with a parenthesis, find_parens_sub() will return when it hits the
1255    matching closing parens. That is why we have to have a loop. */
1256    
1257    for (;;)
1258      {
1259      rc = find_parens_sub(&ptr, cd, name, lorn, xmode, &count);
1260      if (rc > 0 || *ptr++ == 0) break;
1261    }    }
1262    
1263  return -1;  return rc;
1264  }  }
1265    
1266    
1267    
1268    
1269  /*************************************************  /*************************************************
1270  *      Find first significant op code            *  *      Find first significant op code            *
1271  *************************************************/  *************************************************/
# Line 1165  for (;;) Line 1331  for (;;)
1331    
1332    
1333  /*************************************************  /*************************************************
1334  *        Find the fixed length of a pattern      *  *        Find the fixed length of a branch       *
1335  *************************************************/  *************************************************/
1336    
1337  /* 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,
1338  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.
1339  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
1340    temporarily terminated with OP_END when this function is called.
1341    
1342    This function is called when a backward assertion is encountered, so that if it
1343    fails, the error message can point to the correct place in the pattern.
1344    However, we cannot do this when the assertion contains subroutine calls,
1345    because they can be forward references. We solve this by remembering this case
1346    and doing the check at the end; a flag specifies which mode we are running in.
1347    
1348  Arguments:  Arguments:
1349    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1350    options  the compiling options    options  the compiling options
1351      atend    TRUE if called when the pattern is complete
1352      cd       the "compile data" structure
1353    
1354  Returns:   the fixed length, or -1 if there is no fixed length,  Returns:   the fixed length,
1355                 or -1 if there is no fixed length,
1356               or -2 if \C was encountered               or -2 if \C was encountered
1357                 or -3 if an OP_RECURSE item was encountered and atend is FALSE
1358  */  */
1359    
1360  static int  static int
1361  find_fixedlength(uschar *code, int options)  find_fixedlength(uschar *code, int options, BOOL atend, compile_data *cd)
1362  {  {
1363  int length = -1;  int length = -1;
1364    
# Line 1194  branch, check the length against that of Line 1371  branch, check the length against that of
1371  for (;;)  for (;;)
1372    {    {
1373    int d;    int d;
1374      uschar *ce, *cs;
1375    register int op = *cc;    register int op = *cc;
1376    switch (op)    switch (op)
1377      {      {
# Line 1201  for (;;) Line 1379  for (;;)
1379      case OP_BRA:      case OP_BRA:
1380      case OP_ONCE:      case OP_ONCE:
1381      case OP_COND:      case OP_COND:
1382      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options, atend, cd);
1383      if (d < 0) return d;      if (d < 0) return d;
1384      branchlength += d;      branchlength += d;
1385      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
# Line 1223  for (;;) Line 1401  for (;;)
1401      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1402      branchlength = 0;      branchlength = 0;
1403      break;      break;
1404    
1405        /* A true recursion implies not fixed length, but a subroutine call may
1406        be OK. If the subroutine is a forward reference, we can't deal with
1407        it until the end of the pattern, so return -3. */
1408    
1409        case OP_RECURSE:
1410        if (!atend) return -3;
1411        cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1412        do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */
1413        if (cc > cs && cc < ce) return -1;                /* Recursion */
1414        d = find_fixedlength(cs + 2, options, atend, cd);
1415        if (d < 0) return d;
1416        branchlength += d;
1417        cc += 1 + LINK_SIZE;
1418        break;
1419    
1420      /* Skip over assertive subpatterns */      /* Skip over assertive subpatterns */
1421    
# Line 1260  for (;;) Line 1453  for (;;)
1453      branchlength++;      branchlength++;
1454      cc += 2;      cc += 2;
1455  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1456      if ((options & PCRE_UTF8) != 0)      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)
1457        {        cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       while ((*cc & 0xc0) == 0x80) cc++;  
       }  
1458  #endif  #endif
1459      break;      break;
1460    
# Line 1274  for (;;) Line 1465  for (;;)
1465      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1466      cc += 4;      cc += 4;
1467  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1468      if ((options & PCRE_UTF8) != 0)      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)
1469        {        cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       while((*cc & 0x80) == 0x80) cc++;  
       }  
1470  #endif  #endif
1471      break;      break;
1472    
# Line 1301  for (;;) Line 1490  for (;;)
1490      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
1491      case OP_WORDCHAR:      case OP_WORDCHAR:
1492      case OP_ANY:      case OP_ANY:
1493        case OP_ALLANY:
1494      branchlength++;      branchlength++;
1495      cc++;      cc++;
1496      break;      break;
# Line 1355  for (;;) Line 1545  for (;;)
1545    
1546    
1547  /*************************************************  /*************************************************
1548  *    Scan compiled regex for numbered bracket    *  *    Scan compiled regex for specific bracket    *
1549  *************************************************/  *************************************************/
1550    
1551  /* This little function scans through a compiled pattern until it finds a  /* This little function scans through a compiled pattern until it finds a
1552  capturing bracket with the given number.  capturing bracket with the given number, or, if the number is negative, an
1553    instance of OP_REVERSE for a lookbehind.
1554    
1555  Arguments:  Arguments:
1556    code        points to start of expression    code        points to start of expression
1557    utf8        TRUE in UTF-8 mode    utf8        TRUE in UTF-8 mode
1558    number      the required bracket number    number      the required bracket number or negative to find a lookbehind
1559    
1560  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
1561  */  */
# Line 1382  for (;;) Line 1573  for (;;)
1573    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. */
1574    
1575    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
1576    
1577      /* Handle recursion */
1578    
1579      else if (c == OP_REVERSE)
1580        {
1581        if (number < 0) return (uschar *)code;
1582        code += _pcre_OP_lengths[c];
1583        }
1584    
1585    /* Handle capturing bracket */    /* Handle capturing bracket */
1586    
# Line 1449  for (;;) Line 1648  for (;;)
1648        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1649        break;        break;
1650        }        }
1651    #else
1652        (void)(utf8);  /* Keep compiler happy by referencing function argument */
1653  #endif  #endif
1654      }      }
1655    }    }
# Line 1542  for (;;) Line 1743  for (;;)
1743        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1744        break;        break;
1745        }        }
1746    #else
1747        (void)(utf8);  /* Keep compiler happy by referencing function argument */
1748  #endif  #endif
1749      }      }
1750    }    }
# Line 1608  for (code = first_significant_code(code Line 1811  for (code = first_significant_code(code
1811      BOOL empty_branch;      BOOL empty_branch;
1812      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
1813    
1814      /* Scan a closed bracket */      /* If a conditional group has only one branch, there is a second, implied,
1815        empty branch, so just skip over the conditional, because it could be empty.
1816        Otherwise, scan the individual branches of the group. */
1817    
1818      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;  
1819        code += GET(code, 1);        code += GET(code, 1);
1820        else
1821          {
1822          empty_branch = FALSE;
1823          do
1824            {
1825            if (!empty_branch && could_be_empty_branch(code, endcode, utf8))
1826              empty_branch = TRUE;
1827            code += GET(code, 1);
1828            }
1829          while (*code == OP_ALT);
1830          if (!empty_branch) return FALSE;   /* All branches are non-empty */
1831        }        }
1832      while (*code == OP_ALT);  
     if (!empty_branch) return FALSE;   /* All branches are non-empty */  
1833      c = *code;      c = *code;
1834      continue;      continue;
1835      }      }
# Line 1679  for (code = first_significant_code(code Line 1890  for (code = first_significant_code(code
1890      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
1891      case OP_WORDCHAR:      case OP_WORDCHAR:
1892      case OP_ANY:      case OP_ANY:
1893        case OP_ALLANY:
1894      case OP_ANYBYTE:      case OP_ANYBYTE:
1895      case OP_CHAR:      case OP_CHAR:
1896      case OP_CHARNC:      case OP_CHARNC:
# Line 1735  for (code = first_significant_code(code Line 1947  for (code = first_significant_code(code
1947      case OP_QUERY:      case OP_QUERY:
1948      case OP_MINQUERY:      case OP_MINQUERY:
1949      case OP_POSQUERY:      case OP_POSQUERY:
1950        if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];
1951        break;
1952    
1953      case OP_UPTO:      case OP_UPTO:
1954      case OP_MINUPTO:      case OP_MINUPTO:
1955      case OP_POSUPTO:      case OP_POSUPTO:
1956      if (utf8) while ((code[2] & 0xc0) == 0x80) code++;      if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];
1957      break;      break;
1958  #endif  #endif
1959      }      }
# Line 1819  int terminator; /* Don't combin Line 2034  int terminator; /* Don't combin
2034  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2035  for (++ptr; *ptr != 0; ptr++)  for (++ptr; *ptr != 0; ptr++)
2036    {    {
2037    if (*ptr == '\\' && ptr[1] == ']') ptr++; else    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else
2038      {      {
2039      if (*ptr == ']') return FALSE;      if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2040      if (*ptr == terminator && ptr[1] == ']')      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2041        {        {
2042        *endptr = ptr;        *endptr = ptr;
2043        return TRUE;        return TRUE;
# Line 1909  while ((ptr = (uschar *)find_recurse(ptr Line 2124  while ((ptr = (uschar *)find_recurse(ptr
2124    
2125    /* 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
2126    reference. */    reference. */
2127    
2128    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
2129      {      {
2130      offset = GET(hc, 0);      offset = GET(hc, 0);
# Line 2013  get_othercase_range(unsigned int *cptr, Line 2228  get_othercase_range(unsigned int *cptr,
2228  unsigned int c, othercase, next;  unsigned int c, othercase, next;
2229    
2230  for (c = *cptr; c <= d; c++)  for (c = *cptr; c <= d; c++)
2231    { if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR) break; }    { if ((othercase = UCD_OTHERCASE(c)) != c) break; }
2232    
2233  if (c > d) return FALSE;  if (c > d) return FALSE;
2234    
# Line 2022  next = othercase + 1; Line 2237  next = othercase + 1;
2237    
2238  for (++c; c <= d; c++)  for (++c; c <= d; c++)
2239    {    {
2240    if (_pcre_ucp_othercase(c) != next) break;    if (UCD_OTHERCASE(c) != next) break;
2241    next++;    next++;
2242    }    }
2243    
# Line 2068  if ((options & PCRE_EXTENDED) != 0) Line 2283  if ((options & PCRE_EXTENDED) != 0)
2283    for (;;)    for (;;)
2284      {      {
2285      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2286      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
2287        {        {
2288        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2289          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
# Line 2080  if ((options & PCRE_EXTENDED) != 0) Line 2295  if ((options & PCRE_EXTENDED) != 0)
2295  /* 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
2296  value is a character, a negative value is an escape value. */  value is a character, a negative value is an escape value. */
2297    
2298  if (*ptr == '\\')  if (*ptr == CHAR_BACKSLASH)
2299    {    {
2300    int temperrorcode = 0;    int temperrorcode = 0;
2301    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);
# Line 2105  if ((options & PCRE_EXTENDED) != 0) Line 2320  if ((options & PCRE_EXTENDED) != 0)
2320    for (;;)    for (;;)
2321      {      {
2322      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2323      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
2324        {        {
2325        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2326          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
# Line 2116  if ((options & PCRE_EXTENDED) != 0) Line 2331  if ((options & PCRE_EXTENDED) != 0)
2331    
2332  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
2333    
2334  if (*ptr == '*' || *ptr == '?' || strncmp((char *)ptr, "{0,", 3) == 0)  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
2335    return FALSE;    strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
2336        return FALSE;
2337    
2338  /* 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
2339  positive single character match, "item" either contains the character or, if  positive single character match, "item" either contains the character or, if
# Line 2132  if (next >= 0) switch(op_code) Line 2348  if (next >= 0) switch(op_code)
2348    case OP_CHAR:    case OP_CHAR:
2349  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2350    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
2351    #else
2352      (void)(utf8_char);  /* Keep compiler happy by referencing function argument */
2353  #endif  #endif
2354    return item != next;    return item != next;
2355    
# Line 2150  if (next >= 0) switch(op_code) Line 2368  if (next >= 0) switch(op_code)
2368      unsigned int othercase;      unsigned int othercase;
2369      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2370  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2371      othercase = _pcre_ucp_othercase((unsigned int)next);      othercase = UCD_OTHERCASE((unsigned int)next);
2372  #else  #else
2373      othercase = NOTACHAR;      othercase = NOTACHAR;
2374  #endif  #endif
# Line 2171  if (next >= 0) switch(op_code) Line 2389  if (next >= 0) switch(op_code)
2389      unsigned int othercase;      unsigned int othercase;
2390      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2391  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2392      othercase = _pcre_ucp_othercase(next);      othercase = UCD_OTHERCASE(next);
2393  #else  #else
2394      othercase = NOTACHAR;      othercase = NOTACHAR;
2395  #endif  #endif
# Line 2485  for (;; ptr++) Line 2703  for (;; ptr++)
2703    /* Get next byte in the pattern */    /* Get next byte in the pattern */
2704    
2705    c = *ptr;    c = *ptr;
2706    
2707    /* 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
2708    previous cycle of this loop. */    previous cycle of this loop. */
2709    
# Line 2553  for (;; ptr++) Line 2771  for (;; ptr++)
2771    
2772    if (inescq && c != 0)    if (inescq && c != 0)
2773      {      {
2774      if (c == '\\' && ptr[1] == 'E')      if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
2775        {        {
2776        inescq = FALSE;        inescq = FALSE;
2777        ptr++;        ptr++;
# Line 2579  for (;; ptr++) Line 2797  for (;; ptr++)
2797    /* 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
2798    a quantifier. */    a quantifier. */
2799    
2800    is_quantifier = c == '*' || c == '+' || c == '?' ||    is_quantifier =
2801      (c == '{' && is_counted_repeat(ptr+1));      c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
2802        (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
2803    
2804    if (!is_quantifier && previous_callout != NULL &&    if (!is_quantifier && previous_callout != NULL &&
2805         after_manual_callout-- <= 0)         after_manual_callout-- <= 0)
# Line 2595  for (;; ptr++) Line 2814  for (;; ptr++)
2814    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
2815      {      {
2816      if ((cd->ctypes[c] & ctype_space) != 0) continue;      if ((cd->ctypes[c] & ctype_space) != 0) continue;
2817      if (c == '#')      if (c == CHAR_NUMBER_SIGN)
2818        {        {
2819        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2820          {          {
# Line 2620  for (;; ptr++) Line 2839  for (;; ptr++)
2839      {      {
2840      /* ===================================================================*/      /* ===================================================================*/
2841      case 0:                        /* The branch terminates at string end */      case 0:                        /* The branch terminates at string end */
2842      case '|':                      /* or | or ) */      case CHAR_VERTICAL_LINE:       /* or | or ) */
2843      case ')':      case CHAR_RIGHT_PARENTHESIS:
2844      *firstbyteptr = firstbyte;      *firstbyteptr = firstbyte;
2845      *reqbyteptr = reqbyte;      *reqbyteptr = reqbyte;
2846      *codeptr = code;      *codeptr = code;
# Line 2643  for (;; ptr++) Line 2862  for (;; ptr++)
2862      /* Handle single-character metacharacters. In multiline mode, ^ disables      /* Handle single-character metacharacters. In multiline mode, ^ disables
2863      the setting of any following char as a first character. */      the setting of any following char as a first character. */
2864    
2865      case '^':      case CHAR_CIRCUMFLEX_ACCENT:
2866      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
2867        {        {
2868        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
# Line 2652  for (;; ptr++) Line 2871  for (;; ptr++)
2871      *code++ = OP_CIRC;      *code++ = OP_CIRC;
2872      break;      break;
2873    
2874      case '$':      case CHAR_DOLLAR_SIGN:
2875      previous = NULL;      previous = NULL;
2876      *code++ = OP_DOLL;      *code++ = OP_DOLL;
2877      break;      break;
# Line 2660  for (;; ptr++) Line 2879  for (;; ptr++)
2879      /* 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
2880      repeats. The value of reqbyte doesn't change either. */      repeats. The value of reqbyte doesn't change either. */
2881    
2882      case '.':      case CHAR_DOT:
2883      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
2884      zerofirstbyte = firstbyte;      zerofirstbyte = firstbyte;
2885      zeroreqbyte = reqbyte;      zeroreqbyte = reqbyte;
2886      previous = code;      previous = code;
2887      *code++ = OP_ANY;      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
2888      break;      break;
2889    
2890    
# Line 2680  for (;; ptr++) Line 2899  for (;; ptr++)
2899      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,
2900      but those above are are explicitly listed afterwards. A flag byte tells      but those above are are explicitly listed afterwards. A flag byte tells
2901      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.
2902    
2903      In JavaScript compatibility mode, an isolated ']' causes an error. In      In JavaScript compatibility mode, an isolated ']' causes an error. In
2904      default (Perl) mode, it is treated as a data character. */      default (Perl) mode, it is treated as a data character. */
2905    
2906      case ']':      case CHAR_RIGHT_SQUARE_BRACKET:
2907      if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)      if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
2908        {        {
2909        *errorcodeptr = ERR64;        *errorcodeptr = ERR64;
2910        goto FAILED;        goto FAILED;
2911        }        }
2912      goto NORMAL_CHAR;      goto NORMAL_CHAR;
2913    
2914      case '[':      case CHAR_LEFT_SQUARE_BRACKET:
2915      previous = code;      previous = code;
2916    
2917      /* 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
2918      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. */
2919    
2920      if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&      if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
2921             ptr[1] == CHAR_EQUALS_SIGN) &&
2922          check_posix_syntax(ptr, &tempptr))          check_posix_syntax(ptr, &tempptr))
2923        {        {
2924        *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;        *errorcodeptr = (ptr[1] == CHAR_COLON)? ERR13 : ERR31;
2925        goto FAILED;        goto FAILED;
2926        }        }
2927    
# Line 2713  for (;; ptr++) Line 2933  for (;; ptr++)
2933      for (;;)      for (;;)
2934        {        {
2935        c = *(++ptr);        c = *(++ptr);
2936        if (c == '\\')        if (c == CHAR_BACKSLASH)
2937          {          {
2938          if (ptr[1] == 'E') ptr++;          if (ptr[1] == CHAR_E)
2939            else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;            ptr++;
2940              else break;          else if (strncmp((const char *)ptr+1,
2941                              STR_Q STR_BACKSLASH STR_E, 3) == 0)
2942              ptr += 3;
2943            else
2944              break;
2945          }          }
2946        else if (!negate_class && c == '^')        else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
2947          negate_class = TRUE;          negate_class = TRUE;
2948        else break;        else break;
2949        }        }
2950    
2951      /* Empty classes are allowed in JavaScript compatibility mode. Otherwise,      /* Empty classes are allowed in JavaScript compatibility mode. Otherwise,
2952      an initial ']' is taken as a data character -- the code below handles      an initial ']' is taken as a data character -- the code below handles
2953      that. In JS mode, [] must always fail, so generate OP_FAIL, whereas      that. In JS mode, [] must always fail, so generate OP_FAIL, whereas
2954      [^] must match any character, so generate OP_ALLANY. */      [^] must match any character, so generate OP_ALLANY. */
2955    
2956      if (c ==']' && (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)      if (c == CHAR_RIGHT_SQUARE_BRACKET &&
2957            (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
2958        {        {
2959        *code++ = negate_class? OP_ALLANY : OP_FAIL;        *code++ = negate_class? OP_ALLANY : OP_FAIL;
2960        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
2961        zerofirstbyte = firstbyte;        zerofirstbyte = firstbyte;
2962        break;        break;
2963        }        }
2964    
2965      /* 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
2966      negation flag at the end, so that support for characters > 255 works      negation flag at the end, so that support for characters > 255 works
# Line 2794  for (;; ptr++) Line 3019  for (;; ptr++)
3019    
3020        if (inescq)        if (inescq)
3021          {          {
3022          if (c == '\\' && ptr[1] == 'E')     /* If we are at \E */          if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)  /* If we are at \E */
3023            {            {
3024            inescq = FALSE;                   /* Reset literal state */            inescq = FALSE;                   /* Reset literal state */
3025            ptr++;                            /* Skip the 'E' */            ptr++;                            /* Skip the 'E' */
# Line 2809  for (;; ptr++) Line 3034  for (;; ptr++)
3034        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
3035        5.6 and 5.8 do. */        5.6 and 5.8 do. */
3036    
3037        if (c == '[' &&        if (c == CHAR_LEFT_SQUARE_BRACKET &&
3038            (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&            (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
3039            check_posix_syntax(ptr, &tempptr))             ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))
3040          {          {
3041          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
3042          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
3043          register const uschar *cbits = cd->cbits;          register const uschar *cbits = cd->cbits;
3044          uschar pbits[32];          uschar pbits[32];
3045    
3046          if (ptr[1] != ':')          if (ptr[1] != CHAR_COLON)
3047            {            {
3048            *errorcodeptr = ERR31;            *errorcodeptr = ERR31;
3049            goto FAILED;            goto FAILED;
3050            }            }
3051    
3052          ptr += 2;          ptr += 2;
3053          if (*ptr == '^')          if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
3054            {            {
3055            local_negate = TRUE;            local_negate = TRUE;
3056            should_flip_negation = TRUE;  /* Note negative special */            should_flip_negation = TRUE;  /* Note negative special */
# Line 2898  for (;; ptr++) Line 3123  for (;; ptr++)
3123        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
3124        character in them, so set class_charcount bigger than one. */        character in them, so set class_charcount bigger than one. */
3125    
3126        if (c == '\\')        if (c == CHAR_BACKSLASH)
3127          {          {
3128          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3129          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
3130    
3131          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 */
3132          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 */
3133          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 */
3134          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
3135            {            {
3136            if (ptr[1] == '\\' && ptr[2] == 'E')            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
3137              {              {
3138              ptr += 2; /* avoid empty string */              ptr += 2; /* avoid empty string */
3139              }              }
# Line 3134  for (;; ptr++) Line 3359  for (;; ptr++)
3359        entirely. The code for handling \Q and \E is messy. */        entirely. The code for handling \Q and \E is messy. */
3360    
3361        CHECK_RANGE:        CHECK_RANGE:
3362        while (ptr[1] == '\\' && ptr[2] == 'E')        while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
3363          {          {
3364          inescq = FALSE;          inescq = FALSE;
3365          ptr += 2;          ptr += 2;
# Line 3144  for (;; ptr++) Line 3369  for (;; ptr++)
3369    
3370        /* Remember \r or \n */        /* Remember \r or \n */
3371    
3372        if (c == '\r' || c == '\n') cd->external_flags |= PCRE_HASCRORLF;        if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
3373    
3374        /* Check for range */        /* Check for range */
3375    
3376        if (!inescq && ptr[1] == '-')        if (!inescq && ptr[1] == CHAR_MINUS)
3377          {          {
3378          int d;          int d;
3379          ptr += 2;          ptr += 2;
3380          while (*ptr == '\\' && ptr[1] == 'E') ptr += 2;          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;
3381    
3382          /* 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
3383          mode. */          mode. */
3384    
3385          while (*ptr == '\\' && ptr[1] == 'Q')          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
3386            {            {
3387            ptr += 2;            ptr += 2;
3388            if (*ptr == '\\' && ptr[1] == 'E') { ptr += 2; continue; }            if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)
3389                { ptr += 2; continue; }
3390            inescq = TRUE;            inescq = TRUE;
3391            break;            break;
3392            }            }
3393    
3394          if (*ptr == 0 || (!inescq && *ptr == ']'))          if (*ptr == 0 || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
3395            {            {
3396            ptr = oldptr;            ptr = oldptr;
3397            goto LONE_SINGLE_CHARACTER;            goto LONE_SINGLE_CHARACTER;
# Line 3184  for (;; ptr++) Line 3410  for (;; ptr++)
3410          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
3411          in such circumstances. */          in such circumstances. */
3412    
3413          if (!inescq && d == '\\')          if (!inescq && d == CHAR_BACKSLASH)
3414            {            {
3415            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3416            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
# Line 3194  for (;; ptr++) Line 3420  for (;; ptr++)
3420    
3421            if (d < 0)            if (d < 0)
3422              {              {
3423              if (d == -ESC_b) d = '\b';              if (d == -ESC_b) d = CHAR_BS;
3424              else if (d == -ESC_X) d = 'X';              else if (d == -ESC_X) d = CHAR_X;
3425              else if (d == -ESC_R) d = 'R'; else              else if (d == -ESC_R) d = CHAR_R; else
3426                {                {
3427                ptr = oldptr;                ptr = oldptr;
3428                goto LONE_SINGLE_CHARACTER;  /* A few lines below */                goto LONE_SINGLE_CHARACTER;  /* A few lines below */
# Line 3217  for (;; ptr++) Line 3443  for (;; ptr++)
3443    
3444          /* Remember \r or \n */          /* Remember \r or \n */
3445    
3446          if (d == '\r' || d == '\n') cd->external_flags |= PCRE_HASCRORLF;          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
3447    
3448          /* 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
3449          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 3337  for (;; ptr++) Line 3563  for (;; ptr++)
3563          if ((options & PCRE_CASELESS) != 0)          if ((options & PCRE_CASELESS) != 0)
3564            {            {
3565            unsigned int othercase;            unsigned int othercase;
3566            if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR)            if ((othercase = UCD_OTHERCASE(c)) != c)
3567              {              {
3568              *class_utf8data++ = XCL_SINGLE;              *class_utf8data++ = XCL_SINGLE;
3569              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);
# Line 3364  for (;; ptr++) Line 3590  for (;; ptr++)
3590    
3591      /* Loop until ']' reached. This "while" is the end of the "do" above. */      /* Loop until ']' reached. This "while" is the end of the "do" above. */
3592    
3593      while ((c = *(++ptr)) != 0 && (c != ']' || inescq));      while ((c = *(++ptr)) != 0 && (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
3594    
3595      if (c == 0)                          /* Missing terminating ']' */      if (c == 0)                          /* Missing terminating ']' */
3596        {        {
# Line 3509  we set the flag only if there is a liter Line 3735  we set the flag only if there is a liter
3735      /* Various kinds of repeat; '{' is not necessarily a quantifier, but this      /* Various kinds of repeat; '{' is not necessarily a quantifier, but this
3736      has been tested above. */      has been tested above. */
3737    
3738      case '{':      case CHAR_LEFT_CURLY_BRACKET:
3739      if (!is_quantifier) goto NORMAL_CHAR;      if (!is_quantifier) goto NORMAL_CHAR;
3740      ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);      ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);
3741      if (*errorcodeptr != 0) goto FAILED;      if (*errorcodeptr != 0) goto FAILED;
3742      goto REPEAT;      goto REPEAT;
3743    
3744      case '*':      case CHAR_ASTERISK:
3745      repeat_min = 0;      repeat_min = 0;
3746      repeat_max = -1;      repeat_max = -1;
3747      goto REPEAT;      goto REPEAT;
3748    
3749      case '+':      case CHAR_PLUS:
3750      repeat_min = 1;      repeat_min = 1;
3751      repeat_max = -1;      repeat_max = -1;
3752      goto REPEAT;      goto REPEAT;
3753    
3754      case '?':      case CHAR_QUESTION_MARK:
3755      repeat_min = 0;      repeat_min = 0;
3756      repeat_max = 1;      repeat_max = 1;
3757    
# Line 3560  we set the flag only if there is a liter Line 3786  we set the flag only if there is a liter
3786      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
3787      repeat type to the non-default. */      repeat type to the non-default. */
3788    
3789      if (ptr[1] == '+')      if (ptr[1] == CHAR_PLUS)
3790        {        {
3791        repeat_type = 0;                  /* Force greedy */        repeat_type = 0;                  /* Force greedy */
3792        possessive_quantifier = TRUE;        possessive_quantifier = TRUE;
3793        ptr++;        ptr++;
3794        }        }
3795      else if (ptr[1] == '?')      else if (ptr[1] == CHAR_QUESTION_MARK)
3796        {        {
3797        repeat_type = greedy_non_default;        repeat_type = greedy_non_default;
3798        ptr++;        ptr++;
# Line 3681  we set the flag only if there is a liter Line 3907  we set the flag only if there is a liter
3907    
3908        if (repeat_max == 0) goto END_REPEAT;        if (repeat_max == 0) goto END_REPEAT;
3909    
3910          /*--------------------------------------------------------------------*/
3911          /* This code is obsolete from release 8.00; the restriction was finally
3912          removed: */
3913    
3914        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
3915        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
3916    
3917        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
3918          /*--------------------------------------------------------------------*/
3919    
3920        /* Combine the op_type with the repeat_type */        /* Combine the op_type with the repeat_type */
3921    
# Line 3831  we set the flag only if there is a liter Line 4062  we set the flag only if there is a liter
4062          goto END_REPEAT;          goto END_REPEAT;
4063          }          }
4064    
4065          /*--------------------------------------------------------------------*/
4066          /* This code is obsolete from release 8.00; the restriction was finally
4067          removed: */
4068    
4069        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
4070        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
4071    
4072        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
4073          /*--------------------------------------------------------------------*/
4074    
4075        if (repeat_min == 0 && repeat_max == -1)        if (repeat_min == 0 && repeat_max == -1)
4076          *code++ = OP_CRSTAR + repeat_type;          *code++ = OP_CRSTAR + repeat_type;
# Line 3900  we set the flag only if there is a liter Line 4136  we set the flag only if there is a liter
4136          **   code = previous;          **   code = previous;
4137          **   goto END_REPEAT;          **   goto END_REPEAT;
4138          **   }          **   }
4139    
4140          However, that fails when a group is referenced as a subroutine from          However, that fails when a group is referenced as a subroutine from
4141          elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it          elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it
4142          so that it is skipped on execution. As we don't have a list of which          so that it is skipped on execution. As we don't have a list of which
4143          groups are referenced, we cannot do this selectively.          groups are referenced, we cannot do this selectively.
4144    
4145          If the maximum is 1 or unlimited, we just have to stick in the BRAZERO          If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
4146          and do no more at this point. However, we do need to adjust any          and do no more at this point. However, we do need to adjust any
# Line 3923  we set the flag only if there is a liter Line 4159  we set the flag only if there is a liter
4159              {              {
4160              *previous++ = OP_SKIPZERO;              *previous++ = OP_SKIPZERO;
4161              goto END_REPEAT;              goto END_REPEAT;
4162              }              }
4163            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
4164            }            }
4165    
# Line 4117  we set the flag only if there is a liter Line 4353  we set the flag only if there is a liter
4353            }            }
4354          }          }
4355        }        }
4356    
4357      /* If previous is OP_FAIL, it was generated by an empty class [] in      /* If previous is OP_FAIL, it was generated by an empty class [] in
4358      JavaScript mode. The other ways in which OP_FAIL can be generated, that is      JavaScript mode. The other ways in which OP_FAIL can be generated, that is
4359      by (*FAIL) or (?!) set previous to NULL, which gives a "nothing to repeat"      by (*FAIL) or (?!) set previous to NULL, which gives a "nothing to repeat"
4360      error above. We can just ignore the repeat in JS case. */      error above. We can just ignore the repeat in JS case. */
4361    
4362      else if (*previous == OP_FAIL) goto END_REPEAT;      else if (*previous == OP_FAIL) goto END_REPEAT;
4363    
4364      /* Else there's some kind of shambles */      /* Else there's some kind of shambles */
4365    
# Line 4149  we set the flag only if there is a liter Line 4385  we set the flag only if there is a liter
4385      if (possessive_quantifier)      if (possessive_quantifier)
4386        {        {
4387        int len;        int len;
4388        if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||  
4389            *tempcode == OP_NOTEXACT)        if (*tempcode == OP_TYPEEXACT)
4390          tempcode += _pcre_OP_lengths[*tempcode] +          tempcode += _pcre_OP_lengths[*tempcode] +
4391            ((*tempcode == OP_TYPEEXACT &&            ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);
4392               (tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP))? 2:0);  
4393          else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
4394            {
4395            tempcode += _pcre_OP_lengths[*tempcode];
4396    #ifdef SUPPORT_UTF8
4397            if (utf8 && tempcode[-1] >= 0xc0)
4398              tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];
4399    #endif
4400            }
4401    
4402        len = code - tempcode;        len = code - tempcode;
4403        if (len > 0) switch (*tempcode)        if (len > 0) switch (*tempcode)
4404          {          {
# Line 4199  we set the flag only if there is a liter Line 4444  we set the flag only if there is a liter
4444      lookbehind or option setting or condition or all the other extended      lookbehind or option setting or condition or all the other extended
4445      parenthesis forms.  */      parenthesis forms.  */
4446    
4447      case '(':      case CHAR_LEFT_PARENTHESIS:
4448      newoptions = options;      newoptions = options;
4449      skipbytes = 0;      skipbytes = 0;
4450      bravalue = OP_CBRA;      bravalue = OP_CBRA;
4451      save_hwm = cd->hwm;      save_hwm = cd->hwm;
4452      reset_bracount = FALSE;      reset_bracount = FALSE;
4453    
4454      /* First deal with various "verbs" that can be introduced by '*'. */      /* First deal with various "verbs" that can be introduced by '*'. */
4455    
4456      if (*(++ptr) == '*' && (cd->ctypes[ptr[1]] & ctype_letter) != 0)      if (*(++ptr) == CHAR_ASTERISK && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
4457        {        {
4458        int i, namelen;        int i, namelen;
4459        const char *vn = verbnames;        const char *vn = verbnames;
4460        const uschar *name = ++ptr;        const uschar *name = ++ptr;
4461        previous = NULL;        previous = NULL;
4462        while ((cd->ctypes[*++ptr] & ctype_letter) != 0);        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
4463        if (*ptr == ':')        if (*ptr == CHAR_COLON)
4464          {          {
4465          *errorcodeptr = ERR59;   /* Not supported */          *errorcodeptr = ERR59;   /* Not supported */
4466          goto FAILED;          goto FAILED;
4467          }          }
4468        if (*ptr != ')')        if (*ptr != CHAR_RIGHT_PARENTHESIS)
4469          {          {
4470          *errorcodeptr = ERR60;          *errorcodeptr = ERR60;
4471          goto FAILED;          goto FAILED;
# Line 4231  we set the flag only if there is a liter Line 4476  we set the flag only if there is a liter
4476          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
4477              strncmp((char *)name, vn, namelen) == 0)              strncmp((char *)name, vn, namelen) == 0)
4478            {            {
4479            *code = verbs[i].op;            /* Check for open captures before ACCEPT */
4480            if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;  
4481              if (verbs[i].op == OP_ACCEPT)
4482                {
4483                open_capitem *oc;
4484                cd->had_accept = TRUE;
4485                for (oc = cd->open_caps; oc != NULL; oc = oc->next)
4486                  {
4487                  *code++ = OP_CLOSE;
4488                  PUT2INC(code, 0, oc->number);
4489                  }
4490                }
4491              *code++ = verbs[i].op;
4492            break;            break;
4493            }            }
4494          vn += verbs[i].len + 1;          vn += verbs[i].len + 1;
# Line 4245  we set the flag only if there is a liter Line 4501  we set the flag only if there is a liter
4501      /* Deal with the extended parentheses; all are introduced by '?', and the      /* Deal with the extended parentheses; all are introduced by '?', and the
4502      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. */
4503    
4504      else if (*ptr == '?')      else if (*ptr == CHAR_QUESTION_MARK)
4505        {        {
4506        int i, set, unset, namelen;        int i, set, unset, namelen;
4507        int *optset;        int *optset;
# Line 4254  we set the flag only if there is a liter Line 4510  we set the flag only if there is a liter
4510    
4511        switch (*(++ptr))        switch (*(++ptr))
4512          {          {
4513          case '#':                 /* Comment; skip to ket */          case CHAR_NUMBER_SIGN:                 /* Comment; skip to ket */
4514          ptr++;          ptr++;
4515          while (*ptr != 0 && *ptr != ')') ptr++;          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
4516          if (*ptr == 0)          if (*ptr == 0)
4517            {            {
4518            *errorcodeptr = ERR18;            *errorcodeptr = ERR18;
# Line 4266  we set the flag only if there is a liter Line 4522  we set the flag only if there is a liter
4522    
4523    
4524          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4525          case '|':                 /* Reset capture count for each branch */          case CHAR_VERTICAL_LINE:  /* Reset capture count for each branch */
4526          reset_bracount = TRUE;          reset_bracount = TRUE;
4527          /* Fall through */          /* Fall through */
4528    
4529          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4530          case ':':                 /* Non-capturing bracket */          case CHAR_COLON:          /* Non-capturing bracket */
4531          bravalue = OP_BRA;          bravalue = OP_BRA;
4532          ptr++;          ptr++;
4533          break;          break;
4534    
4535    
4536          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4537          case '(':          case CHAR_LEFT_PARENTHESIS:
4538          bravalue = OP_COND;       /* Conditional group */          bravalue = OP_COND;       /* Conditional group */
4539    
4540          /* 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 4298  we set the flag only if there is a liter Line 4554  we set the flag only if there is a liter
4554          the switch. This will take control down to where bracketed groups,          the switch. This will take control down to where bracketed groups,
4555          including assertions, are processed. */          including assertions, are processed. */
4556    
4557          if (ptr[1] == '?' && (ptr[2] == '=' || ptr[2] == '!' || ptr[2] == '<'))          if (ptr[1] == CHAR_QUESTION_MARK && (ptr[2] == CHAR_EQUALS_SIGN ||
4558                ptr[2] == CHAR_EXCLAMATION_MARK || ptr[2] == CHAR_LESS_THAN_SIGN))
4559            break;            break;
4560    
4561          /* 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 4310  we set the flag only if there is a liter Line 4567  we set the flag only if there is a liter
4567    
4568          /* Check for a test for recursion in a named group. */          /* Check for a test for recursion in a named group. */
4569    
4570          if (ptr[1] == 'R' && ptr[2] == '&')          if (ptr[1] == CHAR_R && ptr[2] == CHAR_AMPERSAND)
4571            {            {
4572            terminator = -1;            terminator = -1;
4573            ptr += 2;            ptr += 2;
# Line 4320  we set the flag only if there is a liter Line 4577  we set the flag only if there is a liter
4577          /* 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
4578          syntax (?(<name>) or (?('name') */          syntax (?(<name>) or (?('name') */
4579    
4580          else if (ptr[1] == '<')          else if (ptr[1] == CHAR_LESS_THAN_SIGN)
4581            {            {
4582            terminator = '>';            terminator = CHAR_GREATER_THAN_SIGN;
4583            ptr++;            ptr++;
4584            }            }
4585          else if (ptr[1] == '\'')          else if (ptr[1] == CHAR_APOSTROPHE)
4586            {            {
4587            terminator = '\'';            terminator = CHAR_APOSTROPHE;
4588            ptr++;            ptr++;
4589            }            }
4590          else          else
4591            {            {
4592            terminator = 0;            terminator = 0;
4593            if (ptr[1] == '-' || ptr[1] == '+') refsign = *(++ptr);            if (ptr[1] == CHAR_MINUS || ptr[1] == CHAR_PLUS) refsign = *(++ptr);
4594            }            }
4595    
4596          /* 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 4353  we set the flag only if there is a liter Line 4610  we set the flag only if there is a liter
4610            {            {
4611            if (recno >= 0)            if (recno >= 0)
4612              recno = ((digitab[*ptr] & ctype_digit) != 0)?              recno = ((digitab[*ptr] & ctype_digit) != 0)?
4613                recno * 10 + *ptr - '0' : -1;                recno * 10 + *ptr - CHAR_0 : -1;
4614            ptr++;            ptr++;
4615            }            }
4616          namelen = ptr - name;          namelen = ptr - name;
4617    
4618          if ((terminator > 0 && *ptr++ != terminator) || *ptr++ != ')')          if ((terminator > 0 && *ptr++ != terminator) ||
4619                *ptr++ != CHAR_RIGHT_PARENTHESIS)
4620            {            {
4621            ptr--;      /* Error offset */            ptr--;      /* Error offset */
4622            *errorcodeptr = ERR26;            *errorcodeptr = ERR26;
# Line 4380  we set the flag only if there is a liter Line 4638  we set the flag only if there is a liter
4638              *errorcodeptr = ERR58;              *errorcodeptr = ERR58;
4639              goto FAILED;              goto FAILED;
4640              }              }
4641            recno = (refsign == '-')?            recno = (refsign == CHAR_MINUS)?
4642              cd->bracount - recno + 1 : recno +cd->bracount;              cd->bracount - recno + 1 : recno +cd->bracount;
4643            if (recno <= 0 || recno > cd->final_bracount)            if (recno <= 0 || recno > cd->final_bracount)
4644              {              {
# Line 4411  we set the flag only if there is a liter Line 4669  we set the flag only if there is a liter
4669    
4670          /* Search the pattern for a forward reference */          /* Search the pattern for a forward reference */
4671    
4672          else if ((i = find_parens(ptr, cd, name, namelen,          else if ((i = find_parens(cd, name, namelen,
4673                          (options & PCRE_EXTENDED) != 0)) > 0)                          (options & PCRE_EXTENDED) != 0)) > 0)
4674            {            {
4675            PUT2(code, 2+LINK_SIZE, i);            PUT2(code, 2+LINK_SIZE, i);
# Line 4432  we set the flag only if there is a liter Line 4690  we set the flag only if there is a liter
4690          /* Check for (?(R) for recursion. Allow digits after R to specify a          /* Check for (?(R) for recursion. Allow digits after R to specify a
4691          specific group number. */          specific group number. */
4692    
4693          else if (*name == 'R')          else if (*name == CHAR_R)
4694            {            {
4695            recno = 0;            recno = 0;
4696            for (i = 1; i < namelen; i++)            for (i = 1; i < namelen; i++)
# Line 4442  we set the flag only if there is a liter Line 4700  we set the flag only if there is a liter
4700                *errorcodeptr = ERR15;                *errorcodeptr = ERR15;
4701                goto FAILED;                goto FAILED;
4702                }                }
4703              recno = recno * 10 + name[i] - '0';              recno = recno * 10 + name[i] - CHAR_0;
4704              }              }
4705            if (recno == 0) recno = RREF_ANY;            if (recno == 0) recno = RREF_ANY;
4706            code[1+LINK_SIZE] = OP_RREF;      /* Change test type */            code[1+LINK_SIZE] = OP_RREF;      /* Change test type */
# Line 4452  we set the flag only if there is a liter Line 4710  we set the flag only if there is a liter
4710          /* Similarly, check for the (?(DEFINE) "condition", which is always          /* Similarly, check for the (?(DEFINE) "condition", which is always
4711          false. */          false. */
4712    
4713          else if (namelen == 6 && strncmp((char *)name, "DEFINE", 6) == 0)          else if (namelen == 6 && strncmp((char *)name, STRING_DEFINE, 6) == 0)
4714            {            {
4715            code[1+LINK_SIZE] = OP_DEF;            code[1+LINK_SIZE] = OP_DEF;
4716            skipbytes = 1;            skipbytes = 1;
# Line 4477  we set the flag only if there is a liter Line 4735  we set the flag only if there is a liter
4735    
4736    
4737          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4738          case '=':                 /* Positive lookahead */          case CHAR_EQUALS_SIGN:                 /* Positive lookahead */
4739          bravalue = OP_ASSERT;          bravalue = OP_ASSERT;
4740          ptr++;          ptr++;
4741          break;          break;
4742    
4743    
4744          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4745          case '!':                 /* Negative lookahead */          case CHAR_EXCLAMATION_MARK:            /* Negative lookahead */
4746          ptr++;          ptr++;
4747          if (*ptr == ')')          /* Optimize (?!) */          if (*ptr == CHAR_RIGHT_PARENTHESIS)    /* Optimize (?!) */
4748            {            {
4749            *code++ = OP_FAIL;            *code++ = OP_FAIL;
4750            previous = NULL;            previous = NULL;
# Line 4497  we set the flag only if there is a liter Line 4755  we set the flag only if there is a liter
4755    
4756    
4757          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4758          case '<':                 /* Lookbehind or named define */          case CHAR_LESS_THAN_SIGN:              /* Lookbehind or named define */
4759          switch (ptr[1])          switch (ptr[1])
4760            {            {
4761            case '=':               /* Positive lookbehind */            case CHAR_EQUALS_SIGN:               /* Positive lookbehind */
4762            bravalue = OP_ASSERTBACK;            bravalue = OP_ASSERTBACK;
4763            ptr += 2;            ptr += 2;
4764            break;            break;
4765    
4766            case '!':               /* Negative lookbehind */            case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */
4767            bravalue = OP_ASSERTBACK_NOT;            bravalue = OP_ASSERTBACK_NOT;
4768            ptr += 2;            ptr += 2;
4769            break;            break;
# Line 4520  we set the flag only if there is a liter Line 4778  we set the flag only if there is a liter
4778    
4779    
4780          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4781          case '>':                 /* One-time brackets */          case CHAR_GREATER_THAN_SIGN:           /* One-time brackets */
4782          bravalue = OP_ONCE;          bravalue = OP_ONCE;
4783          ptr++;          ptr++;
4784          break;          break;
4785    
4786    
4787          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4788          case 'C':                 /* Callout - may be followed by digits; */          case CHAR_C:                 /* Callout - may be followed by digits; */
4789          previous_callout = code;  /* Save for later completion */          previous_callout = code;  /* Save for later completion */
4790          after_manual_callout = 1; /* Skip one item before completing */          after_manual_callout = 1; /* Skip one item before completing */
4791          *code++ = OP_CALLOUT;          *code++ = OP_CALLOUT;
4792            {            {
4793            int n = 0;            int n = 0;
4794            while ((digitab[*(++ptr)] & ctype_digit) != 0)            while ((digitab[*(++ptr)] & ctype_digit) != 0)
4795              n = n * 10 + *ptr - '0';              n = n * 10 + *ptr - CHAR_0;
4796            if (*ptr != ')')            if (*ptr != CHAR_RIGHT_PARENTHESIS)
4797              {              {
4798              *errorcodeptr = ERR39;              *errorcodeptr = ERR39;
4799              goto FAILED;              goto FAILED;
# Line 4555  we set the flag only if there is a liter Line 4813  we set the flag only if there is a liter
4813    
4814    
4815          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4816          case 'P':                 /* Python-style named subpattern handling */          case CHAR_P:              /* Python-style named subpattern handling */
4817          if (*(++ptr) == '=' || *ptr == '>')  /* Reference or recursion */          if (*(++ptr) == CHAR_EQUALS_SIGN ||
4818                *ptr == CHAR_GREATER_THAN_SIGN)  /* Reference or recursion */
4819            {            {
4820            is_recurse = *ptr == '>';            is_recurse = *ptr == CHAR_GREATER_THAN_SIGN;
4821            terminator = ')';            terminator = CHAR_RIGHT_PARENTHESIS;
4822            goto NAMED_REF_OR_RECURSE;            goto NAMED_REF_OR_RECURSE;
4823            }            }
4824          else if (*ptr != '<')    /* Test for Python-style definition */          else if (*ptr != CHAR_LESS_THAN_SIGN)  /* Test for Python-style defn */
4825            {            {
4826            *errorcodeptr = ERR41;            *errorcodeptr = ERR41;
4827            goto FAILED;            goto FAILED;
# Line 4572  we set the flag only if there is a liter Line 4831  we set the flag only if there is a liter
4831    
4832          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4833          DEFINE_NAME:    /* Come here from (?< handling */          DEFINE_NAME:    /* Come here from (?< handling */
4834          case '\'':          case CHAR_APOSTROPHE:
4835            {            {
4836            terminator = (*ptr == '<')? '>' : '\'';            terminator = (*ptr == CHAR_LESS_THAN_SIGN)?
4837                CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
4838            name = ++ptr;            name = ++ptr;
4839    
4840            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
# Line 4648  we set the flag only if there is a liter Line 4908  we set the flag only if there is a liter
4908    
4909    
4910          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4911          case '&':                 /* Perl recursion/subroutine syntax */          case CHAR_AMPERSAND:            /* Perl recursion/subroutine syntax */
4912          terminator = ')';          terminator = CHAR_RIGHT_PARENTHESIS;
4913          is_recurse = TRUE;          is_recurse = TRUE;
4914          /* Fall through */          /* Fall through */
4915    
# Line 4708  we set the flag only if there is a liter Line 4968  we set the flag only if there is a liter
4968              recno = GET2(slot, 0);              recno = GET2(slot, 0);
4969              }              }
4970            else if ((recno =                /* Forward back reference */            else if ((recno =                /* Forward back reference */
4971                      find_parens(ptr, cd, name, namelen,                      find_parens(cd, name, namelen,
4972                        (options & PCRE_EXTENDED) != 0)) <= 0)                        (options & PCRE_EXTENDED) != 0)) <= 0)
4973              {              {
4974              *errorcodeptr = ERR15;              *errorcodeptr = ERR15;
# Line 4724  we set the flag only if there is a liter Line 4984  we set the flag only if there is a liter
4984    
4985    
4986          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4987          case 'R':                 /* Recursion */          case CHAR_R:              /* Recursion */
4988          ptr++;                    /* Same as (?0)      */          ptr++;                    /* Same as (?0)      */
4989          /* Fall through */          /* Fall through */
4990    
4991    
4992          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4993          case '-': case '+':          case CHAR_MINUS: case CHAR_PLUS:  /* Recursion or subroutine */
4994          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:
4995          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:
4996            {            {
4997            const uschar *called;            const uschar *called;
4998            terminator = ')';            terminator = CHAR_RIGHT_PARENTHESIS;
4999    
5000            /* Come here from the \g<...> and \g'...' code (Oniguruma            /* Come here from the \g<...> and \g'...' code (Oniguruma
5001            compatibility). However, the syntax has been checked to ensure that            compatibility). However, the syntax has been checked to ensure that
5002            the ... are a (signed) number, so that neither ERR63 nor ERR29 will            the ... are a (signed) number, so that neither ERR63 nor ERR29 will
5003            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
5004            ever be taken. */            ever be taken. */
   
           HANDLE_NUMERICAL_RECURSION:  
5005    
5006            if ((refsign = *ptr) == '+')            HANDLE_NUMERICAL_RECURSION:
5007    
5008              if ((refsign = *ptr) == CHAR_PLUS)
5009              {              {
5010              ptr++;              ptr++;
5011              if ((digitab[*ptr] & ctype_digit) == 0)              if ((digitab[*ptr] & ctype_digit) == 0)
# Line 4754  we set the flag only if there is a liter Line 5014  we set the flag only if there is a liter
5014                goto FAILED;                goto FAILED;
5015                }                }
5016              }              }
5017            else if (refsign == '-')            else if (refsign == CHAR_MINUS)
5018              {              {
5019              if ((digitab[ptr[1]] & ctype_digit) == 0)              if ((digitab[ptr[1]] & ctype_digit) == 0)
5020                goto OTHER_CHAR_AFTER_QUERY;                goto OTHER_CHAR_AFTER_QUERY;
# Line 4763  we set the flag only if there is a liter Line 5023  we set the flag only if there is a liter
5023    
5024            recno = 0;            recno = 0;
5025            while((digitab[*ptr] & ctype_digit) != 0)            while((digitab[*ptr] & ctype_digit) != 0)
5026              recno = recno * 10 + *ptr++ - '0';              recno = recno * 10 + *ptr++ - CHAR_0;
5027    
5028            if (*ptr != terminator)            if (*ptr != terminator)
5029              {              {
# Line 4771  we set the flag only if there is a liter Line 5031  we set the flag only if there is a liter
5031              goto FAILED;              goto FAILED;
5032              }              }
5033    
5034            if (refsign == '-')            if (refsign == CHAR_MINUS)
5035              {              {
5036              if (recno == 0)              if (recno == 0)
5037                {                {
# Line 4785  we set the flag only if there is a liter Line 5045  we set the flag only if there is a liter
5045                goto FAILED;                goto FAILED;
5046                }                }
5047              }              }
5048            else if (refsign == '+')            else if (refsign == CHAR_PLUS)
5049              {              {
5050              if (recno == 0)              if (recno == 0)
5051                {                {
# Line 4818  we set the flag only if there is a liter Line 5078  we set the flag only if there is a liter
5078    
5079              if (called == NULL)              if (called == NULL)
5080                {                {
5081                if (find_parens(ptr, cd, NULL, recno,                if (find_parens(cd, NULL, recno,
5082                      (options & PCRE_EXTENDED) != 0) < 0)                      (options & PCRE_EXTENDED) != 0) < 0)
5083                  {                  {
5084                  *errorcodeptr = ERR15;                  *errorcodeptr = ERR15;
# Line 4871  we set the flag only if there is a liter Line 5131  we set the flag only if there is a liter
5131          set = unset = 0;          set = unset = 0;
5132          optset = &set;          optset = &set;
5133    
5134          while (*ptr != ')' && *ptr != ':')          while (*ptr != CHAR_RIGHT_PARENTHESIS && *ptr != CHAR_COLON)
5135            {            {
5136            switch (*ptr++)            switch (*ptr++)
5137              {              {
5138              case '-': optset = &unset; break;              case CHAR_MINUS: optset = &unset; break;
5139    
5140              case 'J':    /* Record that it changed in the external options */              case CHAR_J:    /* Record that it changed in the external options */
5141              *optset |= PCRE_DUPNAMES;              *optset |= PCRE_DUPNAMES;
5142              cd->external_flags |= PCRE_JCHANGED;              cd->external_flags |= PCRE_JCHANGED;
5143              break;              break;
5144    
5145              case 'i': *optset |= PCRE_CASELESS; break;              case CHAR_i: *optset |= PCRE_CASELESS; break;
5146              case 'm': *optset |= PCRE_MULTILINE; break;              case CHAR_m: *optset |= PCRE_MULTILINE; break;
5147              case 's': *optset |= PCRE_DOTALL; break;              case CHAR_s: *optset |= PCRE_DOTALL; break;
5148              case 'x': *optset |= PCRE_EXTENDED; break;              case CHAR_x: *optset |= PCRE_EXTENDED; break;
5149              case 'U': *optset |= PCRE_UNGREEDY; break;              case CHAR_U: *optset |= PCRE_UNGREEDY; break;
5150              case 'X': *optset |= PCRE_EXTRA; break;              case CHAR_X: *optset |= PCRE_EXTRA; break;
5151    
5152              default:  *errorcodeptr = ERR12;              default:  *errorcodeptr = ERR12;
5153                        ptr--;    /* Correct the offset */                        ptr--;    /* Correct the offset */
# Line 4918  we set the flag only if there is a liter Line 5178  we set the flag only if there is a liter
5178          both phases.          both phases.
5179    
5180          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
5181          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
5182          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. */  
5183    
5184          if (*ptr == ')')          if (*ptr == CHAR_RIGHT_PARENTHESIS)
5185            {            {
5186            if (code == cd->start_code + 1 + LINK_SIZE &&            if (code == cd->start_code + 1 + LINK_SIZE &&
5187                 (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))                 (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
5188              {              {
5189              cd->external_options = newoptions;              cd->external_options = newoptions;
             options = newoptions;  
5190              }              }
5191           else           else
5192              {              {
# Line 4938  we set the flag only if there is a liter Line 5195  we set the flag only if there is a liter
5195                *code++ = OP_OPT;                *code++ = OP_OPT;
5196                *code++ = newoptions & PCRE_IMS;                *code++ = newoptions & PCRE_IMS;
5197                }                }
   
             /* 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;  
5198              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
5199              greedy_non_default = greedy_default ^ 1;              greedy_non_default = greedy_default ^ 1;
5200              req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;              req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
5201              }              }
5202    
5203              /* Change options at this level, and pass them back for use
5204              in subsequent branches. When not at the start of the pattern, this
5205              information is also necessary so that a resetting item can be
5206              compiled at the end of a group (if we are in a group). */
5207    
5208              *optionsptr = options = newoptions;
5209            previous = NULL;       /* This item can't be repeated */            previous = NULL;       /* This item can't be repeated */
5210            continue;              /* It is complete */            continue;              /* It is complete */
5211            }            }
# Line 5064  we set the flag only if there is a liter Line 5321  we set the flag only if there is a liter
5321    
5322      /* Error if hit end of pattern */      /* Error if hit end of pattern */
5323    
5324      if (*ptr != ')')      if (*ptr != CHAR_RIGHT_PARENTHESIS)
5325        {        {
5326        *errorcodeptr = ERR14;        *errorcodeptr = ERR14;
5327        goto FAILED;        goto FAILED;
# Line 5161  we set the flag only if there is a liter Line 5418  we set the flag only if there is a liter
5418      back references and those types that consume a character may be repeated.      back references and those types that consume a character may be repeated.
5419      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
5420      have to change if any new ones are ever created. */      have to change if any new ones are ever created. */
5421    
5422      case '\\':      case CHAR_BACKSLASH:
5423      tempptr = ptr;      tempptr = ptr;
5424      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);
5425      if (*errorcodeptr != 0) goto FAILED;      if (*errorcodeptr != 0) goto FAILED;
# Line 5171  we set the flag only if there is a liter Line 5428  we set the flag only if there is a liter
5428        {        {
5429        if (-c == ESC_Q)            /* Handle start of quoted string */        if (-c == ESC_Q)            /* Handle start of quoted string */
5430          {          {
5431          if (ptr[1] == '\\' && ptr[2] == 'E') ptr += 2; /* avoid empty string */          if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
5432            else inescq = TRUE;            ptr += 2;               /* avoid empty string */
5433                else inescq = TRUE;
5434          continue;          continue;
5435          }          }
5436    
# Line 5188  we set the flag only if there is a liter Line 5446  we set the flag only if there is a liter
5446    
5447        zerofirstbyte = firstbyte;        zerofirstbyte = firstbyte;
5448        zeroreqbyte = reqbyte;        zeroreqbyte = reqbyte;
5449    
5450        /* \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'
5451        is a subroutine call by number (Oniguruma syntax). In fact, the value        is a subroutine call by number (Oniguruma syntax). In fact, the value
5452        -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 <
5453        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
5454        -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
5455        that is a synonym for a named back reference). */        that is a synonym for a named back reference). */
5456    
5457        if (-c == ESC_g)        if (-c == ESC_g)
5458          {          {
5459          const uschar *p;          const uschar *p;
5460          save_hwm = cd->hwm;   /* Normally this is set when '(' is read */          save_hwm = cd->hwm;   /* Normally this is set when '(' is read */
5461          terminator = (*(++ptr) == '<')? '>' : '\'';          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
5462              CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
5463    
5464          /* These two statements stop the compiler for warning about possibly          /* These two statements stop the compiler for warning about possibly
5465          unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In          unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In
5466          fact, because we actually check for a number below, the paths that          fact, because we actually check for a number below, the paths that
5467          would actually be in error are never taken. */          would actually be in error are never taken. */
5468    
5469          skipbytes = 0;          skipbytes = 0;
5470          reset_bracount = FALSE;          reset_bracount = FALSE;
5471    
5472          /* Test for a name */          /* Test for a name */
5473    
5474          if (ptr[1] != '+' && ptr[1] != '-')          if (ptr[1] != CHAR_PLUS && ptr[1] != CHAR_MINUS)
5475            {            {
5476            BOOL isnumber = TRUE;            BOOL isnumber = TRUE;
5477            for (p = ptr + 1; *p != 0 && *p != terminator; p++)            for (p = ptr + 1; *p != 0 && *p != terminator; p++)
5478              {              {
5479              if ((cd->ctypes[*p] & ctype_digit) == 0) isnumber = FALSE;              if ((cd->ctypes[*p] & ctype_digit) == 0) isnumber = FALSE;
5480              if ((cd->ctypes[*p] & ctype_word) == 0) break;              if ((cd->ctypes[*p] & ctype_word) == 0) break;
5481              }              }
5482            if (*p != terminator)            if (*p != terminator)
5483              {              {
5484              *errorcodeptr = ERR57;              *errorcodeptr = ERR57;
5485              break;              break;
5486              }              }
5487            if (isnumber)            if (isnumber)
5488              {              {
5489              ptr++;              ptr++;
5490              goto HANDLE_NUMERICAL_RECURSION;              goto HANDLE_NUMERICAL_RECURSION;
5491              }              }
5492            is_recurse = TRUE;            is_recurse = TRUE;
5493            goto NAMED_REF_OR_RECURSE;            goto NAMED_REF_OR_RECURSE;
5494            }            }
5495    
5496          /* Test a signed number in angle brackets or quotes. */          /* Test a signed number in angle brackets or quotes. */
5497    
5498          p = ptr + 2;          p = ptr + 2;
5499          while ((digitab[*p] & ctype_digit) != 0) p++;          while ((digitab[*p] & ctype_digit) != 0) p++;
5500          if (*p != terminator)          if (*p != terminator)
# Line 5243  we set the flag only if there is a liter Line 5502  we set the flag only if there is a liter
5502            *errorcodeptr = ERR57;            *errorcodeptr = ERR57;
5503            break;            break;
5504            }            }
5505          ptr++;          ptr++;
5506          goto HANDLE_NUMERICAL_RECURSION;          goto HANDLE_NUMERICAL_RECURSION;
5507          }          }
5508    
5509        /* \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).
5510        We also support \k{name} (.NET syntax) */        We also support \k{name} (.NET syntax) */
5511    
5512        if (-c == ESC_k && (ptr[1] == '<' || ptr[1] == '\'' || ptr[1] == '{'))        if (-c == ESC_k && (ptr[1] == CHAR_LESS_THAN_SIGN ||
5513              ptr[1] == CHAR_APOSTROPHE || ptr[1] == CHAR_LEFT_CURLY_BRACKET))
5514          {          {
5515          is_recurse = FALSE;          is_recurse = FALSE;
5516          terminator = (*(++ptr) == '<')? '>' : (*ptr == '\'')? '\'' : '}';          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
5517              CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?
5518              CHAR_APOSTROPHE : CHAR_RIGHT_CURLY_BRACKET;
5519          goto NAMED_REF_OR_RECURSE;          goto NAMED_REF_OR_RECURSE;
5520          }          }
5521    
# Line 5356  we set the flag only if there is a liter Line 5618  we set the flag only if there is a liter
5618    
5619      /* Remember if \r or \n were seen */      /* Remember if \r or \n were seen */
5620    
5621      if (mcbuffer[0] == '\r' || mcbuffer[0] == '\n')      if (mcbuffer[0] == CHAR_CR || mcbuffer[0] == CHAR_NL)
5622        cd->external_flags |= PCRE_HASCRORLF;        cd->external_flags |= PCRE_HASCRORLF;
5623    
5624      /* Set the first and required bytes appropriately. If no previous first      /* Set the first and required bytes appropriately. If no previous first
# Line 5454  uschar *code = *codeptr; Line 5716  uschar *code = *codeptr;
5716  uschar *last_branch = code;  uschar *last_branch = code;
5717  uschar *start_bracket = code;  uschar *start_bracket = code;
5718  uschar *reverse_count = NULL;  uschar *reverse_count = NULL;
5719    open_capitem capitem;
5720    int capnumber = 0;
5721  int firstbyte, reqbyte;  int firstbyte, reqbyte;
5722  int branchfirstbyte, branchreqbyte;  int branchfirstbyte, branchreqbyte;
5723  int length;  int length;
# Line 5480  the code that abstracts option settings Line 5744  the code that abstracts option settings
5744  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
5745  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. */
5746    
5747    /* If this is a capturing subpattern, add to the chain of open capturing items
5748    so that we can detect them if (*ACCEPT) is encountered. */
5749    
5750    if (*code == OP_CBRA)
5751      {
5752      capnumber = GET2(code, 1 + LINK_SIZE);
5753      capitem.number = capnumber;
5754      capitem.next = cd->open_caps;
5755      cd->open_caps = &capitem;
5756      }
5757    
5758  /* Offset is set zero to mark that this bracket is still open */  /* Offset is set zero to mark that this bracket is still open */
5759    
5760  PUT(code, 1, 0);  PUT(code, 1, 0);
# Line 5574  for (;;) Line 5849  for (;;)
5849    
5850      /* If lookbehind, check that this branch matches a fixed-length string, and      /* If lookbehind, check that this branch matches a fixed-length string, and
5851      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
5852      branch with OP_END. */      branch with OP_END. If the branch contains OP_RECURSE, the result is -3
5853        because there may be forward references that we can't check here. Set a
5854        flag to cause another lookbehind check at the end. Why not do it all at the
5855        end? Because common, erroneous checks are picked up here and the offset of
5856        the problem can be shown. */
5857    
5858      if (lookbehind)      if (lookbehind)
5859        {        {
5860        int fixed_length;        int fixed_length;
5861        *code = OP_END;        *code = OP_END;
5862        fixed_length = find_fixedlength(last_branch, options);        fixed_length = find_fixedlength(last_branch, options, FALSE, cd);
5863        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
5864        if (fixed_length < 0)        if (fixed_length == -3)
5865            {
5866            cd->check_lookbehind = TRUE;
5867            }
5868          else if (fixed_length < 0)
5869          {          {
5870          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;
5871          *ptrptr = ptr;          *ptrptr = ptr;
5872          return FALSE;          return FALSE;
5873          }          }
5874        PUT(reverse_count, 0, fixed_length);        else { PUT(reverse_count, 0, fixed_length); }
5875        }        }
5876      }      }
5877    
# Line 5601  for (;;) Line 5884  for (;;)
5884    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.
5885    Return leaving the pointer at the terminating char. */    Return leaving the pointer at the terminating char. */
5886    
5887    if (*ptr != '|')    if (*ptr != CHAR_VERTICAL_LINE)
5888      {      {
5889      if (lengthptr == NULL)      if (lengthptr == NULL)
5890        {        {
# Line 5615  for (;;) Line 5898  for (;;)
5898          }          }
5899        while (branch_length > 0);        while (branch_length > 0);
5900        }        }
5901    
5902        /* If it was a capturing subpattern, remove it from the chain. */
5903    
5904        if (capnumber > 0) cd->open_caps = cd->open_caps->next;
5905    
5906      /* Fill in the ket */      /* Fill in the ket */
5907    
# Line 5624  for (;;) Line 5911  for (;;)
5911    
5912      /* Resetting option if needed */      /* Resetting option if needed */
5913    
5914      if ((options & PCRE_IMS) != oldims && *ptr == ')')      if ((options & PCRE_IMS) != oldims && *ptr == CHAR_RIGHT_PARENTHESIS)
5915        {        {
5916        *code++ = OP_OPT;        *code++ = OP_OPT;
5917        *code++ = oldims;        *code++ = oldims;
# Line 5753  do { Line 6040  do {
6040       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;
6041       }       }
6042    
6043     /* .* 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
6044     are or may be referenced. */     it isn't in brackets that are or may be referenced. */
6045    
6046     else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||     else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||
6047               op == OP_TYPEPOSSTAR) &&               op == OP_TYPEPOSSTAR))
             (*options & PCRE_DOTALL) != 0)  
6048       {       {
6049       if (scode[1] != OP_ANY || (bracket_map & backref_map) != 0) return FALSE;       if (scode[1] != OP_ALLANY || (bracket_map & backref_map) != 0)
6050           return FALSE;
6051       }       }
6052    
6053     /* Check for explicit anchoring */     /* Check for explicit anchoring */
# Line 5806  do { Line 6093  do {
6093       NULL, 0, FALSE);       NULL, 0, FALSE);
6094     register int op = *scode;     register int op = *scode;
6095    
6096       /* If we are at the start of a conditional assertion group, *both* the
6097       conditional assertion *and* what follows the condition must satisfy the test
6098       for start of line. Other kinds of condition fail. Note that there may be an
6099       auto-callout at the start of a condition. */
6100    
6101       if (op == OP_COND)
6102         {
6103         scode += 1 + LINK_SIZE;
6104         if (*scode == OP_CALLOUT) scode += _pcre_OP_lengths[OP_CALLOUT];
6105         switch (*scode)
6106           {
6107           case OP_CREF:
6108           case OP_RREF:
6109           case OP_DEF:
6110           return FALSE;
6111    
6112           default:     /* Assertion */
6113           if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
6114           do scode += GET(scode, 1); while (*scode == OP_ALT);
6115           scode += 1 + LINK_SIZE;
6116           break;
6117           }
6118         scode = first_significant_code(scode, NULL, 0, FALSE);
6119         op = *scode;
6120         }
6121    
6122     /* Non-capturing brackets */     /* Non-capturing brackets */
6123    
6124     if (op == OP_BRA)     if (op == OP_BRA)
# Line 5824  do { Line 6137  do {
6137    
6138     /* Other brackets */     /* Other brackets */
6139    
6140     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)     else if (op == OP_ASSERT || op == OP_ONCE)
6141       { if (!is_startline(scode, bracket_map, backref_map)) return FALSE; }       {
6142         if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
6143         }
6144    
6145     /* .* 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
6146     may be referenced. */     may be referenced. */
# Line 5942  Returns: pointer to compiled data Line 6257  Returns: pointer to compiled data
6257                  with errorptr and erroroffset set                  with errorptr and erroroffset set
6258  */  */
6259    
6260  PCRE_EXP_DEFN pcre *  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
6261  pcre_compile(const char *pattern, int options, const char **errorptr,  pcre_compile(const char *pattern, int options, const char **errorptr,
6262    int *erroroffset, const unsigned char *tables)    int *erroroffset, const unsigned char *tables)
6263  {  {
# Line 5950  return pcre_compile2(pattern, options, N Line 6265  return pcre_compile2(pattern, options, N
6265  }  }
6266    
6267    
6268  PCRE_EXP_DEFN pcre *  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
6269  pcre_compile2(const char *pattern, int options, int *errorcodeptr,  pcre_compile2(const char *pattern, int options, int *errorcodeptr,
6270    const char **errorptr, int *erroroffset, const unsigned char *tables)    const char **errorptr, int *erroroffset, const unsigned char *tables)
6271  {  {
# Line 5959  int length = 1; /* For final END opcode Line 6274  int length = 1; /* For final END opcode
6274  int firstbyte, reqbyte, newline;  int firstbyte, reqbyte, newline;
6275  int errorcode = 0;  int errorcode = 0;
6276  int skipatstart = 0;  int skipatstart = 0;
6277  #ifdef SUPPORT_UTF8  BOOL utf8 = (options & PCRE_UTF8) != 0;
 BOOL utf8;  
 #endif  
6278  size_t size;  size_t size;
6279  uschar *code;  uschar *code;
6280  const uschar *codestart;  const uschar *codestart;
# Line 6004  if (erroroffset == NULL) Line 6317  if (erroroffset == NULL)
6317    
6318  *erroroffset = 0;  *erroroffset = 0;
6319    
 /* 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;  
   }  
   
6320  /* Set up pointers to the individual character tables */  /* Set up pointers to the individual character tables */
6321    
6322  if (tables == NULL) tables = _pcre_default_tables;  if (tables == NULL) tables = _pcre_default_tables;
# Line 6036  cd->fcc = tables + fcc_offset; Line 6325  cd->fcc = tables + fcc_offset;
6325  cd->cbits = tables + cbits_offset;  cd->cbits = tables + cbits_offset;
6326  cd->ctypes = tables + ctypes_offset;  cd->ctypes = tables + ctypes_offset;
6327    
6328    /* Check that all undefined public option bits are zero */
6329    
6330    if ((options & ~PUBLIC_COMPILE_OPTIONS) != 0)
6331      {
6332      errorcode = ERR17;
6333      goto PCRE_EARLY_ERROR_RETURN;
6334      }
6335    
6336  /* 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
6337  the offset for later. */  the offset for later. */
6338    
6339  while (ptr[skipatstart] == '(' && ptr[skipatstart+1] == '*')  while (ptr[skipatstart] == CHAR_LEFT_PARENTHESIS &&
6340           ptr[skipatstart+1] == CHAR_ASTERISK)
6341    {    {
6342    int newnl = 0;    int newnl = 0;
6343    int newbsr = 0;    int newbsr = 0;
6344    
6345    if (strncmp((char *)(ptr+skipatstart+2), "CR)", 3) == 0)    if (strncmp((char *)(ptr+skipatstart+2), STRING_UTF8_RIGHTPAR, 5) == 0)
6346        { skipatstart += 7; options |= PCRE_UTF8; continue; }
6347    
6348      if (strncmp((char *)(ptr+skipatstart+2), STRING_CR_RIGHTPAR, 3) == 0)
6349      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
6350    else if (strncmp((char *)(ptr+skipatstart+2), "LF)", 3)  == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_LF_RIGHTPAR, 3)  == 0)
6351      { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }      { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
6352    else if (strncmp((char *)(ptr+skipatstart+2), "CRLF)", 5)  == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_CRLF_RIGHTPAR, 5)  == 0)
6353      { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }      { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
6354    else if (strncmp((char *)(ptr+skipatstart+2), "ANY)", 4) == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_ANY_RIGHTPAR, 4) == 0)
6355      { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }      { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
6356    else if (strncmp((char *)(ptr+skipatstart+2), "ANYCRLF)", 8)  == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_ANYCRLF_RIGHTPAR, 8) == 0)
6357      { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }      { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
6358    
6359    else if (strncmp((char *)(ptr+skipatstart+2), "BSR_ANYCRLF)", 12) == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_BSR_ANYCRLF_RIGHTPAR, 12) == 0)
6360      { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }      { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
6361    else if (strncmp((char *)(ptr+skipatstart+2), "BSR_UNICODE)", 12) == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_BSR_UNICODE_RIGHTPAR, 12) == 0)
6362      { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }      { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
6363    
6364    if (newnl != 0)    if (newnl != 0)
# Line 6067  while (ptr[skipatstart] == '(' && ptr[sk Line 6368  while (ptr[skipatstart] == '(' && ptr[sk
6368    else break;    else break;
6369    }    }
6370    
6371    /* Can't support UTF8 unless PCRE has been compiled to include the code. */
6372    
6373    #ifdef SUPPORT_UTF8
6374    if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&
6375         (*erroroffset = _pcre_valid_utf8((uschar *)pattern, -1)) >= 0)
6376      {
6377      errorcode = ERR44;
6378      goto PCRE_EARLY_ERROR_RETURN2;
6379      }
6380    #else
6381    if (utf8)
6382      {
6383      errorcode = ERR32;
6384      goto PCRE_EARLY_ERROR_RETURN;
6385      }
6386    #endif
6387    
6388  /* Check validity of \R options. */  /* Check validity of \R options. */
6389    
6390  switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))  switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
# Line 6085  current code allows for fixed one- or tw Line 6403  current code allows for fixed one- or tw
6403  switch (options & PCRE_NEWLINE_BITS)  switch (options & PCRE_NEWLINE_BITS)
6404    {    {
6405    case 0: newline = NEWLINE; break;   /* Build-time default */    case 0: newline = NEWLINE; break;   /* Build-time default */
6406    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
6407    case PCRE_NEWLINE_LF: newline = '\n'; break;    case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
6408    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
6409         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;         PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
6410    case PCRE_NEWLINE_ANY: newline = -1; break;    case PCRE_NEWLINE_ANY: newline = -1; break;
6411    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
6412    default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;    default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
# Line 6149  cd->end_pattern = (const uschar *)(patte Line 6467  cd->end_pattern = (const uschar *)(patte
6467  cd->req_varyopt = 0;  cd->req_varyopt = 0;
6468  cd->external_options = options;  cd->external_options = options;
6469  cd->external_flags = 0;  cd->external_flags = 0;
6470    cd->open_caps = NULL;
6471    
6472  /* 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
6473  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 6223  cd->start_code = codestart; Line 6542  cd->start_code = codestart;
6542  cd->hwm = cworkspace;  cd->hwm = cworkspace;
6543  cd->req_varyopt = 0;  cd->req_varyopt = 0;
6544  cd->had_accept = FALSE;  cd->had_accept = FALSE;
6545    cd->check_lookbehind = FALSE;
6546    cd->open_caps = NULL;
6547    
6548  /* Set up a starting, non-extracting bracket, then compile the expression. On  /* Set up a starting, non-extracting bracket, then compile the expression. On
6549  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 6261  while (errorcode == 0 && cd->hwm > cwork Line 6582  while (errorcode == 0 && cd->hwm > cwork
6582    cd->hwm -= LINK_SIZE;    cd->hwm -= LINK_SIZE;
6583    offset = GET(cd->hwm, 0);    offset = GET(cd->hwm, 0);
6584    recno = GET(codestart, offset);    recno = GET(codestart, offset);
6585    groupptr = find_bracket(codestart, (re->options & PCRE_UTF8) != 0, recno);    groupptr = find_bracket(codestart, utf8, recno);
6586    if (groupptr == NULL) errorcode = ERR53;    if (groupptr == NULL) errorcode = ERR53;
6587      else PUT(((uschar *)codestart), offset, groupptr - codestart);      else PUT(((uschar *)codestart), offset, groupptr - codestart);
6588    }    }
6589    
6590  /* Give an error if there's back reference to a non-existent capturing  /* Give an error if there's back reference to a non-existent capturing
6591  subpattern. */  subpattern. */
6592    
6593  if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;  if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;
6594    
6595    /* If there were any lookbehind assertions that contained OP_RECURSE
6596    (recursions or subroutine calls), a flag is set for them to be checked here,
6597    because they may contain forward references. Actual recursions can't be fixed
6598    length, but subroutine calls can. It is done like this so that those without
6599    OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
6600    exceptional ones forgo this. We scan the pattern to check that they are fixed
6601    length, and set their lengths. */
6602    
6603    if (cd->check_lookbehind)
6604      {
6605      uschar *cc = (uschar *)codestart;
6606    
6607      /* Loop, searching for OP_REVERSE items, and process those that do not have
6608      their length set. (Actually, it will also re-process any that have a length
6609      of zero, but that is a pathological case, and it does no harm.) When we find
6610      one, we temporarily terminate the branch it is in while we scan it. */
6611    
6612      for (cc = (uschar *)find_bracket(codestart, utf8, -1);
6613           cc != NULL;
6614           cc = (uschar *)find_bracket(cc, utf8, -1))
6615        {
6616        if (GET(cc, 1) == 0)
6617          {
6618          int fixed_length;
6619          uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);
6620          int end_op = *be;
6621          *be = OP_END;
6622          fixed_length = find_fixedlength(cc, re->options, TRUE, cd);
6623          *be = end_op;
6624          DPRINTF(("fixed length = %d\n", fixed_length));
6625          if (fixed_length < 0)
6626            {
6627            errorcode = (fixed_length == -2)? ERR36 : ERR25;
6628            break;
6629            }
6630          PUT(cc, 1, fixed_length);
6631          }
6632        cc += 1 + LINK_SIZE;
6633        }
6634      }
6635    
6636  /* Failed to compile, or error while post-processing */  /* Failed to compile, or error while post-processing */
6637    
6638  if (errorcode != 0)  if (errorcode != 0)

Legend:
Removed from v.341  
changed lines
  Added in v.454

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12