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

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

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

revision 602 by ph10, Wed May 25 08:29:03 2011 UTC revision 749 by ph10, Fri Nov 18 10:36:45 2011 UTC
# Line 393  static const char error_texts[] = Line 393  static const char error_texts[] =
393    "internal error: previously-checked referenced subpattern not found\0"    "internal error: previously-checked referenced subpattern not found\0"
394    "DEFINE group contains more than one branch\0"    "DEFINE group contains more than one branch\0"
395    /* 55 */    /* 55 */
396    "repeating a DEFINE group is not allowed\0"    "repeating a DEFINE group is not allowed\0"  /** DEAD **/
397    "inconsistent NEWLINE options\0"    "inconsistent NEWLINE options\0"
398    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
399    "a numbered reference must not be zero\0"    "a numbered reference must not be zero\0"
# Line 409  static const char error_texts[] = Line 409  static const char error_texts[] =
409    "(*MARK) must have an argument\0"    "(*MARK) must have an argument\0"
410    "this version of PCRE is not compiled with PCRE_UCP support\0"    "this version of PCRE is not compiled with PCRE_UCP support\0"
411    "\\c must be followed by an ASCII character\0"    "\\c must be followed by an ASCII character\0"
412      "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
413      /* 70 */
414      "internal error: unknown opcode in find_fixedlength()\0"
415    ;    ;
416    
417  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
# Line 545  static const unsigned char ebcdic_charta Line 548  static const unsigned char ebcdic_charta
548  /* Definition to allow mutual recursion */  /* Definition to allow mutual recursion */
549    
550  static BOOL  static BOOL
551    compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,    compile_regex(int, uschar **, const uschar **, int *, BOOL, BOOL, int, int,
552      int *, int *, branch_chain *, compile_data *, int *);      int *, int *, branch_chain *, compile_data *, int *);
553    
554    
# Line 577  return s; Line 580  return s;
580    
581    
582  /*************************************************  /*************************************************
583    *            Check for counted repeat            *
584    *************************************************/
585    
586    /* This function is called when a '{' is encountered in a place where it might
587    start a quantifier. It looks ahead to see if it really is a quantifier or not.
588    It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
589    where the ddds are digits.
590    
591    Arguments:
592      p         pointer to the first char after '{'
593    
594    Returns:    TRUE or FALSE
595    */
596    
597    static BOOL
598    is_counted_repeat(const uschar *p)
599    {
600    if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
601    while ((digitab[*p] & ctype_digit) != 0) p++;
602    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
603    
604    if (*p++ != CHAR_COMMA) return FALSE;
605    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
606    
607    if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
608    while ((digitab[*p] & ctype_digit) != 0) p++;
609    
610    return (*p == CHAR_RIGHT_CURLY_BRACKET);
611    }
612    
613    
614    
615    /*************************************************
616  *            Handle escapes                      *  *            Handle escapes                      *
617  *************************************************/  *************************************************/
618    
# Line 642  else Line 678  else
678    
679      case CHAR_l:      case CHAR_l:
680      case CHAR_L:      case CHAR_L:
681        *errorcodeptr = ERR37;
682        break;
683    
684      case CHAR_u:      case CHAR_u:
685        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
686          {
687          /* In JavaScript, \u must be followed by four hexadecimal numbers.
688          Otherwise it is a lowercase u letter. */
689          if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0
690               && (digitab[ptr[3]] & ctype_xdigit) != 0 && (digitab[ptr[4]] & ctype_xdigit) != 0)
691            {
692            c = 0;
693            for (i = 0; i < 4; ++i)
694              {
695              register int cc = *(++ptr);
696    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
697              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
698              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
699    #else           /* EBCDIC coding */
700              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
701              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
702    #endif
703              }
704            }
705          }
706        else
707          *errorcodeptr = ERR37;
708        break;
709    
710      case CHAR_U:      case CHAR_U:
711      *errorcodeptr = ERR37;      /* In JavaScript, \U is an uppercase U letter. */
712        if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
713      break;      break;
714    
715      /* \g must be followed by one of a number of specific things:      /* In a character class, \g is just a literal "g". Outside a character
716        class, \g must be followed by one of a number of specific things:
717    
718      (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
719      backreference. If negative, it is a relative backreference. This is a Perl      backreference. If negative, it is a relative backreference. This is a Perl
# Line 664  else Line 730  else
730      the -ESC_g code (cf \k). */      the -ESC_g code (cf \k). */
731    
732      case CHAR_g:      case CHAR_g:
733        if (isclass) break;
734      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
735        {        {
736        c = -ESC_g;        c = -ESC_g;
# Line 792  else Line 859  else
859      treated as a data character. */      treated as a data character. */
860    
861      case CHAR_x:      case CHAR_x:
862        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
863          {
864          /* In JavaScript, \x must be followed by two hexadecimal numbers.
865          Otherwise it is a lowercase x letter. */
866          if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0)
867            {
868            c = 0;
869            for (i = 0; i < 2; ++i)
870              {
871              register int cc = *(++ptr);
872    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
873              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
874              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
875    #else           /* EBCDIC coding */
876              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
877              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
878    #endif
879              }
880            }
881          break;
882          }
883    
884      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
885        {        {
886        const uschar *pt = ptr + 2;        const uschar *pt = ptr + 2;
# Line 885  else Line 974  else
974    }    }
975    
976  /* Perl supports \N{name} for character names, as well as plain \N for "not  /* Perl supports \N{name} for character names, as well as plain \N for "not
977  newline". PCRE does not support \N{name}. */  newline". PCRE does not support \N{name}. However, it does support
978    quantification such as \N{2,3}. */
979    
980  if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET)  if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
981         !is_counted_repeat(ptr+2))
982    *errorcodeptr = ERR37;    *errorcodeptr = ERR37;
983    
984  /* If PCRE_UCP is set, we change the values for \d etc. */  /* If PCRE_UCP is set, we change the values for \d etc. */
# Line 997  return -1; Line 1088  return -1;
1088    
1089    
1090  /*************************************************  /*************************************************
 *            Check for counted repeat            *  
 *************************************************/  
   
 /* This function is called when a '{' is encountered in a place where it might  
 start a quantifier. It looks ahead to see if it really is a quantifier or not.  
 It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}  
 where the ddds are digits.  
   
 Arguments:  
   p         pointer to the first char after '{'  
   
 Returns:    TRUE or FALSE  
 */  
   
 static BOOL  
 is_counted_repeat(const uschar *p)  
 {  
 if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  
 while ((digitab[*p] & ctype_digit) != 0) p++;  
 if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  
   
 if (*p++ != CHAR_COMMA) return FALSE;  
 if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  
   
 if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  
 while ((digitab[*p] & ctype_digit) != 0) p++;  
   
 return (*p == CHAR_RIGHT_CURLY_BRACKET);  
 }  
   
   
   
 /*************************************************  
1091  *         Read repeat counts                     *  *         Read repeat counts                     *
1092  *************************************************/  *************************************************/
1093    
# Line 1403  does not. Line 1461  does not.
1461    
1462  Arguments:  Arguments:
1463    code         pointer to the start of the group    code         pointer to the start of the group
   options      pointer to external options  
   optbit       the option bit whose changing is significant, or  
                  zero if none are  
1464    skipassert   TRUE if certain assertions are to be skipped    skipassert   TRUE if certain assertions are to be skipped
1465    
1466  Returns:       pointer to the first significant opcode  Returns:       pointer to the first significant opcode
1467  */  */
1468    
1469  static const uschar*  static const uschar*
1470  first_significant_code(const uschar *code, int *options, int optbit,  first_significant_code(const uschar *code, BOOL skipassert)
   BOOL skipassert)  
1471  {  {
1472  for (;;)  for (;;)
1473    {    {
# Line 1468  and doing the check at the end; a flag s Line 1522  and doing the check at the end; a flag s
1522    
1523  Arguments:  Arguments:
1524    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1525    options  the compiling options    utf8     TRUE in UTF-8 mode
1526    atend    TRUE if called when the pattern is complete    atend    TRUE if called when the pattern is complete
1527    cd       the "compile data" structure    cd       the "compile data" structure
1528    
# Line 1476  Returns:   the fixed length, Line 1530  Returns:   the fixed length,
1530               or -1 if there is no fixed length,               or -1 if there is no fixed length,
1531               or -2 if \C was encountered               or -2 if \C was encountered
1532               or -3 if an OP_RECURSE item was encountered and atend is FALSE               or -3 if an OP_RECURSE item was encountered and atend is FALSE
1533                 or -4 if an unknown opcode was encountered (internal error)
1534  */  */
1535    
1536  static int  static int
1537  find_fixedlength(uschar *code, int options, BOOL atend, compile_data *cd)  find_fixedlength(uschar *code, BOOL utf8, BOOL atend, compile_data *cd)
1538  {  {
1539  int length = -1;  int length = -1;
1540    
# Line 1496  for (;;) Line 1551  for (;;)
1551    register int op = *cc;    register int op = *cc;
1552    switch (op)    switch (op)
1553      {      {
1554        /* We only need to continue for OP_CBRA (normal capturing bracket) and
1555        OP_BRA (normal non-capturing bracket) because the other variants of these
1556        opcodes are all concerned with unlimited repeated groups, which of course
1557        are not of fixed length. */
1558    
1559      case OP_CBRA:      case OP_CBRA:
1560      case OP_BRA:      case OP_BRA:
1561      case OP_ONCE:      case OP_ONCE:
1562        case OP_ONCE_NC:
1563      case OP_COND:      case OP_COND:
1564      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options, atend, cd);      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), utf8, atend, cd);
1565      if (d < 0) return d;      if (d < 0) return d;
1566      branchlength += d;      branchlength += d;
1567      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1568      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1569      break;      break;
1570    
1571      /* Reached end of a branch; if it's a ket it is the end of a nested      /* Reached end of a branch; if it's a ket it is the end of a nested call.
1572      call. If it's ALT it is an alternation in a nested call. If it is      If it's ALT it is an alternation in a nested call. An ACCEPT is effectively
1573      END it's the end of the outer call. All can be handled by the same code. */      an ALT. If it is END it's the end of the outer call. All can be handled by
1574        the same code. Note that we must not include the OP_KETRxxx opcodes here,
1575        because they all imply an unlimited repeat. */
1576    
1577      case OP_ALT:      case OP_ALT:
1578      case OP_KET:      case OP_KET:
     case OP_KETRMAX:  
     case OP_KETRMIN:  
1579      case OP_END:      case OP_END:
1580        case OP_ACCEPT:
1581        case OP_ASSERT_ACCEPT:
1582      if (length < 0) length = branchlength;      if (length < 0) length = branchlength;
1583        else if (length != branchlength) return -1;        else if (length != branchlength) return -1;
1584      if (*cc != OP_ALT) return length;      if (*cc != OP_ALT) return length;
# Line 1532  for (;;) Line 1595  for (;;)
1595      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1596      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */
1597      if (cc > cs && cc < ce) return -1;                /* Recursion */      if (cc > cs && cc < ce) return -1;                /* Recursion */
1598      d = find_fixedlength(cs + 2, options, atend, cd);      d = find_fixedlength(cs + 2, utf8, atend, cd);
1599      if (d < 0) return d;      if (d < 0) return d;
1600      branchlength += d;      branchlength += d;
1601      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
# Line 1549  for (;;) Line 1612  for (;;)
1612    
1613      /* Skip over things that don't match chars */      /* Skip over things that don't match chars */
1614    
1615      case OP_REVERSE:      case OP_MARK:
1616      case OP_CREF:      case OP_PRUNE_ARG:
1617      case OP_NCREF:      case OP_SKIP_ARG:
1618      case OP_RREF:      case OP_THEN_ARG:
1619      case OP_NRREF:      cc += cc[1] + _pcre_OP_lengths[*cc];
1620      case OP_DEF:      break;
1621    
1622      case OP_CALLOUT:      case OP_CALLOUT:
     case OP_SOD:  
     case OP_SOM:  
     case OP_SET_SOM:  
     case OP_EOD:  
     case OP_EODN:  
1623      case OP_CIRC:      case OP_CIRC:
1624      case OP_CIRCM:      case OP_CIRCM:
1625        case OP_CLOSE:
1626        case OP_COMMIT:
1627        case OP_CREF:
1628        case OP_DEF:
1629      case OP_DOLL:      case OP_DOLL:
1630      case OP_DOLLM:      case OP_DOLLM:
1631        case OP_EOD:
1632        case OP_EODN:
1633        case OP_FAIL:
1634        case OP_NCREF:
1635        case OP_NRREF:
1636      case OP_NOT_WORD_BOUNDARY:      case OP_NOT_WORD_BOUNDARY:
1637        case OP_PRUNE:
1638        case OP_REVERSE:
1639        case OP_RREF:
1640        case OP_SET_SOM:
1641        case OP_SKIP:
1642        case OP_SOD:
1643        case OP_SOM:
1644        case OP_THEN:
1645      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
1646      cc += _pcre_OP_lengths[*cc];      cc += _pcre_OP_lengths[*cc];
1647      break;      break;
# Line 1575  for (;;) Line 1651  for (;;)
1651      case OP_CHAR:      case OP_CHAR:
1652      case OP_CHARI:      case OP_CHARI:
1653      case OP_NOT:      case OP_NOT:
1654      case OP_NOTI:      case OP_NOTI:
1655      branchlength++;      branchlength++;
1656      cc += 2;      cc += 2;
1657  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1658      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       cc += _pcre_utf8_table4[cc[-1] & 0x3f];  
1659  #endif  #endif
1660      break;      break;
1661    
# Line 1588  for (;;) Line 1663  for (;;)
1663      need to skip over a multibyte character in UTF8 mode.  */      need to skip over a multibyte character in UTF8 mode.  */
1664    
1665      case OP_EXACT:      case OP_EXACT:
1666        case OP_EXACTI:
1667        case OP_NOTEXACT:
1668        case OP_NOTEXACTI:
1669      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1670      cc += 4;      cc += 4;
1671  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1672      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
       cc += _pcre_utf8_table4[cc[-1] & 0x3f];  
1673  #endif  #endif
1674      break;      break;
1675    
# Line 1609  for (;;) Line 1686  for (;;)
1686      cc += 2;      cc += 2;
1687      /* Fall through */      /* Fall through */
1688    
1689        case OP_HSPACE:
1690        case OP_VSPACE:
1691        case OP_NOT_HSPACE:
1692        case OP_NOT_VSPACE:
1693      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
1694      case OP_DIGIT:      case OP_DIGIT:
1695      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
# Line 1640  for (;;) Line 1721  for (;;)
1721    
1722      switch (*cc)      switch (*cc)
1723        {        {
1724          case OP_CRPLUS:
1725          case OP_CRMINPLUS:
1726        case OP_CRSTAR:        case OP_CRSTAR:
1727        case OP_CRMINSTAR:        case OP_CRMINSTAR:
1728        case OP_CRQUERY:        case OP_CRQUERY:
# Line 1660  for (;;) Line 1743  for (;;)
1743    
1744      /* Anything else is variable length */      /* Anything else is variable length */
1745    
1746      default:      case OP_ANYNL:
1747        case OP_BRAMINZERO:
1748        case OP_BRAPOS:
1749        case OP_BRAPOSZERO:
1750        case OP_BRAZERO:
1751        case OP_CBRAPOS:
1752        case OP_EXTUNI:
1753        case OP_KETRMAX:
1754        case OP_KETRMIN:
1755        case OP_KETRPOS:
1756        case OP_MINPLUS:
1757        case OP_MINPLUSI:
1758        case OP_MINQUERY:
1759        case OP_MINQUERYI:
1760        case OP_MINSTAR:
1761        case OP_MINSTARI:
1762        case OP_MINUPTO:
1763        case OP_MINUPTOI:
1764        case OP_NOTMINPLUS:
1765        case OP_NOTMINPLUSI:
1766        case OP_NOTMINQUERY:
1767        case OP_NOTMINQUERYI:
1768        case OP_NOTMINSTAR:
1769        case OP_NOTMINSTARI:
1770        case OP_NOTMINUPTO:
1771        case OP_NOTMINUPTOI:
1772        case OP_NOTPLUS:
1773        case OP_NOTPLUSI:
1774        case OP_NOTPOSPLUS:
1775        case OP_NOTPOSPLUSI:
1776        case OP_NOTPOSQUERY:
1777        case OP_NOTPOSQUERYI:
1778        case OP_NOTPOSSTAR:
1779        case OP_NOTPOSSTARI:
1780        case OP_NOTPOSUPTO:
1781        case OP_NOTPOSUPTOI:
1782        case OP_NOTQUERY:
1783        case OP_NOTQUERYI:
1784        case OP_NOTSTAR:
1785        case OP_NOTSTARI:
1786        case OP_NOTUPTO:
1787        case OP_NOTUPTOI:
1788        case OP_PLUS:
1789        case OP_PLUSI:
1790        case OP_POSPLUS:
1791        case OP_POSPLUSI:
1792        case OP_POSQUERY:
1793        case OP_POSQUERYI:
1794        case OP_POSSTAR:
1795        case OP_POSSTARI:
1796        case OP_POSUPTO:
1797        case OP_POSUPTOI:
1798        case OP_QUERY:
1799        case OP_QUERYI:
1800        case OP_REF:
1801        case OP_REFI:
1802        case OP_SBRA:
1803        case OP_SBRAPOS:
1804        case OP_SCBRA:
1805        case OP_SCBRAPOS:
1806        case OP_SCOND:
1807        case OP_SKIPZERO:
1808        case OP_STAR:
1809        case OP_STARI:
1810        case OP_TYPEMINPLUS:
1811        case OP_TYPEMINQUERY:
1812        case OP_TYPEMINSTAR:
1813        case OP_TYPEMINUPTO:
1814        case OP_TYPEPLUS:
1815        case OP_TYPEPOSPLUS:
1816        case OP_TYPEPOSQUERY:
1817        case OP_TYPEPOSSTAR:
1818        case OP_TYPEPOSUPTO:
1819        case OP_TYPEQUERY:
1820        case OP_TYPESTAR:
1821        case OP_TYPEUPTO:
1822        case OP_UPTO:
1823        case OP_UPTOI:
1824      return -1;      return -1;
1825    
1826        /* Catch unrecognized opcodes so that when new ones are added they
1827        are not forgotten, as has happened in the past. */
1828    
1829        default:
1830        return -4;
1831      }      }
1832    }    }
1833  /* Control never gets here */  /* Control never gets here */
# Line 1694  _pcre_find_bracket(const uschar *code, B Line 1860  _pcre_find_bracket(const uschar *code, B
1860  for (;;)  for (;;)
1861    {    {
1862    register int c = *code;    register int c = *code;
1863    
1864    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
1865    
1866    /* XCLASS is used for classes that cannot be represented just by a bit    /* XCLASS is used for classes that cannot be represented just by a bit
# Line 1712  for (;;) Line 1879  for (;;)
1879    
1880    /* Handle capturing bracket */    /* Handle capturing bracket */
1881    
1882    else if (c == OP_CBRA)    else if (c == OP_CBRA || c == OP_SCBRA ||
1883               c == OP_CBRAPOS || c == OP_SCBRAPOS)
1884      {      {
1885      int n = GET2(code, 1+LINK_SIZE);      int n = GET2(code, 1+LINK_SIZE);
1886      if (n == number) return (uschar *)code;      if (n == number) return (uschar *)code;
# Line 1754  for (;;) Line 1922  for (;;)
1922        break;        break;
1923    
1924        case OP_THEN_ARG:        case OP_THEN_ARG:
1925        code += code[1+LINK_SIZE];        code += code[1];
1926        break;        break;
1927        }        }
1928    
# Line 1873  for (;;) Line 2041  for (;;)
2041        break;        break;
2042    
2043        case OP_THEN_ARG:        case OP_THEN_ARG:
2044        code += code[1+LINK_SIZE];        code += code[1];
2045        break;        break;
2046        }        }
2047    
# Line 1954  could_be_empty_branch(const uschar *code Line 2122  could_be_empty_branch(const uschar *code
2122    compile_data *cd)    compile_data *cd)
2123  {  {
2124  register int c;  register int c;
2125  for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);  for (code = first_significant_code(code + _pcre_OP_lengths[*code], TRUE);
2126       code < endcode;       code < endcode;
2127       code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))       code = first_significant_code(code + _pcre_OP_lengths[c], TRUE))
2128    {    {
2129    const uschar *ccode;    const uschar *ccode;
2130    
# Line 1972  for (code = first_significant_code(code Line 2140  for (code = first_significant_code(code
2140      continue;      continue;
2141      }      }
2142    
   /* Groups with zero repeats can of course be empty; skip them. */  
   
   if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)  
     {  
     code += _pcre_OP_lengths[c];  
     do code += GET(code, 1); while (*code == OP_ALT);  
     c = *code;  
     continue;  
     }  
   
2143    /* For a recursion/subroutine call, if its end has been reached, which    /* For a recursion/subroutine call, if its end has been reached, which
2144    implies a subroutine call, we can scan it. */    implies a backward reference subroutine call, we can scan it. If it's a
2145      forward reference subroutine call, we can't. To detect forward reference
2146      we have to scan up the list that is kept in the workspace. This function is
2147      called only when doing the real compile, not during the pre-compile that
2148      measures the size of the compiled pattern. */
2149    
2150    if (c == OP_RECURSE)    if (c == OP_RECURSE)
2151      {      {
2152      BOOL empty_branch = FALSE;      const uschar *scode;
2153      const uschar *scode = cd->start_code + GET(code, 1);      BOOL empty_branch;
2154    
2155        /* Test for forward reference */
2156    
2157        for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE)
2158          if (GET(scode, 0) == code + 1 - cd->start_code) return TRUE;
2159    
2160        /* Not a forward reference, test for completed backward reference */
2161    
2162        empty_branch = FALSE;
2163        scode = cd->start_code + GET(code, 1);
2164      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
2165    
2166        /* Completed backwards reference */
2167    
2168      do      do
2169        {        {
2170        if (could_be_empty_branch(scode, endcode, utf8, cd))        if (could_be_empty_branch(scode, endcode, utf8, cd))
# Line 2000  for (code = first_significant_code(code Line 2175  for (code = first_significant_code(code
2175        scode += GET(scode, 1);        scode += GET(scode, 1);
2176        }        }
2177      while (*scode == OP_ALT);      while (*scode == OP_ALT);
2178    
2179      if (!empty_branch) return FALSE;  /* All branches are non-empty */      if (!empty_branch) return FALSE;  /* All branches are non-empty */
2180      continue;      continue;
2181      }      }
2182    
2183      /* Groups with zero repeats can of course be empty; skip them. */
2184    
2185      if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2186          c == OP_BRAPOSZERO)
2187        {
2188        code += _pcre_OP_lengths[c];
2189        do code += GET(code, 1); while (*code == OP_ALT);
2190        c = *code;
2191        continue;
2192        }
2193    
2194      /* A nested group that is already marked as "could be empty" can just be
2195      skipped. */
2196    
2197      if (c == OP_SBRA  || c == OP_SBRAPOS ||
2198          c == OP_SCBRA || c == OP_SCBRAPOS)
2199        {
2200        do code += GET(code, 1); while (*code == OP_ALT);
2201        c = *code;
2202        continue;
2203        }
2204    
2205    /* For other groups, scan the branches. */    /* For other groups, scan the branches. */
2206    
2207    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)    if (c == OP_BRA  || c == OP_BRAPOS ||
2208          c == OP_CBRA || c == OP_CBRAPOS ||
2209          c == OP_ONCE || c == OP_ONCE_NC ||
2210          c == OP_COND)
2211      {      {
2212      BOOL empty_branch;      BOOL empty_branch;
2213      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
# Line 2135  for (code = first_significant_code(code Line 2336  for (code = first_significant_code(code
2336      case OP_KET:      case OP_KET:
2337      case OP_KETRMAX:      case OP_KETRMAX:
2338      case OP_KETRMIN:      case OP_KETRMIN:
2339        case OP_KETRPOS:
2340      case OP_ALT:      case OP_ALT:
2341      return TRUE;      return TRUE;
2342    
# Line 2177  for (code = first_significant_code(code Line 2379  for (code = first_significant_code(code
2379      break;      break;
2380    
2381      case OP_THEN_ARG:      case OP_THEN_ARG:
2382      code += code[1+LINK_SIZE];      code += code[1];
2383      break;      break;
2384    
2385      /* None of the remaining opcodes are required to match a character. */      /* None of the remaining opcodes are required to match a character. */
# Line 2200  return TRUE; Line 2402  return TRUE;
2402  the current branch of the current pattern to see if it could match the empty  the current branch of the current pattern to see if it could match the empty
2403  string. If it could, we must look outwards for branches at other levels,  string. If it could, we must look outwards for branches at other levels,
2404  stopping when we pass beyond the bracket which is the subject of the recursion.  stopping when we pass beyond the bracket which is the subject of the recursion.
2405    This function is called only during the real compile, not during the
2406    pre-compile.
2407    
2408  Arguments:  Arguments:
2409    code        points to start of the recursion    code        points to start of the recursion
# Line 2250  where Perl recognizes it as the POSIX cl Line 2454  where Perl recognizes it as the POSIX cl
2454  "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,  "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
2455  I think.  I think.
2456    
2457    A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
2458    It seems that the appearance of a nested POSIX class supersedes an apparent
2459    external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
2460    a digit.
2461    
2462    In Perl, unescaped square brackets may also appear as part of class names. For
2463    example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
2464    [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
2465    seem right at all. PCRE does not allow closing square brackets in POSIX class
2466    names.
2467    
2468  Arguments:  Arguments:
2469    ptr      pointer to the initial [    ptr      pointer to the initial [
2470    endptr   where to return the end pointer    endptr   where to return the end pointer
# Line 2264  int terminator;          /* Don't combin Line 2479  int terminator;          /* Don't combin
2479  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2480  for (++ptr; *ptr != 0; ptr++)  for (++ptr; *ptr != 0; ptr++)
2481    {    {
2482    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2483        ptr++;
2484      else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2485      else
2486      {      {
     if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;  
2487      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2488        {        {
2489        *endptr = ptr;        *endptr = ptr;
2490        return TRUE;        return TRUE;
2491        }        }
2492        if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&
2493             (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
2494              ptr[1] == CHAR_EQUALS_SIGN) &&
2495            check_posix_syntax(ptr, endptr))
2496          return FALSE;
2497      }      }
2498    }    }
2499  return FALSE;  return FALSE;
# Line 2682  if (next >= 0) switch(op_code) Line 2904  if (next >= 0) switch(op_code)
2904    return (c != cd->fcc[next]);  /* Non-UTF-8 mode */    return (c != cd->fcc[next]);  /* Non-UTF-8 mode */
2905    
2906    /* For OP_NOT and OP_NOTI, the data is always a single-byte character. These    /* For OP_NOT and OP_NOTI, the data is always a single-byte character. These
2907    opcodes are not used for multi-byte characters, because they are coded using    opcodes are not used for multi-byte characters, because they are coded using
2908    an XCLASS instead. */    an XCLASS instead. */
2909    
2910    case OP_NOT:    case OP_NOT:
2911    return (c = *previous) == next;    return (c = *previous) == next;
2912    
2913    case OP_NOTI:    case OP_NOTI:
2914    if ((c = *previous) == next) return TRUE;    if ((c = *previous) == next) return TRUE;
2915  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2916    if (utf8)    if (utf8)
# Line 2981  Arguments: Line 3203  Arguments:
3203    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)
3204    reqbyteptr     set to the last literal character required, else < 0    reqbyteptr     set to the last literal character required, else < 0
3205    bcptr          points to current branch chain    bcptr          points to current branch chain
3206      cond_depth     conditional nesting depth
3207    cd             contains pointers to tables etc.    cd             contains pointers to tables etc.
3208    lengthptr      NULL during the real compile phase    lengthptr      NULL during the real compile phase
3209                   points to length accumulator during pre-compile phase                   points to length accumulator during pre-compile phase
# Line 2992  Returns:         TRUE on success Line 3215  Returns:         TRUE on success
3215  static BOOL  static BOOL
3216  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,
3217    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
3218    compile_data *cd, int *lengthptr)    int cond_depth, compile_data *cd, int *lengthptr)
3219  {  {
3220  int repeat_type, op_type;  int repeat_type, op_type;
3221  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
# Line 3001  int greedy_default, greedy_non_default; Line 3224  int greedy_default, greedy_non_default;
3224  int firstbyte, reqbyte;  int firstbyte, reqbyte;
3225  int zeroreqbyte, zerofirstbyte;  int zeroreqbyte, zerofirstbyte;
3226  int req_caseopt, reqvary, tempreqvary;  int req_caseopt, reqvary, tempreqvary;
3227  int options = *optionsptr;  int options = *optionsptr;               /* May change dynamically */
3228  int after_manual_callout = 0;  int after_manual_callout = 0;
3229  int length_prevgroup = 0;  int length_prevgroup = 0;
3230  register int c;  register int c;
# Line 3019  uschar *previous_callout = NULL; Line 3242  uschar *previous_callout = NULL;
3242  uschar *save_hwm = NULL;  uschar *save_hwm = NULL;
3243  uschar classbits[32];  uschar classbits[32];
3244    
3245    /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
3246    must not do this for other options (e.g. PCRE_EXTENDED) because they may change
3247    dynamically as we process the pattern. */
3248    
3249  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3250  BOOL class_utf8;  BOOL class_utf8;
3251  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf8 = (options & PCRE_UTF8) != 0;
# Line 3027  uschar *class_utf8data_base; Line 3254  uschar *class_utf8data_base;
3254  uschar utf8_char[6];  uschar utf8_char[6];
3255  #else  #else
3256  BOOL utf8 = FALSE;  BOOL utf8 = FALSE;
 uschar *utf8_char = NULL;  
3257  #endif  #endif
3258    
3259  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 3078  for (;; ptr++) Line 3304  for (;; ptr++)
3304    int subfirstbyte;    int subfirstbyte;
3305    int terminator;    int terminator;
3306    int mclength;    int mclength;
3307      int tempbracount;
3308    uschar mcbuffer[8];    uschar mcbuffer[8];
3309    
3310    /* Get next byte in the pattern */    /* Get next byte in the pattern */
# Line 3199  for (;; ptr++) Line 3426  for (;; ptr++)
3426      previous_callout = NULL;      previous_callout = NULL;
3427      }      }
3428    
3429    /* In extended mode, skip white space and comments */    /* In extended mode, skip white space and comments. */
3430    
3431    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
3432      {      {
# Line 4168  for (;; ptr++) Line 4395  for (;; ptr++)
4395      op_type = 0;                    /* Default single-char op codes */      op_type = 0;                    /* Default single-char op codes */
4396      possessive_quantifier = FALSE;  /* Default not possessive quantifier */      possessive_quantifier = FALSE;  /* Default not possessive quantifier */
4397    
4398      /* Save start of previous item, in case we have to move it up to make space      /* Save start of previous item, in case we have to move it up in order to
4399      for an inserted OP_ONCE for the additional '+' extension. */      insert something before it. */
4400    
4401      tempcode = previous;      tempcode = previous;
4402    
# Line 4192  for (;; ptr++) Line 4419  for (;; ptr++)
4419        }        }
4420      else repeat_type = greedy_default;      else repeat_type = greedy_default;
4421    
4422        /* If previous was a recursion call, wrap it in atomic brackets so that
4423        previous becomes the atomic group. All recursions were so wrapped in the
4424        past, but it no longer happens for non-repeated recursions. In fact, the
4425        repeated ones could be re-implemented independently so as not to need this,
4426        but for the moment we rely on the code for repeating groups. */
4427    
4428        if (*previous == OP_RECURSE)
4429          {
4430          memmove(previous + 1 + LINK_SIZE, previous, 1 + LINK_SIZE);
4431          *previous = OP_ONCE;
4432          PUT(previous, 1, 2 + 2*LINK_SIZE);
4433          previous[2 + 2*LINK_SIZE] = OP_KET;
4434          PUT(previous, 3 + 2*LINK_SIZE, 2 + 2*LINK_SIZE);
4435          code += 2 + 2 * LINK_SIZE;
4436          length_prevgroup = 3 + 3*LINK_SIZE;
4437    
4438          /* When actually compiling, we need to check whether this was a forward
4439          reference, and if so, adjust the offset. */
4440    
4441          if (lengthptr == NULL && cd->hwm >= cd->start_workspace + LINK_SIZE)
4442            {
4443            int offset = GET(cd->hwm, -LINK_SIZE);
4444            if (offset == previous + 1 - cd->start_code)
4445              PUT(cd->hwm, -LINK_SIZE, offset + 1 + LINK_SIZE);
4446            }
4447          }
4448    
4449        /* Now handle repetition for the different types of item. */
4450    
4451      /* If previous was a character match, abolish the item and generate a      /* If previous was a character match, abolish the item and generate a
4452      repeat item instead. If a char item has a minumum of more than one, ensure      repeat item instead. If a char item has a minumum of more than one, ensure
4453      that it is set in reqbyte - it might not be if a sequence such as x{3} is      that it is set in reqbyte - it might not be if a sequence such as x{3} is
# Line 4201  for (;; ptr++) Line 4457  for (;; ptr++)
4457      if (*previous == OP_CHAR || *previous == OP_CHARI)      if (*previous == OP_CHAR || *previous == OP_CHARI)
4458        {        {
4459        op_type = (*previous == OP_CHAR)? 0 : OP_STARI - OP_STAR;        op_type = (*previous == OP_CHAR)? 0 : OP_STARI - OP_STAR;
4460    
4461        /* Deal with UTF-8 characters that take up more than one byte. It's        /* Deal with UTF-8 characters that take up more than one byte. It's
4462        easier to write this out separately than try to macrify it. Use c to        easier to write this out separately than try to macrify it. Use c to
4463        hold the length of the character in bytes, plus 0x80 to flag that it's a        hold the length of the character in bytes, plus 0x80 to flag that it's a
# Line 4246  for (;; ptr++) Line 4502  for (;; ptr++)
4502      /* If previous was a single negated character ([^a] or similar), we use      /* If previous was a single negated character ([^a] or similar), we use
4503      one of the special opcodes, replacing it. The code is shared with single-      one of the special opcodes, replacing it. The code is shared with single-
4504      character repeats by setting opt_type to add a suitable offset into      character repeats by setting opt_type to add a suitable offset into
4505      repeat_type. We can also test for auto-possessification. OP_NOT and OP_NOTI      repeat_type. We can also test for auto-possessification. OP_NOT and OP_NOTI
4506      are currently used only for single-byte chars. */      are currently used only for single-byte chars. */
4507    
4508      else if (*previous == OP_NOT || *previous == OP_NOTI)      else if (*previous == OP_NOT || *previous == OP_NOTI)
# Line 4483  for (;; ptr++) Line 4739  for (;; ptr++)
4739        }        }
4740    
4741      /* If previous was a bracket group, we may have to replicate it in certain      /* If previous was a bracket group, we may have to replicate it in certain
4742      cases. */      cases. Note that at this point we can encounter only the "basic" bracket
4743        opcodes such as BRA and CBRA, as this is the place where they get converted
4744        into the more special varieties such as BRAPOS and SBRA. A test for >=
4745        OP_ASSERT and <= OP_COND includes ASSERT, ASSERT_NOT, ASSERTBACK,
4746        ASSERTBACK_NOT, ONCE, BRA, CBRA, and COND. Originally, PCRE did not allow
4747        repetition of assertions, but now it does, for Perl compatibility. */
4748    
4749      else if (*previous == OP_BRA  || *previous == OP_CBRA ||      else if (*previous >= OP_ASSERT && *previous <= OP_COND)
              *previous == OP_ONCE || *previous == OP_COND)  
4750        {        {
4751        register int i;        register int i;
       int ketoffset = 0;  
4752        int len = (int)(code - previous);        int len = (int)(code - previous);
4753        uschar *bralink = NULL;        uschar *bralink = NULL;
4754          uschar *brazeroptr = NULL;
4755    
4756        /* Repeating a DEFINE group is pointless */        /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so
4757          we just ignore the repeat. */
4758    
4759        if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)        if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)
4760          {          goto END_REPEAT;
4761          *errorcodeptr = ERR55;  
4762          goto FAILED;        /* There is no sense in actually repeating assertions. The only potential
4763          }        use of repetition is in cases when the assertion is optional. Therefore,
4764          if the minimum is greater than zero, just ignore the repeat. If the
4765          maximum is not not zero or one, set it to 1. */
4766    
4767        /* If the maximum repeat count is unlimited, find the end of the bracket        if (*previous < OP_ONCE)    /* Assertion */
4768        by scanning through from the start, and compute the offset back to it          {
4769        from the current code pointer. */          if (repeat_min > 0) goto END_REPEAT;
4770            if (repeat_max < 0 || repeat_max > 1) repeat_max = 1;
       if (repeat_max == -1)  
         {  
         register uschar *ket = previous;  
         do ket += GET(ket, 1); while (*ket != OP_KET);  
         ketoffset = (int)(code - ket);  
4771          }          }
4772    
4773        /* The case of a zero minimum is special because of the need to stick        /* The case of a zero minimum is special because of the need to stick
# Line 4530  for (;; ptr++) Line 4788  for (;; ptr++)
4788          **   goto END_REPEAT;          **   goto END_REPEAT;
4789          **   }          **   }
4790    
4791          However, that fails when a group is referenced as a subroutine from          However, that fails when a group or a subgroup within it is referenced
4792          elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it          as a subroutine from elsewhere in the pattern, so now we stick in
4793          so that it is skipped on execution. As we don't have a list of which          OP_SKIPZERO in front of it so that it is skipped on execution. As we
4794          groups are referenced, we cannot do this selectively.          don't have a list of which groups are referenced, we cannot do this
4795            selectively.
4796    
4797          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
4798          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 4553  for (;; ptr++) Line 4812  for (;; ptr++)
4812              *previous++ = OP_SKIPZERO;              *previous++ = OP_SKIPZERO;
4813              goto END_REPEAT;              goto END_REPEAT;
4814              }              }
4815              brazeroptr = previous;    /* Save for possessive optimizing */
4816            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
4817            }            }
4818    
# Line 4717  for (;; ptr++) Line 4977  for (;; ptr++)
4977            }            }
4978          }          }
4979    
4980        /* If the maximum is unlimited, set a repeater in the final copy. We        /* If the maximum is unlimited, set a repeater in the final copy. For
4981        can't just offset backwards from the current code point, because we        ONCE brackets, that's all we need to do. However, possessively repeated
4982        don't know if there's been an options resetting after the ket. The        ONCE brackets can be converted into non-capturing brackets, as the
4983        correct offset was computed above.        behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to
4984          deal with possessive ONCEs specially.
4985        Then, when we are doing the actual compile phase, check to see whether  
4986        this group is a non-atomic one that could match an empty string. If so,        Otherwise, when we are doing the actual compile phase, check to see
4987          whether this group is one that could match an empty string. If so,
4988        convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so        convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
4989        that runtime checking can be done. [This check is also applied to        that runtime checking can be done. [This check is also applied to ONCE
4990        atomic groups at runtime, but in a different way.] */        groups at runtime, but in a different way.]
4991    
4992          Then, if the quantifier was possessive and the bracket is not a
4993          conditional, we convert the BRA code to the POS form, and the KET code to
4994          KETRPOS. (It turns out to be convenient at runtime to detect this kind of
4995          subpattern at both the start and at the end.) The use of special opcodes
4996          makes it possible to reduce greatly the stack usage in pcre_exec(). If
4997          the group is preceded by OP_BRAZERO, convert this to OP_BRAPOSZERO. Then
4998          cancel the possessive flag so that the default action below, of wrapping
4999          everything inside atomic brackets, does not happen. */
5000    
5001        else        else
5002          {          {
5003          uschar *ketcode = code - ketoffset;          uschar *ketcode = code - 1 - LINK_SIZE;
5004          uschar *bracode = ketcode - GET(ketcode, 1);          uschar *bracode = ketcode - GET(ketcode, 1);
5005          *ketcode = OP_KETRMAX + repeat_type;  
5006          if (lengthptr == NULL && *bracode != OP_ONCE)          /* Convert possessive ONCE brackets to non-capturing */
5007    
5008            if ((*bracode == OP_ONCE || *bracode == OP_ONCE_NC) &&
5009                possessive_quantifier) *bracode = OP_BRA;
5010    
5011            /* For non-possessive ONCE brackets, all we need to do is to
5012            set the KET. */
5013    
5014            if (*bracode == OP_ONCE || *bracode == OP_ONCE_NC)
5015              *ketcode = OP_KETRMAX + repeat_type;
5016    
5017            /* Handle non-ONCE brackets and possessive ONCEs (which have been
5018            converted to non-capturing above). */
5019    
5020            else
5021            {            {
5022            uschar *scode = bracode;            /* In the compile phase, check for empty string matching. */
5023            do  
5024              if (lengthptr == NULL)
5025              {              {
5026              if (could_be_empty_branch(scode, ketcode, utf8, cd))              uschar *scode = bracode;
5027                do
5028                {                {
5029                *bracode += OP_SBRA - OP_BRA;                if (could_be_empty_branch(scode, ketcode, utf8, cd))
5030                break;                  {
5031                    *bracode += OP_SBRA - OP_BRA;
5032                    break;
5033                    }
5034                  scode += GET(scode, 1);
5035                }                }
5036              scode += GET(scode, 1);              while (*scode == OP_ALT);
5037              }              }
5038            while (*scode == OP_ALT);  
5039              /* Handle possessive quantifiers. */
5040    
5041              if (possessive_quantifier)
5042                {
5043                /* For COND brackets, we wrap the whole thing in a possessively
5044                repeated non-capturing bracket, because we have not invented POS
5045                versions of the COND opcodes. Because we are moving code along, we
5046                must ensure that any pending recursive references are updated. */
5047    
5048                if (*bracode == OP_COND || *bracode == OP_SCOND)
5049                  {
5050                  int nlen = (int)(code - bracode);
5051                  *code = OP_END;
5052                  adjust_recurse(bracode, 1 + LINK_SIZE, utf8, cd, save_hwm);
5053                  memmove(bracode + 1+LINK_SIZE, bracode, nlen);
5054                  code += 1 + LINK_SIZE;
5055                  nlen += 1 + LINK_SIZE;
5056                  *bracode = OP_BRAPOS;
5057                  *code++ = OP_KETRPOS;
5058                  PUTINC(code, 0, nlen);
5059                  PUT(bracode, 1, nlen);
5060                  }
5061    
5062                /* For non-COND brackets, we modify the BRA code and use KETRPOS. */
5063    
5064                else
5065                  {
5066                  *bracode += 1;              /* Switch to xxxPOS opcodes */
5067                  *ketcode = OP_KETRPOS;
5068                  }
5069    
5070                /* If the minimum is zero, mark it as possessive, then unset the
5071                possessive flag. */
5072    
5073                if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
5074                possessive_quantifier = FALSE;
5075                }
5076    
5077              /* Non-possessive quantifier */
5078    
5079              else *ketcode = OP_KETRMAX + repeat_type;
5080            }            }
5081          }          }
5082        }        }
# Line 4766  for (;; ptr++) Line 5097  for (;; ptr++)
5097        }        }
5098    
5099      /* If the character following a repeat is '+', or if certain optimization      /* If the character following a repeat is '+', or if certain optimization
5100      tests above succeeded, possessive_quantifier is TRUE. For some of the      tests above succeeded, possessive_quantifier is TRUE. For some opcodes,
5101      simpler opcodes, there is an special alternative opcode for this. For      there are special alternative opcodes for this case. For anything else, we
5102      anything else, we wrap the entire repeated item inside OP_ONCE brackets.      wrap the entire repeated item inside OP_ONCE brackets. Logically, the '+'
5103      The '+' notation is just syntactic sugar, taken from Sun's Java package,      notation is just syntactic sugar, taken from Sun's Java package, but the
5104      but the special opcodes can optimize it a bit. The repeated item starts at      special opcodes can optimize it.
5105      tempcode, not at previous, which might be the first part of a string whose  
5106      (former) last char we repeated.      Possessively repeated subpatterns have already been handled in the code
5107        just above, so possessive_quantifier is always FALSE for them at this
5108        stage.
5109    
5110        Note that the repeated item starts at tempcode, not at previous, which
5111        might be the first part of a string whose (former) last char we repeated.
5112    
5113      Possessifying an 'exact' quantifier has no effect, so we can ignore it. But      Possessifying an 'exact' quantifier has no effect, so we can ignore it. But
5114      an 'upto' may follow. We skip over an 'exact' item, and then test the      an 'upto' may follow. We skip over an 'exact' item, and then test the
# Line 4876  for (;; ptr++) Line 5212  for (;; ptr++)
5212        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
5213        namelen = (int)(ptr - name);        namelen = (int)(ptr - name);
5214    
5215          /* It appears that Perl allows any characters whatsoever, other than
5216          a closing parenthesis, to appear in arguments, so we no longer insist on
5217          letters, digits, and underscores. */
5218    
5219        if (*ptr == CHAR_COLON)        if (*ptr == CHAR_COLON)
5220          {          {
5221          arg = ++ptr;          arg = ++ptr;
5222          while ((cd->ctypes[*ptr] & (ctype_letter|ctype_digit)) != 0          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
           || *ptr == '_') ptr++;  
5223          arglen = (int)(ptr - arg);          arglen = (int)(ptr - arg);
5224          }          }
5225    
# Line 4897  for (;; ptr++) Line 5236  for (;; ptr++)
5236          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
5237              strncmp((char *)name, vn, namelen) == 0)              strncmp((char *)name, vn, namelen) == 0)
5238            {            {
5239            /* Check for open captures before ACCEPT */            /* Check for open captures before ACCEPT and convert it to
5240              ASSERT_ACCEPT if in an assertion. */
5241    
5242            if (verbs[i].op == OP_ACCEPT)            if (verbs[i].op == OP_ACCEPT)
5243              {              {
5244              open_capitem *oc;              open_capitem *oc;
5245                if (arglen != 0)
5246                  {
5247                  *errorcodeptr = ERR59;
5248                  goto FAILED;
5249                  }
5250              cd->had_accept = TRUE;              cd->had_accept = TRUE;
5251              for (oc = cd->open_caps; oc != NULL; oc = oc->next)              for (oc = cd->open_caps; oc != NULL; oc = oc->next)
5252                {                {
5253                *code++ = OP_CLOSE;                *code++ = OP_CLOSE;
5254                PUT2INC(code, 0, oc->number);                PUT2INC(code, 0, oc->number);
5255                }                }
5256                *code++ = (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
5257    
5258                /* Do not set firstbyte after *ACCEPT */
5259                if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
5260              }              }
5261    
5262            /* Handle the cases with/without an argument */            /* Handle other cases with/without an argument */
5263    
5264            if (arglen == 0)            else if (arglen == 0)
5265              {              {
5266              if (verbs[i].op < 0)   /* Argument is mandatory */              if (verbs[i].op < 0)   /* Argument is mandatory */
5267                {                {
# Line 4920  for (;; ptr++) Line 5269  for (;; ptr++)
5269                goto FAILED;                goto FAILED;
5270                }                }
5271              *code = verbs[i].op;              *code = verbs[i].op;
5272              if (*code++ == OP_THEN)              if (*code++ == OP_THEN) cd->external_flags |= PCRE_HASTHEN;
               {  
               PUT(code, 0, code - bcptr->current_branch - 1);  
               code += LINK_SIZE;  
               }  
5273              }              }
5274    
5275            else            else
# Line 4935  for (;; ptr++) Line 5280  for (;; ptr++)
5280                goto FAILED;                goto FAILED;
5281                }                }
5282              *code = verbs[i].op_arg;              *code = verbs[i].op_arg;
5283              if (*code++ == OP_THEN_ARG)              if (*code++ == OP_THEN_ARG) cd->external_flags |= PCRE_HASTHEN;
               {  
               PUT(code, 0, code - bcptr->current_branch - 1);  
               code += LINK_SIZE;  
               }  
5284              *code++ = arglen;              *code++ = arglen;
5285              memcpy(code, arg, arglen);              memcpy(code, arg, arglen);
5286              code += arglen;              code += arglen;
# Line 5201  for (;; ptr++) Line 5542  for (;; ptr++)
5542          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5543          case CHAR_EQUALS_SIGN:                 /* Positive lookahead */          case CHAR_EQUALS_SIGN:                 /* Positive lookahead */
5544          bravalue = OP_ASSERT;          bravalue = OP_ASSERT;
5545            cd->assert_depth += 1;
5546          ptr++;          ptr++;
5547          break;          break;
5548    
# Line 5215  for (;; ptr++) Line 5557  for (;; ptr++)
5557            continue;            continue;
5558            }            }
5559          bravalue = OP_ASSERT_NOT;          bravalue = OP_ASSERT_NOT;
5560            cd->assert_depth += 1;
5561          break;          break;
5562    
5563    
# Line 5224  for (;; ptr++) Line 5567  for (;; ptr++)
5567            {            {
5568            case CHAR_EQUALS_SIGN:               /* Positive lookbehind */            case CHAR_EQUALS_SIGN:               /* Positive lookbehind */
5569            bravalue = OP_ASSERTBACK;            bravalue = OP_ASSERTBACK;
5570              cd->assert_depth += 1;
5571            ptr += 2;            ptr += 2;
5572            break;            break;
5573    
5574            case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */            case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */
5575            bravalue = OP_ASSERTBACK_NOT;            bravalue = OP_ASSERTBACK_NOT;
5576              cd->assert_depth += 1;
5577            ptr += 2;            ptr += 2;
5578            break;            break;
5579    
# Line 5619  for (;; ptr++) Line 5964  for (;; ptr++)
5964    
5965                /* Fudge the value of "called" so that when it is inserted as an                /* Fudge the value of "called" so that when it is inserted as an
5966                offset below, what it actually inserted is the reference number                offset below, what it actually inserted is the reference number
5967                of the group. */                of the group. Then remember the forward reference. */
5968    
5969                called = cd->start_code + recno;                called = cd->start_code + recno;
5970                PUTINC(cd->hwm, 0, (int)(code + 2 + LINK_SIZE - cd->start_code));                PUTINC(cd->hwm, 0, (int)(code + 1 - cd->start_code));
5971                }                }
5972    
5973              /* If not a forward reference, and the subpattern is still open,              /* If not a forward reference, and the subpattern is still open,
5974              this is a recursive call. We check to see if this is a left              this is a recursive call. We check to see if this is a left
5975              recursion that could loop for ever, and diagnose that case. */              recursion that could loop for ever, and diagnose that case. We
5976                must not, however, do this check if we are in a conditional
5977                subpattern because the condition might be testing for recursion in
5978                a pattern such as /(?(R)a+|(?R)b)/, which is perfectly valid.
5979                Forever loops are also detected at runtime, so those that occur in
5980                conditional subpatterns will be picked up then. */
5981    
5982              else if (GET(called, 1) == 0 &&              else if (GET(called, 1) == 0 && cond_depth <= 0 &&
5983                       could_be_empty(called, code, bcptr, utf8, cd))                       could_be_empty(called, code, bcptr, utf8, cd))
5984                {                {
5985                *errorcodeptr = ERR40;                *errorcodeptr = ERR40;
# Line 5637  for (;; ptr++) Line 5987  for (;; ptr++)
5987                }                }
5988              }              }
5989    
5990            /* Insert the recursion/subroutine item, automatically wrapped inside            /* Insert the recursion/subroutine item. */
           "once" brackets. Set up a "previous group" length so that a  
           subsequent quantifier will work. */  
   
           *code = OP_ONCE;  
           PUT(code, 1, 2 + 2*LINK_SIZE);  
           code += 1 + LINK_SIZE;  
5991    
5992            *code = OP_RECURSE;            *code = OP_RECURSE;
5993            PUT(code, 1, (int)(called - cd->start_code));            PUT(code, 1, (int)(called - cd->start_code));
5994            code += 1 + LINK_SIZE;            code += 1 + LINK_SIZE;
   
           *code = OP_KET;  
           PUT(code, 1, 2 + 2*LINK_SIZE);  
           code += 1 + LINK_SIZE;  
   
           length_prevgroup = 3 + 3*LINK_SIZE;  
5995            }            }
5996    
5997          /* Can't determine a first byte now */          /* Can't determine a first byte now */
# Line 5714  for (;; ptr++) Line 6052  for (;; ptr++)
6052          is necessary to ensure we correctly detect the start of the pattern in          is necessary to ensure we correctly detect the start of the pattern in
6053          both phases.          both phases.
6054    
6055          If we are not at the pattern start, compile code to change the ims          If we are not at the pattern start, reset the greedy defaults and the
6056          options if this setting actually changes any of them, and reset the          case value for firstbyte and reqbyte. */
         greedy defaults and the case value for firstbyte and reqbyte. */  
6057    
6058          if (*ptr == CHAR_RIGHT_PARENTHESIS)          if (*ptr == CHAR_RIGHT_PARENTHESIS)
6059            {            {
# Line 5733  for (;; ptr++) Line 6070  for (;; ptr++)
6070              }              }
6071    
6072            /* Change options at this level, and pass them back for use            /* Change options at this level, and pass them back for use
6073            in subsequent branches. When not at the start of the pattern, this            in subsequent branches. */
           information is also necessary so that a resetting item can be  
           compiled at the end of a group (if we are in a group). */  
6074    
6075            *optionsptr = options = newoptions;            *optionsptr = options = newoptions;
6076            previous = NULL;       /* This item can't be repeated */            previous = NULL;       /* This item can't be repeated */
# Line 5771  for (;; ptr++) Line 6106  for (;; ptr++)
6106        skipbytes = 2;        skipbytes = 2;
6107        }        }
6108    
6109      /* Process nested bracketed regex. Assertions may not be repeated, but      /* Process nested bracketed regex. Assertions used not to be repeatable,
6110      other kinds can be. All their opcodes are >= OP_ONCE. We copy code into a      but this was changed for Perl compatibility, so all kinds can now be
6111      non-register variable in order to be able to pass its address because some      repeated. We copy code into a non-register variable (tempcode) in order to
6112      compilers complain otherwise. Pass in a new setting for the ims options if      be able to pass its address because some compilers complain otherwise. */
     they have changed. */  
6113    
6114      previous = (bravalue >= OP_ONCE)? code : NULL;      previous = code;                      /* For handling repetition */
6115      *code = bravalue;      *code = bravalue;
6116      tempcode = code;      tempcode = code;
6117      tempreqvary = cd->req_varyopt;     /* Save value before bracket */      tempreqvary = cd->req_varyopt;        /* Save value before bracket */
6118      length_prevgroup = 0;              /* Initialize for pre-compile phase */      tempbracount = cd->bracount;          /* Save value before bracket */
6119        length_prevgroup = 0;                 /* Initialize for pre-compile phase */
6120    
6121      if (!compile_regex(      if (!compile_regex(
6122           newoptions,                   /* The complete new option state */           newoptions,                      /* The complete new option state */
6123           options & PCRE_IMS,           /* The previous ims option state */           &tempcode,                       /* Where to put code (updated) */
6124           &tempcode,                    /* Where to put code (updated) */           &ptr,                            /* Input pointer (updated) */
6125           &ptr,                         /* Input pointer (updated) */           errorcodeptr,                    /* Where to put an error message */
          errorcodeptr,                 /* Where to put an error message */  
6126           (bravalue == OP_ASSERTBACK ||           (bravalue == OP_ASSERTBACK ||
6127            bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */            bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */
6128           reset_bracount,               /* True if (?| group */           reset_bracount,                  /* True if (?| group */
6129           skipbytes,                    /* Skip over bracket number */           skipbytes,                       /* Skip over bracket number */
6130           &subfirstbyte,                /* For possible first char */           cond_depth +
6131           &subreqbyte,                  /* For possible last char */             ((bravalue == OP_COND)?1:0),   /* Depth of condition subpatterns */
6132           bcptr,                        /* Current branch chain */           &subfirstbyte,                   /* For possible first char */
6133           cd,                           /* Tables block */           &subreqbyte,                     /* For possible last char */
6134           (lengthptr == NULL)? NULL :   /* Actual compile phase */           bcptr,                           /* Current branch chain */
6135             &length_prevgroup           /* Pre-compile phase */           cd,                              /* Tables block */
6136             (lengthptr == NULL)? NULL :      /* Actual compile phase */
6137               &length_prevgroup              /* Pre-compile phase */
6138           ))           ))
6139        goto FAILED;        goto FAILED;
6140    
6141        /* If this was an atomic group and there are no capturing groups within it,
6142        generate OP_ONCE_NC instead of OP_ONCE. */
6143    
6144        if (bravalue == OP_ONCE && cd->bracount <= tempbracount)
6145          *code = OP_ONCE_NC;
6146    
6147        if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NOT)
6148          cd->assert_depth -= 1;
6149    
6150      /* At the end of compiling, code is still pointing to the start of the      /* At the end of compiling, code is still pointing to the start of the
6151      group, while tempcode has been updated to point past the end of the group      group, while tempcode has been updated to point past the end of the group.
6152      and any option resetting that may follow it. The pattern pointer (ptr)      The pattern pointer (ptr) is on the bracket.
     is on the bracket. */  
6153    
6154      /* If this is a conditional bracket, check that there are no more than      If this is a conditional bracket, check that there are no more than
6155      two branches in the group, or just one if it's a DEFINE group. We do this      two branches in the group, or just one if it's a DEFINE group. We do this
6156      in the real compile phase, not in the pre-pass, where the whole group may      in the real compile phase, not in the pre-pass, where the whole group may
6157      not be available. */      not be available. */
# Line 5872  for (;; ptr++) Line 6216  for (;; ptr++)
6216          goto FAILED;          goto FAILED;
6217          }          }
6218        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
6219        *code++ = OP_BRA;        code++;   /* This already contains bravalue */
6220        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
6221        *code++ = OP_KET;        *code++ = OP_KET;
6222        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
# Line 6040  for (;; ptr++) Line 6384  for (;; ptr++)
6384          }          }
6385    
6386        /* \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).
6387        We also support \k{name} (.NET syntax) */        We also support \k{name} (.NET syntax).  */
6388    
6389        if (-c == ESC_k && (ptr[1] == CHAR_LESS_THAN_SIGN ||        if (-c == ESC_k)
           ptr[1] == CHAR_APOSTROPHE || ptr[1] == CHAR_LEFT_CURLY_BRACKET))  
6390          {          {
6391            if ((ptr[1] != CHAR_LESS_THAN_SIGN &&
6392              ptr[1] != CHAR_APOSTROPHE && ptr[1] != CHAR_LEFT_CURLY_BRACKET))
6393              {
6394              *errorcodeptr = ERR69;
6395              break;
6396              }
6397          is_recurse = FALSE;          is_recurse = FALSE;
6398          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
6399            CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?            CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?
# Line 6201  for (;; ptr++) Line 6550  for (;; ptr++)
6550        else firstbyte = reqbyte = REQ_NONE;        else firstbyte = reqbyte = REQ_NONE;
6551        }        }
6552    
6553      /* firstbyte was previously set; we can set reqbyte only the length is      /* firstbyte was previously set; we can set reqbyte only if the length is
6554      1 or the matching is caseful. */      1 or the matching is caseful. */
6555    
6556      else      else
# Line 6242  value of lengthptr distinguishes the two Line 6591  value of lengthptr distinguishes the two
6591    
6592  Arguments:  Arguments:
6593    options        option bits, including any changes for this subpattern    options        option bits, including any changes for this subpattern
   oldims         previous settings of ims option bits  
6594    codeptr        -> the address of the current code pointer    codeptr        -> the address of the current code pointer
6595    ptrptr         -> the address of the current pattern pointer    ptrptr         -> the address of the current pattern pointer
6596    errorcodeptr   -> pointer to error code variable    errorcodeptr   -> pointer to error code variable
6597    lookbehind     TRUE if this is a lookbehind assertion    lookbehind     TRUE if this is a lookbehind assertion
6598    reset_bracount TRUE to reset the count for each branch    reset_bracount TRUE to reset the count for each branch
6599    skipbytes      skip this many bytes at start (for brackets and OP_COND)    skipbytes      skip this many bytes at start (for brackets and OP_COND)
6600      cond_depth     depth of nesting for conditional subpatterns
6601    firstbyteptr   place to put the first required character, or a negative number    firstbyteptr   place to put the first required character, or a negative number
6602    reqbyteptr     place to put the last required character, or a negative number    reqbyteptr     place to put the last required character, or a negative number
6603    bcptr          pointer to the chain of currently open branches    bcptr          pointer to the chain of currently open branches
# Line 6260  Returns:         TRUE on success Line 6609  Returns:         TRUE on success
6609  */  */
6610    
6611  static BOOL  static BOOL
6612  compile_regex(int options, int oldims, uschar **codeptr, const uschar **ptrptr,  compile_regex(int options, uschar **codeptr, const uschar **ptrptr,
6613    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
6614    int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr, compile_data *cd,    int cond_depth, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
6615    int *lengthptr)    compile_data *cd, int *lengthptr)
6616  {  {
6617  const uschar *ptr = *ptrptr;  const uschar *ptr = *ptrptr;
6618  uschar *code = *codeptr;  uschar *code = *codeptr;
# Line 6277  int branchfirstbyte, branchreqbyte; Line 6626  int branchfirstbyte, branchreqbyte;
6626  int length;  int length;
6627  int orig_bracount;  int orig_bracount;
6628  int max_bracount;  int max_bracount;
 int old_external_options = cd->external_options;  
6629  branch_chain bc;  branch_chain bc;
6630    
6631  bc.outer = bcptr;  bc.outer = bcptr;
# Line 6301  pre-compile phase to find out whether an Line 6649  pre-compile phase to find out whether an
6649    
6650  /* If this is a capturing subpattern, add to the chain of open capturing items  /* If this is a capturing subpattern, add to the chain of open capturing items
6651  so that we can detect them if (*ACCEPT) is encountered. This is also used to  so that we can detect them if (*ACCEPT) is encountered. This is also used to
6652  detect groups that contain recursive back references to themselves. */  detect groups that contain recursive back references to themselves. Note that
6653    only OP_CBRA need be tested here; changing this opcode to one of its variants,
6654    e.g. OP_SCBRAPOS, happens later, after the group has been compiled. */
6655    
6656  if (*code == OP_CBRA)  if (*code == OP_CBRA)
6657    {    {
# Line 6341  for (;;) Line 6691  for (;;)
6691    into the length. */    into the length. */
6692    
6693    if (!compile_branch(&options, &code, &ptr, errorcodeptr, &branchfirstbyte,    if (!compile_branch(&options, &code, &ptr, errorcodeptr, &branchfirstbyte,
6694          &branchreqbyte, &bc, cd, (lengthptr == NULL)? NULL : &length))          &branchreqbyte, &bc, cond_depth, cd,
6695            (lengthptr == NULL)? NULL : &length))
6696      {      {
6697      *ptrptr = ptr;      *ptrptr = ptr;
6698      return FALSE;      return FALSE;
6699      }      }
6700    
   /* If the external options have changed during this branch, it means that we  
   are at the top level, and a leading option setting has been encountered. We  
   need to re-set the original option values to take account of this so that,  
   during the pre-compile phase, we know to allow for a re-set at the start of  
   subsequent branches. */  
   
   if (old_external_options != cd->external_options)  
     oldims = cd->external_options & PCRE_IMS;  
   
6701    /* Keep the highest bracket count in case (?| was used and some branch    /* Keep the highest bracket count in case (?| was used and some branch
6702    has fewer than the rest. */    has fewer than the rest. */
6703    
# Line 6416  for (;;) Line 6758  for (;;)
6758        {        {
6759        int fixed_length;        int fixed_length;
6760        *code = OP_END;        *code = OP_END;
6761        fixed_length = find_fixedlength(last_branch, options, FALSE, cd);        fixed_length = find_fixedlength(last_branch,  (options & PCRE_UTF8) != 0,
6762            FALSE, cd);
6763        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
6764        if (fixed_length == -3)        if (fixed_length == -3)
6765          {          {
# Line 6424  for (;;) Line 6767  for (;;)
6767          }          }
6768        else if (fixed_length < 0)        else if (fixed_length < 0)
6769          {          {
6770          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;          *errorcodeptr = (fixed_length == -2)? ERR36 :
6771                            (fixed_length == -4)? ERR70: ERR25;
6772          *ptrptr = ptr;          *ptrptr = ptr;
6773          return FALSE;          return FALSE;
6774          }          }
# Line 6437  for (;;) Line 6781  for (;;)
6781    of offsets, with the field in the BRA item now becoming an offset to the    of offsets, with the field in the BRA item now becoming an offset to the
6782    first alternative. If there are no alternatives, it points to the end of the    first alternative. If there are no alternatives, it points to the end of the
6783    group. The length in the terminating ket is always the length of the whole    group. The length in the terminating ket is always the length of the whole
6784    bracketed item. If any of the ims options were changed inside the group,    bracketed item. Return leaving the pointer at the terminating char. */
   compile a resetting op-code following, except at the very end of the pattern.  
   Return leaving the pointer at the terminating char. */  
6785    
6786    if (*ptr != CHAR_VERTICAL_LINE)    if (*ptr != CHAR_VERTICAL_LINE)
6787      {      {
# Line 6564  of the more common cases more precisely. Line 6906  of the more common cases more precisely.
6906    
6907  Arguments:  Arguments:
6908    code           points to start of expression (the bracket)    code           points to start of expression (the bracket)
   options        points to the options setting  
6909    bracket_map    a bitmap of which brackets we are inside while testing; this    bracket_map    a bitmap of which brackets we are inside while testing; this
6910                    handles up to substring 31; after that we just have to take                    handles up to substring 31; after that we just have to take
6911                    the less precise approach                    the less precise approach
# Line 6574  Returns:     TRUE or FALSE Line 6915  Returns:     TRUE or FALSE
6915  */  */
6916    
6917  static BOOL  static BOOL
6918  is_anchored(register const uschar *code, int *options, unsigned int bracket_map,  is_anchored(register const uschar *code, unsigned int bracket_map,
6919    unsigned int backref_map)    unsigned int backref_map)
6920  {  {
6921  do {  do {
6922     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
6923       options, PCRE_MULTILINE, FALSE);       FALSE);
6924     register int op = *scode;     register int op = *scode;
6925    
6926     /* Non-capturing brackets */     /* Non-capturing brackets */
6927    
6928     if (op == OP_BRA)     if (op == OP_BRA  || op == OP_BRAPOS ||
6929           op == OP_SBRA || op == OP_SBRAPOS)
6930       {       {
6931       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;       if (!is_anchored(scode, bracket_map, backref_map)) return FALSE;
6932       }       }
6933    
6934     /* Capturing brackets */     /* Capturing brackets */
6935    
6936     else if (op == OP_CBRA)     else if (op == OP_CBRA  || op == OP_CBRAPOS ||
6937                op == OP_SCBRA || op == OP_SCBRAPOS)
6938       {       {
6939       int n = GET2(scode, 1+LINK_SIZE);       int n = GET2(scode, 1+LINK_SIZE);
6940       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
6941       if (!is_anchored(scode, options, new_map, backref_map)) return FALSE;       if (!is_anchored(scode, new_map, backref_map)) return FALSE;
6942       }       }
6943    
6944     /* Other brackets */     /* Other brackets */
6945    
6946     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_ONCE_NC ||
6947                op == OP_COND)
6948       {       {
6949       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;       if (!is_anchored(scode, bracket_map, backref_map)) return FALSE;
6950       }       }
6951    
6952     /* .* is not anchored unless DOTALL is set (which generates OP_ALLANY) and     /* .* is not anchored unless DOTALL is set (which generates OP_ALLANY) and
# Line 6653  is_startline(const uschar *code, unsigne Line 6997  is_startline(const uschar *code, unsigne
6997  {  {
6998  do {  do {
6999     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
7000       NULL, 0, FALSE);       FALSE);
7001     register int op = *scode;     register int op = *scode;
7002    
7003     /* If we are at the start of a conditional assertion group, *both* the     /* If we are at the start of a conditional assertion group, *both* the
# Line 6680  do { Line 7024  do {
7024         scode += 1 + LINK_SIZE;         scode += 1 + LINK_SIZE;
7025         break;         break;
7026         }         }
7027       scode = first_significant_code(scode, NULL, 0, FALSE);       scode = first_significant_code(scode, FALSE);
7028       op = *scode;       op = *scode;
7029       }       }
7030    
7031     /* Non-capturing brackets */     /* Non-capturing brackets */
7032    
7033     if (op == OP_BRA)     if (op == OP_BRA  || op == OP_BRAPOS ||
7034           op == OP_SBRA || op == OP_SBRAPOS)
7035       {       {
7036       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
7037       }       }
7038    
7039     /* Capturing brackets */     /* Capturing brackets */
7040    
7041     else if (op == OP_CBRA)     else if (op == OP_CBRA  || op == OP_CBRAPOS ||
7042                op == OP_SCBRA || op == OP_SCBRAPOS)
7043       {       {
7044       int n = GET2(scode, 1+LINK_SIZE);       int n = GET2(scode, 1+LINK_SIZE);
7045       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
# Line 6702  do { Line 7048  do {
7048    
7049     /* Other brackets */     /* Other brackets */
7050    
7051     else if (op == OP_ASSERT || op == OP_ONCE)     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_ONCE_NC)
7052       {       {
7053       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
7054       }       }
# Line 6743  we return that char, otherwise -1. Line 7089  we return that char, otherwise -1.
7089    
7090  Arguments:  Arguments:
7091    code       points to start of expression (the bracket)    code       points to start of expression (the bracket)
   options    pointer to the options (used to check casing changes)  
7092    inassert   TRUE if in an assertion    inassert   TRUE if in an assertion
7093    
7094  Returns:     -1 or the fixed first char  Returns:     -1 or the fixed first char
7095  */  */
7096    
7097  static int  static int
7098  find_firstassertedchar(const uschar *code, int *options, BOOL inassert)  find_firstassertedchar(const uschar *code, BOOL inassert)
7099  {  {
7100  register int c = -1;  register int c = -1;
7101  do {  do {
7102     int d;     int d;
7103     const uschar *scode =     int xl = (*code == OP_CBRA || *code == OP_SCBRA ||
7104       first_significant_code(code + 1+LINK_SIZE, options, PCRE_CASELESS, TRUE);               *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? 2:0;
7105       const uschar *scode = first_significant_code(code + 1+LINK_SIZE + xl, TRUE);
7106     register int op = *scode;     register int op = *scode;
7107    
7108     switch(op)     switch(op)
# Line 6765  do { Line 7111  do {
7111       return -1;       return -1;
7112    
7113       case OP_BRA:       case OP_BRA:
7114         case OP_BRAPOS:
7115       case OP_CBRA:       case OP_CBRA:
7116         case OP_SCBRA:
7117         case OP_CBRAPOS:
7118         case OP_SCBRAPOS:
7119       case OP_ASSERT:       case OP_ASSERT:
7120       case OP_ONCE:       case OP_ONCE:
7121         case OP_ONCE_NC:
7122       case OP_COND:       case OP_COND:
7123       if ((d = find_firstassertedchar(scode, options, op == OP_ASSERT)) < 0)       if ((d = find_firstassertedchar(scode, op == OP_ASSERT)) < 0)
7124         return -1;         return -1;
7125       if (c < 0) c = d; else if (c != d) return -1;       if (c < 0) c = d; else if (c != d) return -1;
7126       break;       break;
7127    
7128       case OP_EXACT:       /* Fall through */       case OP_EXACT:
7129       scode += 2;       scode += 2;
7130         /* Fall through */
7131    
7132       case OP_CHAR:       case OP_CHAR:
      case OP_CHARI:  
7133       case OP_PLUS:       case OP_PLUS:
7134       case OP_MINPLUS:       case OP_MINPLUS:
7135       case OP_POSPLUS:       case OP_POSPLUS:
7136       if (!inassert) return -1;       if (!inassert) return -1;
7137       if (c < 0)       if (c < 0) c = scode[1];
7138         {         else if (c != scode[1]) return -1;
7139         c = scode[1];       break;
7140         if ((*options & PCRE_CASELESS) != 0) c |= REQ_CASELESS;  
7141         }       case OP_EXACTI:
7142       else if (c != scode[1]) return -1;       scode += 2;
7143         /* Fall through */
7144    
7145         case OP_CHARI:
7146         case OP_PLUSI:
7147         case OP_MINPLUSI:
7148         case OP_POSPLUSI:
7149         if (!inassert) return -1;
7150         if (c < 0) c = scode[1] | REQ_CASELESS;
7151           else if (c != scode[1]) return -1;
7152       break;       break;
7153       }       }
7154    
# Line 6939  while (ptr[skipatstart] == CHAR_LEFT_PAR Line 7299  while (ptr[skipatstart] == CHAR_LEFT_PAR
7299    
7300  utf8 = (options & PCRE_UTF8) != 0;  utf8 = (options & PCRE_UTF8) != 0;
7301    
7302  /* Can't support UTF8 unless PCRE has been compiled to include the code. The  /* Can't support UTF8 unless PCRE has been compiled to include the code. The
7303  return of an error code from _pcre_valid_utf8() is a new feature, introduced in  return of an error code from _pcre_valid_utf8() is a new feature, introduced in
7304  release 8.13. The only use we make of it here is to adjust the offset value to  release 8.13. It is passed back from pcre_[dfa_]exec(), but at the moment is
7305  the end of the string for a short string error, for compatibility with previous  not used here. */
 versions. */  
7306    
7307  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
7308  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&
7309       (*erroroffset = _pcre_valid_utf8((USPTR)pattern, -1, &errorcode)) >= 0)       (errorcode = _pcre_valid_utf8((USPTR)pattern, -1, erroroffset)) != 0)
7310    {    {
7311    errorcode = ERR44;    errorcode = ERR44;
7312    goto PCRE_EARLY_ERROR_RETURN2;    goto PCRE_EARLY_ERROR_RETURN2;
# Line 6972  if ((options & PCRE_UCP) != 0) Line 7331  if ((options & PCRE_UCP) != 0)
7331    
7332  /* Check validity of \R options. */  /* Check validity of \R options. */
7333    
7334  switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))  if ((options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) ==
7335         (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
7336    {    {
7337    case 0:    errorcode = ERR56;
7338    case PCRE_BSR_ANYCRLF:    goto PCRE_EARLY_ERROR_RETURN;
   case PCRE_BSR_UNICODE:  
   break;  
   default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;  
7339    }    }
7340    
7341  /* Handle different types of newline. The three bits give seven cases. The  /* Handle different types of newline. The three bits give seven cases. The
# Line 7063  outside can help speed up starting point Line 7420  outside can help speed up starting point
7420  ptr += skipatstart;  ptr += skipatstart;
7421  code = cworkspace;  code = cworkspace;
7422  *code = OP_BRA;  *code = OP_BRA;
7423  (void)compile_regex(cd->external_options, cd->external_options & PCRE_IMS,  (void)compile_regex(cd->external_options, &code, &ptr, &errorcode, FALSE,
7424    &code, &ptr, &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd,    FALSE, 0, 0, &firstbyte, &reqbyte, NULL, cd, &length);
   &length);  
7425  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
7426    
7427  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
# Line 7119  field; this time it's used for rememberi Line 7475  field; this time it's used for rememberi
7475  */  */
7476    
7477  cd->final_bracount = cd->bracount;  /* Save for checking forward references */  cd->final_bracount = cd->bracount;  /* Save for checking forward references */
7478    cd->assert_depth = 0;
7479  cd->bracount = 0;  cd->bracount = 0;
7480  cd->names_found = 0;  cd->names_found = 0;
7481  cd->name_table = (uschar *)re + re->name_table_offset;  cd->name_table = (uschar *)re + re->name_table_offset;
# Line 7137  of the function here. */ Line 7494  of the function here. */
7494  ptr = (const uschar *)pattern + skipatstart;  ptr = (const uschar *)pattern + skipatstart;
7495  code = (uschar *)codestart;  code = (uschar *)codestart;
7496  *code = OP_BRA;  *code = OP_BRA;
7497  (void)compile_regex(re->options, re->options & PCRE_IMS, &code, &ptr,  (void)compile_regex(re->options, &code, &ptr, &errorcode, FALSE, FALSE, 0, 0,
7498    &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, NULL);    &firstbyte, &reqbyte, NULL, cd, NULL);
7499  re->top_bracket = cd->bracount;  re->top_bracket = cd->bracount;
7500  re->top_backref = cd->top_backref;  re->top_backref = cd->top_backref;
7501  re->flags = cd->external_flags;  re->flags = cd->external_flags;
7502    
7503  if (cd->had_accept) reqbyte = -1;   /* Must disable after (*ACCEPT) */  if (cd->had_accept) reqbyte = REQ_NONE;   /* Must disable after (*ACCEPT) */
7504    
7505  /* If not reached end of pattern on success, there's an excess bracket. */  /* If not reached end of pattern on success, there's an excess bracket. */
7506    
# Line 7204  if (cd->check_lookbehind) Line 7561  if (cd->check_lookbehind)
7561        uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);        uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);
7562        int end_op = *be;        int end_op = *be;
7563        *be = OP_END;        *be = OP_END;
7564        fixed_length = find_fixedlength(cc, re->options, TRUE, cd);        fixed_length = find_fixedlength(cc, (re->options & PCRE_UTF8) != 0, TRUE,
7565            cd);
7566        *be = end_op;        *be = end_op;
7567        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
7568        if (fixed_length < 0)        if (fixed_length < 0)
7569          {          {
7570          errorcode = (fixed_length == -2)? ERR36 : ERR25;          errorcode = (fixed_length == -2)? ERR36 :
7571                        (fixed_length == -4)? ERR70 : ERR25;
7572          break;          break;
7573          }          }
7574        PUT(cc, 1, fixed_length);        PUT(cc, 1, fixed_length);
# Line 7243  start with ^. and also when all branches Line 7602  start with ^. and also when all branches
7602    
7603  if ((re->options & PCRE_ANCHORED) == 0)  if ((re->options & PCRE_ANCHORED) == 0)
7604    {    {
7605    int temp_options = re->options;   /* May get changed during these scans */    if (is_anchored(codestart, 0, cd->backref_map))
   if (is_anchored(codestart, &temp_options, 0, cd->backref_map))  
7606      re->options |= PCRE_ANCHORED;      re->options |= PCRE_ANCHORED;
7607    else    else
7608      {      {
7609      if (firstbyte < 0)      if (firstbyte < 0)
7610        firstbyte = find_firstassertedchar(codestart, &temp_options, FALSE);        firstbyte = find_firstassertedchar(codestart, FALSE);
7611      if (firstbyte >= 0)   /* Remove caseless flag for non-caseable chars */      if (firstbyte >= 0)   /* Remove caseless flag for non-caseable chars */
7612        {        {
7613        int ch = firstbyte & 255;        int ch = firstbyte & 255;

Legend:
Removed from v.602  
changed lines
  Added in v.749

  ViewVC Help
Powered by ViewVC 1.1.5