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

Diff of /code/trunk/pcre_compile.c

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

revision 341 by ph10, Sat Apr 19 16:41:04 2008 UTC revision 499 by ph10, Wed Mar 3 20:09:39 2010 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2008 University of Cambridge             Copyright (c) 1997-2010 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 53  supporting internal functions that are n Line 53  supporting internal functions that are n
53  #include "pcre_internal.h"  #include "pcre_internal.h"
54    
55    
56  /* When DEBUG is defined, we need the pcre_printint() function, which is also  /* When PCRE_DEBUG is defined, we need the pcre_printint() function, which is
57  used by pcretest. DEBUG is not defined when building a production library. */  also used by pcretest. PCRE_DEBUG is not defined when building a production
58    library. */
59    
60  #ifdef DEBUG  #ifdef PCRE_DEBUG
61  #include "pcre_printint.src"  #include "pcre_printint.src"
62  #endif  #endif
63    
# Line 97  are simple data values; negative values Line 98  are simple data values; negative values
98  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
99  is invalid. */  is invalid. */
100    
101  #ifndef EBCDIC  /* This is the "normal" table for ASCII systems */  #ifndef EBCDIC
102    
103    /* This is the "normal" table for ASCII systems or for EBCDIC systems running
104    in UTF-8 mode. */
105    
106  static const short int escapes[] = {  static const short int escapes[] = {
107       0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */       0,                       0,
108       0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */       0,                       0,
109     '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */       0,                       0,
110  -ESC_H,      0,      0, -ESC_K,      0,      0,      0,      0,   /* H - O */       0,                       0,
111  -ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0, -ESC_V, -ESC_W,   /* P - W */       0,                       0,
112  -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */       CHAR_COLON,              CHAR_SEMICOLON,
113     '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */       CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
114  -ESC_h,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */       CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
115  -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0, -ESC_v, -ESC_w,   /* p - w */       CHAR_COMMERCIAL_AT,      -ESC_A,
116       0,      0, -ESC_z                                            /* x - z */       -ESC_B,                  -ESC_C,
117         -ESC_D,                  -ESC_E,
118         0,                       -ESC_G,
119         -ESC_H,                  0,
120         0,                       -ESC_K,
121         0,                       0,
122         0,                       0,
123         -ESC_P,                  -ESC_Q,
124         -ESC_R,                  -ESC_S,
125         0,                       0,
126         -ESC_V,                  -ESC_W,
127         -ESC_X,                  0,
128         -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
129         CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
130         CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
131         CHAR_GRAVE_ACCENT,       7,
132         -ESC_b,                  0,
133         -ESC_d,                  ESC_e,
134         ESC_f,                   0,
135         -ESC_h,                  0,
136         0,                       -ESC_k,
137         0,                       0,
138         ESC_n,                   0,
139         -ESC_p,                  0,
140         ESC_r,                   -ESC_s,
141         ESC_tee,                 0,
142         -ESC_v,                  -ESC_w,
143         0,                       0,
144         -ESC_z
145  };  };
146    
147  #else           /* This is the "abnormal" table for EBCDIC systems */  #else
148    
149    /* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
150    
151  static const short int escapes[] = {  static const short int escapes[] = {
152  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
153  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
# Line 142  static const short int escapes[] = { Line 178  static const short int escapes[] = {
178    
179  /* 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
180  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
181  the number of relocations when a shared library is dynamically linked. */  the number of relocations when a shared library is dynamically linked. The
182    string is built from string macros so that it works in UTF-8 mode on EBCDIC
183    platforms. */
184    
185  typedef struct verbitem {  typedef struct verbitem {
186    int   len;    int   len;
# Line 150  typedef struct verbitem { Line 188  typedef struct verbitem {
188  } verbitem;  } verbitem;
189    
190  static const char verbnames[] =  static const char verbnames[] =
191    "ACCEPT\0"    STRING_ACCEPT0
192    "COMMIT\0"    STRING_COMMIT0
193    "F\0"    STRING_F0
194    "FAIL\0"    STRING_FAIL0
195    "PRUNE\0"    STRING_PRUNE0
196    "SKIP\0"    STRING_SKIP0
197    "THEN";    STRING_THEN;
198    
199  static const verbitem verbs[] = {  static const verbitem verbs[] = {
200    { 6, OP_ACCEPT },    { 6, OP_ACCEPT },
# Line 178  length entry. The first three must be al Line 216  length entry. The first three must be al
216  for handling case independence. */  for handling case independence. */
217    
218  static const char posix_names[] =  static const char posix_names[] =
219    "alpha\0"  "lower\0"  "upper\0"  "alnum\0"  "ascii\0"  "blank\0"    STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
220    "cntrl\0"  "digit\0"  "graph\0"  "print\0"  "punct\0"  "space\0"    STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
221    "word\0"   "xdigit";    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
222      STRING_word0  STRING_xdigit;
223    
224  static const uschar posix_name_lengths[] = {  static const uschar posix_name_lengths[] = {
225    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 224  the number of relocations needed when a Line 263  the number of relocations needed when a
263  it is now one long string. We cannot use a table of offsets, because the  it is now one long string. We cannot use a table of offsets, because the
264  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
265  simply count through to the one we want - this isn't a performance issue  simply count through to the one we want - this isn't a performance issue
266  because these strings are used only when there is a compilation error. */  because these strings are used only when there is a compilation error.
267    
268    Each substring ends with \0 to insert a null character. This includes the final
269    substring, so that the whole string ends with \0\0, which can be detected when
270    counting through. */
271    
272  static const char error_texts[] =  static const char error_texts[] =
273    "no error\0"    "no error\0"
# Line 303  static const char error_texts[] = Line 346  static const char error_texts[] =
346    "number is too big\0"    "number is too big\0"
347    "subpattern name expected\0"    "subpattern name expected\0"
348    "digit expected after (?+\0"    "digit expected after (?+\0"
349    "] is an invalid data character in JavaScript compatibility mode";    "] is an invalid data character in JavaScript compatibility mode\0"
350      /* 65 */
351      "different names for subpatterns of the same number are not allowed\0";
352    
353  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
354  patterns. Note that the tables in chartables are dependent on the locale, and  patterns. Note that the tables in chartables are dependent on the locale, and
# Line 322  For convenience, we use the same bit def Line 366  For convenience, we use the same bit def
366    
367  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
368    
369  #ifndef EBCDIC  /* This is the "normal" case, for ASCII systems */  #ifndef EBCDIC
370    
371    /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
372    UTF-8 mode. */
373    
374  static const unsigned char digitab[] =  static const unsigned char digitab[] =
375    {    {
376    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 406  static const unsigned char digitab[] =
406    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
407    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
408    
409  #else           /* This is the "abnormal" case, for EBCDIC systems */  #else
410    
411    /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
412    
413  static const unsigned char digitab[] =  static const unsigned char digitab[] =
414    {    {
415    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 506  static const char *
506  find_error_text(int n)  find_error_text(int n)
507  {  {
508  const char *s = error_texts;  const char *s = error_texts;
509  for (; n > 0; n--) while (*s++ != 0);  for (; n > 0; n--)
510      {
511      while (*s++ != 0) {};
512      if (*s == 0) return "Error text not found (please report)";
513      }
514  return s;  return s;
515  }  }
516    
# Line 503  if (c == 0) *errorcodeptr = ERR1; Line 558  if (c == 0) *errorcodeptr = ERR1;
558  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.
559  Otherwise further processing may be required. */  Otherwise further processing may be required. */
560    
561  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
562  else if (c < '0' || c > 'z') {}                           /* Not alphanumeric */  else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */
563  else if ((i = escapes[c - '0']) != 0) c = i;  else if ((i = escapes[c - CHAR_0]) != 0) c = i;
564    
565  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
566  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 579  else
579      /* 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
580      error. */      error. */
581    
582      case 'l':      case CHAR_l:
583      case 'L':      case CHAR_L:
584      case 'N':      case CHAR_N:
585      case 'u':      case CHAR_u:
586      case 'U':      case CHAR_U:
587      *errorcodeptr = ERR37;      *errorcodeptr = ERR37;
588      break;      break;
589    
590      /* \g must be followed by one of a number of specific things:      /* \g must be followed by one of a number of specific things:
591    
592      (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
593      backreference. If negative, it is a relative backreference. This is a Perl      backreference. If negative, it is a relative backreference. This is a Perl
594      5.10 feature.      5.10 feature.
595    
596      (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
597      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
598      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
599      was \k.      was \k.
600    
601      (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
602      number either in angle brackets or in single quotes. However, these are      number either in angle brackets or in single quotes. However, these are
603      (possibly recursive) subroutine calls, _not_ backreferences. Just return      (possibly recursive) subroutine calls, _not_ backreferences. Just return
604      the -ESC_g code (cf \k). */      the -ESC_g code (cf \k). */
605    
606      case 'g':      case CHAR_g:
607      if (ptr[1] == '<' || ptr[1] == '\'')      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
608        {        {
609        c = -ESC_g;        c = -ESC_g;
610        break;        break;
611        }        }
612    
613      /* Handle the Perl-compatible cases */      /* Handle the Perl-compatible cases */
614    
615      if (ptr[1] == '{')      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
616        {        {
617        const uschar *p;        const uschar *p;
618        for (p = ptr+2; *p != 0 && *p != '}'; p++)        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
619          if (*p != '-' && (digitab[*p] & ctype_digit) == 0) break;          if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;
620        if (*p != 0 && *p != '}')        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
621          {          {
622          c = -ESC_k;          c = -ESC_k;
623          break;          break;
# Line 572  else Line 627  else
627        }        }
628      else braced = FALSE;      else braced = FALSE;
629    
630      if (ptr[1] == '-')      if (ptr[1] == CHAR_MINUS)
631        {        {
632        negated = TRUE;        negated = TRUE;
633        ptr++;        ptr++;
# Line 581  else Line 636  else
636    
637      c = 0;      c = 0;
638      while ((digitab[ptr[1]] & ctype_digit) != 0)      while ((digitab[ptr[1]] & ctype_digit) != 0)
639        c = c * 10 + *(++ptr) - '0';        c = c * 10 + *(++ptr) - CHAR_0;
640    
641      if (c < 0)   /* Integer overflow */      if (c < 0)   /* Integer overflow */
642        {        {
643        *errorcodeptr = ERR61;        *errorcodeptr = ERR61;
644        break;        break;
645        }        }
646    
647      if (braced && *(++ptr) != '}')      if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
648        {        {
649        *errorcodeptr = ERR57;        *errorcodeptr = ERR57;
650        break;        break;
651        }        }
652    
653      if (c == 0)      if (c == 0)
654        {        {
655        *errorcodeptr = ERR58;        *errorcodeptr = ERR58;
656        break;        break;
657        }        }
658    
659      if (negated)      if (negated)
660        {        {
# Line 626  else Line 681  else
681      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
682      character class, \ followed by a digit is always an octal number. */      character class, \ followed by a digit is always an octal number. */
683    
684      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:
685      case '6': case '7': case '8': case '9':      case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
686    
687      if (!isclass)      if (!isclass)
688        {        {
689        oldptr = ptr;        oldptr = ptr;
690        c -= '0';        c -= CHAR_0;
691        while ((digitab[ptr[1]] & ctype_digit) != 0)        while ((digitab[ptr[1]] & ctype_digit) != 0)
692          c = c * 10 + *(++ptr) - '0';          c = c * 10 + *(++ptr) - CHAR_0;
693        if (c < 0)    /* Integer overflow */        if (c < 0)    /* Integer overflow */
694          {          {
695          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
# Line 652  else Line 707  else
707      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.
708      Thus we have to pull back the pointer by one. */      Thus we have to pull back the pointer by one. */
709    
710      if ((c = *ptr) >= '8')      if ((c = *ptr) >= CHAR_8)
711        {        {
712        ptr--;        ptr--;
713        c = 0;        c = 0;
# Line 665  else Line 720  else
720      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
721      than 3 octal digits. */      than 3 octal digits. */
722    
723      case '0':      case CHAR_0:
724      c -= '0';      c -= CHAR_0;
725      while(i++ < 2 && ptr[1] >= '0' && ptr[1] <= '7')      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
726          c = c * 8 + *(++ptr) - '0';          c = c * 8 + *(++ptr) - CHAR_0;
727      if (!utf8 && c > 255) *errorcodeptr = ERR51;      if (!utf8 && c > 255) *errorcodeptr = ERR51;
728      break;      break;
729    
# Line 676  else Line 731  else
731      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
732      treated as a data character. */      treated as a data character. */
733    
734      case 'x':      case CHAR_x:
735      if (ptr[1] == '{')      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
736        {        {
737        const uschar *pt = ptr + 2;        const uschar *pt = ptr + 2;
738        int count = 0;        int count = 0;
# Line 686  else Line 741  else
741        while ((digitab[*pt] & ctype_xdigit) != 0)        while ((digitab[*pt] & ctype_xdigit) != 0)
742          {          {
743          register int cc = *pt++;          register int cc = *pt++;
744          if (c == 0 && cc == '0') continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
745          count++;          count++;
746    
747  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
748          if (cc >= 'a') cc -= 32;               /* Convert to upper case */          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
749          c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
750  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
751          if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
752          c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
753  #endif  #endif
754          }          }
755    
756        if (*pt == '}')        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
757          {          {
758          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;
759          ptr = pt;          ptr = pt;
# Line 714  else Line 769  else
769      c = 0;      c = 0;
770      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)
771        {        {
772        int cc;                               /* Some compilers don't like ++ */        int cc;                                  /* Some compilers don't like */
773        cc = *(++ptr);                        /* in initializers */        cc = *(++ptr);                           /* ++ in initializers */
774  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
775        if (cc >= 'a') cc -= 32;              /* Convert to upper case */        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
776        c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
777  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
778        if (cc <= 'z') cc += 64;              /* Convert to upper case */        if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
779        c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));        c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
780  #endif  #endif
781        }        }
782      break;      break;
# Line 730  else Line 785  else
785      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
786      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
787    
788      case 'c':      case CHAR_c:
789      c = *(++ptr);      c = *(++ptr);
790      if (c == 0)      if (c == 0)
791        {        {
# Line 738  else Line 793  else
793        break;        break;
794        }        }
795    
796  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
797      if (c >= 'a' && c <= 'z') c -= 32;      if (c >= CHAR_a && c <= CHAR_z) c -= 32;
798      c ^= 0x40;      c ^= 0x40;
799  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
800      if (c >= 'a' && c <= 'z') c += 64;      if (c >= CHAR_a && c <= CHAR_z) c += 64;
801      c ^= 0xC0;      c ^= 0xC0;
802  #endif  #endif
803      break;      break;
# Line 804  if (c == 0) goto ERROR_RETURN; Line 859  if (c == 0) goto ERROR_RETURN;
859  /* \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
860  negation. */  negation. */
861    
862  if (c == '{')  if (c == CHAR_LEFT_CURLY_BRACKET)
863    {    {
864    if (ptr[1] == '^')    if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
865      {      {
866      *negptr = TRUE;      *negptr = TRUE;
867      ptr++;      ptr++;
# Line 815  if (c == '{') Line 870  if (c == '{')
870      {      {
871      c = *(++ptr);      c = *(++ptr);
872      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
873      if (c == '}') break;      if (c == CHAR_RIGHT_CURLY_BRACKET) break;
874      name[i] = c;      name[i] = c;
875      }      }
876    if (c !='}') goto ERROR_RETURN;    if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
877    name[i] = 0;    name[i] = 0;
878    }    }
879    
# Line 883  is_counted_repeat(const uschar *p) Line 938  is_counted_repeat(const uschar *p)
938  {  {
939  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
940  while ((digitab[*p] & ctype_digit) != 0) p++;  while ((digitab[*p] & ctype_digit) != 0) p++;
941  if (*p == '}') return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
942    
943  if (*p++ != ',') return FALSE;  if (*p++ != CHAR_COMMA) return FALSE;
944  if (*p == '}') return TRUE;  if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
945    
946  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
947  while ((digitab[*p] & ctype_digit) != 0) p++;  while ((digitab[*p] & ctype_digit) != 0) p++;
948    
949  return (*p == '}');  return (*p == CHAR_RIGHT_CURLY_BRACKET);
950  }  }
951    
952    
# Line 924  int max = -1; Line 979  int max = -1;
979  /* 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
980  an integer overflow. */  an integer overflow. */
981    
982  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;
983  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
984    {    {
985    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 934  if (min < 0 || min > 65535) Line 989  if (min < 0 || min > 65535)
989  /* 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.
990  Also, max must not be less than min. */  Also, max must not be less than min. */
991    
992  if (*p == '}') max = min; else  if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
993    {    {
994    if (*(++p) != '}')    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
995      {      {
996      max = 0;      max = 0;
997      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;
998      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
999        {        {
1000        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 964  return p; Line 1019  return p;
1019    
1020    
1021  /*************************************************  /*************************************************
1022  *       Find forward referenced subpattern       *  *  Subroutine for finding forward reference      *
1023  *************************************************/  *************************************************/
1024    
1025  /* This function scans along a pattern's text looking for capturing  /* This recursive function is called only from find_parens() below. The
1026    top-level call starts at the beginning of the pattern. All other calls must
1027    start at a parenthesis. It scans along a pattern's text looking for capturing
1028  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
1029  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
1030  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
1031  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
1032  be terminated by '>' because that is checked in the first pass.  first pass. Recursion is used to keep track of subpatterns that reset the
1033    capturing group numbers - the (?| feature.
1034    
1035  Arguments:  Arguments:
1036    ptr          current position in the pattern    ptrptr       address of the current character pointer (updated)
1037    cd           compile background data    cd           compile background data
1038    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1039    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1040    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1041      count        pointer to the current capturing subpattern number (updated)
1042    
1043  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1044  */  */
1045    
1046  static int  static int
1047  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,
1048    BOOL xmode)    BOOL xmode, int *count)
1049  {  {
1050  const uschar *thisname;  uschar *ptr = *ptrptr;
1051  int count = cd->bracount;  int start_count = *count;
1052    int hwm_count = start_count;
1053    BOOL dup_parens = FALSE;
1054    
1055  for (; *ptr != 0; ptr++)  /* If the first character is a parenthesis, check on the type of group we are
1056    dealing with. The very first call may not start with a parenthesis. */
1057    
1058    if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1059    {    {
1060    int term;    if (ptr[1] == CHAR_QUESTION_MARK &&
1061          ptr[2] == CHAR_VERTICAL_LINE)
1062        {
1063        ptr += 3;
1064        dup_parens = TRUE;
1065        }
1066    
1067      /* Handle a normal, unnamed capturing parenthesis */
1068    
1069      else if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)
1070        {
1071        *count += 1;
1072        if (name == NULL && *count == lorn) return *count;
1073        ptr++;
1074        }
1075    
1076      /* Handle a condition. If it is an assertion, just carry on so that it
1077      is processed as normal. If not, skip to the closing parenthesis of the
1078      condition (there can't be any nested parens. */
1079    
1080      else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
1081        {
1082        ptr += 2;
1083        if (ptr[1] != CHAR_QUESTION_MARK)
1084          {
1085          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
1086          if (*ptr != 0) ptr++;
1087          }
1088        }
1089    
1090      /* We have either (? or (* and not a condition */
1091    
1092      else
1093        {
1094        ptr += 2;
1095        if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */
1096    
1097        /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */
1098    
1099        if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&
1100            ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1101          {
1102          int term;
1103          const uschar *thisname;
1104          *count += 1;
1105          if (name == NULL && *count == lorn) return *count;
1106          term = *ptr++;
1107          if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;
1108          thisname = ptr;
1109          while (*ptr != term) ptr++;
1110          if (name != NULL && lorn == ptr - thisname &&
1111              strncmp((const char *)name, (const char *)thisname, lorn) == 0)
1112            return *count;
1113          term++;
1114          }
1115        }
1116      }
1117    
1118    /* Past any initial parenthesis handling, scan for parentheses or vertical
1119    bars. */
1120    
1121    for (; *ptr != 0; ptr++)
1122      {
1123    /* Skip over backslashed characters and also entire \Q...\E */    /* Skip over backslashed characters and also entire \Q...\E */
1124    
1125    if (*ptr == '\\')    if (*ptr == CHAR_BACKSLASH)
1126      {      {
1127      if (*(++ptr) == 0) return -1;      if (*(++ptr) == 0) goto FAIL_EXIT;
1128      if (*ptr == 'Q') for (;;)      if (*ptr == CHAR_Q) for (;;)
1129        {        {
1130        while (*(++ptr) != 0 && *ptr != '\\');        while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1131        if (*ptr == 0) return -1;        if (*ptr == 0) goto FAIL_EXIT;
1132        if (*(++ptr) == 'E') break;        if (*(++ptr) == CHAR_E) break;
1133        }        }
1134      continue;      continue;
1135      }      }
# Line 1012  for (; *ptr != 0; ptr++) Line 1137  for (; *ptr != 0; ptr++)
1137    /* 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
1138    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
1139    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
1140    too. This makes for compatibility with Perl. */    too. This makes for compatibility with Perl. Note the use of STR macros to
1141      encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */
1142    
1143    if (*ptr == '[')    if (*ptr == CHAR_LEFT_SQUARE_BRACKET)
1144      {      {
1145      BOOL negate_class = FALSE;      BOOL negate_class = FALSE;
1146      for (;;)      for (;;)
1147        {        {
1148        int c = *(++ptr);        if (ptr[1] == CHAR_BACKSLASH)
       if (c == '\\')  
1149          {          {
1150          if (ptr[1] == 'E') ptr++;          if (ptr[2] == CHAR_E)
1151            else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;            ptr+= 2;
1152              else break;          else if (strncmp((const char *)ptr+2,
1153                     STR_Q STR_BACKSLASH STR_E, 3) == 0)
1154              ptr += 4;
1155            else
1156              break;
1157          }          }
1158        else if (!negate_class && c == '^')        else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
1159            {
1160          negate_class = TRUE;          negate_class = TRUE;
1161            ptr++;
1162            }
1163        else break;        else break;
1164        }        }
1165    
1166      /* 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
1167      skipped, except in JavaScript compatibility mode. */      skipped, except in JavaScript compatibility mode. */
1168    
1169      if (ptr[1] == ']' && (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)      if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&
1170        ptr++;          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
1171          ptr++;
1172      while (*(++ptr) != ']')  
1173        while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)
1174        {        {
1175        if (*ptr == 0) return -1;        if (*ptr == 0) return -1;
1176        if (*ptr == '\\')        if (*ptr == CHAR_BACKSLASH)
1177          {          {
1178          if (*(++ptr) == 0) return -1;          if (*(++ptr) == 0) goto FAIL_EXIT;
1179          if (*ptr == 'Q') for (;;)          if (*ptr == CHAR_Q) for (;;)
1180            {            {
1181            while (*(++ptr) != 0 && *ptr != '\\');            while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
1182            if (*ptr == 0) return -1;            if (*ptr == 0) goto FAIL_EXIT;
1183            if (*(++ptr) == 'E') break;            if (*(++ptr) == CHAR_E) break;
1184            }            }
1185          continue;          continue;
1186          }          }
# Line 1057  for (; *ptr != 0; ptr++) Line 1190  for (; *ptr != 0; ptr++)
1190    
1191    /* Skip comments in /x mode */    /* Skip comments in /x mode */
1192    
1193    if (xmode && *ptr == '#')    if (xmode && *ptr == CHAR_NUMBER_SIGN)
1194      {      {
1195      while (*(++ptr) != 0 && *ptr != '\n');      while (*(++ptr) != 0 && *ptr != CHAR_NL) {};
1196      if (*ptr == 0) return -1;      if (*ptr == 0) goto FAIL_EXIT;
1197      continue;      continue;
1198      }      }
1199    
1200    /* An opening parens must now be a real metacharacter */    /* Check for the special metacharacters */
1201    
1202    if (*ptr != '(') continue;    if (*ptr == CHAR_LEFT_PARENTHESIS)
   if (ptr[1] != '?' && ptr[1] != '*')  
1203      {      {
1204      count++;      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, count);
1205      if (name == NULL && count == lorn) return count;      if (rc > 0) return rc;
1206      continue;      if (*ptr == 0) goto FAIL_EXIT;
1207        }
1208    
1209      else if (*ptr == CHAR_RIGHT_PARENTHESIS)
1210        {
1211        if (dup_parens && *count < hwm_count) *count = hwm_count;
1212        *ptrptr = ptr;
1213        return -1;
1214      }      }
1215    
1216    ptr += 2;    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
1217    if (*ptr == 'P') ptr++;                      /* Allow optional P */      {
1218        if (*count > hwm_count) hwm_count = *count;
1219        *count = start_count;
1220        }
1221      }
1222    
1223    /* We have to disambiguate (?<! and (?<= from (?<name> */  FAIL_EXIT:
1224    *ptrptr = ptr;
1225    return -1;
1226    }
1227    
   if ((*ptr != '<' || ptr[1] == '!' || ptr[1] == '=') &&  
        *ptr != '\'')  
     continue;  
1228    
   count++;  
1229    
1230    if (name == NULL && count == lorn) return count;  
1231    term = *ptr++;  /*************************************************
1232    if (term == '<') term = '>';  *       Find forward referenced subpattern       *
1233    thisname = ptr;  *************************************************/
1234    while (*ptr != term) ptr++;  
1235    if (name != NULL && lorn == ptr - thisname &&  /* This function scans along a pattern's text looking for capturing
1236        strncmp((const char *)name, (const char *)thisname, lorn) == 0)  subpatterns, and counting them. If it finds a named pattern that matches the
1237      return count;  name it is given, it returns its number. Alternatively, if the name is NULL, it
1238    returns when it reaches a given numbered subpattern. This is used for forward
1239    references to subpatterns. We used to be able to start this scan from the
1240    current compiling point, using the current count value from cd->bracount, and
1241    do it all in a single loop, but the addition of the possibility of duplicate
1242    subpattern numbers means that we have to scan from the very start, in order to
1243    take account of such duplicates, and to use a recursive function to keep track
1244    of the different types of group.
1245    
1246    Arguments:
1247      cd           compile background data
1248      name         name to seek, or NULL if seeking a numbered subpattern
1249      lorn         name length, or subpattern number if name is NULL
1250      xmode        TRUE if we are in /x mode
1251    
1252    Returns:       the number of the found subpattern, or -1 if not found
1253    */
1254    
1255    static int
1256    find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode)
1257    {
1258    uschar *ptr = (uschar *)cd->start_pattern;
1259    int count = 0;
1260    int rc;
1261    
1262    /* If the pattern does not start with an opening parenthesis, the first call
1263    to find_parens_sub() will scan right to the end (if necessary). However, if it
1264    does start with a parenthesis, find_parens_sub() will return when it hits the
1265    matching closing parens. That is why we have to have a loop. */
1266    
1267    for (;;)
1268      {
1269      rc = find_parens_sub(&ptr, cd, name, lorn, xmode, &count);
1270      if (rc > 0 || *ptr++ == 0) break;
1271    }    }
1272    
1273  return -1;  return rc;
1274  }  }
1275    
1276    
1277    
1278    
1279  /*************************************************  /*************************************************
1280  *      Find first significant op code            *  *      Find first significant op code            *
1281  *************************************************/  *************************************************/
# Line 1149  for (;;) Line 1325  for (;;)
1325    
1326      case OP_CALLOUT:      case OP_CALLOUT:
1327      case OP_CREF:      case OP_CREF:
1328        case OP_NCREF:
1329      case OP_RREF:      case OP_RREF:
1330        case OP_NRREF:
1331      case OP_DEF:      case OP_DEF:
1332      code += _pcre_OP_lengths[*code];      code += _pcre_OP_lengths[*code];
1333      break;      break;
# Line 1165  for (;;) Line 1343  for (;;)
1343    
1344    
1345  /*************************************************  /*************************************************
1346  *        Find the fixed length of a pattern      *  *        Find the fixed length of a branch       *
1347  *************************************************/  *************************************************/
1348    
1349  /* 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,
1350  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.
1351  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
1352    temporarily terminated with OP_END when this function is called.
1353    
1354    This function is called when a backward assertion is encountered, so that if it
1355    fails, the error message can point to the correct place in the pattern.
1356    However, we cannot do this when the assertion contains subroutine calls,
1357    because they can be forward references. We solve this by remembering this case
1358    and doing the check at the end; a flag specifies which mode we are running in.
1359    
1360  Arguments:  Arguments:
1361    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1362    options  the compiling options    options  the compiling options
1363      atend    TRUE if called when the pattern is complete
1364      cd       the "compile data" structure
1365    
1366  Returns:   the fixed length, or -1 if there is no fixed length,  Returns:   the fixed length,
1367                 or -1 if there is no fixed length,
1368               or -2 if \C was encountered               or -2 if \C was encountered
1369                 or -3 if an OP_RECURSE item was encountered and atend is FALSE
1370  */  */
1371    
1372  static int  static int
1373  find_fixedlength(uschar *code, int options)  find_fixedlength(uschar *code, int options, BOOL atend, compile_data *cd)
1374  {  {
1375  int length = -1;  int length = -1;
1376    
# Line 1194  branch, check the length against that of Line 1383  branch, check the length against that of
1383  for (;;)  for (;;)
1384    {    {
1385    int d;    int d;
1386      uschar *ce, *cs;
1387    register int op = *cc;    register int op = *cc;
1388    switch (op)    switch (op)
1389      {      {
# Line 1201  for (;;) Line 1391  for (;;)
1391      case OP_BRA:      case OP_BRA:
1392      case OP_ONCE:      case OP_ONCE:
1393      case OP_COND:      case OP_COND:
1394      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options, atend, cd);
1395      if (d < 0) return d;      if (d < 0) return d;
1396      branchlength += d;      branchlength += d;
1397      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
# Line 1224  for (;;) Line 1414  for (;;)
1414      branchlength = 0;      branchlength = 0;
1415      break;      break;
1416    
1417        /* A true recursion implies not fixed length, but a subroutine call may
1418        be OK. If the subroutine is a forward reference, we can't deal with
1419        it until the end of the pattern, so return -3. */
1420    
1421        case OP_RECURSE:
1422        if (!atend) return -3;
1423        cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1424        do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */
1425        if (cc > cs && cc < ce) return -1;                /* Recursion */
1426        d = find_fixedlength(cs + 2, options, atend, cd);
1427        if (d < 0) return d;
1428        branchlength += d;
1429        cc += 1 + LINK_SIZE;
1430        break;
1431    
1432      /* Skip over assertive subpatterns */      /* Skip over assertive subpatterns */
1433    
1434      case OP_ASSERT:      case OP_ASSERT:
# Line 1237  for (;;) Line 1442  for (;;)
1442    
1443      case OP_REVERSE:      case OP_REVERSE:
1444      case OP_CREF:      case OP_CREF:
1445        case OP_NCREF:
1446      case OP_RREF:      case OP_RREF:
1447        case OP_NRREF:
1448      case OP_DEF:      case OP_DEF:
1449      case OP_OPT:      case OP_OPT:
1450      case OP_CALLOUT:      case OP_CALLOUT:
# Line 1260  for (;;) Line 1467  for (;;)
1467      branchlength++;      branchlength++;
1468      cc += 2;      cc += 2;
1469  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1470      if ((options & PCRE_UTF8) != 0)      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)
1471        {        cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       while ((*cc & 0xc0) == 0x80) cc++;  
       }  
1472  #endif  #endif
1473      break;      break;
1474    
# Line 1274  for (;;) Line 1479  for (;;)
1479      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1480      cc += 4;      cc += 4;
1481  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1482      if ((options & PCRE_UTF8) != 0)      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)
1483        {        cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       while((*cc & 0x80) == 0x80) cc++;  
       }  
1484  #endif  #endif
1485      break;      break;
1486    
# Line 1301  for (;;) Line 1504  for (;;)
1504      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
1505      case OP_WORDCHAR:      case OP_WORDCHAR:
1506      case OP_ANY:      case OP_ANY:
1507        case OP_ALLANY:
1508      branchlength++;      branchlength++;
1509      cc++;      cc++;
1510      break;      break;
# Line 1355  for (;;) Line 1559  for (;;)
1559    
1560    
1561  /*************************************************  /*************************************************
1562  *    Scan compiled regex for numbered bracket    *  *    Scan compiled regex for specific bracket    *
1563  *************************************************/  *************************************************/
1564    
1565  /* This little function scans through a compiled pattern until it finds a  /* This little function scans through a compiled pattern until it finds a
1566  capturing bracket with the given number.  capturing bracket with the given number, or, if the number is negative, an
1567    instance of OP_REVERSE for a lookbehind. The function is global in the C sense
1568    so that it can be called from pcre_study() when finding the minimum matching
1569    length.
1570    
1571  Arguments:  Arguments:
1572    code        points to start of expression    code        points to start of expression
1573    utf8        TRUE in UTF-8 mode    utf8        TRUE in UTF-8 mode
1574    number      the required bracket number    number      the required bracket number or negative to find a lookbehind
1575    
1576  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
1577  */  */
1578    
1579  static const uschar *  const uschar *
1580  find_bracket(const uschar *code, BOOL utf8, int number)  _pcre_find_bracket(const uschar *code, BOOL utf8, int number)
1581  {  {
1582  for (;;)  for (;;)
1583    {    {
# Line 1383  for (;;) Line 1590  for (;;)
1590    
1591    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
1592    
1593      /* Handle recursion */
1594    
1595      else if (c == OP_REVERSE)
1596        {
1597        if (number < 0) return (uschar *)code;
1598        code += _pcre_OP_lengths[c];
1599        }
1600    
1601    /* Handle capturing bracket */    /* Handle capturing bracket */
1602    
1603    else if (c == OP_CBRA)    else if (c == OP_CBRA)
# Line 1449  for (;;) Line 1664  for (;;)
1664        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1665        break;        break;
1666        }        }
1667    #else
1668        (void)(utf8);  /* Keep compiler happy by referencing function argument */
1669  #endif  #endif
1670      }      }
1671    }    }
# Line 1542  for (;;) Line 1759  for (;;)
1759        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
1760        break;        break;
1761        }        }
1762    #else
1763        (void)(utf8);  /* Keep compiler happy by referencing function argument */
1764  #endif  #endif
1765      }      }
1766    }    }
# Line 1608  for (code = first_significant_code(code Line 1827  for (code = first_significant_code(code
1827      BOOL empty_branch;      BOOL empty_branch;
1828      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
1829    
1830      /* Scan a closed bracket */      /* If a conditional group has only one branch, there is a second, implied,
1831        empty branch, so just skip over the conditional, because it could be empty.
1832        Otherwise, scan the individual branches of the group. */
1833    
1834      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;  
1835        code += GET(code, 1);        code += GET(code, 1);
1836        else
1837          {
1838          empty_branch = FALSE;
1839          do
1840            {
1841            if (!empty_branch && could_be_empty_branch(code, endcode, utf8))
1842              empty_branch = TRUE;
1843            code += GET(code, 1);
1844            }
1845          while (*code == OP_ALT);
1846          if (!empty_branch) return FALSE;   /* All branches are non-empty */
1847        }        }
1848      while (*code == OP_ALT);  
     if (!empty_branch) return FALSE;   /* All branches are non-empty */  
1849      c = *code;      c = *code;
1850      continue;      continue;
1851      }      }
# Line 1679  for (code = first_significant_code(code Line 1906  for (code = first_significant_code(code
1906      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
1907      case OP_WORDCHAR:      case OP_WORDCHAR:
1908      case OP_ANY:      case OP_ANY:
1909        case OP_ALLANY:
1910      case OP_ANYBYTE:      case OP_ANYBYTE:
1911      case OP_CHAR:      case OP_CHAR:
1912      case OP_CHARNC:      case OP_CHARNC:
# Line 1735  for (code = first_significant_code(code Line 1963  for (code = first_significant_code(code
1963      case OP_QUERY:      case OP_QUERY:
1964      case OP_MINQUERY:      case OP_MINQUERY:
1965      case OP_POSQUERY:      case OP_POSQUERY:
1966        if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];
1967        break;
1968    
1969      case OP_UPTO:      case OP_UPTO:
1970      case OP_MINUPTO:      case OP_MINUPTO:
1971      case OP_POSUPTO:      case OP_POSUPTO:
1972      if (utf8) while ((code[2] & 0xc0) == 0x80) code++;      if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];
1973      break;      break;
1974  #endif  #endif
1975      }      }
# Line 1771  static BOOL Line 2002  static BOOL
2002  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,
2003    BOOL utf8)    BOOL utf8)
2004  {  {
2005  while (bcptr != NULL && bcptr->current >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2006    {    {
2007    if (!could_be_empty_branch(bcptr->current, endcode, utf8)) return FALSE;    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8))
2008        return FALSE;
2009    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2010    }    }
2011  return TRUE;  return TRUE;
# Line 1819  int terminator;          /* Don't combin Line 2051  int terminator;          /* Don't combin
2051  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2052  for (++ptr; *ptr != 0; ptr++)  for (++ptr; *ptr != 0; ptr++)
2053    {    {
2054    if (*ptr == '\\' && ptr[1] == ']') ptr++; else    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else
2055      {      {
2056      if (*ptr == ']') return FALSE;      if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2057      if (*ptr == terminator && ptr[1] == ']')      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2058        {        {
2059        *endptr = ptr;        *endptr = ptr;
2060        return TRUE;        return TRUE;
# Line 1909  while ((ptr = (uschar *)find_recurse(ptr Line 2141  while ((ptr = (uschar *)find_recurse(ptr
2141    
2142    /* 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
2143    reference. */    reference. */
2144    
2145    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
2146      {      {
2147      offset = GET(hc, 0);      offset = GET(hc, 0);
# Line 2013  get_othercase_range(unsigned int *cptr, Line 2245  get_othercase_range(unsigned int *cptr,
2245  unsigned int c, othercase, next;  unsigned int c, othercase, next;
2246    
2247  for (c = *cptr; c <= d; c++)  for (c = *cptr; c <= d; c++)
2248    { if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR) break; }    { if ((othercase = UCD_OTHERCASE(c)) != c) break; }
2249    
2250  if (c > d) return FALSE;  if (c > d) return FALSE;
2251    
# Line 2022  next = othercase + 1; Line 2254  next = othercase + 1;
2254    
2255  for (++c; c <= d; c++)  for (++c; c <= d; c++)
2256    {    {
2257    if (_pcre_ucp_othercase(c) != next) break;    if (UCD_OTHERCASE(c) != next) break;
2258    next++;    next++;
2259    }    }
2260    
# Line 2068  if ((options & PCRE_EXTENDED) != 0) Line 2300  if ((options & PCRE_EXTENDED) != 0)
2300    for (;;)    for (;;)
2301      {      {
2302      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2303      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
2304        {        {
2305        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2306          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
# Line 2080  if ((options & PCRE_EXTENDED) != 0) Line 2312  if ((options & PCRE_EXTENDED) != 0)
2312  /* 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
2313  value is a character, a negative value is an escape value. */  value is a character, a negative value is an escape value. */
2314    
2315  if (*ptr == '\\')  if (*ptr == CHAR_BACKSLASH)
2316    {    {
2317    int temperrorcode = 0;    int temperrorcode = 0;
2318    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 2337  if ((options & PCRE_EXTENDED) != 0)
2337    for (;;)    for (;;)
2338      {      {
2339      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2340      if (*ptr == '#')      if (*ptr == CHAR_NUMBER_SIGN)
2341        {        {
2342        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2343          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
# Line 2116  if ((options & PCRE_EXTENDED) != 0) Line 2348  if ((options & PCRE_EXTENDED) != 0)
2348    
2349  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
2350    
2351  if (*ptr == '*' || *ptr == '?' || strncmp((char *)ptr, "{0,", 3) == 0)  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
2352    return FALSE;    strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
2353        return FALSE;
2354    
2355  /* 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
2356  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 2365  if (next >= 0) switch(op_code)
2365    case OP_CHAR:    case OP_CHAR:
2366  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2367    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
2368    #else
2369      (void)(utf8_char);  /* Keep compiler happy by referencing function argument */
2370  #endif  #endif
2371    return item != next;    return item != next;
2372    
# Line 2150  if (next >= 0) switch(op_code) Line 2385  if (next >= 0) switch(op_code)
2385      unsigned int othercase;      unsigned int othercase;
2386      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2387  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2388      othercase = _pcre_ucp_othercase((unsigned int)next);      othercase = UCD_OTHERCASE((unsigned int)next);
2389  #else  #else
2390      othercase = NOTACHAR;      othercase = NOTACHAR;
2391  #endif  #endif
# Line 2171  if (next >= 0) switch(op_code) Line 2406  if (next >= 0) switch(op_code)
2406      unsigned int othercase;      unsigned int othercase;
2407      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2408  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2409      othercase = _pcre_ucp_othercase(next);      othercase = UCD_OTHERCASE(next);
2410  #else  #else
2411      othercase = NOTACHAR;      othercase = NOTACHAR;
2412  #endif  #endif
# Line 2432  BOOL utf8 = FALSE; Line 2667  BOOL utf8 = FALSE;
2667  uschar *utf8_char = NULL;  uschar *utf8_char = NULL;
2668  #endif  #endif
2669    
2670  #ifdef DEBUG  #ifdef PCRE_DEBUG
2671  if (lengthptr != NULL) DPRINTF((">> start branch\n"));  if (lengthptr != NULL) DPRINTF((">> start branch\n"));
2672  #endif  #endif
2673    
# Line 2485  for (;; ptr++) Line 2720  for (;; ptr++)
2720    /* Get next byte in the pattern */    /* Get next byte in the pattern */
2721    
2722    c = *ptr;    c = *ptr;
2723    
2724    /* 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
2725    previous cycle of this loop. */    previous cycle of this loop. */
2726    
2727    if (lengthptr != NULL)    if (lengthptr != NULL)
2728      {      {
2729  #ifdef DEBUG  #ifdef PCRE_DEBUG
2730      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
2731  #endif  #endif
2732      if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */      if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */
# Line 2553  for (;; ptr++) Line 2788  for (;; ptr++)
2788    
2789    if (inescq && c != 0)    if (inescq && c != 0)
2790      {      {
2791      if (c == '\\' && ptr[1] == 'E')      if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
2792        {        {
2793        inescq = FALSE;        inescq = FALSE;
2794        ptr++;        ptr++;
# Line 2579  for (;; ptr++) Line 2814  for (;; ptr++)
2814    /* 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
2815    a quantifier. */    a quantifier. */
2816    
2817    is_quantifier = c == '*' || c == '+' || c == '?' ||    is_quantifier =
2818      (c == '{' && is_counted_repeat(ptr+1));      c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
2819        (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
2820    
2821    if (!is_quantifier && previous_callout != NULL &&    if (!is_quantifier && previous_callout != NULL &&
2822         after_manual_callout-- <= 0)         after_manual_callout-- <= 0)
# Line 2595  for (;; ptr++) Line 2831  for (;; ptr++)
2831    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
2832      {      {
2833      if ((cd->ctypes[c] & ctype_space) != 0) continue;      if ((cd->ctypes[c] & ctype_space) != 0) continue;
2834      if (c == '#')      if (c == CHAR_NUMBER_SIGN)
2835        {        {
2836        while (*(++ptr) != 0)        while (*(++ptr) != 0)
2837          {          {
# Line 2620  for (;; ptr++) Line 2856  for (;; ptr++)
2856      {      {
2857      /* ===================================================================*/      /* ===================================================================*/
2858      case 0:                        /* The branch terminates at string end */      case 0:                        /* The branch terminates at string end */
2859      case '|':                      /* or | or ) */      case CHAR_VERTICAL_LINE:       /* or | or ) */
2860      case ')':      case CHAR_RIGHT_PARENTHESIS:
2861      *firstbyteptr = firstbyte;      *firstbyteptr = firstbyte;
2862      *reqbyteptr = reqbyte;      *reqbyteptr = reqbyte;
2863      *codeptr = code;      *codeptr = code;
# Line 2643  for (;; ptr++) Line 2879  for (;; ptr++)
2879      /* Handle single-character metacharacters. In multiline mode, ^ disables      /* Handle single-character metacharacters. In multiline mode, ^ disables
2880      the setting of any following char as a first character. */      the setting of any following char as a first character. */
2881    
2882      case '^':      case CHAR_CIRCUMFLEX_ACCENT:
2883      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
2884        {        {
2885        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
# Line 2652  for (;; ptr++) Line 2888  for (;; ptr++)
2888      *code++ = OP_CIRC;      *code++ = OP_CIRC;
2889      break;      break;
2890    
2891      case '$':      case CHAR_DOLLAR_SIGN:
2892      previous = NULL;      previous = NULL;
2893      *code++ = OP_DOLL;      *code++ = OP_DOLL;
2894      break;      break;
# Line 2660  for (;; ptr++) Line 2896  for (;; ptr++)
2896      /* 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
2897      repeats. The value of reqbyte doesn't change either. */      repeats. The value of reqbyte doesn't change either. */
2898    
2899      case '.':      case CHAR_DOT:
2900      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
2901      zerofirstbyte = firstbyte;      zerofirstbyte = firstbyte;
2902      zeroreqbyte = reqbyte;      zeroreqbyte = reqbyte;
2903      previous = code;      previous = code;
2904      *code++ = OP_ANY;      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
2905      break;      break;
2906    
2907    
# Line 2680  for (;; ptr++) Line 2916  for (;; ptr++)
2916      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,
2917      but those above are are explicitly listed afterwards. A flag byte tells      but those above are are explicitly listed afterwards. A flag byte tells
2918      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.
2919    
2920      In JavaScript compatibility mode, an isolated ']' causes an error. In      In JavaScript compatibility mode, an isolated ']' causes an error. In
2921      default (Perl) mode, it is treated as a data character. */      default (Perl) mode, it is treated as a data character. */
2922    
2923      case ']':      case CHAR_RIGHT_SQUARE_BRACKET:
2924      if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)      if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
2925        {        {
2926        *errorcodeptr = ERR64;        *errorcodeptr = ERR64;
2927        goto FAILED;        goto FAILED;
2928        }        }
2929      goto NORMAL_CHAR;      goto NORMAL_CHAR;
2930    
2931      case '[':      case CHAR_LEFT_SQUARE_BRACKET:
2932      previous = code;      previous = code;
2933    
2934      /* 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
2935      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. */
2936    
2937      if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&      if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
2938             ptr[1] == CHAR_EQUALS_SIGN) &&
2939          check_posix_syntax(ptr, &tempptr))          check_posix_syntax(ptr, &tempptr))
2940        {        {
2941        *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;        *errorcodeptr = (ptr[1] == CHAR_COLON)? ERR13 : ERR31;
2942        goto FAILED;        goto FAILED;
2943        }        }
2944    
# Line 2713  for (;; ptr++) Line 2950  for (;; ptr++)
2950      for (;;)      for (;;)
2951        {        {
2952        c = *(++ptr);        c = *(++ptr);
2953        if (c == '\\')        if (c == CHAR_BACKSLASH)
2954          {          {
2955          if (ptr[1] == 'E') ptr++;          if (ptr[1] == CHAR_E)
2956            else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;            ptr++;
2957              else break;          else if (strncmp((const char *)ptr+1,
2958                              STR_Q STR_BACKSLASH STR_E, 3) == 0)
2959              ptr += 3;
2960            else
2961              break;
2962          }          }
2963        else if (!negate_class && c == '^')        else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
2964          negate_class = TRUE;          negate_class = TRUE;
2965        else break;        else break;
2966        }        }
2967    
2968      /* Empty classes are allowed in JavaScript compatibility mode. Otherwise,      /* Empty classes are allowed in JavaScript compatibility mode. Otherwise,
2969      an initial ']' is taken as a data character -- the code below handles      an initial ']' is taken as a data character -- the code below handles
2970      that. In JS mode, [] must always fail, so generate OP_FAIL, whereas      that. In JS mode, [] must always fail, so generate OP_FAIL, whereas
2971      [^] must match any character, so generate OP_ALLANY. */      [^] must match any character, so generate OP_ALLANY. */
2972    
2973      if (c ==']' && (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)      if (c == CHAR_RIGHT_SQUARE_BRACKET &&
2974            (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
2975        {        {
2976        *code++ = negate_class? OP_ALLANY : OP_FAIL;        *code++ = negate_class? OP_ALLANY : OP_FAIL;
2977        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
2978        zerofirstbyte = firstbyte;        zerofirstbyte = firstbyte;
2979        break;        break;
2980        }        }
2981    
2982      /* 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
2983      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 3036  for (;; ptr++)
3036    
3037        if (inescq)        if (inescq)
3038          {          {
3039          if (c == '\\' && ptr[1] == 'E')     /* If we are at \E */          if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)  /* If we are at \E */
3040            {            {
3041            inescq = FALSE;                   /* Reset literal state */            inescq = FALSE;                   /* Reset literal state */
3042            ptr++;                            /* Skip the 'E' */            ptr++;                            /* Skip the 'E' */
# Line 2809  for (;; ptr++) Line 3051  for (;; ptr++)
3051        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
3052        5.6 and 5.8 do. */        5.6 and 5.8 do. */
3053    
3054        if (c == '[' &&        if (c == CHAR_LEFT_SQUARE_BRACKET &&
3055            (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&            (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
3056            check_posix_syntax(ptr, &tempptr))             ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))
3057          {          {
3058          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
3059          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
3060          register const uschar *cbits = cd->cbits;          register const uschar *cbits = cd->cbits;
3061          uschar pbits[32];          uschar pbits[32];
3062    
3063          if (ptr[1] != ':')          if (ptr[1] != CHAR_COLON)
3064            {            {
3065            *errorcodeptr = ERR31;            *errorcodeptr = ERR31;
3066            goto FAILED;            goto FAILED;
3067            }            }
3068    
3069          ptr += 2;          ptr += 2;
3070          if (*ptr == '^')          if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
3071            {            {
3072            local_negate = TRUE;            local_negate = TRUE;
3073            should_flip_negation = TRUE;  /* Note negative special */            should_flip_negation = TRUE;  /* Note negative special */
# Line 2898  for (;; ptr++) Line 3140  for (;; ptr++)
3140        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
3141        character in them, so set class_charcount bigger than one. */        character in them, so set class_charcount bigger than one. */
3142    
3143        if (c == '\\')        if (c == CHAR_BACKSLASH)
3144          {          {
3145          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3146          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
3147    
3148          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 */
3149          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 */
3150          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 */
3151          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
3152            {            {
3153            if (ptr[1] == '\\' && ptr[2] == 'E')            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
3154              {              {
3155              ptr += 2; /* avoid empty string */              ptr += 2; /* avoid empty string */
3156              }              }
# Line 3134  for (;; ptr++) Line 3376  for (;; ptr++)
3376        entirely. The code for handling \Q and \E is messy. */        entirely. The code for handling \Q and \E is messy. */
3377    
3378        CHECK_RANGE:        CHECK_RANGE:
3379        while (ptr[1] == '\\' && ptr[2] == 'E')        while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
3380          {          {
3381          inescq = FALSE;          inescq = FALSE;
3382          ptr += 2;          ptr += 2;
# Line 3144  for (;; ptr++) Line 3386  for (;; ptr++)
3386    
3387        /* Remember \r or \n */        /* Remember \r or \n */
3388    
3389        if (c == '\r' || c == '\n') cd->external_flags |= PCRE_HASCRORLF;        if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
3390    
3391        /* Check for range */        /* Check for range */
3392    
3393        if (!inescq && ptr[1] == '-')        if (!inescq && ptr[1] == CHAR_MINUS)
3394          {          {
3395          int d;          int d;
3396          ptr += 2;          ptr += 2;
3397          while (*ptr == '\\' && ptr[1] == 'E') ptr += 2;          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;
3398    
3399          /* 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
3400          mode. */          mode. */
3401    
3402          while (*ptr == '\\' && ptr[1] == 'Q')          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
3403            {            {
3404            ptr += 2;            ptr += 2;
3405            if (*ptr == '\\' && ptr[1] == 'E') { ptr += 2; continue; }            if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)
3406                { ptr += 2; continue; }
3407            inescq = TRUE;            inescq = TRUE;
3408            break;            break;
3409            }            }
3410    
3411          if (*ptr == 0 || (!inescq && *ptr == ']'))          if (*ptr == 0 || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
3412            {            {
3413            ptr = oldptr;            ptr = oldptr;
3414            goto LONE_SINGLE_CHARACTER;            goto LONE_SINGLE_CHARACTER;
# Line 3184  for (;; ptr++) Line 3427  for (;; ptr++)
3427          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
3428          in such circumstances. */          in such circumstances. */
3429    
3430          if (!inescq && d == '\\')          if (!inescq && d == CHAR_BACKSLASH)
3431            {            {
3432            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3433            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
# Line 3194  for (;; ptr++) Line 3437  for (;; ptr++)
3437    
3438            if (d < 0)            if (d < 0)
3439              {              {
3440              if (d == -ESC_b) d = '\b';              if (d == -ESC_b) d = CHAR_BS;
3441              else if (d == -ESC_X) d = 'X';              else if (d == -ESC_X) d = CHAR_X;
3442              else if (d == -ESC_R) d = 'R'; else              else if (d == -ESC_R) d = CHAR_R; else
3443                {                {
3444                ptr = oldptr;                ptr = oldptr;
3445                goto LONE_SINGLE_CHARACTER;  /* A few lines below */                goto LONE_SINGLE_CHARACTER;  /* A few lines below */
# Line 3217  for (;; ptr++) Line 3460  for (;; ptr++)
3460    
3461          /* Remember \r or \n */          /* Remember \r or \n */
3462    
3463          if (d == '\r' || d == '\n') cd->external_flags |= PCRE_HASCRORLF;          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
3464    
3465          /* 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
3466          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 3580  for (;; ptr++)
3580          if ((options & PCRE_CASELESS) != 0)          if ((options & PCRE_CASELESS) != 0)
3581            {            {
3582            unsigned int othercase;            unsigned int othercase;
3583            if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR)            if ((othercase = UCD_OTHERCASE(c)) != c)
3584              {              {
3585              *class_utf8data++ = XCL_SINGLE;              *class_utf8data++ = XCL_SINGLE;
3586              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);
# Line 3364  for (;; ptr++) Line 3607  for (;; ptr++)
3607    
3608      /* Loop until ']' reached. This "while" is the end of the "do" above. */      /* Loop until ']' reached. This "while" is the end of the "do" above. */
3609    
3610      while ((c = *(++ptr)) != 0 && (c != ']' || inescq));      while ((c = *(++ptr)) != 0 && (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
3611    
3612      if (c == 0)                          /* Missing terminating ']' */      if (c == 0)                          /* Missing terminating ']' */
3613        {        {
# Line 3509  we set the flag only if there is a liter Line 3752  we set the flag only if there is a liter
3752      /* Various kinds of repeat; '{' is not necessarily a quantifier, but this      /* Various kinds of repeat; '{' is not necessarily a quantifier, but this
3753      has been tested above. */      has been tested above. */
3754    
3755      case '{':      case CHAR_LEFT_CURLY_BRACKET:
3756      if (!is_quantifier) goto NORMAL_CHAR;      if (!is_quantifier) goto NORMAL_CHAR;
3757      ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);      ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);
3758      if (*errorcodeptr != 0) goto FAILED;      if (*errorcodeptr != 0) goto FAILED;
3759      goto REPEAT;      goto REPEAT;
3760    
3761      case '*':      case CHAR_ASTERISK:
3762      repeat_min = 0;      repeat_min = 0;
3763      repeat_max = -1;      repeat_max = -1;
3764      goto REPEAT;      goto REPEAT;
3765    
3766      case '+':      case CHAR_PLUS:
3767      repeat_min = 1;      repeat_min = 1;
3768      repeat_max = -1;      repeat_max = -1;
3769      goto REPEAT;      goto REPEAT;
3770    
3771      case '?':      case CHAR_QUESTION_MARK:
3772      repeat_min = 0;      repeat_min = 0;
3773      repeat_max = 1;      repeat_max = 1;
3774    
# Line 3560  we set the flag only if there is a liter Line 3803  we set the flag only if there is a liter
3803      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
3804      repeat type to the non-default. */      repeat type to the non-default. */
3805    
3806      if (ptr[1] == '+')      if (ptr[1] == CHAR_PLUS)
3807        {        {
3808        repeat_type = 0;                  /* Force greedy */        repeat_type = 0;                  /* Force greedy */
3809        possessive_quantifier = TRUE;        possessive_quantifier = TRUE;
3810        ptr++;        ptr++;
3811        }        }
3812      else if (ptr[1] == '?')      else if (ptr[1] == CHAR_QUESTION_MARK)
3813        {        {
3814        repeat_type = greedy_non_default;        repeat_type = greedy_non_default;
3815        ptr++;        ptr++;
# Line 3681  we set the flag only if there is a liter Line 3924  we set the flag only if there is a liter
3924    
3925        if (repeat_max == 0) goto END_REPEAT;        if (repeat_max == 0) goto END_REPEAT;
3926    
3927          /*--------------------------------------------------------------------*/
3928          /* This code is obsolete from release 8.00; the restriction was finally
3929          removed: */
3930    
3931        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
3932        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
3933    
3934        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
3935          /*--------------------------------------------------------------------*/
3936    
3937        /* Combine the op_type with the repeat_type */        /* Combine the op_type with the repeat_type */
3938    
# Line 3831  we set the flag only if there is a liter Line 4079  we set the flag only if there is a liter
4079          goto END_REPEAT;          goto END_REPEAT;
4080          }          }
4081    
4082          /*--------------------------------------------------------------------*/
4083          /* This code is obsolete from release 8.00; the restriction was finally
4084          removed: */
4085    
4086        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
4087        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
4088    
4089        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
4090          /*--------------------------------------------------------------------*/
4091    
4092        if (repeat_min == 0 && repeat_max == -1)        if (repeat_min == 0 && repeat_max == -1)
4093          *code++ = OP_CRSTAR + repeat_type;          *code++ = OP_CRSTAR + repeat_type;
# Line 3900  we set the flag only if there is a liter Line 4153  we set the flag only if there is a liter
4153          **   code = previous;          **   code = previous;
4154          **   goto END_REPEAT;          **   goto END_REPEAT;
4155          **   }          **   }
4156    
4157          However, that fails when a group is referenced as a subroutine from          However, that fails when a group is referenced as a subroutine from
4158          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
4159          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
4160          groups are referenced, we cannot do this selectively.          groups are referenced, we cannot do this selectively.
4161    
4162          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
4163          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 4176  we set the flag only if there is a liter
4176              {              {
4177              *previous++ = OP_SKIPZERO;              *previous++ = OP_SKIPZERO;
4178              goto END_REPEAT;              goto END_REPEAT;
4179              }              }
4180            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
4181            }            }
4182    
# Line 3969  we set the flag only if there is a liter Line 4222  we set the flag only if there is a liter
4222            {            {
4223            /* In the pre-compile phase, we don't actually do the replication. We            /* In the pre-compile phase, we don't actually do the replication. We
4224            just adjust the length as if we had. Do some paranoid checks for            just adjust the length as if we had. Do some paranoid checks for
4225            potential integer overflow. */            potential integer overflow. The INT64_OR_DOUBLE type is a 64-bit
4226              integer type when available, otherwise double. */
4227    
4228            if (lengthptr != NULL)            if (lengthptr != NULL)
4229              {              {
4230              int delta = (repeat_min - 1)*length_prevgroup;              int delta = (repeat_min - 1)*length_prevgroup;
4231              if ((double)(repeat_min - 1)*(double)length_prevgroup >              if ((INT64_OR_DOUBLE)(repeat_min - 1)*
4232                                                              (double)INT_MAX ||                    (INT64_OR_DOUBLE)length_prevgroup >
4233                        (INT64_OR_DOUBLE)INT_MAX ||
4234                  OFLOW_MAX - *lengthptr < delta)                  OFLOW_MAX - *lengthptr < delta)
4235                {                {
4236                *errorcodeptr = ERR20;                *errorcodeptr = ERR20;
# Line 4021  we set the flag only if there is a liter Line 4276  we set the flag only if there is a liter
4276          just adjust the length as if we had. For each repetition we must add 1          just adjust the length as if we had. For each repetition we must add 1
4277          to the length for BRAZERO and for all but the last repetition we must          to the length for BRAZERO and for all but the last repetition we must
4278          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
4279          paranoid checks to avoid integer overflow. */          paranoid checks to avoid integer overflow. The INT64_OR_DOUBLE type is
4280            a 64-bit integer type when available, otherwise double. */
4281    
4282          if (lengthptr != NULL && repeat_max > 0)          if (lengthptr != NULL && repeat_max > 0)
4283            {            {
4284            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
4285                        2 - 2*LINK_SIZE;   /* Last one doesn't nest */                        2 - 2*LINK_SIZE;   /* Last one doesn't nest */
4286            if ((double)repeat_max *            if ((INT64_OR_DOUBLE)repeat_max *
4287                  (double)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)                  (INT64_OR_DOUBLE)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
4288                    > (double)INT_MAX ||                    > (INT64_OR_DOUBLE)INT_MAX ||
4289                OFLOW_MAX - *lengthptr < delta)                OFLOW_MAX - *lengthptr < delta)
4290              {              {
4291              *errorcodeptr = ERR20;              *errorcodeptr = ERR20;
# Line 4117  we set the flag only if there is a liter Line 4373  we set the flag only if there is a liter
4373            }            }
4374          }          }
4375        }        }
4376    
4377      /* 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
4378      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
4379      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"
4380      error above. We can just ignore the repeat in JS case. */      error above. We can just ignore the repeat in JS case. */
4381    
4382      else if (*previous == OP_FAIL) goto END_REPEAT;      else if (*previous == OP_FAIL) goto END_REPEAT;
4383    
4384      /* Else there's some kind of shambles */      /* Else there's some kind of shambles */
4385    
# Line 4149  we set the flag only if there is a liter Line 4405  we set the flag only if there is a liter
4405      if (possessive_quantifier)      if (possessive_quantifier)
4406        {        {
4407        int len;        int len;
4408        if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||  
4409            *tempcode == OP_NOTEXACT)        if (*tempcode == OP_TYPEEXACT)
4410          tempcode += _pcre_OP_lengths[*tempcode] +          tempcode += _pcre_OP_lengths[*tempcode] +
4411            ((*tempcode == OP_TYPEEXACT &&            ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);
4412               (tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP))? 2:0);  
4413          else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
4414            {
4415            tempcode += _pcre_OP_lengths[*tempcode];
4416    #ifdef SUPPORT_UTF8
4417            if (utf8 && tempcode[-1] >= 0xc0)
4418              tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];
4419    #endif
4420            }
4421    
4422        len = code - tempcode;        len = code - tempcode;
4423        if (len > 0) switch (*tempcode)        if (len > 0) switch (*tempcode)
4424          {          {
# Line 4172  we set the flag only if there is a liter Line 4437  we set the flag only if there is a liter
4437          case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;          case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;
4438          case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;          case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;
4439    
4440            /* Because we are moving code along, we must ensure that any
4441            pending recursive references are updated. */
4442    
4443          default:          default:
4444            *code = OP_END;
4445            adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);
4446          memmove(tempcode + 1+LINK_SIZE, tempcode, len);          memmove(tempcode + 1+LINK_SIZE, tempcode, len);
4447          code += 1 + LINK_SIZE;          code += 1 + LINK_SIZE;
4448          len += 1 + LINK_SIZE;          len += 1 + LINK_SIZE;
# Line 4199  we set the flag only if there is a liter Line 4469  we set the flag only if there is a liter
4469      lookbehind or option setting or condition or all the other extended      lookbehind or option setting or condition or all the other extended
4470      parenthesis forms.  */      parenthesis forms.  */
4471    
4472      case '(':      case CHAR_LEFT_PARENTHESIS:
4473      newoptions = options;      newoptions = options;
4474      skipbytes = 0;      skipbytes = 0;
4475      bravalue = OP_CBRA;      bravalue = OP_CBRA;
4476      save_hwm = cd->hwm;      save_hwm = cd->hwm;
4477      reset_bracount = FALSE;      reset_bracount = FALSE;
4478    
4479      /* First deal with various "verbs" that can be introduced by '*'. */      /* First deal with various "verbs" that can be introduced by '*'. */
4480    
4481      if (*(++ptr) == '*' && (cd->ctypes[ptr[1]] & ctype_letter) != 0)      if (*(++ptr) == CHAR_ASTERISK && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
4482        {        {
4483        int i, namelen;        int i, namelen;
4484        const char *vn = verbnames;        const char *vn = verbnames;
4485        const uschar *name = ++ptr;        const uschar *name = ++ptr;
4486        previous = NULL;        previous = NULL;
4487        while ((cd->ctypes[*++ptr] & ctype_letter) != 0);        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
4488        if (*ptr == ':')        if (*ptr == CHAR_COLON)
4489          {          {
4490          *errorcodeptr = ERR59;   /* Not supported */          *errorcodeptr = ERR59;   /* Not supported */
4491          goto FAILED;          goto FAILED;
4492          }          }
4493        if (*ptr != ')')        if (*ptr != CHAR_RIGHT_PARENTHESIS)
4494          {          {
4495          *errorcodeptr = ERR60;          *errorcodeptr = ERR60;
4496          goto FAILED;          goto FAILED;
# Line 4231  we set the flag only if there is a liter Line 4501  we set the flag only if there is a liter
4501          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
4502              strncmp((char *)name, vn, namelen) == 0)              strncmp((char *)name, vn, namelen) == 0)
4503            {            {
4504            *code = verbs[i].op;            /* Check for open captures before ACCEPT */
4505            if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;  
4506              if (verbs[i].op == OP_ACCEPT)
4507                {
4508                open_capitem *oc;
4509                cd->had_accept = TRUE;
4510                for (oc = cd->open_caps; oc != NULL; oc = oc->next)
4511                  {
4512                  *code++ = OP_CLOSE;
4513                  PUT2INC(code, 0, oc->number);
4514                  }
4515                }
4516              *code++ = verbs[i].op;
4517            break;            break;
4518            }            }
4519          vn += verbs[i].len + 1;          vn += verbs[i].len + 1;
# Line 4245  we set the flag only if there is a liter Line 4526  we set the flag only if there is a liter
4526      /* Deal with the extended parentheses; all are introduced by '?', and the      /* Deal with the extended parentheses; all are introduced by '?', and the
4527      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. */
4528    
4529      else if (*ptr == '?')      else if (*ptr == CHAR_QUESTION_MARK)
4530        {        {
4531        int i, set, unset, namelen;        int i, set, unset, namelen;
4532        int *optset;        int *optset;
# Line 4254  we set the flag only if there is a liter Line 4535  we set the flag only if there is a liter
4535    
4536        switch (*(++ptr))        switch (*(++ptr))
4537          {          {
4538          case '#':                 /* Comment; skip to ket */          case CHAR_NUMBER_SIGN:                 /* Comment; skip to ket */
4539          ptr++;          ptr++;
4540          while (*ptr != 0 && *ptr != ')') ptr++;          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
4541          if (*ptr == 0)          if (*ptr == 0)
4542            {            {
4543            *errorcodeptr = ERR18;            *errorcodeptr = ERR18;
# Line 4266  we set the flag only if there is a liter Line 4547  we set the flag only if there is a liter
4547    
4548    
4549          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4550          case '|':                 /* Reset capture count for each branch */          case CHAR_VERTICAL_LINE:  /* Reset capture count for each branch */
4551          reset_bracount = TRUE;          reset_bracount = TRUE;
4552          /* Fall through */          /* Fall through */
4553    
4554          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4555          case ':':                 /* Non-capturing bracket */          case CHAR_COLON:          /* Non-capturing bracket */
4556          bravalue = OP_BRA;          bravalue = OP_BRA;
4557          ptr++;          ptr++;
4558          break;          break;
4559    
4560    
4561          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4562          case '(':          case CHAR_LEFT_PARENTHESIS:
4563          bravalue = OP_COND;       /* Conditional group */          bravalue = OP_COND;       /* Conditional group */
4564    
4565          /* 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 4579  we set the flag only if there is a liter
4579          the switch. This will take control down to where bracketed groups,          the switch. This will take control down to where bracketed groups,
4580          including assertions, are processed. */          including assertions, are processed. */
4581    
4582          if (ptr[1] == '?' && (ptr[2] == '=' || ptr[2] == '!' || ptr[2] == '<'))          if (ptr[1] == CHAR_QUESTION_MARK && (ptr[2] == CHAR_EQUALS_SIGN ||
4583                ptr[2] == CHAR_EXCLAMATION_MARK || ptr[2] == CHAR_LESS_THAN_SIGN))
4584            break;            break;
4585    
4586          /* 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 4592  we set the flag only if there is a liter
4592    
4593          /* Check for a test for recursion in a named group. */          /* Check for a test for recursion in a named group. */
4594    
4595          if (ptr[1] == 'R' && ptr[2] == '&')          if (ptr[1] == CHAR_R && ptr[2] == CHAR_AMPERSAND)
4596            {            {
4597            terminator = -1;            terminator = -1;
4598            ptr += 2;            ptr += 2;
# Line 4320  we set the flag only if there is a liter Line 4602  we set the flag only if there is a liter
4602          /* 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
4603          syntax (?(<name>) or (?('name') */          syntax (?(<name>) or (?('name') */
4604    
4605          else if (ptr[1] == '<')          else if (ptr[1] == CHAR_LESS_THAN_SIGN)
4606            {            {
4607            terminator = '>';            terminator = CHAR_GREATER_THAN_SIGN;
4608            ptr++;            ptr++;
4609            }            }
4610          else if (ptr[1] == '\'')          else if (ptr[1] == CHAR_APOSTROPHE)
4611            {            {
4612            terminator = '\'';            terminator = CHAR_APOSTROPHE;
4613            ptr++;            ptr++;
4614            }            }
4615          else          else
4616            {            {
4617            terminator = 0;            terminator = 0;
4618            if (ptr[1] == '-' || ptr[1] == '+') refsign = *(++ptr);            if (ptr[1] == CHAR_MINUS || ptr[1] == CHAR_PLUS) refsign = *(++ptr);
4619            }            }
4620    
4621          /* 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 4635  we set the flag only if there is a liter
4635            {            {
4636            if (recno >= 0)            if (recno >= 0)
4637              recno = ((digitab[*ptr] & ctype_digit) != 0)?              recno = ((digitab[*ptr] & ctype_digit) != 0)?
4638                recno * 10 + *ptr - '0' : -1;                recno * 10 + *ptr - CHAR_0 : -1;
4639            ptr++;            ptr++;
4640            }            }
4641          namelen = ptr - name;          namelen = ptr - name;
4642    
4643          if ((terminator > 0 && *ptr++ != terminator) || *ptr++ != ')')          if ((terminator > 0 && *ptr++ != terminator) ||
4644                *ptr++ != CHAR_RIGHT_PARENTHESIS)
4645            {            {
4646            ptr--;      /* Error offset */            ptr--;      /* Error offset */
4647            *errorcodeptr = ERR26;            *errorcodeptr = ERR26;
# Line 4380  we set the flag only if there is a liter Line 4663  we set the flag only if there is a liter
4663              *errorcodeptr = ERR58;              *errorcodeptr = ERR58;
4664              goto FAILED;              goto FAILED;
4665              }              }
4666            recno = (refsign == '-')?            recno = (refsign == CHAR_MINUS)?
4667              cd->bracount - recno + 1 : recno +cd->bracount;              cd->bracount - recno + 1 : recno +cd->bracount;
4668            if (recno <= 0 || recno > cd->final_bracount)            if (recno <= 0 || recno > cd->final_bracount)
4669              {              {
# Line 4392  we set the flag only if there is a liter Line 4675  we set the flag only if there is a liter
4675            }            }
4676    
4677          /* Otherwise (did not start with "+" or "-"), start by looking for the          /* Otherwise (did not start with "+" or "-"), start by looking for the
4678          name. */          name. If we find a name, add one to the opcode to change OP_CREF or
4679            OP_RREF into OP_NCREF or OP_NRREF. These behave exactly the same,
4680            except they record that the reference was originally to a name. The
4681            information is used to check duplicate names. */
4682    
4683          slot = cd->name_table;          slot = cd->name_table;
4684          for (i = 0; i < cd->names_found; i++)          for (i = 0; i < cd->names_found; i++)
# Line 4407  we set the flag only if there is a liter Line 4693  we set the flag only if there is a liter
4693            {            {
4694            recno = GET2(slot, 0);            recno = GET2(slot, 0);
4695            PUT2(code, 2+LINK_SIZE, recno);            PUT2(code, 2+LINK_SIZE, recno);
4696              code[1+LINK_SIZE]++;
4697            }            }
4698    
4699          /* Search the pattern for a forward reference */          /* Search the pattern for a forward reference */
4700    
4701          else if ((i = find_parens(ptr, cd, name, namelen,          else if ((i = find_parens(cd, name, namelen,
4702                          (options & PCRE_EXTENDED) != 0)) > 0)                          (options & PCRE_EXTENDED) != 0)) > 0)
4703            {            {
4704            PUT2(code, 2+LINK_SIZE, i);            PUT2(code, 2+LINK_SIZE, i);
4705              code[1+LINK_SIZE]++;
4706            }            }
4707    
4708          /* If terminator == 0 it means that the name followed directly after          /* If terminator == 0 it means that the name followed directly after
# Line 4432  we set the flag only if there is a liter Line 4720  we set the flag only if there is a liter
4720          /* Check for (?(R) for recursion. Allow digits after R to specify a          /* Check for (?(R) for recursion. Allow digits after R to specify a
4721          specific group number. */          specific group number. */
4722    
4723          else if (*name == 'R')          else if (*name == CHAR_R)
4724            {            {
4725            recno = 0;            recno = 0;
4726            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 4730  we set the flag only if there is a liter
4730                *errorcodeptr = ERR15;                *errorcodeptr = ERR15;
4731                goto FAILED;                goto FAILED;
4732                }                }
4733              recno = recno * 10 + name[i] - '0';              recno = recno * 10 + name[i] - CHAR_0;
4734              }              }
4735            if (recno == 0) recno = RREF_ANY;            if (recno == 0) recno = RREF_ANY;
4736            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 4740  we set the flag only if there is a liter
4740          /* Similarly, check for the (?(DEFINE) "condition", which is always          /* Similarly, check for the (?(DEFINE) "condition", which is always
4741          false. */          false. */
4742    
4743          else if (namelen == 6 && strncmp((char *)name, "DEFINE", 6) == 0)          else if (namelen == 6 && strncmp((char *)name, STRING_DEFINE, 6) == 0)
4744            {            {
4745            code[1+LINK_SIZE] = OP_DEF;            code[1+LINK_SIZE] = OP_DEF;
4746            skipbytes = 1;            skipbytes = 1;
# Line 4477  we set the flag only if there is a liter Line 4765  we set the flag only if there is a liter
4765    
4766    
4767          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4768          case '=':                 /* Positive lookahead */          case CHAR_EQUALS_SIGN:                 /* Positive lookahead */
4769          bravalue = OP_ASSERT;          bravalue = OP_ASSERT;
4770          ptr++;          ptr++;
4771          break;          break;
4772    
4773    
4774          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4775          case '!':                 /* Negative lookahead */          case CHAR_EXCLAMATION_MARK:            /* Negative lookahead */
4776          ptr++;          ptr++;
4777          if (*ptr == ')')          /* Optimize (?!) */          if (*ptr == CHAR_RIGHT_PARENTHESIS)    /* Optimize (?!) */
4778            {            {
4779            *code++ = OP_FAIL;            *code++ = OP_FAIL;
4780            previous = NULL;            previous = NULL;
# Line 4497  we set the flag only if there is a liter Line 4785  we set the flag only if there is a liter
4785    
4786    
4787          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4788          case '<':                 /* Lookbehind or named define */          case CHAR_LESS_THAN_SIGN:              /* Lookbehind or named define */
4789          switch (ptr[1])          switch (ptr[1])
4790            {            {
4791            case '=':               /* Positive lookbehind */            case CHAR_EQUALS_SIGN:               /* Positive lookbehind */
4792            bravalue = OP_ASSERTBACK;            bravalue = OP_ASSERTBACK;
4793            ptr += 2;            ptr += 2;
4794            break;            break;
4795    
4796            case '!':               /* Negative lookbehind */            case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */
4797            bravalue = OP_ASSERTBACK_NOT;            bravalue = OP_ASSERTBACK_NOT;
4798            ptr += 2;            ptr += 2;
4799            break;            break;
# Line 4520  we set the flag only if there is a liter Line 4808  we set the flag only if there is a liter
4808    
4809    
4810          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4811          case '>':                 /* One-time brackets */          case CHAR_GREATER_THAN_SIGN:           /* One-time brackets */
4812          bravalue = OP_ONCE;          bravalue = OP_ONCE;
4813          ptr++;          ptr++;
4814          break;          break;
4815    
4816    
4817          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4818          case 'C':                 /* Callout - may be followed by digits; */          case CHAR_C:                 /* Callout - may be followed by digits; */
4819          previous_callout = code;  /* Save for later completion */          previous_callout = code;  /* Save for later completion */
4820          after_manual_callout = 1; /* Skip one item before completing */          after_manual_callout = 1; /* Skip one item before completing */
4821          *code++ = OP_CALLOUT;          *code++ = OP_CALLOUT;
4822            {            {
4823            int n = 0;            int n = 0;
4824            while ((digitab[*(++ptr)] & ctype_digit) != 0)            while ((digitab[*(++ptr)] & ctype_digit) != 0)
4825              n = n * 10 + *ptr - '0';              n = n * 10 + *ptr - CHAR_0;
4826            if (*ptr != ')')            if (*ptr != CHAR_RIGHT_PARENTHESIS)
4827              {              {
4828              *errorcodeptr = ERR39;              *errorcodeptr = ERR39;
4829              goto FAILED;              goto FAILED;
# Line 4555  we set the flag only if there is a liter Line 4843  we set the flag only if there is a liter
4843    
4844    
4845          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4846          case 'P':                 /* Python-style named subpattern handling */          case CHAR_P:              /* Python-style named subpattern handling */
4847          if (*(++ptr) == '=' || *ptr == '>')  /* Reference or recursion */          if (*(++ptr) == CHAR_EQUALS_SIGN ||
4848                *ptr == CHAR_GREATER_THAN_SIGN)  /* Reference or recursion */
4849            {            {
4850            is_recurse = *ptr == '>';            is_recurse = *ptr == CHAR_GREATER_THAN_SIGN;
4851            terminator = ')';            terminator = CHAR_RIGHT_PARENTHESIS;
4852            goto NAMED_REF_OR_RECURSE;            goto NAMED_REF_OR_RECURSE;
4853            }            }
4854          else if (*ptr != '<')    /* Test for Python-style definition */          else if (*ptr != CHAR_LESS_THAN_SIGN)  /* Test for Python-style defn */
4855            {            {
4856            *errorcodeptr = ERR41;            *errorcodeptr = ERR41;
4857            goto FAILED;            goto FAILED;
# Line 4572  we set the flag only if there is a liter Line 4861  we set the flag only if there is a liter
4861    
4862          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4863          DEFINE_NAME:    /* Come here from (?< handling */          DEFINE_NAME:    /* Come here from (?< handling */
4864          case '\'':          case CHAR_APOSTROPHE:
4865            {            {
4866            terminator = (*ptr == '<')? '>' : '\'';            terminator = (*ptr == CHAR_LESS_THAN_SIGN)?
4867                CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
4868            name = ++ptr;            name = ++ptr;
4869    
4870            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
# Line 4605  we set the flag only if there is a liter Line 4895  we set the flag only if there is a liter
4895                }                }
4896              }              }
4897    
4898            /* In the real compile, create the entry in the table */            /* In the real compile, create the entry in the table, maintaining
4899              alphabetical order. Duplicate names for different numbers are
4900              permitted only if PCRE_DUPNAMES is set. Duplicate names for the same
4901              number are always OK. (An existing number can be re-used if (?|
4902              appears in the pattern.) In either event, a duplicate name results in
4903              a duplicate entry in the table, even if the number is the same. This
4904              is because the number of names, and hence the table size, is computed
4905              in the pre-compile, and it affects various numbers and pointers which
4906              would all have to be modified, and the compiled code moved down, if
4907              duplicates with the same number were omitted from the table. This
4908              doesn't seem worth the hassle. However, *different* names for the
4909              same number are not permitted. */
4910    
4911            else            else
4912              {              {
4913                BOOL dupname = FALSE;
4914              slot = cd->name_table;              slot = cd->name_table;
4915    
4916              for (i = 0; i < cd->names_found; i++)              for (i = 0; i < cd->names_found; i++)
4917                {                {
4918                int crc = memcmp(name, slot+2, namelen);                int crc = memcmp(name, slot+2, namelen);
# Line 4617  we set the flag only if there is a liter Line 4920  we set the flag only if there is a liter
4920                  {                  {
4921                  if (slot[2+namelen] == 0)                  if (slot[2+namelen] == 0)
4922                    {                    {
4923                    if ((options & PCRE_DUPNAMES) == 0)                    if (GET2(slot, 0) != cd->bracount + 1 &&
4924                          (options & PCRE_DUPNAMES) == 0)
4925                      {                      {
4926                      *errorcodeptr = ERR43;                      *errorcodeptr = ERR43;
4927                      goto FAILED;                      goto FAILED;
4928                      }                      }
4929                      else dupname = TRUE;
4930                    }                    }
4931                  else crc = -1;      /* Current name is substring */                  else crc = -1;      /* Current name is a substring */
4932                  }                  }
4933    
4934                  /* Make space in the table and break the loop for an earlier
4935                  name. For a duplicate or later name, carry on. We do this for
4936                  duplicates so that in the simple case (when ?(| is not used) they
4937                  are in order of their numbers. */
4938    
4939                if (crc < 0)                if (crc < 0)
4940                  {                  {
4941                  memmove(slot + cd->name_entry_size, slot,                  memmove(slot + cd->name_entry_size, slot,
4942                    (cd->names_found - i) * cd->name_entry_size);                    (cd->names_found - i) * cd->name_entry_size);
4943                  break;                  break;
4944                  }                  }
4945    
4946                  /* Continue the loop for a later or duplicate name */
4947    
4948                slot += cd->name_entry_size;                slot += cd->name_entry_size;
4949                }                }
4950    
4951                /* For non-duplicate names, check for a duplicate number before
4952                adding the new name. */
4953    
4954                if (!dupname)
4955                  {
4956                  uschar *cslot = cd->name_table;
4957                  for (i = 0; i < cd->names_found; i++)
4958                    {
4959                    if (cslot != slot)
4960                      {
4961                      if (GET2(cslot, 0) == cd->bracount + 1)
4962                        {
4963                        *errorcodeptr = ERR65;
4964                        goto FAILED;
4965                        }
4966                      }
4967                    else i--;
4968                    cslot += cd->name_entry_size;
4969                    }
4970                  }
4971    
4972              PUT2(slot, 0, cd->bracount + 1);              PUT2(slot, 0, cd->bracount + 1);
4973              memcpy(slot + 2, name, namelen);              memcpy(slot + 2, name, namelen);
4974              slot[2+namelen] = 0;              slot[2+namelen] = 0;
4975              }              }
4976            }            }
4977    
4978          /* In both cases, count the number of names we've encountered. */          /* In both pre-compile and compile, count the number of names we've
4979            encountered. */
4980    
         ptr++;                    /* Move past > or ' */  
4981          cd->names_found++;          cd->names_found++;
4982            ptr++;                    /* Move past > or ' */
4983          goto NUMBERED_GROUP;          goto NUMBERED_GROUP;
4984    
4985    
4986          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
4987          case '&':                 /* Perl recursion/subroutine syntax */          case CHAR_AMPERSAND:            /* Perl recursion/subroutine syntax */
4988          terminator = ')';          terminator = CHAR_RIGHT_PARENTHESIS;
4989          is_recurse = TRUE;          is_recurse = TRUE;
4990          /* Fall through */          /* Fall through */
4991    
# Line 4708  we set the flag only if there is a liter Line 5044  we set the flag only if there is a liter
5044              recno = GET2(slot, 0);              recno = GET2(slot, 0);
5045              }              }
5046            else if ((recno =                /* Forward back reference */            else if ((recno =                /* Forward back reference */
5047                      find_parens(ptr, cd, name, namelen,                      find_parens(cd, name, namelen,
5048                        (options & PCRE_EXTENDED) != 0)) <= 0)                        (options & PCRE_EXTENDED) != 0)) <= 0)
5049              {              {
5050              *errorcodeptr = ERR15;              *errorcodeptr = ERR15;
# Line 4724  we set the flag only if there is a liter Line 5060  we set the flag only if there is a liter
5060    
5061    
5062          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5063          case 'R':                 /* Recursion */          case CHAR_R:              /* Recursion */
5064          ptr++;                    /* Same as (?0)      */          ptr++;                    /* Same as (?0)      */
5065          /* Fall through */          /* Fall through */
5066    
5067    
5068          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5069          case '-': case '+':          case CHAR_MINUS: case CHAR_PLUS:  /* Recursion or subroutine */
5070          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:
5071          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:
5072            {            {
5073            const uschar *called;            const uschar *called;
5074            terminator = ')';            terminator = CHAR_RIGHT_PARENTHESIS;
5075    
5076            /* Come here from the \g<...> and \g'...' code (Oniguruma            /* Come here from the \g<...> and \g'...' code (Oniguruma
5077            compatibility). However, the syntax has been checked to ensure that            compatibility). However, the syntax has been checked to ensure that
5078            the ... are a (signed) number, so that neither ERR63 nor ERR29 will            the ... are a (signed) number, so that neither ERR63 nor ERR29 will
5079            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
5080            ever be taken. */            ever be taken. */
   
           HANDLE_NUMERICAL_RECURSION:  
5081    
5082            if ((refsign = *ptr) == '+')            HANDLE_NUMERICAL_RECURSION:
5083    
5084              if ((refsign = *ptr) == CHAR_PLUS)
5085              {              {
5086              ptr++;              ptr++;
5087              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 5090  we set the flag only if there is a liter
5090                goto FAILED;                goto FAILED;
5091                }                }
5092              }              }
5093            else if (refsign == '-')            else if (refsign == CHAR_MINUS)
5094              {              {
5095              if ((digitab[ptr[1]] & ctype_digit) == 0)              if ((digitab[ptr[1]] & ctype_digit) == 0)
5096                goto OTHER_CHAR_AFTER_QUERY;                goto OTHER_CHAR_AFTER_QUERY;
# Line 4763  we set the flag only if there is a liter Line 5099  we set the flag only if there is a liter
5099    
5100            recno = 0;            recno = 0;
5101            while((digitab[*ptr] & ctype_digit) != 0)            while((digitab[*ptr] & ctype_digit) != 0)
5102              recno = recno * 10 + *ptr++ - '0';              recno = recno * 10 + *ptr++ - CHAR_0;
5103    
5104            if (*ptr != terminator)            if (*ptr != terminator)
5105              {              {
# Line 4771  we set the flag only if there is a liter Line 5107  we set the flag only if there is a liter
5107              goto FAILED;              goto FAILED;
5108              }              }
5109    
5110            if (refsign == '-')            if (refsign == CHAR_MINUS)
5111              {              {
5112              if (recno == 0)              if (recno == 0)
5113                {                {
# Line 4785  we set the flag only if there is a liter Line 5121  we set the flag only if there is a liter
5121                goto FAILED;                goto FAILED;
5122                }                }
5123              }              }
5124            else if (refsign == '+')            else if (refsign == CHAR_PLUS)
5125              {              {
5126              if (recno == 0)              if (recno == 0)
5127                {                {
# Line 4812  we set the flag only if there is a liter Line 5148  we set the flag only if there is a liter
5148            if (lengthptr == NULL)            if (lengthptr == NULL)
5149              {              {
5150              *code = OP_END;              *code = OP_END;
5151              if (recno != 0) called = find_bracket(cd->start_code, utf8, recno);              if (recno != 0)
5152                  called = _pcre_find_bracket(cd->start_code, utf8, recno);
5153    
5154              /* Forward reference */              /* Forward reference */
5155    
5156              if (called == NULL)              if (called == NULL)
5157                {                {
5158                if (find_parens(ptr, cd, NULL, recno,                if (find_parens(cd, NULL, recno,
5159                      (options & PCRE_EXTENDED) != 0) < 0)                      (options & PCRE_EXTENDED) != 0) < 0)
5160                  {                  {
5161                  *errorcodeptr = ERR15;                  *errorcodeptr = ERR15;
5162                  goto FAILED;                  goto FAILED;
5163                  }                  }
5164    
5165                  /* Fudge the value of "called" so that when it is inserted as an
5166                  offset below, what it actually inserted is the reference number
5167                  of the group. */
5168    
5169                called = cd->start_code + recno;                called = cd->start_code + recno;
5170                PUTINC(cd->hwm, 0, code + 2 + LINK_SIZE - cd->start_code);                PUTINC(cd->hwm, 0, code + 2 + LINK_SIZE - cd->start_code);
5171                }                }
# Line 4871  we set the flag only if there is a liter Line 5213  we set the flag only if there is a liter
5213          set = unset = 0;          set = unset = 0;
5214          optset = &set;          optset = &set;
5215    
5216          while (*ptr != ')' && *ptr != ':')          while (*ptr != CHAR_RIGHT_PARENTHESIS && *ptr != CHAR_COLON)
5217            {            {
5218            switch (*ptr++)            switch (*ptr++)
5219              {              {
5220              case '-': optset = &unset; break;              case CHAR_MINUS: optset = &unset; break;
5221    
5222              case 'J':    /* Record that it changed in the external options */              case CHAR_J:    /* Record that it changed in the external options */
5223              *optset |= PCRE_DUPNAMES;              *optset |= PCRE_DUPNAMES;
5224              cd->external_flags |= PCRE_JCHANGED;              cd->external_flags |= PCRE_JCHANGED;
5225              break;              break;
5226    
5227              case 'i': *optset |= PCRE_CASELESS; break;              case CHAR_i: *optset |= PCRE_CASELESS; break;
5228              case 'm': *optset |= PCRE_MULTILINE; break;              case CHAR_m: *optset |= PCRE_MULTILINE; break;
5229              case 's': *optset |= PCRE_DOTALL; break;              case CHAR_s: *optset |= PCRE_DOTALL; break;
5230              case 'x': *optset |= PCRE_EXTENDED; break;              case CHAR_x: *optset |= PCRE_EXTENDED; break;
5231              case 'U': *optset |= PCRE_UNGREEDY; break;              case CHAR_U: *optset |= PCRE_UNGREEDY; break;
5232              case 'X': *optset |= PCRE_EXTRA; break;              case CHAR_X: *optset |= PCRE_EXTRA; break;
5233    
5234              default:  *errorcodeptr = ERR12;              default:  *errorcodeptr = ERR12;
5235                        ptr--;    /* Correct the offset */                        ptr--;    /* Correct the offset */
# Line 4918  we set the flag only if there is a liter Line 5260  we set the flag only if there is a liter
5260          both phases.          both phases.
5261    
5262          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
5263          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
5264          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. */  
5265    
5266          if (*ptr == ')')          if (*ptr == CHAR_RIGHT_PARENTHESIS)
5267            {            {
5268            if (code == cd->start_code + 1 + LINK_SIZE &&            if (code == cd->start_code + 1 + LINK_SIZE &&
5269                 (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))                 (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
5270              {              {
5271              cd->external_options = newoptions;              cd->external_options = newoptions;
             options = newoptions;  
5272              }              }
5273           else            else
5274              {              {
5275              if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))              if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
5276                {                {
5277                *code++ = OP_OPT;                *code++ = OP_OPT;
5278                *code++ = newoptions & PCRE_IMS;                *code++ = newoptions & PCRE_IMS;
5279                }                }
   
             /* 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;  
5280              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
5281              greedy_non_default = greedy_default ^ 1;              greedy_non_default = greedy_default ^ 1;
5282              req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;              req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
5283              }              }
5284    
5285              /* Change options at this level, and pass them back for use
5286              in subsequent branches. When not at the start of the pattern, this
5287              information is also necessary so that a resetting item can be
5288              compiled at the end of a group (if we are in a group). */
5289    
5290              *optionsptr = options = newoptions;
5291            previous = NULL;       /* This item can't be repeated */            previous = NULL;       /* This item can't be repeated */
5292            continue;              /* It is complete */            continue;              /* It is complete */
5293            }            }
# Line 5064  we set the flag only if there is a liter Line 5403  we set the flag only if there is a liter
5403    
5404      /* Error if hit end of pattern */      /* Error if hit end of pattern */
5405    
5406      if (*ptr != ')')      if (*ptr != CHAR_RIGHT_PARENTHESIS)
5407        {        {
5408        *errorcodeptr = ERR14;        *errorcodeptr = ERR14;
5409        goto FAILED;        goto FAILED;
# Line 5161  we set the flag only if there is a liter Line 5500  we set the flag only if there is a liter
5500      back references and those types that consume a character may be repeated.      back references and those types that consume a character may be repeated.
5501      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
5502      have to change if any new ones are ever created. */      have to change if any new ones are ever created. */
5503    
5504      case '\\':      case CHAR_BACKSLASH:
5505      tempptr = ptr;      tempptr = ptr;
5506      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);
5507      if (*errorcodeptr != 0) goto FAILED;      if (*errorcodeptr != 0) goto FAILED;
# Line 5171  we set the flag only if there is a liter Line 5510  we set the flag only if there is a liter
5510        {        {
5511        if (-c == ESC_Q)            /* Handle start of quoted string */        if (-c == ESC_Q)            /* Handle start of quoted string */
5512          {          {
5513          if (ptr[1] == '\\' && ptr[2] == 'E') ptr += 2; /* avoid empty string */          if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
5514            else inescq = TRUE;            ptr += 2;               /* avoid empty string */
5515                else inescq = TRUE;
5516          continue;          continue;
5517          }          }
5518    
# Line 5188  we set the flag only if there is a liter Line 5528  we set the flag only if there is a liter
5528    
5529        zerofirstbyte = firstbyte;        zerofirstbyte = firstbyte;
5530        zeroreqbyte = reqbyte;        zeroreqbyte = reqbyte;
5531    
5532        /* \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'
5533        is a subroutine call by number (Oniguruma syntax). In fact, the value        is a subroutine call by number (Oniguruma syntax). In fact, the value
5534        -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 <
5535        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
5536        -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
5537        that is a synonym for a named back reference). */        that is a synonym for a named back reference). */
5538    
5539        if (-c == ESC_g)        if (-c == ESC_g)
5540          {          {
5541          const uschar *p;          const uschar *p;
5542          save_hwm = cd->hwm;   /* Normally this is set when '(' is read */          save_hwm = cd->hwm;   /* Normally this is set when '(' is read */
5543          terminator = (*(++ptr) == '<')? '>' : '\'';          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
5544              CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
5545    
5546          /* These two statements stop the compiler for warning about possibly          /* These two statements stop the compiler for warning about possibly
5547          unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In          unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In
5548          fact, because we actually check for a number below, the paths that          fact, because we actually check for a number below, the paths that
5549          would actually be in error are never taken. */          would actually be in error are never taken. */
5550    
5551          skipbytes = 0;          skipbytes = 0;
5552          reset_bracount = FALSE;          reset_bracount = FALSE;
5553    
5554          /* Test for a name */          /* Test for a name */
5555    
5556          if (ptr[1] != '+' && ptr[1] != '-')          if (ptr[1] != CHAR_PLUS && ptr[1] != CHAR_MINUS)
5557            {            {
5558            BOOL isnumber = TRUE;            BOOL isnumber = TRUE;
5559            for (p = ptr + 1; *p != 0 && *p != terminator; p++)            for (p = ptr + 1; *p != 0 && *p != terminator; p++)
5560              {              {
5561              if ((cd->ctypes[*p] & ctype_digit) == 0) isnumber = FALSE;              if ((cd->ctypes[*p] & ctype_digit) == 0) isnumber = FALSE;
5562              if ((cd->ctypes[*p] & ctype_word) == 0) break;              if ((cd->ctypes[*p] & ctype_word) == 0) break;
5563              }              }
5564            if (*p != terminator)            if (*p != terminator)
5565              {              {
5566              *errorcodeptr = ERR57;              *errorcodeptr = ERR57;
5567              break;              break;
5568              }              }
5569            if (isnumber)            if (isnumber)
5570              {              {
5571              ptr++;              ptr++;
5572              goto HANDLE_NUMERICAL_RECURSION;              goto HANDLE_NUMERICAL_RECURSION;
5573              }              }
5574            is_recurse = TRUE;            is_recurse = TRUE;
5575            goto NAMED_REF_OR_RECURSE;            goto NAMED_REF_OR_RECURSE;
5576            }            }
5577    
5578          /* Test a signed number in angle brackets or quotes. */          /* Test a signed number in angle brackets or quotes. */
5579    
5580          p = ptr + 2;          p = ptr + 2;
5581          while ((digitab[*p] & ctype_digit) != 0) p++;          while ((digitab[*p] & ctype_digit) != 0) p++;
5582          if (*p != terminator)          if (*p != terminator)
# Line 5243  we set the flag only if there is a liter Line 5584  we set the flag only if there is a liter
5584            *errorcodeptr = ERR57;            *errorcodeptr = ERR57;
5585            break;            break;
5586            }            }
5587          ptr++;          ptr++;
5588          goto HANDLE_NUMERICAL_RECURSION;          goto HANDLE_NUMERICAL_RECURSION;
5589          }          }
5590    
5591        /* \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).
5592        We also support \k{name} (.NET syntax) */        We also support \k{name} (.NET syntax) */
5593    
5594        if (-c == ESC_k && (ptr[1] == '<' || ptr[1] == '\'' || ptr[1] == '{'))        if (-c == ESC_k && (ptr[1] == CHAR_LESS_THAN_SIGN ||
5595              ptr[1] == CHAR_APOSTROPHE || ptr[1] == CHAR_LEFT_CURLY_BRACKET))
5596          {          {
5597          is_recurse = FALSE;          is_recurse = FALSE;
5598          terminator = (*(++ptr) == '<')? '>' : (*ptr == '\'')? '\'' : '}';          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
5599              CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?
5600              CHAR_APOSTROPHE : CHAR_RIGHT_CURLY_BRACKET;
5601          goto NAMED_REF_OR_RECURSE;          goto NAMED_REF_OR_RECURSE;
5602          }          }
5603    
# Line 5263  we set the flag only if there is a liter Line 5607  we set the flag only if there is a liter
5607    
5608        if (-c >= ESC_REF)        if (-c >= ESC_REF)
5609          {          {
5610            open_capitem *oc;
5611          recno = -c - ESC_REF;          recno = -c - ESC_REF;
5612    
5613          HANDLE_REFERENCE:    /* Come here from named backref handling */          HANDLE_REFERENCE:    /* Come here from named backref handling */
# Line 5272  we set the flag only if there is a liter Line 5617  we set the flag only if there is a liter
5617          PUT2INC(code, 0, recno);          PUT2INC(code, 0, recno);
5618          cd->backref_map |= (recno < 32)? (1 << recno) : 1;          cd->backref_map |= (recno < 32)? (1 << recno) : 1;
5619          if (recno > cd->top_backref) cd->top_backref = recno;          if (recno > cd->top_backref) cd->top_backref = recno;
5620    
5621            /* Check to see if this back reference is recursive, that it, it
5622            is inside the group that it references. A flag is set so that the
5623            group can be made atomic. */
5624    
5625            for (oc = cd->open_caps; oc != NULL; oc = oc->next)
5626              {
5627              if (oc->number == recno)
5628                {
5629                oc->flag = TRUE;
5630                break;
5631                }
5632              }
5633          }          }
5634    
5635        /* So are Unicode property matches, if supported. */        /* So are Unicode property matches, if supported. */
# Line 5356  we set the flag only if there is a liter Line 5714  we set the flag only if there is a liter
5714    
5715      /* Remember if \r or \n were seen */      /* Remember if \r or \n were seen */
5716    
5717      if (mcbuffer[0] == '\r' || mcbuffer[0] == '\n')      if (mcbuffer[0] == CHAR_CR || mcbuffer[0] == CHAR_NL)
5718        cd->external_flags |= PCRE_HASCRORLF;        cd->external_flags |= PCRE_HASCRORLF;
5719    
5720      /* 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 5812  uschar *code = *codeptr;
5812  uschar *last_branch = code;  uschar *last_branch = code;
5813  uschar *start_bracket = code;  uschar *start_bracket = code;
5814  uschar *reverse_count = NULL;  uschar *reverse_count = NULL;
5815    open_capitem capitem;
5816    int capnumber = 0;
5817  int firstbyte, reqbyte;  int firstbyte, reqbyte;
5818  int branchfirstbyte, branchreqbyte;  int branchfirstbyte, branchreqbyte;
5819  int length;  int length;
5820  int orig_bracount;  int orig_bracount;
5821  int max_bracount;  int max_bracount;
5822    int old_external_options = cd->external_options;
5823  branch_chain bc;  branch_chain bc;
5824    
5825  bc.outer = bcptr;  bc.outer = bcptr;
5826  bc.current = code;  bc.current_branch = code;
5827    
5828  firstbyte = reqbyte = REQ_UNSET;  firstbyte = reqbyte = REQ_UNSET;
5829    
# Line 5480  the code that abstracts option settings Line 5841  the code that abstracts option settings
5841  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
5842  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. */
5843    
5844    /* If this is a capturing subpattern, add to the chain of open capturing items
5845    so that we can detect them if (*ACCEPT) is encountered. This is also used to
5846    detect groups that contain recursive back references to themselves. */
5847    
5848    if (*code == OP_CBRA)
5849      {
5850      capnumber = GET2(code, 1 + LINK_SIZE);
5851      capitem.number = capnumber;
5852      capitem.next = cd->open_caps;
5853      capitem.flag = FALSE;
5854      cd->open_caps = &capitem;
5855      }
5856    
5857  /* Offset is set zero to mark that this bracket is still open */  /* Offset is set zero to mark that this bracket is still open */
5858    
5859  PUT(code, 1, 0);  PUT(code, 1, 0);
# Line 5524  for (;;) Line 5898  for (;;)
5898      return FALSE;      return FALSE;
5899      }      }
5900    
5901      /* If the external options have changed during this branch, it means that we
5902      are at the top level, and a leading option setting has been encountered. We
5903      need to re-set the original option values to take account of this so that,
5904      during the pre-compile phase, we know to allow for a re-set at the start of
5905      subsequent branches. */
5906    
5907      if (old_external_options != cd->external_options)
5908        oldims = cd->external_options & PCRE_IMS;
5909    
5910    /* Keep the highest bracket count in case (?| was used and some branch    /* Keep the highest bracket count in case (?| was used and some branch
5911    has fewer than the rest. */    has fewer than the rest. */
5912    
# Line 5574  for (;;) Line 5957  for (;;)
5957    
5958      /* If lookbehind, check that this branch matches a fixed-length string, and      /* If lookbehind, check that this branch matches a fixed-length string, and
5959      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
5960      branch with OP_END. */      branch with OP_END. If the branch contains OP_RECURSE, the result is -3
5961        because there may be forward references that we can't check here. Set a
5962        flag to cause another lookbehind check at the end. Why not do it all at the
5963        end? Because common, erroneous checks are picked up here and the offset of
5964        the problem can be shown. */
5965    
5966      if (lookbehind)      if (lookbehind)
5967        {        {
5968        int fixed_length;        int fixed_length;
5969        *code = OP_END;        *code = OP_END;
5970        fixed_length = find_fixedlength(last_branch, options);        fixed_length = find_fixedlength(last_branch, options, FALSE, cd);
5971        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
5972        if (fixed_length < 0)        if (fixed_length == -3)
5973            {
5974            cd->check_lookbehind = TRUE;
5975            }
5976          else if (fixed_length < 0)
5977          {          {
5978          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;
5979          *ptrptr = ptr;          *ptrptr = ptr;
5980          return FALSE;          return FALSE;
5981          }          }
5982        PUT(reverse_count, 0, fixed_length);        else { PUT(reverse_count, 0, fixed_length); }
5983        }        }
5984      }      }
5985    
# Line 5601  for (;;) Line 5992  for (;;)
5992    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.
5993    Return leaving the pointer at the terminating char. */    Return leaving the pointer at the terminating char. */
5994    
5995    if (*ptr != '|')    if (*ptr != CHAR_VERTICAL_LINE)
5996      {      {
5997      if (lengthptr == NULL)      if (lengthptr == NULL)
5998        {        {
# Line 5622  for (;;) Line 6013  for (;;)
6013      PUT(code, 1, code - start_bracket);      PUT(code, 1, code - start_bracket);
6014      code += 1 + LINK_SIZE;      code += 1 + LINK_SIZE;
6015    
6016      /* Resetting option if needed */      /* If it was a capturing subpattern, check to see if it contained any
6017        recursive back references. If so, we must wrap it in atomic brackets.
6018        In any event, remove the block from the chain. */
6019    
6020      if ((options & PCRE_IMS) != oldims && *ptr == ')')      if (capnumber > 0)
6021          {
6022          if (cd->open_caps->flag)
6023            {
6024            memmove(start_bracket + 1 + LINK_SIZE, start_bracket,
6025              code - start_bracket);
6026            *start_bracket = OP_ONCE;
6027            code += 1 + LINK_SIZE;
6028            PUT(start_bracket, 1, code - start_bracket);
6029            *code = OP_KET;
6030            PUT(code, 1, code - start_bracket);
6031            code += 1 + LINK_SIZE;
6032            length += 2 + 2*LINK_SIZE;
6033            }
6034          cd->open_caps = cd->open_caps->next;
6035          }
6036    
6037        /* Reset options if needed. */
6038    
6039        if ((options & PCRE_IMS) != oldims && *ptr == CHAR_RIGHT_PARENTHESIS)
6040        {        {
6041        *code++ = OP_OPT;        *code++ = OP_OPT;
6042        *code++ = oldims;        *code++ = oldims;
# Line 5671  for (;;) Line 6083  for (;;)
6083      {      {
6084      *code = OP_ALT;      *code = OP_ALT;
6085      PUT(code, 1, code - last_branch);      PUT(code, 1, code - last_branch);
6086      bc.current = last_branch = code;      bc.current_branch = last_branch = code;
6087      code += 1 + LINK_SIZE;      code += 1 + LINK_SIZE;
6088      }      }
6089    
# Line 5753  do { Line 6165  do {
6165       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;
6166       }       }
6167    
6168     /* .* 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
6169     are or may be referenced. */     it isn't in brackets that are or may be referenced. */
6170    
6171     else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||     else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||
6172               op == OP_TYPEPOSSTAR) &&               op == OP_TYPEPOSSTAR))
             (*options & PCRE_DOTALL) != 0)  
6173       {       {
6174       if (scode[1] != OP_ANY || (bracket_map & backref_map) != 0) return FALSE;       if (scode[1] != OP_ALLANY || (bracket_map & backref_map) != 0)
6175           return FALSE;
6176       }       }
6177    
6178     /* Check for explicit anchoring */     /* Check for explicit anchoring */
# Line 5806  do { Line 6218  do {
6218       NULL, 0, FALSE);       NULL, 0, FALSE);
6219     register int op = *scode;     register int op = *scode;
6220    
6221       /* If we are at the start of a conditional assertion group, *both* the
6222       conditional assertion *and* what follows the condition must satisfy the test
6223       for start of line. Other kinds of condition fail. Note that there may be an
6224       auto-callout at the start of a condition. */
6225    
6226       if (op == OP_COND)
6227         {
6228         scode += 1 + LINK_SIZE;
6229         if (*scode == OP_CALLOUT) scode += _pcre_OP_lengths[OP_CALLOUT];
6230         switch (*scode)
6231           {
6232           case OP_CREF:
6233           case OP_NCREF:
6234           case OP_RREF:
6235           case OP_NRREF:
6236           case OP_DEF:
6237           return FALSE;
6238    
6239           default:     /* Assertion */
6240           if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
6241           do scode += GET(scode, 1); while (*scode == OP_ALT);
6242           scode += 1 + LINK_SIZE;
6243           break;
6244           }
6245         scode = first_significant_code(scode, NULL, 0, FALSE);
6246         op = *scode;
6247         }
6248    
6249     /* Non-capturing brackets */     /* Non-capturing brackets */
6250    
6251     if (op == OP_BRA)     if (op == OP_BRA)
# Line 5824  do { Line 6264  do {
6264    
6265     /* Other brackets */     /* Other brackets */
6266    
6267     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)     else if (op == OP_ASSERT || op == OP_ONCE)
6268       { if (!is_startline(scode, bracket_map, backref_map)) return FALSE; }       {
6269         if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
6270         }
6271    
6272     /* .* 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
6273     may be referenced. */     may be referenced. */
# Line 5942  Returns:        pointer to compiled data Line 6384  Returns:        pointer to compiled data
6384                  with errorptr and erroroffset set                  with errorptr and erroroffset set
6385  */  */
6386    
6387  PCRE_EXP_DEFN pcre *  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
6388  pcre_compile(const char *pattern, int options, const char **errorptr,  pcre_compile(const char *pattern, int options, const char **errorptr,
6389    int *erroroffset, const unsigned char *tables)    int *erroroffset, const unsigned char *tables)
6390  {  {
# Line 5950  return pcre_compile2(pattern, options, N Line 6392  return pcre_compile2(pattern, options, N
6392  }  }
6393    
6394    
6395  PCRE_EXP_DEFN pcre *  PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
6396  pcre_compile2(const char *pattern, int options, int *errorcodeptr,  pcre_compile2(const char *pattern, int options, int *errorcodeptr,
6397    const char **errorptr, int *erroroffset, const unsigned char *tables)    const char **errorptr, int *erroroffset, const unsigned char *tables)
6398  {  {
# Line 5959  int length = 1;  /* For final END opcode Line 6401  int length = 1;  /* For final END opcode
6401  int firstbyte, reqbyte, newline;  int firstbyte, reqbyte, newline;
6402  int errorcode = 0;  int errorcode = 0;
6403  int skipatstart = 0;  int skipatstart = 0;
6404  #ifdef SUPPORT_UTF8  BOOL utf8 = (options & PCRE_UTF8) != 0;
 BOOL utf8;  
 #endif  
6405  size_t size;  size_t size;
6406  uschar *code;  uschar *code;
6407  const uschar *codestart;  const uschar *codestart;
# Line 6004  if (erroroffset == NULL) Line 6444  if (erroroffset == NULL)
6444    
6445  *erroroffset = 0;  *erroroffset = 0;
6446    
 /* 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;  
   }  
   
6447  /* Set up pointers to the individual character tables */  /* Set up pointers to the individual character tables */
6448    
6449  if (tables == NULL) tables = _pcre_default_tables;  if (tables == NULL) tables = _pcre_default_tables;
# Line 6036  cd->fcc = tables + fcc_offset; Line 6452  cd->fcc = tables + fcc_offset;
6452  cd->cbits = tables + cbits_offset;  cd->cbits = tables + cbits_offset;
6453  cd->ctypes = tables + ctypes_offset;  cd->ctypes = tables + ctypes_offset;
6454    
6455    /* Check that all undefined public option bits are zero */
6456    
6457    if ((options & ~PUBLIC_COMPILE_OPTIONS) != 0)
6458      {
6459      errorcode = ERR17;
6460      goto PCRE_EARLY_ERROR_RETURN;
6461      }
6462    
6463  /* 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
6464  the offset for later. */  the offset for later. */
6465    
6466  while (ptr[skipatstart] == '(' && ptr[skipatstart+1] == '*')  while (ptr[skipatstart] == CHAR_LEFT_PARENTHESIS &&
6467           ptr[skipatstart+1] == CHAR_ASTERISK)
6468    {    {
6469    int newnl = 0;    int newnl = 0;
6470    int newbsr = 0;    int newbsr = 0;
6471    
6472    if (strncmp((char *)(ptr+skipatstart+2), "CR)", 3) == 0)    if (strncmp((char *)(ptr+skipatstart+2), STRING_UTF8_RIGHTPAR, 5) == 0)
6473        { skipatstart += 7; options |= PCRE_UTF8; continue; }
6474    
6475      if (strncmp((char *)(ptr+skipatstart+2), STRING_CR_RIGHTPAR, 3) == 0)
6476      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
6477    else if (strncmp((char *)(ptr+skipatstart+2), "LF)", 3)  == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_LF_RIGHTPAR, 3)  == 0)
6478      { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }      { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
6479    else if (strncmp((char *)(ptr+skipatstart+2), "CRLF)", 5)  == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_CRLF_RIGHTPAR, 5)  == 0)
6480      { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }      { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
6481    else if (strncmp((char *)(ptr+skipatstart+2), "ANY)", 4) == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_ANY_RIGHTPAR, 4) == 0)
6482      { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }      { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
6483    else if (strncmp((char *)(ptr+skipatstart+2), "ANYCRLF)", 8)  == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_ANYCRLF_RIGHTPAR, 8) == 0)
6484      { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }      { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
6485    
6486    else if (strncmp((char *)(ptr+skipatstart+2), "BSR_ANYCRLF)", 12) == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_BSR_ANYCRLF_RIGHTPAR, 12) == 0)
6487      { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }      { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
6488    else if (strncmp((char *)(ptr+skipatstart+2), "BSR_UNICODE)", 12) == 0)    else if (strncmp((char *)(ptr+skipatstart+2), STRING_BSR_UNICODE_RIGHTPAR, 12) == 0)
6489      { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }      { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
6490    
6491    if (newnl != 0)    if (newnl != 0)
# Line 6067  while (ptr[skipatstart] == '(' && ptr[sk Line 6495  while (ptr[skipatstart] == '(' && ptr[sk
6495    else break;    else break;
6496    }    }
6497    
6498    /* Can't support UTF8 unless PCRE has been compiled to include the code. */
6499    
6500    #ifdef SUPPORT_UTF8
6501    if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&
6502         (*erroroffset = _pcre_valid_utf8((USPTR)pattern, -1)) >= 0)
6503      {
6504      errorcode = ERR44;
6505      goto PCRE_EARLY_ERROR_RETURN2;
6506      }
6507    #else
6508    if (utf8)
6509      {
6510      errorcode = ERR32;
6511      goto PCRE_EARLY_ERROR_RETURN;
6512      }
6513    #endif
6514    
6515  /* Check validity of \R options. */  /* Check validity of \R options. */
6516    
6517  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 6530  current code allows for fixed one- or tw
6530  switch (options & PCRE_NEWLINE_BITS)  switch (options & PCRE_NEWLINE_BITS)
6531    {    {
6532    case 0: newline = NEWLINE; break;   /* Build-time default */    case 0: newline = NEWLINE; break;   /* Build-time default */
6533    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
6534    case PCRE_NEWLINE_LF: newline = '\n'; break;    case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
6535    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
6536         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;         PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
6537    case PCRE_NEWLINE_ANY: newline = -1; break;    case PCRE_NEWLINE_ANY: newline = -1; break;
6538    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
6539    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 6594  cd->end_pattern = (const uschar *)(patte
6594  cd->req_varyopt = 0;  cd->req_varyopt = 0;
6595  cd->external_options = options;  cd->external_options = options;
6596  cd->external_flags = 0;  cd->external_flags = 0;
6597    cd->open_caps = NULL;
6598    
6599  /* 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
6600  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 6669  cd->start_code = codestart;
6669  cd->hwm = cworkspace;  cd->hwm = cworkspace;
6670  cd->req_varyopt = 0;  cd->req_varyopt = 0;
6671  cd->had_accept = FALSE;  cd->had_accept = FALSE;
6672    cd->check_lookbehind = FALSE;
6673    cd->open_caps = NULL;
6674    
6675  /* Set up a starting, non-extracting bracket, then compile the expression. On  /* Set up a starting, non-extracting bracket, then compile the expression. On
6676  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 6248  if debugging, leave the test till after Line 6696  if debugging, leave the test till after
6696    
6697  *code++ = OP_END;  *code++ = OP_END;
6698    
6699  #ifndef DEBUG  #ifndef PCRE_DEBUG
6700  if (code - codestart > length) errorcode = ERR23;  if (code - codestart > length) errorcode = ERR23;
6701  #endif  #endif
6702    
# Line 6261  while (errorcode == 0 && cd->hwm > cwork Line 6709  while (errorcode == 0 && cd->hwm > cwork
6709    cd->hwm -= LINK_SIZE;    cd->hwm -= LINK_SIZE;
6710    offset = GET(cd->hwm, 0);    offset = GET(cd->hwm, 0);
6711    recno = GET(codestart, offset);    recno = GET(codestart, offset);
6712    groupptr = find_bracket(codestart, (re->options & PCRE_UTF8) != 0, recno);    groupptr = _pcre_find_bracket(codestart, utf8, recno);
6713    if (groupptr == NULL) errorcode = ERR53;    if (groupptr == NULL) errorcode = ERR53;
6714      else PUT(((uschar *)codestart), offset, groupptr - codestart);      else PUT(((uschar *)codestart), offset, groupptr - codestart);
6715    }    }
6716    
6717  /* 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
6718  subpattern. */  subpattern. */
6719    
6720  if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;  if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;
6721    
6722    /* If there were any lookbehind assertions that contained OP_RECURSE
6723    (recursions or subroutine calls), a flag is set for them to be checked here,
6724    because they may contain forward references. Actual recursions can't be fixed
6725    length, but subroutine calls can. It is done like this so that those without
6726    OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
6727    exceptional ones forgo this. We scan the pattern to check that they are fixed
6728    length, and set their lengths. */
6729    
6730    if (cd->check_lookbehind)
6731      {
6732      uschar *cc = (uschar *)codestart;
6733    
6734      /* Loop, searching for OP_REVERSE items, and process those that do not have
6735      their length set. (Actually, it will also re-process any that have a length
6736      of zero, but that is a pathological case, and it does no harm.) When we find
6737      one, we temporarily terminate the branch it is in while we scan it. */
6738    
6739      for (cc = (uschar *)_pcre_find_bracket(codestart, utf8, -1);
6740           cc != NULL;
6741           cc = (uschar *)_pcre_find_bracket(cc, utf8, -1))
6742        {
6743        if (GET(cc, 1) == 0)
6744          {
6745          int fixed_length;
6746          uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);
6747          int end_op = *be;
6748          *be = OP_END;
6749          fixed_length = find_fixedlength(cc, re->options, TRUE, cd);
6750          *be = end_op;
6751          DPRINTF(("fixed length = %d\n", fixed_length));
6752          if (fixed_length < 0)
6753            {
6754            errorcode = (fixed_length == -2)? ERR36 : ERR25;
6755            break;
6756            }
6757          PUT(cc, 1, fixed_length);
6758          }
6759        cc += 1 + LINK_SIZE;
6760        }
6761      }
6762    
6763  /* Failed to compile, or error while post-processing */  /* Failed to compile, or error while post-processing */
6764    
6765  if (errorcode != 0)  if (errorcode != 0)
# Line 6331  if (reqbyte >= 0 && Line 6820  if (reqbyte >= 0 &&
6820  /* Print out the compiled data if debugging is enabled. This is never the  /* Print out the compiled data if debugging is enabled. This is never the
6821  case when building a production library. */  case when building a production library. */
6822    
6823  #ifdef DEBUG  #ifdef PCRE_DEBUG
   
6824  printf("Length = %d top_bracket = %d top_backref = %d\n",  printf("Length = %d top_bracket = %d top_backref = %d\n",
6825    length, re->top_bracket, re->top_backref);    length, re->top_bracket, re->top_backref);
6826    
# Line 6369  if (code - codestart > length) Line 6857  if (code - codestart > length)
6857    if (errorcodeptr != NULL) *errorcodeptr = ERR23;    if (errorcodeptr != NULL) *errorcodeptr = ERR23;
6858    return NULL;    return NULL;
6859    }    }
6860  #endif   /* DEBUG */  #endif   /* PCRE_DEBUG */
6861    
6862  return (pcre *)re;  return (pcre *)re;
6863  }  }

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

  ViewVC Help
Powered by ViewVC 1.1.5