/[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 455 by ph10, Sat Sep 26 19:12:32 2009 UTC revision 488 by ph10, Mon Jan 11 15:29:42 2010 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2009 University of Cambridge             Copyright (c) 1997-2010 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 53  supporting internal functions that are n Line 53  supporting internal functions that are n
53  #include "pcre_internal.h"  #include "pcre_internal.h"
54    
55    
56  /* When DEBUG is defined, we need the pcre_printint() function, which is also  /* When PCRE_DEBUG is defined, we need the pcre_printint() function, which is
57  used by pcretest. DEBUG is not defined when building a production library. */  also used by pcretest. PCRE_DEBUG is not defined when building a production
58    library. */
59    
60  #ifdef DEBUG  #ifdef PCRE_DEBUG
61  #include "pcre_printint.src"  #include "pcre_printint.src"
62  #endif  #endif
63    
# Line 341  static const char error_texts[] = Line 342  static const char error_texts[] =
342    "number is too big\0"    "number is too big\0"
343    "subpattern name expected\0"    "subpattern name expected\0"
344    "digit expected after (?+\0"    "digit expected after (?+\0"
345    "] is an invalid data character in JavaScript compatibility mode";    "] is an invalid data character in JavaScript compatibility mode\0"
346      /* 65 */
347      "different names for subpatterns of the same number are not allowed";
348    
349    
350  /* 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 1100  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1103  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1103        if (name != NULL && lorn == ptr - thisname &&        if (name != NULL && lorn == ptr - thisname &&
1104            strncmp((const char *)name, (const char *)thisname, lorn) == 0)            strncmp((const char *)name, (const char *)thisname, lorn) == 0)
1105          return *count;          return *count;
1106        term++;        term++;
1107        }        }
1108      }      }
1109    }    }
# Line 1146  for (; *ptr != 0; ptr++) Line 1149  for (; *ptr != 0; ptr++)
1149            break;            break;
1150          }          }
1151        else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)        else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
1152          {          {
1153          negate_class = TRUE;          negate_class = TRUE;
1154          ptr++;          ptr++;
1155          }          }
1156        else break;        else break;
1157        }        }
1158    
# Line 1315  for (;;) Line 1318  for (;;)
1318    
1319      case OP_CALLOUT:      case OP_CALLOUT:
1320      case OP_CREF:      case OP_CREF:
1321        case OP_NCREF:
1322      case OP_RREF:      case OP_RREF:
1323        case OP_NRREF:
1324      case OP_DEF:      case OP_DEF:
1325      code += _pcre_OP_lengths[*code];      code += _pcre_OP_lengths[*code];
1326      break;      break;
# Line 1336  for (;;) Line 1341  for (;;)
1341    
1342  /* Scan a branch and compute the fixed length of subject that will match it,  /* Scan a branch and compute the fixed length of subject that will match it,
1343  if the length is fixed. This is needed for dealing with backward assertions.  if the length is fixed. This is needed for dealing with backward assertions.
1344  In UTF8 mode, the result is in characters rather than bytes. The branch is  In UTF8 mode, the result is in characters rather than bytes. The branch is
1345  temporarily terminated with OP_END when this function is called.  temporarily terminated with OP_END when this function is called.
1346    
1347  This function is called when a backward assertion is encountered, so that if it  This function is called when a backward assertion is encountered, so that if it
1348  fails, the error message can point to the correct place in the pattern.  fails, the error message can point to the correct place in the pattern.
1349  However, we cannot do this when the assertion contains subroutine calls,  However, we cannot do this when the assertion contains subroutine calls,
1350  because they can be forward references. We solve this by remembering this case  because they can be forward references. We solve this by remembering this case
1351  and doing the check at the end; a flag specifies which mode we are running in.  and doing the check at the end; a flag specifies which mode we are running in.
1352    
1353  Arguments:  Arguments:
1354    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1355    options  the compiling options    options  the compiling options
1356    atend    TRUE if called when the pattern is complete    atend    TRUE if called when the pattern is complete
1357    cd       the "compile data" structure    cd       the "compile data" structure
1358    
1359  Returns:   the fixed length,  Returns:   the fixed length,
1360               or -1 if there is no fixed length,               or -1 if there is no fixed length,
1361               or -2 if \C was encountered               or -2 if \C was encountered
1362               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
# Line 1401  for (;;) Line 1406  for (;;)
1406      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1407      branchlength = 0;      branchlength = 0;
1408      break;      break;
1409    
1410      /* A true recursion implies not fixed length, but a subroutine call may      /* A true recursion implies not fixed length, but a subroutine call may
1411      be OK. If the subroutine is a forward reference, we can't deal with      be OK. If the subroutine is a forward reference, we can't deal with
1412      it until the end of the pattern, so return -3. */      it until the end of the pattern, so return -3. */
1413    
1414      case OP_RECURSE:      case OP_RECURSE:
1415      if (!atend) return -3;      if (!atend) return -3;
1416      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1417      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */
1418      if (cc > cs && cc < ce) return -1;                /* Recursion */      if (cc > cs && cc < ce) return -1;                /* Recursion */
1419      d = find_fixedlength(cs + 2, options, atend, cd);      d = find_fixedlength(cs + 2, options, atend, cd);
1420      if (d < 0) return d;      if (d < 0) return d;
1421      branchlength += d;      branchlength += d;
1422      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1423      break;      break;
1424    
1425      /* Skip over assertive subpatterns */      /* Skip over assertive subpatterns */
1426    
# Line 1430  for (;;) Line 1435  for (;;)
1435    
1436      case OP_REVERSE:      case OP_REVERSE:
1437      case OP_CREF:      case OP_CREF:
1438        case OP_NCREF:
1439      case OP_RREF:      case OP_RREF:
1440        case OP_NRREF:
1441      case OP_DEF:      case OP_DEF:
1442      case OP_OPT:      case OP_OPT:
1443      case OP_CALLOUT:      case OP_CALLOUT:
# Line 1453  for (;;) Line 1460  for (;;)
1460      branchlength++;      branchlength++;
1461      cc += 2;      cc += 2;
1462  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1463      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)
1464        cc += _pcre_utf8_table4[cc[-1] & 0x3f];        cc += _pcre_utf8_table4[cc[-1] & 0x3f];
1465  #endif  #endif
1466      break;      break;
# Line 1465  for (;;) Line 1472  for (;;)
1472      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1473      cc += 4;      cc += 4;
1474  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1475      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)
1476        cc += _pcre_utf8_table4[cc[-1] & 0x3f];        cc += _pcre_utf8_table4[cc[-1] & 0x3f];
1477  #endif  #endif
1478      break;      break;
# Line 1550  for (;;) Line 1557  for (;;)
1557    
1558  /* This little function scans through a compiled pattern until it finds a  /* This little function scans through a compiled pattern until it finds a
1559  capturing bracket with the given number, or, if the number is negative, an  capturing bracket with the given number, or, if the number is negative, an
1560  instance of OP_REVERSE for a lookbehind. The function is global in the C sense  instance of OP_REVERSE for a lookbehind. The function is global in the C sense
1561  so that it can be called from pcre_study() when finding the minimum matching  so that it can be called from pcre_study() when finding the minimum matching
1562  length.  length.
1563    
1564  Arguments:  Arguments:
# Line 1575  for (;;) Line 1582  for (;;)
1582    the table is zero; the actual length is stored in the compiled code. */    the table is zero; the actual length is stored in the compiled code. */
1583    
1584    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
1585    
1586    /* Handle recursion */    /* Handle recursion */
1587    
1588    else if (c == OP_REVERSE)    else if (c == OP_REVERSE)
1589      {      {
1590      if (number < 0) return (uschar *)code;      if (number < 0) return (uschar *)code;
1591      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1592      }      }
1593    
# Line 1951  for (code = first_significant_code(code Line 1958  for (code = first_significant_code(code
1958      case OP_POSQUERY:      case OP_POSQUERY:
1959      if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];      if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];
1960      break;      break;
1961    
1962      case OP_UPTO:      case OP_UPTO:
1963      case OP_MINUPTO:      case OP_MINUPTO:
1964      case OP_POSUPTO:      case OP_POSUPTO:
# Line 1988  static BOOL Line 1995  static BOOL
1995  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,
1996    BOOL utf8)    BOOL utf8)
1997  {  {
1998  while (bcptr != NULL && bcptr->current >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
1999    {    {
2000    if (!could_be_empty_branch(bcptr->current, endcode, utf8)) return FALSE;    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8))
2001        return FALSE;
2002    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2003    }    }
2004  return TRUE;  return TRUE;
# Line 2652  BOOL utf8 = FALSE; Line 2660  BOOL utf8 = FALSE;
2660  uschar *utf8_char = NULL;  uschar *utf8_char = NULL;
2661  #endif  #endif
2662    
2663  #ifdef DEBUG  #ifdef PCRE_DEBUG
2664  if (lengthptr != NULL) DPRINTF((">> start branch\n"));  if (lengthptr != NULL) DPRINTF((">> start branch\n"));
2665  #endif  #endif
2666    
# Line 2711  for (;; ptr++) Line 2719  for (;; ptr++)
2719    
2720    if (lengthptr != NULL)    if (lengthptr != NULL)
2721      {      {
2722  #ifdef DEBUG  #ifdef PCRE_DEBUG
2723      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
2724  #endif  #endif
2725      if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */      if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */
# Line 3909  we set the flag only if there is a liter Line 3917  we set the flag only if there is a liter
3917    
3918        if (repeat_max == 0) goto END_REPEAT;        if (repeat_max == 0) goto END_REPEAT;
3919    
3920        /*--------------------------------------------------------------------*/        /*--------------------------------------------------------------------*/
3921        /* This code is obsolete from release 8.00; the restriction was finally        /* This code is obsolete from release 8.00; the restriction was finally
3922        removed: */        removed: */
3923    
3924        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
3925        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
3926    
3927        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
3928        /*--------------------------------------------------------------------*/        /*--------------------------------------------------------------------*/
3929    
3930        /* Combine the op_type with the repeat_type */        /* Combine the op_type with the repeat_type */
3931    
# Line 4064  we set the flag only if there is a liter Line 4072  we set the flag only if there is a liter
4072          goto END_REPEAT;          goto END_REPEAT;
4073          }          }
4074    
4075        /*--------------------------------------------------------------------*/        /*--------------------------------------------------------------------*/
4076        /* This code is obsolete from release 8.00; the restriction was finally        /* This code is obsolete from release 8.00; the restriction was finally
4077        removed: */        removed: */
4078    
# Line 4072  we set the flag only if there is a liter Line 4080  we set the flag only if there is a liter
4080        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
4081    
4082        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
4083        /*--------------------------------------------------------------------*/        /*--------------------------------------------------------------------*/
4084    
4085        if (repeat_min == 0 && repeat_max == -1)        if (repeat_min == 0 && repeat_max == -1)
4086          *code++ = OP_CRSTAR + repeat_type;          *code++ = OP_CRSTAR + repeat_type;
# Line 4207  we set the flag only if there is a liter Line 4215  we set the flag only if there is a liter
4215            {            {
4216            /* In the pre-compile phase, we don't actually do the replication. We            /* In the pre-compile phase, we don't actually do the replication. We
4217            just adjust the length as if we had. Do some paranoid checks for            just adjust the length as if we had. Do some paranoid checks for
4218            potential integer overflow. */            potential integer overflow. The INT64_OR_DOUBLE type is a 64-bit
4219              integer type when available, otherwise double. */
4220    
4221            if (lengthptr != NULL)            if (lengthptr != NULL)
4222              {              {
4223              int delta = (repeat_min - 1)*length_prevgroup;              int delta = (repeat_min - 1)*length_prevgroup;
4224              if ((double)(repeat_min - 1)*(double)length_prevgroup >              if ((INT64_OR_DOUBLE)(repeat_min - 1)*
4225                                                              (double)INT_MAX ||                    (INT64_OR_DOUBLE)length_prevgroup >
4226                        (INT64_OR_DOUBLE)INT_MAX ||
4227                  OFLOW_MAX - *lengthptr < delta)                  OFLOW_MAX - *lengthptr < delta)
4228                {                {
4229                *errorcodeptr = ERR20;                *errorcodeptr = ERR20;
# Line 4259  we set the flag only if there is a liter Line 4269  we set the flag only if there is a liter
4269          just adjust the length as if we had. For each repetition we must add 1          just adjust the length as if we had. For each repetition we must add 1
4270          to the length for BRAZERO and for all but the last repetition we must          to the length for BRAZERO and for all but the last repetition we must
4271          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
4272          paranoid checks to avoid integer overflow. */          paranoid checks to avoid integer overflow. The INT64_OR_DOUBLE type is
4273            a 64-bit integer type when available, otherwise double. */
4274    
4275          if (lengthptr != NULL && repeat_max > 0)          if (lengthptr != NULL && repeat_max > 0)
4276            {            {
4277            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
4278                        2 - 2*LINK_SIZE;   /* Last one doesn't nest */                        2 - 2*LINK_SIZE;   /* Last one doesn't nest */
4279            if ((double)repeat_max *            if ((INT64_OR_DOUBLE)repeat_max *
4280                  (double)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)                  (INT64_OR_DOUBLE)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
4281                    > (double)INT_MAX ||                    > (INT64_OR_DOUBLE)INT_MAX ||
4282                OFLOW_MAX - *lengthptr < delta)                OFLOW_MAX - *lengthptr < delta)
4283              {              {
4284              *errorcodeptr = ERR20;              *errorcodeptr = ERR20;
# Line 4387  we set the flag only if there is a liter Line 4398  we set the flag only if there is a liter
4398      if (possessive_quantifier)      if (possessive_quantifier)
4399        {        {
4400        int len;        int len;
4401    
4402        if (*tempcode == OP_TYPEEXACT)        if (*tempcode == OP_TYPEEXACT)
4403          tempcode += _pcre_OP_lengths[*tempcode] +          tempcode += _pcre_OP_lengths[*tempcode] +
4404            ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);            ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);
4405    
4406        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
4407          {          {
4408          tempcode += _pcre_OP_lengths[*tempcode];          tempcode += _pcre_OP_lengths[*tempcode];
# Line 4399  we set the flag only if there is a liter Line 4410  we set the flag only if there is a liter
4410          if (utf8 && tempcode[-1] >= 0xc0)          if (utf8 && tempcode[-1] >= 0xc0)
4411            tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];            tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];
4412  #endif  #endif
4413          }          }
4414    
4415        len = code - tempcode;        len = code - tempcode;
4416        if (len > 0) switch (*tempcode)        if (len > 0) switch (*tempcode)
4417          {          {
# Line 4479  we set the flag only if there is a liter Line 4490  we set the flag only if there is a liter
4490              strncmp((char *)name, vn, namelen) == 0)              strncmp((char *)name, vn, namelen) == 0)
4491            {            {
4492            /* Check for open captures before ACCEPT */            /* Check for open captures before ACCEPT */
4493    
4494            if (verbs[i].op == OP_ACCEPT)            if (verbs[i].op == OP_ACCEPT)
4495              {              {
4496              open_capitem *oc;              open_capitem *oc;
4497              cd->had_accept = TRUE;              cd->had_accept = TRUE;
4498              for (oc = cd->open_caps; oc != NULL; oc = oc->next)              for (oc = cd->open_caps; oc != NULL; oc = oc->next)
4499                {                {
4500                *code++ = OP_CLOSE;                *code++ = OP_CLOSE;
4501                PUT2INC(code, 0, oc->number);                PUT2INC(code, 0, oc->number);
4502                }                }
4503              }              }
4504            *code++ = verbs[i].op;            *code++ = verbs[i].op;
4505            break;            break;
4506            }            }
# Line 4652  we set the flag only if there is a liter Line 4663  we set the flag only if there is a liter
4663            }            }
4664    
4665          /* Otherwise (did not start with "+" or "-"), start by looking for the          /* Otherwise (did not start with "+" or "-"), start by looking for the
4666          name. */          name. If we find a name, add one to the opcode to change OP_CREF or
4667            OP_RREF into OP_NCREF or OP_NRREF. These behave exactly the same,
4668            except they record that the reference was originally to a name. The
4669            information is used to check duplicate names. */
4670    
4671          slot = cd->name_table;          slot = cd->name_table;
4672          for (i = 0; i < cd->names_found; i++)          for (i = 0; i < cd->names_found; i++)
# Line 4667  we set the flag only if there is a liter Line 4681  we set the flag only if there is a liter
4681            {            {
4682            recno = GET2(slot, 0);            recno = GET2(slot, 0);
4683            PUT2(code, 2+LINK_SIZE, recno);            PUT2(code, 2+LINK_SIZE, recno);
4684              code[1+LINK_SIZE]++;
4685            }            }
4686    
4687          /* Search the pattern for a forward reference */          /* Search the pattern for a forward reference */
# Line 4675  we set the flag only if there is a liter Line 4690  we set the flag only if there is a liter
4690                          (options & PCRE_EXTENDED) != 0)) > 0)                          (options & PCRE_EXTENDED) != 0)) > 0)
4691            {            {
4692            PUT2(code, 2+LINK_SIZE, i);            PUT2(code, 2+LINK_SIZE, i);
4693              code[1+LINK_SIZE]++;
4694            }            }
4695    
4696          /* If terminator == 0 it means that the name followed directly after          /* If terminator == 0 it means that the name followed directly after
# Line 4867  we set the flag only if there is a liter Line 4883  we set the flag only if there is a liter
4883                }                }
4884              }              }
4885    
4886            /* In the real compile, create the entry in the table */            /* In the real compile, create the entry in the table, maintaining
4887              alphabetical order. Duplicate names for different numbers are
4888              permitted only if PCRE_DUPNAMES is set. Duplicate names for the same
4889              number are always OK. (An existing number can be re-used if (?|
4890              appears in the pattern.) In either event, a duplicate name results in
4891              a duplicate entry in the table, even if the number is the same. This
4892              is because the number of names, and hence the table size, is computed
4893              in the pre-compile, and it affects various numbers and pointers which
4894              would all have to be modified, and the compiled code moved down, if
4895              duplicates with the same number were omitted from the table. This
4896              doesn't seem worth the hassle. However, *different* names for the
4897              same number are not permitted. */
4898    
4899            else            else
4900              {              {
4901                BOOL dupname = FALSE;
4902              slot = cd->name_table;              slot = cd->name_table;
4903    
4904              for (i = 0; i < cd->names_found; i++)              for (i = 0; i < cd->names_found; i++)
4905                {                {
4906                int crc = memcmp(name, slot+2, namelen);                int crc = memcmp(name, slot+2, namelen);
# Line 4879  we set the flag only if there is a liter Line 4908  we set the flag only if there is a liter
4908                  {                  {
4909                  if (slot[2+namelen] == 0)                  if (slot[2+namelen] == 0)
4910                    {                    {
4911                    if ((options & PCRE_DUPNAMES) == 0)                    if (GET2(slot, 0) != cd->bracount + 1 &&
4912                          (options & PCRE_DUPNAMES) == 0)
4913                      {                      {
4914                      *errorcodeptr = ERR43;                      *errorcodeptr = ERR43;
4915                      goto FAILED;                      goto FAILED;
4916                      }                      }
4917                      else dupname = TRUE;
4918                    }                    }
4919                  else crc = -1;      /* Current name is substring */                  else crc = -1;      /* Current name is a substring */
4920                  }                  }
4921    
4922                  /* Make space in the table and break the loop for an earlier
4923                  name. For a duplicate or later name, carry on. We do this for
4924                  duplicates so that in the simple case (when ?(| is not used) they
4925                  are in order of their numbers. */
4926    
4927                if (crc < 0)                if (crc < 0)
4928                  {                  {
4929                  memmove(slot + cd->name_entry_size, slot,                  memmove(slot + cd->name_entry_size, slot,
4930                    (cd->names_found - i) * cd->name_entry_size);                    (cd->names_found - i) * cd->name_entry_size);
4931                  break;                  break;
4932                  }                  }
4933    
4934                  /* Continue the loop for a later or duplicate name */
4935    
4936                slot += cd->name_entry_size;                slot += cd->name_entry_size;
4937                }                }
4938    
4939                /* For non-duplicate names, check for a duplicate number before
4940                adding the new name. */
4941    
4942                if (!dupname)
4943                  {
4944                  uschar *cslot = cd->name_table;
4945                  for (i = 0; i < cd->names_found; i++)
4946                    {
4947                    if (cslot != slot)
4948                      {
4949                      if (GET2(cslot, 0) == cd->bracount + 1)
4950                        {
4951                        *errorcodeptr = ERR65;
4952                        goto FAILED;
4953                        }
4954                      }
4955                    else i--;
4956                    cslot += cd->name_entry_size;
4957                    }
4958                  }
4959    
4960              PUT2(slot, 0, cd->bracount + 1);              PUT2(slot, 0, cd->bracount + 1);
4961              memcpy(slot + 2, name, namelen);              memcpy(slot + 2, name, namelen);
4962              slot[2+namelen] = 0;              slot[2+namelen] = 0;
4963              }              }
4964            }            }
4965    
4966          /* In both cases, count the number of names we've encountered. */          /* In both pre-compile and compile, count the number of names we've
4967            encountered. */
4968    
         ptr++;                    /* Move past > or ' */  
4969          cd->names_found++;          cd->names_found++;
4970            ptr++;                    /* Move past > or ' */
4971          goto NUMBERED_GROUP;          goto NUMBERED_GROUP;
4972    
4973    
# Line 5074  we set the flag only if there is a liter Line 5136  we set the flag only if there is a liter
5136            if (lengthptr == NULL)            if (lengthptr == NULL)
5137              {              {
5138              *code = OP_END;              *code = OP_END;
5139              if (recno != 0)              if (recno != 0)
5140                called = _pcre_find_bracket(cd->start_code, utf8, recno);                called = _pcre_find_bracket(cd->start_code, utf8, recno);
5141    
5142              /* Forward reference */              /* Forward reference */
# Line 5191  we set the flag only if there is a liter Line 5253  we set the flag only if there is a liter
5253              {              {
5254              cd->external_options = newoptions;              cd->external_options = newoptions;
5255              }              }
5256           else            else
5257              {              {
5258              if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))              if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
5259                {                {
# Line 5528  we set the flag only if there is a liter Line 5590  we set the flag only if there is a liter
5590    
5591        if (-c >= ESC_REF)        if (-c >= ESC_REF)
5592          {          {
5593            open_capitem *oc;
5594          recno = -c - ESC_REF;          recno = -c - ESC_REF;
5595    
5596          HANDLE_REFERENCE:    /* Come here from named backref handling */          HANDLE_REFERENCE:    /* Come here from named backref handling */
# Line 5537  we set the flag only if there is a liter Line 5600  we set the flag only if there is a liter
5600          PUT2INC(code, 0, recno);          PUT2INC(code, 0, recno);
5601          cd->backref_map |= (recno < 32)? (1 << recno) : 1;          cd->backref_map |= (recno < 32)? (1 << recno) : 1;
5602          if (recno > cd->top_backref) cd->top_backref = recno;          if (recno > cd->top_backref) cd->top_backref = recno;
5603    
5604            /* Check to see if this back reference is recursive, that it, it
5605            is inside the group that it references. A flag is set so that the
5606            group can be made atomic. */
5607    
5608            for (oc = cd->open_caps; oc != NULL; oc = oc->next)
5609              {
5610              if (oc->number == recno)
5611                {
5612                oc->flag = TRUE;
5613                break;
5614                }
5615              }
5616          }          }
5617    
5618        /* So are Unicode property matches, if supported. */        /* So are Unicode property matches, if supported. */
# Line 5726  int branchfirstbyte, branchreqbyte; Line 5802  int branchfirstbyte, branchreqbyte;
5802  int length;  int length;
5803  int orig_bracount;  int orig_bracount;
5804  int max_bracount;  int max_bracount;
5805    int old_external_options = cd->external_options;
5806  branch_chain bc;  branch_chain bc;
5807    
5808  bc.outer = bcptr;  bc.outer = bcptr;
5809  bc.current = code;  bc.current_branch = code;
5810    
5811  firstbyte = reqbyte = REQ_UNSET;  firstbyte = reqbyte = REQ_UNSET;
5812    
# Line 5748  them global. It tests the value of lengt Line 5825  them global. It tests the value of lengt
5825  pre-compile phase to find out whether anything has yet been compiled or not. */  pre-compile phase to find out whether anything has yet been compiled or not. */
5826    
5827  /* 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
5828  so that we can detect them if (*ACCEPT) is encountered. */  so that we can detect them if (*ACCEPT) is encountered. This is also used to
5829    detect groups that contain recursive back references to themselves. */
5830    
5831  if (*code == OP_CBRA)  if (*code == OP_CBRA)
5832    {    {
5833    capnumber = GET2(code, 1 + LINK_SIZE);    capnumber = GET2(code, 1 + LINK_SIZE);
5834    capitem.number = capnumber;    capitem.number = capnumber;
5835    capitem.next = cd->open_caps;    capitem.next = cd->open_caps;
5836    cd->open_caps = &capitem;    capitem.flag = FALSE;
5837    }    cd->open_caps = &capitem;
5838      }
5839    
5840  /* Offset is set zero to mark that this bracket is still open */  /* Offset is set zero to mark that this bracket is still open */
5841    
# Line 5802  for (;;) Line 5881  for (;;)
5881      return FALSE;      return FALSE;
5882      }      }
5883    
5884      /* If the external options have changed during this branch, it means that we
5885      are at the top level, and a leading option setting has been encountered. We
5886      need to re-set the original option values to take account of this so that,
5887      during the pre-compile phase, we know to allow for a re-set at the start of
5888      subsequent branches. */
5889    
5890      if (old_external_options != cd->external_options)
5891        oldims = cd->external_options & PCRE_IMS;
5892    
5893    /* Keep the highest bracket count in case (?| was used and some branch    /* Keep the highest bracket count in case (?| was used and some branch
5894    has fewer than the rest. */    has fewer than the rest. */
5895    
# Line 5852  for (;;) Line 5940  for (;;)
5940    
5941      /* If lookbehind, check that this branch matches a fixed-length string, and      /* If lookbehind, check that this branch matches a fixed-length string, and
5942      put the length into the OP_REVERSE item. Temporarily mark the end of the      put the length into the OP_REVERSE item. Temporarily mark the end of the
5943      branch with OP_END. If the branch contains OP_RECURSE, the result is -3      branch with OP_END. If the branch contains OP_RECURSE, the result is -3
5944      because there may be forward references that we can't check here. Set a      because there may be forward references that we can't check here. Set a
5945      flag to cause another lookbehind check at the end. Why not do it all at the      flag to cause another lookbehind check at the end. Why not do it all at the
5946      end? Because common, erroneous checks are picked up here and the offset of      end? Because common, erroneous checks are picked up here and the offset of
5947      the problem can be shown. */      the problem can be shown. */
5948    
5949      if (lookbehind)      if (lookbehind)
# Line 5866  for (;;) Line 5954  for (;;)
5954        DPRINTF(("fixed length = %d\n", fixed_length));        DPRINTF(("fixed length = %d\n", fixed_length));
5955        if (fixed_length == -3)        if (fixed_length == -3)
5956          {          {
5957          cd->check_lookbehind = TRUE;          cd->check_lookbehind = TRUE;
5958          }          }
5959        else if (fixed_length < 0)        else if (fixed_length < 0)
5960          {          {
5961          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;
# Line 5901  for (;;) Line 5989  for (;;)
5989          }          }
5990        while (branch_length > 0);        while (branch_length > 0);
5991        }        }
   
     /* If it was a capturing subpattern, remove it from the chain. */  
   
     if (capnumber > 0) cd->open_caps = cd->open_caps->next;  
5992    
5993      /* Fill in the ket */      /* Fill in the ket */
5994    
# Line 5912  for (;;) Line 5996  for (;;)
5996      PUT(code, 1, code - start_bracket);      PUT(code, 1, code - start_bracket);
5997      code += 1 + LINK_SIZE;      code += 1 + LINK_SIZE;
5998    
5999      /* Resetting option if needed */      /* If it was a capturing subpattern, check to see if it contained any
6000        recursive back references. If so, we must wrap it in atomic brackets.
6001        In any event, remove the block from the chain. */
6002    
6003        if (capnumber > 0)
6004          {
6005          if (cd->open_caps->flag)
6006            {
6007            memmove(start_bracket + 1 + LINK_SIZE, start_bracket,
6008              code - start_bracket);
6009            *start_bracket = OP_ONCE;
6010            code += 1 + LINK_SIZE;
6011            PUT(start_bracket, 1, code - start_bracket);
6012            *code = OP_KET;
6013            PUT(code, 1, code - start_bracket);
6014            code += 1 + LINK_SIZE;
6015            length += 2 + 2*LINK_SIZE;
6016            }
6017          cd->open_caps = cd->open_caps->next;
6018          }
6019    
6020        /* Reset options if needed. */
6021    
6022      if ((options & PCRE_IMS) != oldims && *ptr == CHAR_RIGHT_PARENTHESIS)      if ((options & PCRE_IMS) != oldims && *ptr == CHAR_RIGHT_PARENTHESIS)
6023        {        {
# Line 5961  for (;;) Line 6066  for (;;)
6066      {      {
6067      *code = OP_ALT;      *code = OP_ALT;
6068      PUT(code, 1, code - last_branch);      PUT(code, 1, code - last_branch);
6069      bc.current = last_branch = code;      bc.current_branch = last_branch = code;
6070      code += 1 + LINK_SIZE;      code += 1 + LINK_SIZE;
6071      }      }
6072    
# Line 6108  do { Line 6213  do {
6213       switch (*scode)       switch (*scode)
6214         {         {
6215         case OP_CREF:         case OP_CREF:
6216           case OP_NCREF:
6217         case OP_RREF:         case OP_RREF:
6218           case OP_NRREF:
6219         case OP_DEF:         case OP_DEF:
6220         return FALSE;         return FALSE;
6221    
# Line 6375  while (ptr[skipatstart] == CHAR_LEFT_PAR Line 6482  while (ptr[skipatstart] == CHAR_LEFT_PAR
6482    
6483  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
6484  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&
6485       (*erroroffset = _pcre_valid_utf8((uschar *)pattern, -1)) >= 0)       (*erroroffset = _pcre_valid_utf8((USPTR)pattern, -1)) >= 0)
6486    {    {
6487    errorcode = ERR44;    errorcode = ERR44;
6488    goto PCRE_EARLY_ERROR_RETURN2;    goto PCRE_EARLY_ERROR_RETURN2;
# Line 6572  if debugging, leave the test till after Line 6679  if debugging, leave the test till after
6679    
6680  *code++ = OP_END;  *code++ = OP_END;
6681    
6682  #ifndef DEBUG  #ifndef PCRE_DEBUG
6683  if (code - codestart > length) errorcode = ERR23;  if (code - codestart > length) errorcode = ERR23;
6684  #endif  #endif
6685    
# Line 6595  subpattern. */ Line 6702  subpattern. */
6702    
6703  if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;  if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;
6704    
6705  /* If there were any lookbehind assertions that contained OP_RECURSE  /* If there were any lookbehind assertions that contained OP_RECURSE
6706  (recursions or subroutine calls), a flag is set for them to be checked here,  (recursions or subroutine calls), a flag is set for them to be checked here,
6707  because they may contain forward references. Actual recursions can't be fixed  because they may contain forward references. Actual recursions can't be fixed
6708  length, but subroutine calls can. It is done like this so that those without  length, but subroutine calls can. It is done like this so that those without
# Line 6606  length, and set their lengths. */ Line 6713  length, and set their lengths. */
6713  if (cd->check_lookbehind)  if (cd->check_lookbehind)
6714    {    {
6715    uschar *cc = (uschar *)codestart;    uschar *cc = (uschar *)codestart;
6716    
6717    /* Loop, searching for OP_REVERSE items, and process those that do not have    /* Loop, searching for OP_REVERSE items, and process those that do not have
6718    their length set. (Actually, it will also re-process any that have a length    their length set. (Actually, it will also re-process any that have a length
6719    of zero, but that is a pathological case, and it does no harm.) When we find    of zero, but that is a pathological case, and it does no harm.) When we find
6720    one, we temporarily terminate the branch it is in while we scan it. */    one, we temporarily terminate the branch it is in while we scan it. */
6721    
6722    for (cc = (uschar *)_pcre_find_bracket(codestart, utf8, -1);    for (cc = (uschar *)_pcre_find_bracket(codestart, utf8, -1);
6723         cc != NULL;         cc != NULL;
6724         cc = (uschar *)_pcre_find_bracket(cc, utf8, -1))         cc = (uschar *)_pcre_find_bracket(cc, utf8, -1))
6725      {      {
6726      if (GET(cc, 1) == 0)      if (GET(cc, 1) == 0)
6727        {        {
6728        int fixed_length;        int fixed_length;
6729        uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);        uschar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);
6730        int end_op = *be;        int end_op = *be;
6731        *be = OP_END;        *be = OP_END;
6732        fixed_length = find_fixedlength(cc, re->options, TRUE, cd);        fixed_length = find_fixedlength(cc, re->options, TRUE, cd);
6733        *be = end_op;        *be = end_op;
# Line 6628  if (cd->check_lookbehind) Line 6735  if (cd->check_lookbehind)
6735        if (fixed_length < 0)        if (fixed_length < 0)
6736          {          {
6737          errorcode = (fixed_length == -2)? ERR36 : ERR25;          errorcode = (fixed_length == -2)? ERR36 : ERR25;
6738          break;          break;
6739          }          }
6740        PUT(cc, 1, fixed_length);        PUT(cc, 1, fixed_length);
6741        }        }
6742      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
6743      }      }
6744    }    }
6745    
6746  /* Failed to compile, or error while post-processing */  /* Failed to compile, or error while post-processing */
6747    
# Line 6696  if (reqbyte >= 0 && Line 6803  if (reqbyte >= 0 &&
6803  /* Print out the compiled data if debugging is enabled. This is never the  /* Print out the compiled data if debugging is enabled. This is never the
6804  case when building a production library. */  case when building a production library. */
6805    
6806  #ifdef DEBUG  #ifdef PCRE_DEBUG
6807    
6808  printf("Length = %d top_bracket = %d top_backref = %d\n",  printf("Length = %d top_bracket = %d top_backref = %d\n",
6809    length, re->top_bracket, re->top_backref);    length, re->top_bracket, re->top_backref);
# Line 6734  if (code - codestart > length) Line 6841  if (code - codestart > length)
6841    if (errorcodeptr != NULL) *errorcodeptr = ERR23;    if (errorcodeptr != NULL) *errorcodeptr = ERR23;
6842    return NULL;    return NULL;
6843    }    }
6844  #endif   /* DEBUG */  #endif   /* PCRE_DEBUG */
6845    
6846  return (pcre *)re;  return (pcre *)re;
6847  }  }

Legend:
Removed from v.455  
changed lines
  Added in v.488

  ViewVC Help
Powered by ViewVC 1.1.5