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

Diff of /code/trunk/pcre_compile.c

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

revision 602 by ph10, Wed May 25 08:29:03 2011 UTC revision 624 by ph10, Tue Jul 19 10:43:28 2011 UTC
# Line 545  static const unsigned char ebcdic_charta Line 545  static const unsigned char ebcdic_charta
545  /* Definition to allow mutual recursion */  /* Definition to allow mutual recursion */
546    
547  static BOOL  static BOOL
548    compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,    compile_regex(int, uschar **, const uschar **, int *, BOOL, BOOL, int, int *,
549      int *, int *, branch_chain *, compile_data *, int *);      int *, branch_chain *, compile_data *, int *);
550    
551    
552    
# Line 1403  does not. Line 1403  does not.
1403    
1404  Arguments:  Arguments:
1405    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  
1406    skipassert   TRUE if certain assertions are to be skipped    skipassert   TRUE if certain assertions are to be skipped
1407    
1408  Returns:       pointer to the first significant opcode  Returns:       pointer to the first significant opcode
1409  */  */
1410    
1411  static const uschar*  static const uschar*
1412  first_significant_code(const uschar *code, int *options, int optbit,  first_significant_code(const uschar *code, BOOL skipassert)
   BOOL skipassert)  
1413  {  {
1414  for (;;)  for (;;)
1415    {    {
# Line 1468  and doing the check at the end; a flag s Line 1464  and doing the check at the end; a flag s
1464    
1465  Arguments:  Arguments:
1466    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1467    options  the compiling options    utf8     TRUE in UTF-8 mode
1468    atend    TRUE if called when the pattern is complete    atend    TRUE if called when the pattern is complete
1469    cd       the "compile data" structure    cd       the "compile data" structure
1470    
# Line 1479  Returns:   the fixed length, Line 1475  Returns:   the fixed length,
1475  */  */
1476    
1477  static int  static int
1478  find_fixedlength(uschar *code, int options, BOOL atend, compile_data *cd)  find_fixedlength(uschar *code, BOOL utf8, BOOL atend, compile_data *cd)
1479  {  {
1480  int length = -1;  int length = -1;
1481    
# Line 1496  for (;;) Line 1492  for (;;)
1492    register int op = *cc;    register int op = *cc;
1493    switch (op)    switch (op)
1494      {      {
1495        /* We only need to continue for OP_CBRA (normal capturing bracket) and
1496        OP_BRA (normal non-capturing bracket) because the other variants of these
1497        opcodes are all concerned with unlimited repeated groups, which of course
1498        are not of fixed length. They will cause a -1 response from the default
1499        case of this switch. */
1500    
1501      case OP_CBRA:      case OP_CBRA:
1502      case OP_BRA:      case OP_BRA:
1503      case OP_ONCE:      case OP_ONCE:
1504      case OP_COND:      case OP_COND:
1505      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options, atend, cd);      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), utf8, atend, cd);
1506      if (d < 0) return d;      if (d < 0) return d;
1507      branchlength += d;      branchlength += d;
1508      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
# Line 1509  for (;;) Line 1511  for (;;)
1511    
1512      /* 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
1513      call. If it's ALT it is an alternation in a nested call. If it is      call. If it's ALT it is an alternation in a nested call. If it is
1514      END it's the end of the outer call. All can be handled by the same code. */      END it's the end of the outer call. All can be handled by the same code.
1515        Note that we must not include the OP_KETRxxx opcodes here, because they
1516        all imply an unlimited repeat. */
1517    
1518      case OP_ALT:      case OP_ALT:
1519      case OP_KET:      case OP_KET:
     case OP_KETRMAX:  
     case OP_KETRMIN:  
1520      case OP_END:      case OP_END:
1521      if (length < 0) length = branchlength;      if (length < 0) length = branchlength;
1522        else if (length != branchlength) return -1;        else if (length != branchlength) return -1;
# Line 1532  for (;;) Line 1534  for (;;)
1534      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1535      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */
1536      if (cc > cs && cc < ce) return -1;                /* Recursion */      if (cc > cs && cc < ce) return -1;                /* Recursion */
1537      d = find_fixedlength(cs + 2, options, atend, cd);      d = find_fixedlength(cs + 2, utf8, atend, cd);
1538      if (d < 0) return d;      if (d < 0) return d;
1539      branchlength += d;      branchlength += d;
1540      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
# Line 1575  for (;;) Line 1577  for (;;)
1577      case OP_CHAR:      case OP_CHAR:
1578      case OP_CHARI:      case OP_CHARI:
1579      case OP_NOT:      case OP_NOT:
1580      case OP_NOTI:      case OP_NOTI:
1581      branchlength++;      branchlength++;
1582      cc += 2;      cc += 2;
1583  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1584      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];  
1585  #endif  #endif
1586      break;      break;
1587    
# Line 1591  for (;;) Line 1592  for (;;)
1592      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1593      cc += 4;      cc += 4;
1594  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1595      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];  
1596  #endif  #endif
1597      break;      break;
1598    
# Line 1694  _pcre_find_bracket(const uschar *code, B Line 1694  _pcre_find_bracket(const uschar *code, B
1694  for (;;)  for (;;)
1695    {    {
1696    register int c = *code;    register int c = *code;
1697    
1698    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
1699    
1700    /* 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 1713  for (;;)
1713    
1714    /* Handle capturing bracket */    /* Handle capturing bracket */
1715    
1716    else if (c == OP_CBRA)    else if (c == OP_CBRA || c == OP_SCBRA ||
1717               c == OP_CBRAPOS || c == OP_SCBRAPOS)
1718      {      {
1719      int n = GET2(code, 1+LINK_SIZE);      int n = GET2(code, 1+LINK_SIZE);
1720      if (n == number) return (uschar *)code;      if (n == number) return (uschar *)code;
# Line 1954  could_be_empty_branch(const uschar *code Line 1956  could_be_empty_branch(const uschar *code
1956    compile_data *cd)    compile_data *cd)
1957  {  {
1958  register int c;  register int c;
1959  for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);  for (code = first_significant_code(code + _pcre_OP_lengths[*code], TRUE);
1960       code < endcode;       code < endcode;
1961       code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))       code = first_significant_code(code + _pcre_OP_lengths[c], TRUE))
1962    {    {
1963    const uschar *ccode;    const uschar *ccode;
1964    
# Line 1972  for (code = first_significant_code(code Line 1974  for (code = first_significant_code(code
1974      continue;      continue;
1975      }      }
1976    
   /* 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;  
     }  
   
1977    /* For a recursion/subroutine call, if its end has been reached, which    /* For a recursion/subroutine call, if its end has been reached, which
1978    implies a subroutine call, we can scan it. */    implies a backward reference subroutine call, we can scan it. If it's a
1979      forward reference subroutine call, we can't. To detect forward reference
1980      we have to scan up the list that is kept in the workspace. This function is
1981      called only when doing the real compile, not during the pre-compile that
1982      measures the size of the compiled pattern. */
1983    
1984    if (c == OP_RECURSE)    if (c == OP_RECURSE)
1985      {      {
1986      BOOL empty_branch = FALSE;      const uschar *scode;
1987      const uschar *scode = cd->start_code + GET(code, 1);      BOOL empty_branch;
1988    
1989        /* Test for forward reference */
1990    
1991        for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE)
1992          if (GET(scode, 0) == code + 1 - cd->start_code) return TRUE;
1993    
1994        /* Not a forward reference, test for completed backward reference */
1995    
1996        empty_branch = FALSE;
1997        scode = cd->start_code + GET(code, 1);
1998      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
1999    
2000        /* Completed backwards reference */
2001    
2002      do      do
2003        {        {
2004        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 2009  for (code = first_significant_code(code
2009        scode += GET(scode, 1);        scode += GET(scode, 1);
2010        }        }
2011      while (*scode == OP_ALT);      while (*scode == OP_ALT);
2012    
2013      if (!empty_branch) return FALSE;  /* All branches are non-empty */      if (!empty_branch) return FALSE;  /* All branches are non-empty */
2014      continue;      continue;
2015      }      }
2016    
2017      /* Groups with zero repeats can of course be empty; skip them. */
2018    
2019      if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2020          c == OP_BRAPOSZERO)
2021        {
2022        code += _pcre_OP_lengths[c];
2023        do code += GET(code, 1); while (*code == OP_ALT);
2024        c = *code;
2025        continue;
2026        }
2027    
2028      /* A nested group that is already marked as "could be empty" can just be
2029      skipped. */
2030    
2031      if (c == OP_SBRA  || c == OP_SBRAPOS ||
2032          c == OP_SCBRA || c == OP_SCBRAPOS)
2033        {
2034        do code += GET(code, 1); while (*code == OP_ALT);
2035        c = *code;
2036        continue;
2037        }
2038    
2039    /* For other groups, scan the branches. */    /* For other groups, scan the branches. */
2040    
2041    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)    if (c == OP_BRA  || c == OP_BRAPOS ||
2042          c == OP_CBRA || c == OP_CBRAPOS ||
2043          c == OP_ONCE || c == OP_COND)
2044      {      {
2045      BOOL empty_branch;      BOOL empty_branch;
2046      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 2169  for (code = first_significant_code(code
2169      case OP_KET:      case OP_KET:
2170      case OP_KETRMAX:      case OP_KETRMAX:
2171      case OP_KETRMIN:      case OP_KETRMIN:
2172        case OP_KETRPOS:
2173      case OP_ALT:      case OP_ALT:
2174      return TRUE;      return TRUE;
2175    
# Line 2200  return TRUE; Line 2235  return TRUE;
2235  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
2236  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,
2237  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.
2238    This function is called only during the real compile, not during the
2239    pre-compile.
2240    
2241  Arguments:  Arguments:
2242    code        points to start of the recursion    code        points to start of the recursion
# Line 2682  if (next >= 0) switch(op_code) Line 2719  if (next >= 0) switch(op_code)
2719    return (c != cd->fcc[next]);  /* Non-UTF-8 mode */    return (c != cd->fcc[next]);  /* Non-UTF-8 mode */
2720    
2721    /* 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
2722    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
2723    an XCLASS instead. */    an XCLASS instead. */
2724    
2725    case OP_NOT:    case OP_NOT:
2726    return (c = *previous) == next;    return (c = *previous) == next;
2727    
2728    case OP_NOTI:    case OP_NOTI:
2729    if ((c = *previous) == next) return TRUE;    if ((c = *previous) == next) return TRUE;
2730  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2731    if (utf8)    if (utf8)
# Line 4191  for (;; ptr++) Line 4228  for (;; ptr++)
4228        ptr++;        ptr++;
4229        }        }
4230      else repeat_type = greedy_default;      else repeat_type = greedy_default;
4231    
4232        /* If previous was a recursion call, wrap it in atomic brackets so that
4233        previous becomes the atomic group. All recursions were so wrapped in the
4234        past, but it no longer happens for non-repeated recursions. In fact, the
4235        repeated ones could be re-implemented independently so as not to need this,
4236        but for the moment we rely on the code for repeating groups. */
4237    
4238        if (*previous == OP_RECURSE)
4239          {
4240          memmove(previous + 1 + LINK_SIZE, previous, 1 + LINK_SIZE);
4241          *previous = OP_ONCE;
4242          PUT(previous, 1, 2 + 2*LINK_SIZE);
4243          previous[2 + 2*LINK_SIZE] = OP_KET;
4244          PUT(previous, 3 + 2*LINK_SIZE, 2 + 2*LINK_SIZE);
4245          code += 2 + 2 * LINK_SIZE;
4246          length_prevgroup = 3 + 3*LINK_SIZE;
4247    
4248          /* When actually compiling, we need to check whether this was a forward
4249          reference, and if so, adjust the offset. */
4250    
4251          if (lengthptr == NULL && cd->hwm >= cd->start_workspace + LINK_SIZE)
4252            {
4253            int offset = GET(cd->hwm, -LINK_SIZE);
4254            if (offset == previous + 1 - cd->start_code)
4255              PUT(cd->hwm, -LINK_SIZE, offset + 1 + LINK_SIZE);
4256            }
4257          }
4258    
4259        /* Now handle repetition for the different types of item. */
4260    
4261      /* If previous was a character match, abolish the item and generate a      /* If previous was a character match, abolish the item and generate a
4262      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
# Line 4201  for (;; ptr++) Line 4267  for (;; ptr++)
4267      if (*previous == OP_CHAR || *previous == OP_CHARI)      if (*previous == OP_CHAR || *previous == OP_CHARI)
4268        {        {
4269        op_type = (*previous == OP_CHAR)? 0 : OP_STARI - OP_STAR;        op_type = (*previous == OP_CHAR)? 0 : OP_STARI - OP_STAR;
4270    
4271        /* 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
4272        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
4273        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 4312  for (;; ptr++)
4312      /* If previous was a single negated character ([^a] or similar), we use      /* If previous was a single negated character ([^a] or similar), we use
4313      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-
4314      character repeats by setting opt_type to add a suitable offset into      character repeats by setting opt_type to add a suitable offset into
4315      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
4316      are currently used only for single-byte chars. */      are currently used only for single-byte chars. */
4317    
4318      else if (*previous == OP_NOT || *previous == OP_NOTI)      else if (*previous == OP_NOT || *previous == OP_NOTI)
# Line 4483  for (;; ptr++) Line 4549  for (;; ptr++)
4549        }        }
4550    
4551      /* 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
4552      cases. */      cases. Note that at this point we can encounter only the "basic" BRA and
4553        KET opcodes, as this is the place where they get converted into the more
4554        special varieties. */
4555    
4556      else if (*previous == OP_BRA  || *previous == OP_CBRA ||      else if (*previous == OP_BRA  || *previous == OP_CBRA ||
4557               *previous == OP_ONCE || *previous == OP_COND)               *previous == OP_ONCE || *previous == OP_COND)
4558        {        {
4559        register int i;        register int i;
       int ketoffset = 0;  
4560        int len = (int)(code - previous);        int len = (int)(code - previous);
4561        uschar *bralink = NULL;        uschar *bralink = NULL;
4562          uschar *brazeroptr = NULL;
4563    
4564        /* Repeating a DEFINE group is pointless */        /* Repeating a DEFINE group is pointless */
4565    
4566        if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)        if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)
# Line 4501  for (;; ptr++) Line 4569  for (;; ptr++)
4569          goto FAILED;          goto FAILED;
4570          }          }
4571    
       /* If the maximum repeat count is unlimited, find the end of the bracket  
       by scanning through from the start, and compute the offset back to it  
       from the current code pointer. */  
   
       if (repeat_max == -1)  
         {  
         register uschar *ket = previous;  
         do ket += GET(ket, 1); while (*ket != OP_KET);  
         ketoffset = (int)(code - ket);  
         }  
   
4572        /* 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
4573        OP_BRAZERO in front of it, and because the group appears once in the        OP_BRAZERO in front of it, and because the group appears once in the
4574        data, whereas in other cases it appears the minimum number of times. For        data, whereas in other cases it appears the minimum number of times. For
# Line 4553  for (;; ptr++) Line 4610  for (;; ptr++)
4610              *previous++ = OP_SKIPZERO;              *previous++ = OP_SKIPZERO;
4611              goto END_REPEAT;              goto END_REPEAT;
4612              }              }
4613              brazeroptr = previous;    /* Save for possessive optimizing */
4614            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
4615            }            }
4616    
# Line 4717  for (;; ptr++) Line 4775  for (;; ptr++)
4775            }            }
4776          }          }
4777    
4778        /* 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
4779        can't just offset backwards from the current code point, because we        ONCE brackets, that's all we need to do. However, possessively repeated
4780        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
4781        correct offset was computed above.        behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to
4782          deal with possessive ONCEs specially.
4783    
4784          Otherwise, if the quantifier was possessive, we convert the BRA code to
4785          the POS form, and the KET code to KETRPOS. (It turns out to be convenient
4786          at runtime to detect this kind of subpattern at both the start and at the
4787          end.) The use of special opcodes makes it possible to reduce greatly the
4788          stack usage in pcre_exec(). If the group is preceded by OP_BRAZERO,
4789          convert this to OP_BRAPOSZERO. Then cancel the possessive flag so that
4790          the default action below, of wrapping everything inside atomic brackets,
4791          does not happen.
4792    
4793        Then, when we are doing the actual compile phase, check to see whether        Then, when we are doing the actual compile phase, check to see whether
4794        this group is a non-atomic one that could match an empty string. If so,        this group is one that could match an empty string. If so, convert the
4795        convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so        initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so that runtime
4796        that runtime checking can be done. [This check is also applied to        checking can be done. [This check is also applied to ONCE groups at
4797        atomic groups at runtime, but in a different way.] */        runtime, but in a different way.] */
4798    
4799        else        else
4800          {          {
4801          uschar *ketcode = code - ketoffset;          uschar *ketcode = code - 1 - LINK_SIZE;
4802          uschar *bracode = ketcode - GET(ketcode, 1);          uschar *bracode = ketcode - GET(ketcode, 1);
4803          *ketcode = OP_KETRMAX + repeat_type;  
4804          if (lengthptr == NULL && *bracode != OP_ONCE)          if (*bracode == OP_ONCE && possessive_quantifier) *bracode = OP_BRA;
4805            if (*bracode == OP_ONCE)
4806              *ketcode = OP_KETRMAX + repeat_type;
4807            else
4808            {            {
4809            uschar *scode = bracode;            if (possessive_quantifier)
4810            do              {
4811                *bracode += 1;                   /* Switch to xxxPOS opcodes */
4812                *ketcode = OP_KETRPOS;
4813                if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
4814                possessive_quantifier = FALSE;
4815                }
4816              else *ketcode = OP_KETRMAX + repeat_type;
4817    
4818              if (lengthptr == NULL)
4819              {              {
4820              if (could_be_empty_branch(scode, ketcode, utf8, cd))              uschar *scode = bracode;
4821                do
4822                {                {
4823                *bracode += OP_SBRA - OP_BRA;                if (could_be_empty_branch(scode, ketcode, utf8, cd))
4824                break;                  {
4825                    *bracode += OP_SBRA - OP_BRA;
4826                    break;
4827                    }
4828                  scode += GET(scode, 1);
4829                }                }
4830              scode += GET(scode, 1);              while (*scode == OP_ALT);
4831              }              }
           while (*scode == OP_ALT);  
4832            }            }
4833          }          }
4834        }        }
# Line 4766  for (;; ptr++) Line 4849  for (;; ptr++)
4849        }        }
4850    
4851      /* If the character following a repeat is '+', or if certain optimization      /* If the character following a repeat is '+', or if certain optimization
4852      tests above succeeded, possessive_quantifier is TRUE. For some of the      tests above succeeded, possessive_quantifier is TRUE. For some opcodes,
4853      simpler opcodes, there is an special alternative opcode for this. For      there are special alternative opcodes for this case. For anything else, we
4854      anything else, we wrap the entire repeated item inside OP_ONCE brackets.      wrap the entire repeated item inside OP_ONCE brackets. Logically, the '+'
4855      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
4856      but the special opcodes can optimize it a bit. The repeated item starts at      special opcodes can optimize it.
4857      tempcode, not at previous, which might be the first part of a string whose  
4858      (former) last char we repeated.      Possessively repeated subpatterns have already been handled in the code
4859        just above, so possessive_quantifier is always FALSE for them at this
4860        stage.
4861    
4862        Note that the repeated item starts at tempcode, not at previous, which
4863        might be the first part of a string whose (former) last char we repeated.
4864    
4865      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
4866      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 4897  for (;; ptr++) Line 4985  for (;; ptr++)
4985          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
4986              strncmp((char *)name, vn, namelen) == 0)              strncmp((char *)name, vn, namelen) == 0)
4987            {            {
4988            /* Check for open captures before ACCEPT */            /* Check for open captures before ACCEPT and convert it to
4989              ASSERT_ACCEPT if in an assertion. */
4990    
4991            if (verbs[i].op == OP_ACCEPT)            if (verbs[i].op == OP_ACCEPT)
4992              {              {
4993              open_capitem *oc;              open_capitem *oc;
4994                if (arglen != 0)
4995                  {
4996                  *errorcodeptr = ERR59;
4997                  goto FAILED;
4998                  }
4999              cd->had_accept = TRUE;              cd->had_accept = TRUE;
5000              for (oc = cd->open_caps; oc != NULL; oc = oc->next)              for (oc = cd->open_caps; oc != NULL; oc = oc->next)
5001                {                {
5002                *code++ = OP_CLOSE;                *code++ = OP_CLOSE;
5003                PUT2INC(code, 0, oc->number);                PUT2INC(code, 0, oc->number);
5004                }                }
5005                *code++ = (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
5006              }              }
5007    
5008            /* Handle the cases with/without an argument */            /* Handle other cases with/without an argument */
5009    
5010            if (arglen == 0)            else if (arglen == 0)
5011              {              {
5012              if (verbs[i].op < 0)   /* Argument is mandatory */              if (verbs[i].op < 0)   /* Argument is mandatory */
5013                {                {
# Line 5201  for (;; ptr++) Line 5296  for (;; ptr++)
5296          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
5297          case CHAR_EQUALS_SIGN:                 /* Positive lookahead */          case CHAR_EQUALS_SIGN:                 /* Positive lookahead */
5298          bravalue = OP_ASSERT;          bravalue = OP_ASSERT;
5299            cd->assert_depth += 1;
5300          ptr++;          ptr++;
5301          break;          break;
5302    
# Line 5215  for (;; ptr++) Line 5311  for (;; ptr++)
5311            continue;            continue;
5312            }            }
5313          bravalue = OP_ASSERT_NOT;          bravalue = OP_ASSERT_NOT;
5314            cd->assert_depth += 1;
5315          break;          break;
5316    
5317    
# Line 5224  for (;; ptr++) Line 5321  for (;; ptr++)
5321            {            {
5322            case CHAR_EQUALS_SIGN:               /* Positive lookbehind */            case CHAR_EQUALS_SIGN:               /* Positive lookbehind */
5323            bravalue = OP_ASSERTBACK;            bravalue = OP_ASSERTBACK;
5324              cd->assert_depth += 1;
5325            ptr += 2;            ptr += 2;
5326            break;            break;
5327    
5328            case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */            case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */
5329            bravalue = OP_ASSERTBACK_NOT;            bravalue = OP_ASSERTBACK_NOT;
5330              cd->assert_depth += 1;
5331            ptr += 2;            ptr += 2;
5332            break;            break;
5333    
# Line 5619  for (;; ptr++) Line 5718  for (;; ptr++)
5718    
5719                /* 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
5720                offset below, what it actually inserted is the reference number                offset below, what it actually inserted is the reference number
5721                of the group. */                of the group. Then remember the forward reference. */
5722    
5723                called = cd->start_code + recno;                called = cd->start_code + recno;
5724                PUTINC(cd->hwm, 0, (int)(code + 2 + LINK_SIZE - cd->start_code));                PUTINC(cd->hwm, 0, (int)(code + 1 - cd->start_code));
5725                }                }
5726    
5727              /* If not a forward reference, and the subpattern is still open,              /* If not a forward reference, and the subpattern is still open,
# Line 5637  for (;; ptr++) Line 5736  for (;; ptr++)
5736                }                }
5737              }              }
5738    
5739            /* Insert the recursion/subroutine item, automatically wrapped inside            /* Insert the recursion/subroutine item. */
5740            "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;  
   
5741            *code = OP_RECURSE;            *code = OP_RECURSE;
5742            PUT(code, 1, (int)(called - cd->start_code));            PUT(code, 1, (int)(called - cd->start_code));
5743            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;  
5744            }            }
5745    
5746          /* Can't determine a first byte now */          /* Can't determine a first byte now */
# Line 5714  for (;; ptr++) Line 5801  for (;; ptr++)
5801          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
5802          both phases.          both phases.
5803    
5804          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
5805          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. */  
5806    
5807          if (*ptr == CHAR_RIGHT_PARENTHESIS)          if (*ptr == CHAR_RIGHT_PARENTHESIS)
5808            {            {
# Line 5733  for (;; ptr++) Line 5819  for (;; ptr++)
5819              }              }
5820    
5821            /* Change options at this level, and pass them back for use            /* Change options at this level, and pass them back for use
5822            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). */  
5823    
5824            *optionsptr = options = newoptions;            *optionsptr = options = newoptions;
5825            previous = NULL;       /* This item can't be repeated */            previous = NULL;       /* This item can't be repeated */
# Line 5773  for (;; ptr++) Line 5857  for (;; ptr++)
5857    
5858      /* Process nested bracketed regex. Assertions may not be repeated, but      /* Process nested bracketed regex. Assertions may not be repeated, but
5859      other kinds can be. All their opcodes are >= OP_ONCE. We copy code into a      other kinds can be. All their opcodes are >= OP_ONCE. We copy code into a
5860      non-register variable in order to be able to pass its address because some      non-register variable (tempcode) in order to be able to pass its address
5861      compilers complain otherwise. Pass in a new setting for the ims options if      because some compilers complain otherwise. */
     they have changed. */  
5862    
5863      previous = (bravalue >= OP_ONCE)? code : NULL;      previous = (bravalue >= OP_ONCE)? code : NULL;
5864      *code = bravalue;      *code = bravalue;
# Line 5785  for (;; ptr++) Line 5868  for (;; ptr++)
5868    
5869      if (!compile_regex(      if (!compile_regex(
5870           newoptions,                   /* The complete new option state */           newoptions,                   /* The complete new option state */
          options & PCRE_IMS,           /* The previous ims option state */  
5871           &tempcode,                    /* Where to put code (updated) */           &tempcode,                    /* Where to put code (updated) */
5872           &ptr,                         /* Input pointer (updated) */           &ptr,                         /* Input pointer (updated) */
5873           errorcodeptr,                 /* Where to put an error message */           errorcodeptr,                 /* Where to put an error message */
# Line 5801  for (;; ptr++) Line 5883  for (;; ptr++)
5883             &length_prevgroup           /* Pre-compile phase */             &length_prevgroup           /* Pre-compile phase */
5884           ))           ))
5885        goto FAILED;        goto FAILED;
5886    
5887        if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NOT)
5888          cd->assert_depth -= 1;
5889    
5890      /* 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
5891      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
# Line 5872  for (;; ptr++) Line 5957  for (;; ptr++)
5957          goto FAILED;          goto FAILED;
5958          }          }
5959        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
5960        *code++ = OP_BRA;        code++;   /* This already contains bravalue */
5961        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
5962        *code++ = OP_KET;        *code++ = OP_KET;
5963        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
# Line 6242  value of lengthptr distinguishes the two Line 6327  value of lengthptr distinguishes the two
6327    
6328  Arguments:  Arguments:
6329    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  
6330    codeptr        -> the address of the current code pointer    codeptr        -> the address of the current code pointer
6331    ptrptr         -> the address of the current pattern pointer    ptrptr         -> the address of the current pattern pointer
6332    errorcodeptr   -> pointer to error code variable    errorcodeptr   -> pointer to error code variable
# Line 6260  Returns:         TRUE on success Line 6344  Returns:         TRUE on success
6344  */  */
6345    
6346  static BOOL  static BOOL
6347  compile_regex(int options, int oldims, uschar **codeptr, const uschar **ptrptr,  compile_regex(int options, uschar **codeptr, const uschar **ptrptr,
6348    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
6349    int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr, compile_data *cd,    int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr, compile_data *cd,
6350    int *lengthptr)    int *lengthptr)
# Line 6277  int branchfirstbyte, branchreqbyte; Line 6361  int branchfirstbyte, branchreqbyte;
6361  int length;  int length;
6362  int orig_bracount;  int orig_bracount;
6363  int max_bracount;  int max_bracount;
 int old_external_options = cd->external_options;  
6364  branch_chain bc;  branch_chain bc;
6365    
6366  bc.outer = bcptr;  bc.outer = bcptr;
# Line 6301  pre-compile phase to find out whether an Line 6384  pre-compile phase to find out whether an
6384    
6385  /* 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
6386  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
6387  detect groups that contain recursive back references to themselves. */  detect groups that contain recursive back references to themselves. Note that
6388    only OP_CBRA need be tested here; changing this opcode to one of its variants,
6389    e.g. OP_SCBRAPOS, happens later, after the group has been compiled. */
6390    
6391  if (*code == OP_CBRA)  if (*code == OP_CBRA)
6392    {    {
# Line 6347  for (;;) Line 6432  for (;;)
6432      return FALSE;      return FALSE;
6433      }      }
6434    
   /* 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;  
   
6435    /* Keep the highest bracket count in case (?| was used and some branch    /* Keep the highest bracket count in case (?| was used and some branch
6436    has fewer than the rest. */    has fewer than the rest. */
6437    
# Line 6416  for (;;) Line 6492  for (;;)
6492        {        {
6493        int fixed_length;        int fixed_length;
6494        *code = OP_END;        *code = OP_END;
6495        fixed_length = find_fixedlength(last_branch, options, FALSE, cd);        fixed_length = find_fixedlength(last_branch,  (options & PCRE_UTF8) != 0,
6496            FALSE, cd);
6497        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
6498        if (fixed_length == -3)        if (fixed_length == -3)
6499          {          {
# Line 6437  for (;;) Line 6514  for (;;)
6514    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
6515    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
6516    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
6517    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. */  
6518    
6519    if (*ptr != CHAR_VERTICAL_LINE)    if (*ptr != CHAR_VERTICAL_LINE)
6520      {      {
# Line 6564  of the more common cases more precisely. Line 6639  of the more common cases more precisely.
6639    
6640  Arguments:  Arguments:
6641    code           points to start of expression (the bracket)    code           points to start of expression (the bracket)
   options        points to the options setting  
6642    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
6643                    handles up to substring 31; after that we just have to take                    handles up to substring 31; after that we just have to take
6644                    the less precise approach                    the less precise approach
# Line 6574  Returns:     TRUE or FALSE Line 6648  Returns:     TRUE or FALSE
6648  */  */
6649    
6650  static BOOL  static BOOL
6651  is_anchored(register const uschar *code, int *options, unsigned int bracket_map,  is_anchored(register const uschar *code, unsigned int bracket_map,
6652    unsigned int backref_map)    unsigned int backref_map)
6653  {  {
6654  do {  do {
6655     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
6656       options, PCRE_MULTILINE, FALSE);       FALSE);
6657     register int op = *scode;     register int op = *scode;
6658    
6659     /* Non-capturing brackets */     /* Non-capturing brackets */
6660    
6661     if (op == OP_BRA)     if (op == OP_BRA  || op == OP_BRAPOS ||
6662           op == OP_SBRA || op == OP_SBRAPOS)
6663       {       {
6664       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;       if (!is_anchored(scode, bracket_map, backref_map)) return FALSE;
6665       }       }
6666    
6667     /* Capturing brackets */     /* Capturing brackets */
6668    
6669     else if (op == OP_CBRA)     else if (op == OP_CBRA  || op == OP_CBRAPOS ||
6670                op == OP_SCBRA || op == OP_SCBRAPOS)
6671       {       {
6672       int n = GET2(scode, 1+LINK_SIZE);       int n = GET2(scode, 1+LINK_SIZE);
6673       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
6674       if (!is_anchored(scode, options, new_map, backref_map)) return FALSE;       if (!is_anchored(scode, new_map, backref_map)) return FALSE;
6675       }       }
6676    
6677     /* Other brackets */     /* Other brackets */
6678    
6679     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)
6680       {       {
6681       if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;       if (!is_anchored(scode, bracket_map, backref_map)) return FALSE;
6682       }       }
6683    
6684     /* .* 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 6729  is_startline(const uschar *code, unsigne
6729  {  {
6730  do {  do {
6731     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
6732       NULL, 0, FALSE);       FALSE);
6733     register int op = *scode;     register int op = *scode;
6734    
6735     /* 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 6756  do {
6756         scode += 1 + LINK_SIZE;         scode += 1 + LINK_SIZE;
6757         break;         break;
6758         }         }
6759       scode = first_significant_code(scode, NULL, 0, FALSE);       scode = first_significant_code(scode, FALSE);
6760       op = *scode;       op = *scode;
6761       }       }
6762    
6763     /* Non-capturing brackets */     /* Non-capturing brackets */
6764    
6765     if (op == OP_BRA)     if (op == OP_BRA  || op == OP_BRAPOS ||
6766           op == OP_SBRA || op == OP_SBRAPOS)
6767       {       {
6768       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
6769       }       }
6770    
6771     /* Capturing brackets */     /* Capturing brackets */
6772    
6773     else if (op == OP_CBRA)     else if (op == OP_CBRA  || op == OP_CBRAPOS ||
6774                op == OP_SCBRA || op == OP_SCBRAPOS)
6775       {       {
6776       int n = GET2(scode, 1+LINK_SIZE);       int n = GET2(scode, 1+LINK_SIZE);
6777       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
# Line 6743  we return that char, otherwise -1. Line 6821  we return that char, otherwise -1.
6821    
6822  Arguments:  Arguments:
6823    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)  
6824    inassert   TRUE if in an assertion    inassert   TRUE if in an assertion
6825    
6826  Returns:     -1 or the fixed first char  Returns:     -1 or the fixed first char
6827  */  */
6828    
6829  static int  static int
6830  find_firstassertedchar(const uschar *code, int *options, BOOL inassert)  find_firstassertedchar(const uschar *code, BOOL inassert)
6831  {  {
6832  register int c = -1;  register int c = -1;
6833  do {  do {
6834     int d;     int d;
6835     const uschar *scode =     int xl = (*code == OP_CBRA || *code == OP_SCBRA ||
6836       first_significant_code(code + 1+LINK_SIZE, options, PCRE_CASELESS, TRUE);               *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? 2:0;
6837       const uschar *scode = first_significant_code(code + 1+LINK_SIZE + xl, TRUE);
6838     register int op = *scode;     register int op = *scode;
6839    
6840     switch(op)     switch(op)
# Line 6765  do { Line 6843  do {
6843       return -1;       return -1;
6844    
6845       case OP_BRA:       case OP_BRA:
6846         case OP_BRAPOS:
6847       case OP_CBRA:       case OP_CBRA:
6848         case OP_SCBRA:
6849         case OP_CBRAPOS:
6850         case OP_SCBRAPOS:
6851       case OP_ASSERT:       case OP_ASSERT:
6852       case OP_ONCE:       case OP_ONCE:
6853       case OP_COND:       case OP_COND:
6854       if ((d = find_firstassertedchar(scode, options, op == OP_ASSERT)) < 0)       if ((d = find_firstassertedchar(scode, op == OP_ASSERT)) < 0)
6855         return -1;         return -1;
6856       if (c < 0) c = d; else if (c != d) return -1;       if (c < 0) c = d; else if (c != d) return -1;
6857       break;       break;
6858    
6859       case OP_EXACT:       /* Fall through */       case OP_EXACT:
6860       scode += 2;       scode += 2;
6861         /* Fall through */
6862    
6863       case OP_CHAR:       case OP_CHAR:
      case OP_CHARI:  
6864       case OP_PLUS:       case OP_PLUS:
6865       case OP_MINPLUS:       case OP_MINPLUS:
6866       case OP_POSPLUS:       case OP_POSPLUS:
6867       if (!inassert) return -1;       if (!inassert) return -1;
6868       if (c < 0)       if (c < 0) c = scode[1];
6869         {         else if (c != scode[1]) return -1;
6870         c = scode[1];       break;
6871         if ((*options & PCRE_CASELESS) != 0) c |= REQ_CASELESS;  
6872         }       case OP_EXACTI:
6873       else if (c != scode[1]) return -1;       scode += 2;
6874         /* Fall through */
6875    
6876         case OP_CHARI:
6877         case OP_PLUSI:
6878         case OP_MINPLUSI:
6879         case OP_POSPLUSI:
6880         if (!inassert) return -1;
6881         if (c < 0) c = scode[1] | REQ_CASELESS;
6882           else if (c != scode[1]) return -1;
6883       break;       break;
6884       }       }
6885    
# Line 6939  while (ptr[skipatstart] == CHAR_LEFT_PAR Line 7030  while (ptr[skipatstart] == CHAR_LEFT_PAR
7030    
7031  utf8 = (options & PCRE_UTF8) != 0;  utf8 = (options & PCRE_UTF8) != 0;
7032    
7033  /* 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
7034  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
7035  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
7036  the end of the string for a short string error, for compatibility with previous  not used here. */
 versions. */  
7037    
7038  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
7039  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&
7040       (*erroroffset = _pcre_valid_utf8((USPTR)pattern, -1, &errorcode)) >= 0)       (errorcode = _pcre_valid_utf8((USPTR)pattern, -1, erroroffset)) != 0)
7041    {    {
7042    errorcode = ERR44;    errorcode = ERR44;
7043    goto PCRE_EARLY_ERROR_RETURN2;    goto PCRE_EARLY_ERROR_RETURN2;
# Line 7063  outside can help speed up starting point Line 7153  outside can help speed up starting point
7153  ptr += skipatstart;  ptr += skipatstart;
7154  code = cworkspace;  code = cworkspace;
7155  *code = OP_BRA;  *code = OP_BRA;
7156  (void)compile_regex(cd->external_options, cd->external_options & PCRE_IMS,  (void)compile_regex(cd->external_options, &code, &ptr, &errorcode, FALSE,
7157    &code, &ptr, &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd,    FALSE, 0, &firstbyte, &reqbyte, NULL, cd, &length);
   &length);  
7158  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
7159    
7160  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 7208  field; this time it's used for rememberi
7208  */  */
7209    
7210  cd->final_bracount = cd->bracount;  /* Save for checking forward references */  cd->final_bracount = cd->bracount;  /* Save for checking forward references */
7211    cd->assert_depth = 0;
7212  cd->bracount = 0;  cd->bracount = 0;
7213  cd->names_found = 0;  cd->names_found = 0;
7214  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 7227  of the function here. */
7227  ptr = (const uschar *)pattern + skipatstart;  ptr = (const uschar *)pattern + skipatstart;
7228  code = (uschar *)codestart;  code = (uschar *)codestart;
7229  *code = OP_BRA;  *code = OP_BRA;
7230  (void)compile_regex(re->options, re->options & PCRE_IMS, &code, &ptr,  (void)compile_regex(re->options, &code, &ptr, &errorcode, FALSE, FALSE, 0,
7231    &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, NULL);    &firstbyte, &reqbyte, NULL, cd, NULL);
7232  re->top_bracket = cd->bracount;  re->top_bracket = cd->bracount;
7233  re->top_backref = cd->top_backref;  re->top_backref = cd->top_backref;
7234  re->flags = cd->external_flags;  re->flags = cd->external_flags;
# Line 7204  if (cd->check_lookbehind) Line 7294  if (cd->check_lookbehind)
7294        uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);        uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);
7295        int end_op = *be;        int end_op = *be;
7296        *be = OP_END;        *be = OP_END;
7297        fixed_length = find_fixedlength(cc, re->options, TRUE, cd);        fixed_length = find_fixedlength(cc, (re->options & PCRE_UTF8) != 0, TRUE,
7298            cd);
7299        *be = end_op;        *be = end_op;
7300        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
7301        if (fixed_length < 0)        if (fixed_length < 0)
# Line 7243  start with ^. and also when all branches Line 7334  start with ^. and also when all branches
7334    
7335  if ((re->options & PCRE_ANCHORED) == 0)  if ((re->options & PCRE_ANCHORED) == 0)
7336    {    {
7337    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))  
7338      re->options |= PCRE_ANCHORED;      re->options |= PCRE_ANCHORED;
7339    else    else
7340      {      {
7341      if (firstbyte < 0)      if (firstbyte < 0)
7342        firstbyte = find_firstassertedchar(codestart, &temp_options, FALSE);        firstbyte = find_firstassertedchar(codestart, FALSE);
7343      if (firstbyte >= 0)   /* Remove caseless flag for non-caseable chars */      if (firstbyte >= 0)   /* Remove caseless flag for non-caseable chars */
7344        {        {
7345        int ch = firstbyte & 255;        int ch = firstbyte & 255;

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

  ViewVC Help
Powered by ViewVC 1.1.5