/[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 1313 by ph10, Wed Apr 24 12:07:09 2013 UTC revision 1363 by ph10, Tue Oct 1 16:54:40 2013 UTC
# Line 115  kicks in at the same number of forward r Line 115  kicks in at the same number of forward r
115  #define COMPILE_WORK_SIZE (2048*LINK_SIZE)  #define COMPILE_WORK_SIZE (2048*LINK_SIZE)
116  #define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)  #define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)
117    
118    /* This value determines the size of the initial vector that is used for
119    remembering named groups during the pre-compile. It is allocated on the stack,
120    but if it is too small, it is expanded using malloc(), in a similar way to the
121    workspace. The value is the number of slots in the list. */
122    
123    #define NAMED_GROUP_LIST_SIZE  20
124    
125  /* The overrun tests check for a slightly smaller size so that they detect the  /* The overrun tests check for a slightly smaller size so that they detect the
126  overrun before it actually does run off the end of the data block. */  overrun before it actually does run off the end of the data block. */
127    
# Line 648  static const pcre_uint8 ebcdic_chartab[] Line 655  static const pcre_uint8 ebcdic_chartab[]
655  #endif  #endif
656    
657    
658    /* This table is used to check whether auto-possessification is possible
659    between adjacent character-type opcodes. The left-hand (repeated) opcode is
660    used to select the row, and the right-hand opcode is use to select the column.
661    A value of 1 means that auto-possessification is OK. For example, the second
662    value in the first row means that \D+\d can be turned into \D++\d.
663    
664    The Unicode property types (\P and \p) have to be present to fill out the table
665    because of what their opcode values are, but the table values should always be
666    zero because property types are handled separately in the code. The last four
667    columns apply to items that cannot be repeated, so there is no need to have
668    rows for them. Note that OP_DIGIT etc. are generated only when PCRE_UCP is
669    *not* set. When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
670    
671    #define APTROWS (LAST_AUTOTAB_LEFT_OP - FIRST_AUTOTAB_OP + 1)
672    #define APTCOLS (LAST_AUTOTAB_RIGHT_OP - FIRST_AUTOTAB_OP + 1)
673    
674    static const pcre_uint8 autoposstab[APTROWS][APTCOLS] = {
675    /* \D \d \S \s \W \w  . .+ \C \P \p \R \H \h \V \v \X \Z \z  $ $M */
676      { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \D */
677      { 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \d */
678      { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \S */
679      { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \s */
680      { 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \W */
681      { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \w */
682      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* .  */
683      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* .+ */
684      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \C */
685      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* \P */
686      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* \p */
687      { 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 },  /* \R */
688      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 },  /* \H */
689      { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0 },  /* \h */
690      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0 },  /* \V */
691      { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0 },  /* \v */
692      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }   /* \X */
693    };
694    
695    
696    /* This table is used to check whether auto-possessification is possible
697    between adjacent Unicode property opcodes (OP_PROP and OP_NOTPROP). The
698    left-hand (repeated) opcode is used to select the row, and the right-hand
699    opcode is used to select the column. The values are as follows:
700    
701      0   Always return FALSE (never auto-possessify)
702      1   Character groups are distinct (possessify if both are OP_PROP)
703      2   Check character categories in the same group (general or particular)
704      3   TRUE if the two opcodes are not the same (PROP vs NOTPROP)
705    
706      4   Check left general category vs right particular category
707      5   Check right general category vs left particular category
708    
709      6   Left alphanum vs right general category
710      7   Left space vs right general category
711      8   Left word vs right general category
712    
713      9   Right alphanum vs left general category
714     10   Right space vs left general category
715     11   Right word vs left general category
716    
717     12   Left alphanum vs right particular category
718     13   Left space vs right particular category
719     14   Left word vs right particular category
720    
721     15   Right alphanum vs left particular category
722     16   Right space vs left particular category
723     17   Right word vs left particular category
724    */
725    
726    static const pcre_uint8 propposstab[PT_TABSIZE][PT_TABSIZE] = {
727    /* ANY LAMP GC  PC  SC ALNUM SPACE PXSPACE WORD CLIST UCNC */
728      { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   0 },  /* PT_ANY */
729      { 0,  3,  0,  0,  0,    3,    1,      1,   0,    0,   0 },  /* PT_LAMP */
730      { 0,  0,  2,  4,  0,    9,   10,     10,  11,    0,   0 },  /* PT_GC */
731      { 0,  0,  5,  2,  0,   15,   16,     16,  17,    0,   0 },  /* PT_PC */
732      { 0,  0,  0,  0,  2,    0,    0,      0,   0,    0,   0 },  /* PT_SC */
733      { 0,  3,  6, 12,  0,    3,    1,      1,   0,    0,   0 },  /* PT_ALNUM */
734      { 0,  1,  7, 13,  0,    1,    3,      3,   1,    0,   0 },  /* PT_SPACE */
735      { 0,  1,  7, 13,  0,    1,    3,      3,   1,    0,   0 },  /* PT_PXSPACE */
736      { 0,  0,  8, 14,  0,    0,    1,      1,   3,    0,   0 },  /* PT_WORD */
737      { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   0 },  /* PT_CLIST */
738      { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   3 }   /* PT_UCNC */
739    };
740    
741    /* This table is used to check whether auto-possessification is possible
742    between adjacent Unicode property opcodes (OP_PROP and OP_NOTPROP) when one
743    specifies a general category and the other specifies a particular category. The
744    row is selected by the general category and the column by the particular
745    category. The value is 1 if the particular category is not part of the general
746    category. */
747    
748    static const pcre_uint8 catposstab[7][30] = {
749    /* Cc Cf Cn Co Cs Ll Lm Lo Lt Lu Mc Me Mn Nd Nl No Pc Pd Pe Pf Pi Po Ps Sc Sk Sm So Zl Zp Zs */
750      { 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* C */
751      { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* L */
752      { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* M */
753      { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* N */
754      { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1 },  /* P */
755      { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1 },  /* S */
756      { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 }   /* Z */
757    };
758    
759    /* This table is used when checking ALNUM, (PX)SPACE, SPACE, and WORD against
760    a general or particular category. The properties in each row are those
761    that apply to the character set in question. Duplication means that a little
762    unnecessary work is done when checking, but this keeps things much simpler
763    because they can all use the same code. For more details see the comment where
764    this table is used.
765    
766    Note: SPACE and PXSPACE used to be different because Perl excluded VT from
767    "space", but from Perl 5.18 it's included, so both categories are treated the
768    same here. */
769    
770    static const pcre_uint8 posspropstab[3][4] = {
771      { ucp_L, ucp_N, ucp_N, ucp_Nl },  /* ALNUM, 3rd and 4th values redundant */
772      { ucp_Z, ucp_Z, ucp_C, ucp_Cc },  /* SPACE and PXSPACE, 2nd value redundant */
773      { ucp_L, ucp_N, ucp_P, ucp_Po }   /* WORD */
774    };
775    
776    
777    
778  /*************************************************  /*************************************************
779  *            Find an error text                  *  *            Find an error text                  *
# Line 675  return s; Line 801  return s;
801  }  }
802    
803    
804    
805  /*************************************************  /*************************************************
806  *           Expand the workspace                 *  *           Expand the workspace                 *
807  *************************************************/  *************************************************/
# Line 1192  if ((options & PCRE_UCP) != 0 && escape Line 1319  if ((options & PCRE_UCP) != 0 && escape
1319  return escape;  return escape;
1320  }  }
1321    
1322    
1323    
1324  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
1325  /*************************************************  /*************************************************
1326  *               Handle \P and \p                 *  *               Handle \P and \p                 *
# Line 1289  return FALSE; Line 1418  return FALSE;
1418    
1419    
1420    
   
1421  /*************************************************  /*************************************************
1422  *         Read repeat counts                     *  *         Read repeat counts                     *
1423  *************************************************/  *************************************************/
# Line 1358  return p; Line 1486  return p;
1486    
1487    
1488  /*************************************************  /*************************************************
 *  Subroutine for finding forward reference      *  
 *************************************************/  
   
 /* This recursive function is called only from find_parens() below. The  
 top-level call starts at the beginning of the pattern. All other calls must  
 start at a parenthesis. It scans along a pattern's text looking for capturing  
 subpatterns, and counting them. If it finds a named pattern that matches the  
 name it is given, it returns its number. Alternatively, if the name is NULL, it  
 returns when it reaches a given numbered subpattern. Recursion is used to keep  
 track of subpatterns that reset the capturing group numbers - the (?| feature.  
   
 This function was originally called only from the second pass, in which we know  
 that if (?< or (?' or (?P< is encountered, the name will be correctly  
 terminated because that is checked in the first pass. There is now one call to  
 this function in the first pass, to check for a recursive back reference by  
 name (so that we can make the whole group atomic). In this case, we need check  
 only up to the current position in the pattern, and that is still OK because  
 and previous occurrences will have been checked. To make this work, the test  
 for "end of pattern" is a check against cd->end_pattern in the main loop,  
 instead of looking for a binary zero. This means that the special first-pass  
 call can adjust cd->end_pattern temporarily. (Checks for binary zero while  
 processing items within the loop are OK, because afterwards the main loop will  
 terminate.)  
   
 Arguments:  
   ptrptr       address of the current character pointer (updated)  
   cd           compile background data  
   name         name to seek, or NULL if seeking a numbered subpattern  
   lorn         name length, or subpattern number if name is NULL  
   xmode        TRUE if we are in /x mode  
   utf          TRUE if we are in UTF-8 / UTF-16 / UTF-32 mode  
   count        pointer to the current capturing subpattern number (updated)  
   
 Returns:       the number of the named subpattern, or -1 if not found  
 */  
   
 static int  
 find_parens_sub(pcre_uchar **ptrptr, compile_data *cd, const pcre_uchar *name, int lorn,  
   BOOL xmode, BOOL utf, int *count)  
 {  
 pcre_uchar *ptr = *ptrptr;  
 int start_count = *count;  
 int hwm_count = start_count;  
 BOOL dup_parens = FALSE;  
   
 /* If the first character is a parenthesis, check on the type of group we are  
 dealing with. The very first call may not start with a parenthesis. */  
   
 if (ptr[0] == CHAR_LEFT_PARENTHESIS)  
   {  
   /* Handle specials such as (*SKIP) or (*UTF8) etc. */  
   
   if (ptr[1] == CHAR_ASTERISK)  
     {  
     ptr += 2;  
     while (ptr < cd->end_pattern && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;  
     }  
   
   /* Handle a normal, unnamed capturing parenthesis. */  
   
   else if (ptr[1] != CHAR_QUESTION_MARK)  
     {  
     *count += 1;  
     if (name == NULL && *count == lorn) return *count;  
     ptr++;  
     }  
   
   /* All cases now have (? at the start. Remember when we are in a group  
   where the parenthesis numbers are duplicated. */  
   
   else if (ptr[2] == CHAR_VERTICAL_LINE)  
     {  
     ptr += 3;  
     dup_parens = TRUE;  
     }  
   
   /* Handle comments; all characters are allowed until a ket is reached. */  
   
   else if (ptr[2] == CHAR_NUMBER_SIGN)  
     {  
     for (ptr += 3; *ptr != CHAR_NULL; ptr++)  
       if (*ptr == CHAR_RIGHT_PARENTHESIS) break;  
     goto FAIL_EXIT;  
     }  
   
   /* Handle a condition. If it is an assertion, just carry on so that it  
   is processed as normal. If not, skip to the closing parenthesis of the  
   condition (there can't be any nested parens). */  
   
   else if (ptr[2] == CHAR_LEFT_PARENTHESIS)  
     {  
     ptr += 2;  
     if (ptr[1] != CHAR_QUESTION_MARK)  
       {  
       while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;  
       if (*ptr != CHAR_NULL) ptr++;  
       }  
     }  
   
   /* Start with (? but not a condition. */  
   
   else  
     {  
     ptr += 2;  
     if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */  
   
     /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */  
   
     if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&  
         ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)  
       {  
       pcre_uchar term;  
       const pcre_uchar *thisname;  
       *count += 1;  
       if (name == NULL && *count == lorn) return *count;  
       term = *ptr++;  
       if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;  
       thisname = ptr;  
       while (*ptr != term) ptr++;  
       if (name != NULL && lorn == (int)(ptr - thisname) &&  
           STRNCMP_UC_UC(name, thisname, (unsigned int)lorn) == 0)  
         return *count;  
       term++;  
       }  
     }  
   }  
   
 /* Past any initial parenthesis handling, scan for parentheses or vertical  
 bars. Stop if we get to cd->end_pattern. Note that this is important for the  
 first-pass call when this value is temporarily adjusted to stop at the current  
 position. So DO NOT change this to a test for binary zero. */  
   
 for (; ptr < cd->end_pattern; ptr++)  
   {  
   /* Skip over backslashed characters and also entire \Q...\E */  
   
   if (*ptr == CHAR_BACKSLASH)  
     {  
     if (*(++ptr) == CHAR_NULL) goto FAIL_EXIT;  
     if (*ptr == CHAR_Q) for (;;)  
       {  
       while (*(++ptr) != CHAR_NULL && *ptr != CHAR_BACKSLASH) {};  
       if (*ptr == CHAR_NULL) goto FAIL_EXIT;  
       if (*(++ptr) == CHAR_E) break;  
       }  
     continue;  
     }  
   
   /* Skip over character classes; this logic must be similar to the way they  
   are handled for real. If the first character is '^', skip it. Also, if the  
   first few characters (either before or after ^) are \Q\E or \E we skip them  
   too. This makes for compatibility with Perl. Note the use of STR macros to  
   encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */  
   
   if (*ptr == CHAR_LEFT_SQUARE_BRACKET)  
     {  
     BOOL negate_class = FALSE;  
     for (;;)  
       {  
       if (ptr[1] == CHAR_BACKSLASH)  
         {  
         if (ptr[2] == CHAR_E)  
           ptr+= 2;  
         else if (STRNCMP_UC_C8(ptr + 2,  
                  STR_Q STR_BACKSLASH STR_E, 3) == 0)  
           ptr += 4;  
         else  
           break;  
         }  
       else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)  
         {  
         negate_class = TRUE;  
         ptr++;  
         }  
       else break;  
       }  
   
     /* If the next character is ']', it is a data character that must be  
     skipped, except in JavaScript compatibility mode. */  
   
     if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&  
         (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)  
       ptr++;  
   
     while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)  
       {  
       if (*ptr == CHAR_NULL) return -1;  
       if (*ptr == CHAR_BACKSLASH)  
         {  
         if (*(++ptr) == CHAR_NULL) goto FAIL_EXIT;  
         if (*ptr == CHAR_Q) for (;;)  
           {  
           while (*(++ptr) != CHAR_NULL && *ptr != CHAR_BACKSLASH) {};  
           if (*ptr == CHAR_NULL) goto FAIL_EXIT;  
           if (*(++ptr) == CHAR_E) break;  
           }  
         continue;  
         }  
       }  
     continue;  
     }  
   
   /* Skip comments in /x mode */  
   
   if (xmode && *ptr == CHAR_NUMBER_SIGN)  
     {  
     ptr++;  
     while (*ptr != CHAR_NULL)  
       {  
       if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }  
       ptr++;  
 #ifdef SUPPORT_UTF  
       if (utf) FORWARDCHAR(ptr);  
 #endif  
       }  
     if (*ptr == CHAR_NULL) goto FAIL_EXIT;  
     continue;  
     }  
   
   /* Check for the special metacharacters */  
   
   if (*ptr == CHAR_LEFT_PARENTHESIS)  
     {  
     int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, count);  
     if (rc > 0) return rc;  
     if (*ptr == CHAR_NULL) goto FAIL_EXIT;  
     }  
   
   else if (*ptr == CHAR_RIGHT_PARENTHESIS)  
     {  
     if (dup_parens && *count < hwm_count) *count = hwm_count;  
     goto FAIL_EXIT;  
     }  
   
   else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)  
     {  
     if (*count > hwm_count) hwm_count = *count;  
     *count = start_count;  
     }  
   }  
   
 FAIL_EXIT:  
 *ptrptr = ptr;  
 return -1;  
 }  
   
   
   
   
 /*************************************************  
 *       Find forward referenced subpattern       *  
 *************************************************/  
   
 /* This function scans along a pattern's text looking for capturing  
 subpatterns, and counting them. If it finds a named pattern that matches the  
 name it is given, it returns its number. Alternatively, if the name is NULL, it  
 returns when it reaches a given numbered subpattern. This is used for forward  
 references to subpatterns. We used to be able to start this scan from the  
 current compiling point, using the current count value from cd->bracount, and  
 do it all in a single loop, but the addition of the possibility of duplicate  
 subpattern numbers means that we have to scan from the very start, in order to  
 take account of such duplicates, and to use a recursive function to keep track  
 of the different types of group.  
   
 Arguments:  
   cd           compile background data  
   name         name to seek, or NULL if seeking a numbered subpattern  
   lorn         name length, or subpattern number if name is NULL  
   xmode        TRUE if we are in /x mode  
   utf          TRUE if we are in UTF-8 / UTF-16 / UTF-32 mode  
   
 Returns:       the number of the found subpattern, or -1 if not found  
 */  
   
 static int  
 find_parens(compile_data *cd, const pcre_uchar *name, int lorn, BOOL xmode,  
   BOOL utf)  
 {  
 pcre_uchar *ptr = (pcre_uchar *)cd->start_pattern;  
 int count = 0;  
 int rc;  
   
 /* If the pattern does not start with an opening parenthesis, the first call  
 to find_parens_sub() will scan right to the end (if necessary). However, if it  
 does start with a parenthesis, find_parens_sub() will return when it hits the  
 matching closing parens. That is why we have to have a loop. */  
   
 for (;;)  
   {  
   rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, &count);  
   if (rc > 0 || *ptr++ == CHAR_NULL) break;  
   }  
   
 return rc;  
 }  
   
   
   
   
 /*************************************************  
1489  *      Find first significant op code            *  *      Find first significant op code            *
1490  *************************************************/  *************************************************/
1491    
# Line 1712  for (;;) Line 1540  for (;;)
1540    
1541    
1542    
   
1543  /*************************************************  /*************************************************
1544  *        Find the fixed length of a branch       *  *        Find the fixed length of a branch       *
1545  *************************************************/  *************************************************/
# Line 2015  for (;;) Line 1842  for (;;)
1842      case OP_QUERYI:      case OP_QUERYI:
1843      case OP_REF:      case OP_REF:
1844      case OP_REFI:      case OP_REFI:
1845        case OP_DNREF:
1846        case OP_DNREFI:
1847      case OP_SBRA:      case OP_SBRA:
1848      case OP_SBRAPOS:      case OP_SBRAPOS:
1849      case OP_SCBRA:      case OP_SCBRA:
# Line 2051  for (;;) Line 1880  for (;;)
1880    
1881    
1882    
   
1883  /*************************************************  /*************************************************
1884  *    Scan compiled regex for specific bracket    *  *    Scan compiled regex for specific bracket    *
1885  *************************************************/  *************************************************/
# Line 2353  Arguments: Line 2181  Arguments:
2181    endcode     points to where to stop    endcode     points to where to stop
2182    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
2183    cd          contains pointers to tables etc.    cd          contains pointers to tables etc.
2184      recurses    chain of recurse_check to catch mutual recursion
2185    
2186  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2187  */  */
2188    
2189    typedef struct recurse_check {
2190      struct recurse_check *prev;
2191      const pcre_uchar *group;
2192    } recurse_check;
2193    
2194  static BOOL  static BOOL
2195  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
2196    BOOL utf, compile_data *cd)    BOOL utf, compile_data *cd, recurse_check *recurses)
2197  {  {
2198  register pcre_uchar c;  register pcre_uchar c;
2199    recurse_check this_recurse;
2200    
2201  for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);  for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
2202       code < endcode;       code < endcode;
2203       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
# Line 2389  for (code = first_significant_code(code Line 2225  for (code = first_significant_code(code
2225    
2226    if (c == OP_RECURSE)    if (c == OP_RECURSE)
2227      {      {
2228      const pcre_uchar *scode;      const pcre_uchar *scode = cd->start_code + GET(code, 1);
2229      BOOL empty_branch;      BOOL empty_branch;
2230    
2231      /* Test for forward reference */      /* Test for forward reference or uncompleted reference. This is disabled
2232        when called to scan a completed pattern by setting cd->start_workspace to
2233        NULL. */
2234    
2235        if (cd->start_workspace != NULL)
2236          {
2237          const pcre_uchar *tcode;
2238          for (tcode = cd->start_workspace; tcode < cd->hwm; tcode += LINK_SIZE)
2239            if ((int)GET(tcode, 0) == (int)(code + 1 - cd->start_code)) return TRUE;
2240          if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
2241          }
2242    
2243        /* If we are scanning a completed pattern, there are no forward references
2244        and all groups are complete. We need to detect whether this is a recursive
2245        call, as otherwise there will be an infinite loop. If it is a recursion,
2246        just skip over it. Simple recursions are easily detected. For mutual
2247        recursions we keep a chain on the stack. */
2248    
2249        else
2250          {
2251          recurse_check *r = recurses;
2252          const pcre_uchar *endgroup = scode;
2253    
2254          do endgroup += GET(endgroup, 1); while (*endgroup == OP_ALT);
2255          if (code >= scode && code <= endgroup) continue;  /* Simple recursion */
2256    
2257      for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE)        for (r = recurses; r != NULL; r = r->prev)
2258        if ((int)GET(scode, 0) == (int)(code + 1 - cd->start_code)) return TRUE;          if (r->group == scode) break;
2259          if (r != NULL) continue;   /* Mutual recursion */
2260          }
2261    
2262      /* Not a forward reference, test for completed backward reference */      /* Completed reference; scan the referenced group, remembering it on the
2263        stack chain to detect mutual recursions. */
2264    
2265      empty_branch = FALSE;      empty_branch = FALSE;
2266      scode = cd->start_code + GET(code, 1);      this_recurse.prev = recurses;
2267      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */      this_recurse.group = scode;
   
     /* Completed backwards reference */  
2268    
2269      do      do
2270        {        {
2271        if (could_be_empty_branch(scode, endcode, utf, cd))        if (could_be_empty_branch(scode, endcode, utf, cd, &this_recurse))
2272          {          {
2273          empty_branch = TRUE;          empty_branch = TRUE;
2274          break;          break;
# Line 2463  for (code = first_significant_code(code Line 2324  for (code = first_significant_code(code
2324        empty_branch = FALSE;        empty_branch = FALSE;
2325        do        do
2326          {          {
2327          if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd))          if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd, NULL))
2328            empty_branch = TRUE;            empty_branch = TRUE;
2329          code += GET(code, 1);          code += GET(code, 1);
2330          }          }
# Line 2521  for (code = first_significant_code(code Line 2382  for (code = first_significant_code(code
2382    
2383      /* Opcodes that must match a character */      /* Opcodes that must match a character */
2384    
2385        case OP_ANY:
2386        case OP_ALLANY:
2387        case OP_ANYBYTE:
2388    
2389      case OP_PROP:      case OP_PROP:
2390      case OP_NOTPROP:      case OP_NOTPROP:
2391        case OP_ANYNL:
2392    
2393        case OP_NOT_HSPACE:
2394        case OP_HSPACE:
2395        case OP_NOT_VSPACE:
2396        case OP_VSPACE:
2397      case OP_EXTUNI:      case OP_EXTUNI:
2398    
2399      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
2400      case OP_DIGIT:      case OP_DIGIT:
2401      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
2402      case OP_WHITESPACE:      case OP_WHITESPACE:
2403      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
2404      case OP_WORDCHAR:      case OP_WORDCHAR:
2405      case OP_ANY:  
     case OP_ALLANY:  
     case OP_ANYBYTE:  
2406      case OP_CHAR:      case OP_CHAR:
2407      case OP_CHARI:      case OP_CHARI:
2408      case OP_NOT:      case OP_NOT:
2409      case OP_NOTI:      case OP_NOTI:
2410    
2411      case OP_PLUS:      case OP_PLUS:
2412        case OP_PLUSI:
2413      case OP_MINPLUS:      case OP_MINPLUS:
2414      case OP_POSPLUS:      case OP_MINPLUSI:
2415      case OP_EXACT:  
2416      case OP_NOTPLUS:      case OP_NOTPLUS:
2417        case OP_NOTPLUSI:
2418      case OP_NOTMINPLUS:      case OP_NOTMINPLUS:
2419        case OP_NOTMINPLUSI:
2420    
2421        case OP_POSPLUS:
2422        case OP_POSPLUSI:
2423      case OP_NOTPOSPLUS:      case OP_NOTPOSPLUS:
2424        case OP_NOTPOSPLUSI:
2425    
2426        case OP_EXACT:
2427        case OP_EXACTI:
2428      case OP_NOTEXACT:      case OP_NOTEXACT:
2429        case OP_NOTEXACTI:
2430    
2431      case OP_TYPEPLUS:      case OP_TYPEPLUS:
2432      case OP_TYPEMINPLUS:      case OP_TYPEMINPLUS:
2433      case OP_TYPEPOSPLUS:      case OP_TYPEPOSPLUS:
2434      case OP_TYPEEXACT:      case OP_TYPEEXACT:
2435    
2436      return FALSE;      return FALSE;
2437    
2438      /* These are going to continue, as they may be empty, but we have to      /* These are going to continue, as they may be empty, but we have to
# Line 2582  for (code = first_significant_code(code Line 2466  for (code = first_significant_code(code
2466      return TRUE;      return TRUE;
2467    
2468      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
2469      MINUPTO, and POSUPTO may be followed by a multibyte character */      MINUPTO, and POSUPTO and their caseless and negative versions may be
2470        followed by a multibyte character. */
2471    
2472  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2473      case OP_STAR:      case OP_STAR:
2474      case OP_STARI:      case OP_STARI:
2475        case OP_NOTSTAR:
2476        case OP_NOTSTARI:
2477    
2478      case OP_MINSTAR:      case OP_MINSTAR:
2479      case OP_MINSTARI:      case OP_MINSTARI:
2480        case OP_NOTMINSTAR:
2481        case OP_NOTMINSTARI:
2482    
2483      case OP_POSSTAR:      case OP_POSSTAR:
2484      case OP_POSSTARI:      case OP_POSSTARI:
2485        case OP_NOTPOSSTAR:
2486        case OP_NOTPOSSTARI:
2487    
2488      case OP_QUERY:      case OP_QUERY:
2489      case OP_QUERYI:      case OP_QUERYI:
2490        case OP_NOTQUERY:
2491        case OP_NOTQUERYI:
2492    
2493      case OP_MINQUERY:      case OP_MINQUERY:
2494      case OP_MINQUERYI:      case OP_MINQUERYI:
2495        case OP_NOTMINQUERY:
2496        case OP_NOTMINQUERYI:
2497    
2498      case OP_POSQUERY:      case OP_POSQUERY:
2499      case OP_POSQUERYI:      case OP_POSQUERYI:
2500        case OP_NOTPOSQUERY:
2501        case OP_NOTPOSQUERYI:
2502    
2503      if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);      if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
2504      break;      break;
2505    
2506      case OP_UPTO:      case OP_UPTO:
2507      case OP_UPTOI:      case OP_UPTOI:
2508        case OP_NOTUPTO:
2509        case OP_NOTUPTOI:
2510    
2511      case OP_MINUPTO:      case OP_MINUPTO:
2512      case OP_MINUPTOI:      case OP_MINUPTOI:
2513        case OP_NOTMINUPTO:
2514        case OP_NOTMINUPTOI:
2515    
2516      case OP_POSUPTO:      case OP_POSUPTO:
2517      case OP_POSUPTOI:      case OP_POSUPTOI:
2518        case OP_NOTPOSUPTO:
2519        case OP_NOTPOSUPTOI:
2520    
2521      if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);      if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);
2522      break;      break;
2523  #endif  #endif
# Line 2659  could_be_empty(const pcre_uchar *code, c Line 2571  could_be_empty(const pcre_uchar *code, c
2571  {  {
2572  while (bcptr != NULL && bcptr->current_branch >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2573    {    {
2574    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd))    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd, NULL))
2575      return FALSE;      return FALSE;
2576    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2577    }    }
# Line 2669  return TRUE; Line 2581  return TRUE;
2581    
2582    
2583  /*************************************************  /*************************************************
2584  *           Check for POSIX class syntax         *  *        Base opcode of repeated opcodes         *
2585  *************************************************/  *************************************************/
2586    
2587  /* This function is called when the sequence "[:" or "[." or "[=" is  /* Returns the base opcode for repeated single character type opcodes. If the
2588  encountered in a character class. It checks whether this is followed by a  opcode is not a repeated character type, it returns with the original value.
 sequence of characters terminated by a matching ":]" or ".]" or "=]". If we  
 reach an unescaped ']' without the special preceding character, return FALSE.  
   
 Originally, this function only recognized a sequence of letters between the  
 terminators, but it seems that Perl recognizes any sequence of characters,  
 though of course unknown POSIX names are subsequently rejected. Perl gives an  
 "Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE  
 didn't consider this to be a POSIX class. Likewise for [:1234:].  
2589    
2590  The problem in trying to be exactly like Perl is in the handling of escapes. We  Arguments:  c opcode
2591  have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX  Returns:    base opcode for the type
2592  class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code  */
 below handles the special case of \], but does not try to do any other escape  
 processing. This makes it different from Perl for cases such as [:l\ower:]  
 where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize  
 "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,  
 I think.  
2593    
2594  A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.  static pcre_uchar
2595  It seems that the appearance of a nested POSIX class supersedes an apparent  get_repeat_base(pcre_uchar c)
2596  external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or  {
2597  a digit.  return (c > OP_TYPEPOSUPTO)? c :
2598           (c >= OP_TYPESTAR)?   OP_TYPESTAR :
2599  In Perl, unescaped square brackets may also appear as part of class names. For         (c >= OP_NOTSTARI)?   OP_NOTSTARI :
2600  example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for         (c >= OP_NOTSTAR)?    OP_NOTSTAR :
2601  [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not         (c >= OP_STARI)?      OP_STARI :
2602  seem right at all. PCRE does not allow closing square brackets in POSIX class                               OP_STAR;
2603  names.  }
   
 Arguments:  
   ptr      pointer to the initial [  
   endptr   where to return the end pointer  
   
 Returns:   TRUE or FALSE  
 */  
   
 static BOOL  
 check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)  
 {  
 pcre_uchar terminator;          /* Don't combine these lines; the Solaris cc */  
 terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  
 for (++ptr; *ptr != CHAR_NULL; ptr++)  
   {  
   if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)  
     ptr++;  
   else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;  
   else  
     {  
     if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)  
       {  
       *endptr = ptr;  
       return TRUE;  
       }  
     if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&  
          (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||  
           ptr[1] == CHAR_EQUALS_SIGN) &&  
         check_posix_syntax(ptr, endptr))  
       return FALSE;  
     }  
   }  
 return FALSE;  
 }  
   
   
   
   
 /*************************************************  
 *          Check POSIX class name                *  
 *************************************************/  
   
 /* This function is called to check the name given in a POSIX-style class entry  
 such as [:alnum:].  
   
 Arguments:  
   ptr        points to the first letter  
   len        the length of the name  
   
 Returns:     a value representing the name, or -1 if unknown  
 */  
   
 static int  
 check_posix_name(const pcre_uchar *ptr, int len)  
 {  
 const char *pn = posix_names;  
 register int yield = 0;  
 while (posix_name_lengths[yield] != 0)  
   {  
   if (len == posix_name_lengths[yield] &&  
     STRNCMP_UC_C8(ptr, pn, (unsigned int)len) == 0) return yield;  
   pn += posix_name_lengths[yield] + 1;  
   yield++;  
   }  
 return -1;  
 }  
   
   
 /*************************************************  
 *    Adjust OP_RECURSE items in repeated group   *  
 *************************************************/  
   
 /* OP_RECURSE items contain an offset from the start of the regex to the group  
 that is referenced. This means that groups can be replicated for fixed  
 repetition simply by copying (because the recursion is allowed to refer to  
 earlier groups that are outside the current group). However, when a group is  
 optional (i.e. the minimum quantifier is zero), OP_BRAZERO or OP_SKIPZERO is  
 inserted before it, after it has been compiled. This means that any OP_RECURSE  
 items within it that refer to the group itself or any contained groups have to  
 have their offsets adjusted. That one of the jobs of this function. Before it  
 is called, the partially compiled regex must be temporarily terminated with  
 OP_END.  
   
 This function has been extended with the possibility of forward references for  
 recursions and subroutine calls. It must also check the list of such references  
 for the group we are dealing with. If it finds that one of the recursions in  
 the current group is on this list, it adjusts the offset in the list, not the  
 value in the reference (which is a group number).  
   
 Arguments:  
   group      points to the start of the group  
   adjust     the amount by which the group is to be moved  
   utf        TRUE in UTF-8 / UTF-16 / UTF-32 mode  
   cd         contains pointers to tables etc.  
   save_hwm   the hwm forward reference pointer at the start of the group  
   
 Returns:     nothing  
 */  
   
 static void  
 adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,  
   pcre_uchar *save_hwm)  
 {  
 pcre_uchar *ptr = group;  
   
 while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)  
   {  
   int offset;  
   pcre_uchar *hc;  
   
   /* See if this recursion is on the forward reference list. If so, adjust the  
   reference. */  
   
   for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)  
     {  
     offset = (int)GET(hc, 0);  
     if (cd->start_code + offset == ptr + 1)  
       {  
       PUT(hc, 0, offset + adjust);  
       break;  
       }  
     }  
   
   /* Otherwise, adjust the recursion offset if it's after the start of this  
   group. */  
   
   if (hc >= cd->hwm)  
     {  
     offset = (int)GET(ptr, 1);  
     if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);  
     }  
   
   ptr += 1 + LINK_SIZE;  
   }  
 }  
   
   
   
 /*************************************************  
 *        Insert an automatic callout point       *  
 *************************************************/  
   
 /* This function is called when the PCRE_AUTO_CALLOUT option is set, to insert  
 callout points before each pattern item.  
   
 Arguments:  
   code           current code pointer  
   ptr            current pattern pointer  
   cd             pointers to tables etc  
   
 Returns:         new code pointer  
 */  
   
 static pcre_uchar *  
 auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)  
 {  
 *code++ = OP_CALLOUT;  
 *code++ = 255;  
 PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */  
 PUT(code, LINK_SIZE, 0);                       /* Default length */  
 return code + 2 * LINK_SIZE;  
 }  
   
   
   
 /*************************************************  
 *         Complete a callout item                *  
 *************************************************/  
   
 /* A callout item contains the length of the next item in the pattern, which  
 we can't fill in till after we have reached the relevant point. This is used  
 for both automatic and manual callouts.  
   
 Arguments:  
   previous_callout   points to previous callout item  
   ptr                current pattern pointer  
   cd                 pointers to tables etc  
   
 Returns:             nothing  
 */  
   
 static void  
 complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)  
 {  
 int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));  
 PUT(previous_callout, 2 + LINK_SIZE, length);  
 }  
2604    
2605    
2606    
2607  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2608  /*************************************************  /*************************************************
 *           Get othercase range                  *  
 *************************************************/  
   
 /* This function is passed the start and end of a class range, in UTF-8 mode  
 with UCP support. It searches up the characters, looking for ranges of  
 characters in the "other" case. Each call returns the next one, updating the  
 start address. A character with multiple other cases is returned on its own  
 with a special return value.  
   
 Arguments:  
   cptr        points to starting character value; updated  
   d           end value  
   ocptr       where to put start of othercase range  
   odptr       where to put end of othercase range  
   
 Yield:        -1 when no more  
                0 when a range is returned  
               >0 the CASESET offset for char with multiple other cases  
                 in this case, ocptr contains the original  
 */  
   
 static int  
 get_othercase_range(pcre_uint32 *cptr, pcre_uint32 d, pcre_uint32 *ocptr,  
   pcre_uint32 *odptr)  
 {  
 pcre_uint32 c, othercase, next;  
 unsigned int co;  
   
 /* Find the first character that has an other case. If it has multiple other  
 cases, return its case offset value. */  
   
 for (c = *cptr; c <= d; c++)  
   {  
   if ((co = UCD_CASESET(c)) != 0)  
     {  
     *ocptr = c++;   /* Character that has the set */  
     *cptr = c;      /* Rest of input range */  
     return (int)co;  
     }  
   if ((othercase = UCD_OTHERCASE(c)) != c) break;  
   }  
   
 if (c > d) return -1;  /* Reached end of range */  
   
 *ocptr = othercase;  
 next = othercase + 1;  
   
 for (++c; c <= d; c++)  
   {  
   if (UCD_OTHERCASE(c) != next) break;  
   next++;  
   }  
   
 *odptr = next - 1;     /* End of othercase range */  
 *cptr = c;             /* Rest of input range */  
 return 0;  
 }  
   
   
   
 /*************************************************  
2609  *        Check a character and a property        *  *        Check a character and a property        *
2610  *************************************************/  *************************************************/
2611    
# Line 2971  Returns:       TRUE if auto-possessifyin Line 2622  Returns:       TRUE if auto-possessifyin
2622  */  */
2623    
2624  static BOOL  static BOOL
2625  check_char_prop(pcre_uint32 c, unsigned int ptype, unsigned int pdata, BOOL negated)  check_char_prop(pcre_uint32 c, unsigned int ptype, unsigned int pdata,
2626      BOOL negated)
2627  {  {
 #ifdef SUPPORT_UCP  
2628  const pcre_uint32 *p;  const pcre_uint32 *p;
 #endif  
   
2629  const ucd_record *prop = GET_UCD(c);  const ucd_record *prop = GET_UCD(c);
2630    
2631  switch(ptype)  switch(ptype)
# Line 3017  switch(ptype) Line 2666  switch(ptype)
2666            PRIV(ucp_gentype)[prop->chartype] == ucp_N ||            PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2667            c == CHAR_UNDERSCORE) == negated;            c == CHAR_UNDERSCORE) == negated;
2668    
 #ifdef SUPPORT_UCP  
2669    case PT_CLIST:    case PT_CLIST:
2670    p = PRIV(ucd_caseless_sets) + prop->caseset;    p = PRIV(ucd_caseless_sets) + prop->caseset;
2671    for (;;)    for (;;)
# Line 3026  switch(ptype) Line 2674  switch(ptype)
2674      if (c == *p++) return negated;      if (c == *p++) return negated;
2675      }      }
2676    break;  /* Control never reaches here */    break;  /* Control never reaches here */
 #endif  
2677    }    }
2678    
2679  return FALSE;  return FALSE;
# Line 3036  return FALSE; Line 2683  return FALSE;
2683    
2684    
2685  /*************************************************  /*************************************************
2686  *     Check if auto-possessifying is possible    *  *        Fill the character property list        *
2687  *************************************************/  *************************************************/
2688    
2689  /* This function is called for unlimited repeats of certain items, to see  /* Checks whether the code points to an opcode that can take part in auto-
2690  whether the next thing could possibly match the repeated item. If not, it makes  possessification, and if so, fills a list with its properties.
 sense to automatically possessify the repeated item.  
2691    
2692  Arguments:  Arguments:
2693    previous      pointer to the repeated opcode    code        points to start of expression
2694    utf           TRUE in UTF-8 / UTF-16 / UTF-32 mode    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
2695    ptr           next character in pattern    fcc         points to case-flipping table
2696    options       options bits    list        points to output list
2697    cd            contains pointers to tables etc.                list[0] will be filled with the opcode
2698                  list[1] will be non-zero if this opcode
2699                    can match an empty character string
2700                  list[2..7] depends on the opcode
2701    
2702  Returns:        TRUE if possessifying is wanted  Returns:      points to the start of the next opcode if *code is accepted
2703                  NULL if *code is not accepted
2704  */  */
2705    
2706  static BOOL  static const pcre_uchar *
2707  check_auto_possessive(const pcre_uchar *previous, BOOL utf,  get_chr_property_list(const pcre_uchar *code, BOOL utf,
2708    const pcre_uchar *ptr, int options, compile_data *cd)    const pcre_uint8 *fcc, pcre_uint32 *list)
2709  {  {
2710  pcre_uint32 c = NOTACHAR;  pcre_uchar c = *code;
2711  pcre_uint32 next;  const pcre_uchar *end;
2712  int escape;  const pcre_uint32 *clist_src;
2713  pcre_uchar op_code = *previous++;  pcre_uint32 *clist_dest;
2714    pcre_uint32 chr;
2715    pcre_uchar base;
2716    
2717  /* Skip whitespace and comments in extended mode */  list[0] = c;
2718    list[1] = FALSE;
2719    code++;
2720    
2721  if ((options & PCRE_EXTENDED) != 0)  if (c >= OP_STAR && c <= OP_TYPEPOSUPTO)
2722    {    {
2723    for (;;)    base = get_repeat_base(c);
2724      c -= (base - OP_STAR);
2725    
2726      if (c == OP_UPTO || c == OP_MINUPTO || c == OP_EXACT || c == OP_POSUPTO)
2727        code += IMM2_SIZE;
2728    
2729      list[1] = (c != OP_PLUS && c != OP_MINPLUS && c != OP_EXACT && c != OP_POSPLUS);
2730    
2731      switch(base)
2732      {      {
2733      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      case OP_STAR:
2734      if (*ptr == CHAR_NUMBER_SIGN)      list[0] = OP_CHAR;
2735        {      break;
       ptr++;  
       while (*ptr != CHAR_NULL)  
         {  
         if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }  
         ptr++;  
 #ifdef SUPPORT_UTF  
         if (utf) FORWARDCHAR(ptr);  
 #endif  
         }  
       }  
     else break;  
     }  
   }  
2736    
2737  /* If the next item is one that we can handle, get its value. A non-negative      case OP_STARI:
2738  value is a character, a negative value is an escape value. */      list[0] = OP_CHARI;
2739        break;
2740    
2741  if (*ptr == CHAR_BACKSLASH)      case OP_NOTSTAR:
2742    {      list[0] = OP_NOT;
2743    int temperrorcode = 0;      break;
2744    escape = check_escape(&ptr, &next, &temperrorcode, cd->bracount, options,  
2745      FALSE);      case OP_NOTSTARI:
2746    if (temperrorcode != 0) return FALSE;      list[0] = OP_NOTI;
2747    ptr++;    /* Point after the escape sequence */      break;
2748    
2749        case OP_TYPESTAR:
2750        list[0] = *code;
2751        code++;
2752        break;
2753        }
2754      c = list[0];
2755    }    }
2756  else if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_meta) == 0)  
2757    switch(c)
2758    {    {
2759    escape = 0;    case OP_NOT_DIGIT:
2760  #ifdef SUPPORT_UTF    case OP_DIGIT:
2761    if (utf) { GETCHARINC(next, ptr); } else    case OP_NOT_WHITESPACE:
2762      case OP_WHITESPACE:
2763      case OP_NOT_WORDCHAR:
2764      case OP_WORDCHAR:
2765      case OP_ANY:
2766      case OP_ALLANY:
2767      case OP_ANYNL:
2768      case OP_NOT_HSPACE:
2769      case OP_HSPACE:
2770      case OP_NOT_VSPACE:
2771      case OP_VSPACE:
2772      case OP_EXTUNI:
2773      case OP_EODN:
2774      case OP_EOD:
2775      case OP_DOLL:
2776      case OP_DOLLM:
2777      return code;
2778    
2779      case OP_CHAR:
2780      case OP_NOT:
2781      GETCHARINCTEST(chr, code);
2782      list[2] = chr;
2783      list[3] = NOTACHAR;
2784      return code;
2785    
2786      case OP_CHARI:
2787      case OP_NOTI:
2788      list[0] = (c == OP_CHARI) ? OP_CHAR : OP_NOT;
2789      GETCHARINCTEST(chr, code);
2790      list[2] = chr;
2791    
2792    #ifdef SUPPORT_UCP
2793      if (chr < 128 || (chr < 256 && !utf))
2794        list[3] = fcc[chr];
2795      else
2796        list[3] = UCD_OTHERCASE(chr);
2797    #elif defined SUPPORT_UTF || !defined COMPILE_PCRE8
2798      list[3] = (chr < 256) ? fcc[chr] : chr;
2799    #else
2800      list[3] = fcc[chr];
2801  #endif  #endif
   next = *ptr++;  
   }  
 else return FALSE;  
2802    
2803  /* Skip whitespace and comments in extended mode */    /* The othercase might be the same value. */
2804    
2805  if ((options & PCRE_EXTENDED) != 0)    if (chr == list[3])
2806    {      list[3] = NOTACHAR;
2807    for (;;)    else
2808        list[4] = NOTACHAR;
2809      return code;
2810    
2811    #ifdef SUPPORT_UCP
2812      case OP_PROP:
2813      case OP_NOTPROP:
2814      if (code[0] != PT_CLIST)
2815      {      {
2816      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      list[2] = code[0];
2817      if (*ptr == CHAR_NUMBER_SIGN)      list[3] = code[1];
2818        {      return code + 2;
       ptr++;  
       while (*ptr != CHAR_NULL)  
         {  
         if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }  
         ptr++;  
 #ifdef SUPPORT_UTF  
         if (utf) FORWARDCHAR(ptr);  
 #endif  
         }  
       }  
     else break;  
2819      }      }
   }  
2820    
2821  /* If the next thing is itself optional, we have to give up. */    /* Convert only if we have anough space. */
2822    
2823  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||    clist_src = PRIV(ucd_caseless_sets) + code[1];
2824    STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)    clist_dest = list + 2;
2825      return FALSE;    code += 2;
2826    
2827  /* If the previous item is a character, get its value. */    do {
2828         /* Early return if there is not enough space. */
2829         if (clist_dest >= list + 8)
2830           {
2831           list[2] = code[0];
2832           list[3] = code[1];
2833           return code;
2834           }
2835         *clist_dest++ = *clist_src;
2836         }
2837       while(*clist_src++ != NOTACHAR);
2838    
2839  if (op_code == OP_CHAR || op_code == OP_CHARI ||    /* Enough space to store all characters. */
2840      op_code == OP_NOT || op_code == OP_NOTI)  
2841    {    list[0] = (c == OP_PROP) ? OP_CHAR : OP_NOT;
2842  #ifdef SUPPORT_UTF    return code;
2843    GETCHARTEST(c, previous);  #endif
2844  #else  
2845    c = *previous;    case OP_NCLASS:
2846      case OP_CLASS:
2847    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2848      case OP_XCLASS:
2849    
2850      if (c == OP_XCLASS)
2851        end = code + GET(code, 0);
2852      else
2853  #endif  #endif
2854        end = code + 32 / sizeof(pcre_uchar);
2855    
2856      switch(*end)
2857        {
2858        case OP_CRSTAR:
2859        case OP_CRMINSTAR:
2860        case OP_CRQUERY:
2861        case OP_CRMINQUERY:
2862        list[1] = TRUE;
2863        end++;
2864        break;
2865    
2866        case OP_CRRANGE:
2867        case OP_CRMINRANGE:
2868        list[1] = (GET2(end, 1) == 0);
2869        end += 1 + 2 * IMM2_SIZE;
2870        break;
2871        }
2872      list[2] = end - code;
2873      return end;
2874    }    }
2875    return NULL;    /* Opcode not accepted */
2876    }
2877    
2878    
2879    
2880    /*************************************************
2881    *    Scan further character sets for match       *
2882    *************************************************/
2883    
2884    /* Checks whether the base and the current opcode have a common character, in
2885    which case the base cannot be possessified.
2886    
2887    Arguments:
2888      code        points to the byte code
2889      utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
2890      cd          static compile data
2891      base_list   the data list of the base opcode
2892    
2893  /* Now compare the next item with the previous opcode. First, handle cases when  Returns:      TRUE if the auto-possessification is possible
2894  the next item is a character. */  */
2895    
2896    static BOOL
2897    compare_opcodes(const pcre_uchar *code, BOOL utf, const compile_data *cd,
2898      const pcre_uint32* base_list)
2899    {
2900    pcre_uchar c;
2901    pcre_uint32 list[8];
2902    const pcre_uint32* chr_ptr;
2903    const pcre_uint32* ochr_ptr;
2904    const pcre_uint32* list_ptr;
2905    pcre_uint32 chr;
2906    
2907  if (escape == 0)  for(;;)
2908    {    {
2909    /* For a caseless UTF match, the next character may have more than one other    c = *code;
   case, which maps to the special PT_CLIST property. Check this first. */  
2910    
2911  #ifdef SUPPORT_UCP    /* Skip over callouts */
2912    if (utf && c != NOTACHAR && (options & PCRE_CASELESS) != 0)  
2913      if (c == OP_CALLOUT)
2914      {      {
2915      unsigned int ocs = UCD_CASESET(next);      code += PRIV(OP_lengths)[c];
2916      if (ocs > 0) return check_char_prop(c, PT_CLIST, ocs, op_code >= OP_NOT);      continue;
2917      }      }
 #endif  
2918    
2919    switch(op_code)    if (c == OP_ALT)
2920      {      {
2921      case OP_CHAR:      do code += GET(code, 1); while (*code == OP_ALT);
2922      return c != next;      c = *code;
2923        }
2924    
2925      switch(c)
2926        {
2927        case OP_END:
2928        /* TRUE only in greedy case. The non-greedy case could be replaced by an
2929        OP_EXACT, but it is probably not worth it. (And note that OP_EXACT uses
2930        more memory, which we cannot get at this stage.) */
2931    
2932      /* For CHARI (caseless character) we must check the other case. If we have      return base_list[1] != 0;
2933      Unicode property support, we can use it to test the other case of  
2934      high-valued characters. We know that next can have only one other case,      case OP_KET:
2935      because multi-other-case characters are dealt with above. */      /* If the bracket is capturing, and referenced by an OP_RECURSE, the
2936        non-greedy case cannot be converted to a possessive form. We do not test
2937        the bracket type at the moment, but we might do it in the future to improve
2938        this condition. (But note that recursive calls are always atomic.) */
2939    
2940        if (base_list[1] == 0) return FALSE;
2941        code += PRIV(OP_lengths)[c];
2942        continue;
2943        }
2944    
2945      /* Check for a supported opcode, and load its properties. */
2946    
2947      code = get_chr_property_list(code, utf, cd->fcc, list);
2948      if (code == NULL) return FALSE;    /* Unsupported */
2949    
2950      /* If either opcode is a small character list, set pointers for comparing
2951      characters from that list with another list, or with a property. */
2952    
2953      if (base_list[0] == OP_CHAR)
2954        {
2955        chr_ptr = base_list + 2;
2956        list_ptr = list;
2957        }
2958      else if (list[0] == OP_CHAR)
2959        {
2960        chr_ptr = list + 2;
2961        list_ptr = base_list;
2962        }
2963    
2964      /* Some property combinations also acceptable. Unicode property opcodes are
2965      processed specially; the rest can be handled with a lookup table. */
2966    
2967      else
2968        {
2969        pcre_uint32 leftop, rightop;
2970    
2971        if (list[1] != 0) return FALSE;   /* Must match at least one character */
2972        leftop = base_list[0];
2973        rightop = list[0];
2974    
     case OP_CHARI:  
     if (c == next) return FALSE;  
 #ifdef SUPPORT_UTF  
     if (utf)  
       {  
       pcre_uint32 othercase;  
       if (next < 128) othercase = cd->fcc[next]; else  
2975  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2976        othercase = UCD_OTHERCASE(next);      if (leftop == OP_PROP || leftop == OP_NOTPROP)
2977  #else        {
2978        othercase = NOTACHAR;        if (rightop == OP_EOD) return TRUE;
2979  #endif        if (rightop == OP_PROP || rightop == OP_NOTPROP)
2980        return c != othercase;          {
2981            int n;
2982            const pcre_uint8 *p;
2983            BOOL same = leftop == rightop;
2984            BOOL lisprop = leftop == OP_PROP;
2985            BOOL risprop = rightop == OP_PROP;
2986            BOOL bothprop = lisprop && risprop;
2987    
2988            /* There's a table that specifies how each combination is to be
2989            processed:
2990              0   Always return FALSE (never auto-possessify)
2991              1   Character groups are distinct (possessify if both are OP_PROP)
2992              2   Check character categories in the same group (general or particular)
2993              3   Return TRUE if the two opcodes are not the same
2994              ... see comments below
2995            */
2996    
2997            n = propposstab[base_list[2]][list[2]];
2998            switch(n)
2999              {
3000              case 0: return FALSE;
3001              case 1: return bothprop;
3002              case 2: return (base_list[3] == list[3]) != same;
3003              case 3: return !same;
3004    
3005              case 4:  /* Left general category, right particular category */
3006              return risprop && catposstab[base_list[3]][list[3]] == same;
3007    
3008              case 5:  /* Right general category, left particular category */
3009              return lisprop && catposstab[list[3]][base_list[3]] == same;
3010    
3011              /* This code is logically tricky. Think hard before fiddling with it.
3012              The posspropstab table has four entries per row. Each row relates to
3013              one of PCRE's special properties such as ALNUM or SPACE or WORD.
3014              Only WORD actually needs all four entries, but using repeats for the
3015              others means they can all use the same code below.
3016    
3017              The first two entries in each row are Unicode general categories, and
3018              apply always, because all the characters they include are part of the
3019              PCRE character set. The third and fourth entries are a general and a
3020              particular category, respectively, that include one or more relevant
3021              characters. One or the other is used, depending on whether the check
3022              is for a general or a particular category. However, in both cases the
3023              category contains more characters than the specials that are defined
3024              for the property being tested against. Therefore, it cannot be used
3025              in a NOTPROP case.
3026    
3027              Example: the row for WORD contains ucp_L, ucp_N, ucp_P, ucp_Po.
3028              Underscore is covered by ucp_P or ucp_Po. */
3029    
3030              case 6:  /* Left alphanum vs right general category */
3031              case 7:  /* Left space vs right general category */
3032              case 8:  /* Left word vs right general category */
3033              p = posspropstab[n-6];
3034              return risprop && lisprop ==
3035                (list[3] != p[0] &&
3036                 list[3] != p[1] &&
3037                (list[3] != p[2] || !lisprop));
3038    
3039              case 9:   /* Right alphanum vs left general category */
3040              case 10:  /* Right space vs left general category */
3041              case 11:  /* Right word vs left general category */
3042              p = posspropstab[n-9];
3043              return lisprop && risprop ==
3044                (base_list[3] != p[0] &&
3045                 base_list[3] != p[1] &&
3046                (base_list[3] != p[2] || !risprop));
3047    
3048              case 12:  /* Left alphanum vs right particular category */
3049              case 13:  /* Left space vs right particular category */
3050              case 14:  /* Left word vs right particular category */
3051              p = posspropstab[n-12];
3052              return risprop && lisprop ==
3053                (catposstab[p[0]][list[3]] &&
3054                 catposstab[p[1]][list[3]] &&
3055                (list[3] != p[3] || !lisprop));
3056    
3057              case 15:  /* Right alphanum vs left particular category */
3058              case 16:  /* Right space vs left particular category */
3059              case 17:  /* Right word vs left particular category */
3060              p = posspropstab[n-15];
3061              return lisprop && risprop ==
3062                (catposstab[p[0]][base_list[3]] &&
3063                 catposstab[p[1]][base_list[3]] &&
3064                (base_list[3] != p[3] || !risprop));
3065              }
3066            }
3067          return FALSE;
3068        }        }
3069    
3070      else      else
3071  #endif  /* SUPPORT_UTF */  #endif  /* SUPPORT_UCP */
     return (c != TABLE_GET(next, cd->fcc, next));  /* Not UTF */  
3072    
3073      case OP_NOT:      return leftop >= FIRST_AUTOTAB_OP && leftop <= LAST_AUTOTAB_LEFT_OP &&
3074      return c == next;             rightop >= FIRST_AUTOTAB_OP && rightop <= LAST_AUTOTAB_RIGHT_OP &&
3075               autoposstab[leftop - FIRST_AUTOTAB_OP][rightop - FIRST_AUTOTAB_OP];
3076        }
3077    
3078      case OP_NOTI:    /* Control reaches here only if one of the items is a small character list.
3079      if (c == next) return TRUE;    All characters are checked against the other side. */
3080  #ifdef SUPPORT_UTF  
3081      if (utf)    do
3082        {
3083        chr = *chr_ptr;
3084    
3085        switch(list_ptr[0])
3086        {        {
3087        pcre_uint32 othercase;        case OP_CHAR:
3088        if (next < 128) othercase = cd->fcc[next]; else        ochr_ptr = list_ptr + 2;
3089  #ifdef SUPPORT_UCP        do
3090        othercase = UCD_OTHERCASE(next);          {
3091  #else          if (chr == *ochr_ptr) return FALSE;
3092        othercase = NOTACHAR;          ochr_ptr++;
3093  #endif          }
3094        return c == othercase;        while(*ochr_ptr != NOTACHAR);
3095        }        break;
     else  
 #endif  /* SUPPORT_UTF */  
     return (c == TABLE_GET(next, cd->fcc, next));  /* Not UTF */  
3096    
3097      /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.        case OP_NOT:
3098      When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */        ochr_ptr = list_ptr + 2;
3099          do
3100            {
3101            if (chr == *ochr_ptr)
3102              break;
3103            ochr_ptr++;
3104            }
3105          while(*ochr_ptr != NOTACHAR);
3106          if (*ochr_ptr == NOTACHAR) return FALSE;   /* Not found */
3107          break;
3108    
3109      case OP_DIGIT:        /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not*
3110      return next > 255 || (cd->ctypes[next] & ctype_digit) == 0;        set. When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
3111    
3112      case OP_NOT_DIGIT:        case OP_DIGIT:
3113      return next <= 255 && (cd->ctypes[next] & ctype_digit) != 0;        if (chr < 256 && (cd->ctypes[chr] & ctype_digit) != 0) return FALSE;
3114          break;
3115    
3116      case OP_WHITESPACE:        case OP_NOT_DIGIT:
3117      return next > 255 || (cd->ctypes[next] & ctype_space) == 0;        if (chr > 255 || (cd->ctypes[chr] & ctype_digit) == 0) return FALSE;
3118          break;
3119    
3120      case OP_NOT_WHITESPACE:        case OP_WHITESPACE:
3121      return next <= 255 && (cd->ctypes[next] & ctype_space) != 0;        if (chr < 256 && (cd->ctypes[chr] & ctype_space) != 0) return FALSE;
3122          break;
3123    
3124      case OP_WORDCHAR:        case OP_NOT_WHITESPACE:
3125      return next > 255 || (cd->ctypes[next] & ctype_word) == 0;        if (chr > 255 || (cd->ctypes[chr] & ctype_space) == 0) return FALSE;
3126          break;
3127    
3128      case OP_NOT_WORDCHAR:        case OP_WORDCHAR:
3129      return next <= 255 && (cd->ctypes[next] & ctype_word) != 0;        if (chr < 255 && (cd->ctypes[chr] & ctype_word) != 0) return FALSE;
3130          break;
3131    
3132      case OP_HSPACE:        case OP_NOT_WORDCHAR:
3133      case OP_NOT_HSPACE:        if (chr > 255 || (cd->ctypes[chr] & ctype_word) == 0) return FALSE;
3134      switch(next)        break;
       {  
       HSPACE_CASES:  
       return op_code == OP_NOT_HSPACE;  
3135    
3136        default:        case OP_HSPACE:
3137        return op_code != OP_NOT_HSPACE;        switch(chr)
3138        }          {
3139            HSPACE_CASES: return FALSE;
3140            default: break;
3141            }
3142          break;
3143    
3144      case OP_ANYNL:        case OP_NOT_HSPACE:
3145      case OP_VSPACE:        switch(chr)
3146      case OP_NOT_VSPACE:          {
3147      switch(next)          HSPACE_CASES: break;
3148        {          default: return FALSE;
3149        VSPACE_CASES:          }
3150        return op_code == OP_NOT_VSPACE;        break;
3151    
3152        default:        case OP_ANYNL:
3153        return op_code != OP_NOT_VSPACE;        case OP_VSPACE:
3154        }        switch(chr)
3155            {
3156            VSPACE_CASES: return FALSE;
3157            default: break;
3158            }
3159          break;
3160    
3161  #ifdef SUPPORT_UCP        case OP_NOT_VSPACE:
3162      case OP_PROP:        switch(chr)
3163      return check_char_prop(next, previous[0], previous[1], FALSE);          {
3164            VSPACE_CASES: break;
3165            default: return FALSE;
3166            }
3167          break;
3168    
3169      case OP_NOTPROP:        case OP_DOLL:
3170      return check_char_prop(next, previous[0], previous[1], TRUE);        case OP_EODN:
3171          switch (chr)
3172            {
3173            case CHAR_CR:
3174            case CHAR_LF:
3175            case CHAR_VT:
3176            case CHAR_FF:
3177            case CHAR_NEL:
3178    #ifndef EBCDIC
3179            case 0x2028:
3180            case 0x2029:
3181    #endif  /* Not EBCDIC */
3182            return FALSE;
3183            }
3184          break;
3185    
3186          case OP_EOD:    /* Can always possessify before \z */
3187          break;
3188    
3189          case OP_PROP:
3190          case OP_NOTPROP:
3191          if (!check_char_prop(chr, list_ptr[2], list_ptr[3],
3192                list_ptr[0] == OP_NOTPROP))
3193            return FALSE;
3194          break;
3195    
3196          /* The class comparisons work only when the class is the second item
3197          of the pair, because there are at present no possessive forms of the
3198          class opcodes. Note also that the "code" variable that is used below
3199          points after the second item, and that the pointer for the first item
3200          is not available, so even if there were possessive forms of the class
3201          opcodes, the correct comparison could not be done. */
3202    
3203          case OP_NCLASS:
3204          if (chr > 255) return FALSE;
3205          /* Fall through */
3206    
3207          case OP_CLASS:
3208          if (list_ptr != list) return FALSE;   /* Class is first opcode */
3209          if (chr > 255) break;
3210          if ((((pcre_uint8 *)(code - list_ptr[2] + 1))[chr >> 3] & (1 << (chr & 7))) != 0)
3211            return FALSE;
3212          break;
3213    
3214    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3215          case OP_XCLASS:
3216          if (list_ptr != list) return FALSE;   /* Class is first opcode */
3217          if (PRIV(xclass)(chr, code - list_ptr[2] + 1 + LINK_SIZE, utf))
3218            return FALSE;
3219          break;
3220  #endif  #endif
3221    
3222      default:        default:
3223      return FALSE;        return FALSE;
3224          }
3225    
3226        chr_ptr++;
3227      }      }
3228      while(*chr_ptr != NOTACHAR);
3229    
3230      /* At least one character must be matched from this opcode. */
3231    
3232      if (list[1] == 0) return TRUE;
3233    }    }
3234    
3235  /* Handle the case when the next item is \d, \s, etc. Note that when PCRE_UCP  return FALSE;
3236  is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are  }
 generated only when PCRE_UCP is *not* set, that is, when only ASCII  
 characteristics are recognized. Similarly, the opcodes OP_DIGIT etc. are  
 replaced by OP_PROP codes when PCRE_UCP is set. */  
3237    
 switch(op_code)  
   {  
   case OP_CHAR:  
   case OP_CHARI:  
   switch(escape)  
     {  
     case ESC_d:  
     return c > 255 || (cd->ctypes[c] & ctype_digit) == 0;  
3238    
     case ESC_D:  
     return c <= 255 && (cd->ctypes[c] & ctype_digit) != 0;  
3239    
3240      case ESC_s:  /*************************************************
3241      return c > 255 || (cd->ctypes[c] & ctype_space) == 0;  *    Scan compiled regex for auto-possession     *
3242    *************************************************/
3243    
3244    /* Replaces single character iterations with their possessive alternatives
3245    if appropriate. This function modifies the compiled opcode!
3246    
3247    Arguments:
3248      code        points to start of the byte code
3249      utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
3250      cd          static compile data
3251    
3252    Returns:      nothing
3253    */
3254    
3255    static void
3256    auto_possessify(pcre_uchar *code, BOOL utf, const compile_data *cd)
3257    {
3258    register pcre_uchar c;
3259    const pcre_uchar *end;
3260    pcre_uint32 list[8];
3261    
3262      case ESC_S:  for (;;)
3263      return c <= 255 && (cd->ctypes[c] & ctype_space) != 0;    {
3264      c = *code;
3265    
3266      if (c >= OP_STAR && c <= OP_TYPEPOSUPTO)
3267        {
3268        c -= get_repeat_base(c) - OP_STAR;
3269        end = (c <= OP_MINUPTO) ?
3270          get_chr_property_list(code, utf, cd->fcc, list) : NULL;
3271        list[1] = c == OP_STAR || c == OP_PLUS || c == OP_QUERY || c == OP_UPTO;
3272    
3273        if (end != NULL && compare_opcodes(end, utf, cd, list))
3274          {
3275          switch(c)
3276            {
3277            case OP_STAR:
3278            *code += OP_POSSTAR - OP_STAR;
3279            break;
3280    
3281            case OP_MINSTAR:
3282            *code += OP_POSSTAR - OP_MINSTAR;
3283            break;
3284    
3285            case OP_PLUS:
3286            *code += OP_POSPLUS - OP_PLUS;
3287            break;
3288    
3289            case OP_MINPLUS:
3290            *code += OP_POSPLUS - OP_MINPLUS;
3291            break;
3292    
3293            case OP_QUERY:
3294            *code += OP_POSQUERY - OP_QUERY;
3295            break;
3296    
3297            case OP_MINQUERY:
3298            *code += OP_POSQUERY - OP_MINQUERY;
3299            break;
3300    
3301            case OP_UPTO:
3302            *code += OP_POSUPTO - OP_UPTO;
3303            break;
3304    
3305            case OP_MINUPTO:
3306            *code += OP_MINUPTO - OP_UPTO;
3307            break;
3308            }
3309          }
3310        c = *code;
3311        }
3312    
3313      switch(c)
3314        {
3315        case OP_END:
3316        return;
3317    
3318        case OP_TYPESTAR:
3319        case OP_TYPEMINSTAR:
3320        case OP_TYPEPLUS:
3321        case OP_TYPEMINPLUS:
3322        case OP_TYPEQUERY:
3323        case OP_TYPEMINQUERY:
3324        case OP_TYPEPOSSTAR:
3325        case OP_TYPEPOSPLUS:
3326        case OP_TYPEPOSQUERY:
3327        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
3328        break;
3329    
3330        case OP_TYPEUPTO:
3331        case OP_TYPEMINUPTO:
3332        case OP_TYPEEXACT:
3333        case OP_TYPEPOSUPTO:
3334        if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
3335          code += 2;
3336        break;
3337    
3338        case OP_XCLASS:
3339        code += GET(code, 1);
3340        break;
3341    
3342        case OP_MARK:
3343        case OP_PRUNE_ARG:
3344        case OP_SKIP_ARG:
3345        case OP_THEN_ARG:
3346        code += code[1];
3347        break;
3348        }
3349    
3350      /* Add in the fixed length from the table */
3351    
3352      code += PRIV(OP_lengths)[c];
3353    
3354      /* In UTF-8 mode, opcodes that are followed by a character may be followed by
3355      a multi-byte character. The length in the table is a minimum, so we have to
3356      arrange to skip the extra bytes. */
3357    
3358    #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
3359      if (utf) switch(c)
3360        {
3361        case OP_CHAR:
3362        case OP_CHARI:
3363        case OP_NOT:
3364        case OP_NOTI:
3365        case OP_STAR:
3366        case OP_MINSTAR:
3367        case OP_PLUS:
3368        case OP_MINPLUS:
3369        case OP_QUERY:
3370        case OP_MINQUERY:
3371        case OP_UPTO:
3372        case OP_MINUPTO:
3373        case OP_EXACT:
3374        case OP_POSSTAR:
3375        case OP_POSPLUS:
3376        case OP_POSQUERY:
3377        case OP_POSUPTO:
3378        case OP_STARI:
3379        case OP_MINSTARI:
3380        case OP_PLUSI:
3381        case OP_MINPLUSI:
3382        case OP_QUERYI:
3383        case OP_MINQUERYI:
3384        case OP_UPTOI:
3385        case OP_MINUPTOI:
3386        case OP_EXACTI:
3387        case OP_POSSTARI:
3388        case OP_POSPLUSI:
3389        case OP_POSQUERYI:
3390        case OP_POSUPTOI:
3391        case OP_NOTSTAR:
3392        case OP_NOTMINSTAR:
3393        case OP_NOTPLUS:
3394        case OP_NOTMINPLUS:
3395        case OP_NOTQUERY:
3396        case OP_NOTMINQUERY:
3397        case OP_NOTUPTO:
3398        case OP_NOTMINUPTO:
3399        case OP_NOTEXACT:
3400        case OP_NOTPOSSTAR:
3401        case OP_NOTPOSPLUS:
3402        case OP_NOTPOSQUERY:
3403        case OP_NOTPOSUPTO:
3404        case OP_NOTSTARI:
3405        case OP_NOTMINSTARI:
3406        case OP_NOTPLUSI:
3407        case OP_NOTMINPLUSI:
3408        case OP_NOTQUERYI:
3409        case OP_NOTMINQUERYI:
3410        case OP_NOTUPTOI:
3411        case OP_NOTMINUPTOI:
3412        case OP_NOTEXACTI:
3413        case OP_NOTPOSSTARI:
3414        case OP_NOTPOSPLUSI:
3415        case OP_NOTPOSQUERYI:
3416        case OP_NOTPOSUPTOI:
3417        if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
3418        break;
3419        }
3420    #else
3421      (void)(utf);  /* Keep compiler happy by referencing function argument */
3422    #endif
3423      }
3424    }
3425    
3426    
3427    
3428    /*************************************************
3429    *           Check for POSIX class syntax         *
3430    *************************************************/
3431    
3432    /* This function is called when the sequence "[:" or "[." or "[=" is
3433    encountered in a character class. It checks whether this is followed by a
3434    sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
3435    reach an unescaped ']' without the special preceding character, return FALSE.
3436    
3437    Originally, this function only recognized a sequence of letters between the
3438    terminators, but it seems that Perl recognizes any sequence of characters,
3439    though of course unknown POSIX names are subsequently rejected. Perl gives an
3440    "Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
3441    didn't consider this to be a POSIX class. Likewise for [:1234:].
3442    
3443    The problem in trying to be exactly like Perl is in the handling of escapes. We
3444    have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
3445    class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
3446    below handles the special case of \], but does not try to do any other escape
3447    processing. This makes it different from Perl for cases such as [:l\ower:]
3448    where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize
3449    "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
3450    I think.
3451    
3452    A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
3453    It seems that the appearance of a nested POSIX class supersedes an apparent
3454    external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
3455    a digit.
3456    
3457    In Perl, unescaped square brackets may also appear as part of class names. For
3458    example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
3459    [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
3460    seem right at all. PCRE does not allow closing square brackets in POSIX class
3461    names.
3462    
3463    Arguments:
3464      ptr      pointer to the initial [
3465      endptr   where to return the end pointer
3466    
3467    Returns:   TRUE or FALSE
3468    */
3469    
3470    static BOOL
3471    check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
3472    {
3473    pcre_uchar terminator;          /* Don't combine these lines; the Solaris cc */
3474    terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
3475    for (++ptr; *ptr != CHAR_NULL; ptr++)
3476      {
3477      if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
3478        ptr++;
3479      else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
3480      else
3481        {
3482        if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
3483          {
3484          *endptr = ptr;
3485          return TRUE;
3486          }
3487        if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&
3488             (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
3489              ptr[1] == CHAR_EQUALS_SIGN) &&
3490            check_posix_syntax(ptr, endptr))
3491          return FALSE;
3492        }
3493      }
3494    return FALSE;
3495    }
3496    
3497    
3498    
3499    
3500    /*************************************************
3501    *          Check POSIX class name                *
3502    *************************************************/
3503    
3504    /* This function is called to check the name given in a POSIX-style class entry
3505    such as [:alnum:].
3506    
3507    Arguments:
3508      ptr        points to the first letter
3509      len        the length of the name
3510    
3511    Returns:     a value representing the name, or -1 if unknown
3512    */
3513    
3514    static int
3515    check_posix_name(const pcre_uchar *ptr, int len)
3516    {
3517    const char *pn = posix_names;
3518    register int yield = 0;
3519    while (posix_name_lengths[yield] != 0)
3520      {
3521      if (len == posix_name_lengths[yield] &&
3522        STRNCMP_UC_C8(ptr, pn, (unsigned int)len) == 0) return yield;
3523      pn += posix_name_lengths[yield] + 1;
3524      yield++;
3525      }
3526    return -1;
3527    }
3528    
3529    
3530    /*************************************************
3531    *    Adjust OP_RECURSE items in repeated group   *
3532    *************************************************/
3533    
3534    /* OP_RECURSE items contain an offset from the start of the regex to the group
3535    that is referenced. This means that groups can be replicated for fixed
3536    repetition simply by copying (because the recursion is allowed to refer to
3537    earlier groups that are outside the current group). However, when a group is
3538    optional (i.e. the minimum quantifier is zero), OP_BRAZERO or OP_SKIPZERO is
3539    inserted before it, after it has been compiled. This means that any OP_RECURSE
3540    items within it that refer to the group itself or any contained groups have to
3541    have their offsets adjusted. That one of the jobs of this function. Before it
3542    is called, the partially compiled regex must be temporarily terminated with
3543    OP_END.
3544    
3545    This function has been extended with the possibility of forward references for
3546    recursions and subroutine calls. It must also check the list of such references
3547    for the group we are dealing with. If it finds that one of the recursions in
3548    the current group is on this list, it adjusts the offset in the list, not the
3549    value in the reference (which is a group number).
3550    
3551    Arguments:
3552      group      points to the start of the group
3553      adjust     the amount by which the group is to be moved
3554      utf        TRUE in UTF-8 / UTF-16 / UTF-32 mode
3555      cd         contains pointers to tables etc.
3556      save_hwm   the hwm forward reference pointer at the start of the group
3557    
3558    Returns:     nothing
3559    */
3560    
3561    static void
3562    adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
3563      pcre_uchar *save_hwm)
3564    {
3565    pcre_uchar *ptr = group;
3566    
3567    while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
3568      {
3569      int offset;
3570      pcre_uchar *hc;
3571    
3572      /* See if this recursion is on the forward reference list. If so, adjust the
3573      reference. */
3574    
3575      for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
3576        {
3577        offset = (int)GET(hc, 0);
3578        if (cd->start_code + offset == ptr + 1)
3579          {
3580          PUT(hc, 0, offset + adjust);
3581          break;
3582          }
3583        }
3584    
3585      /* Otherwise, adjust the recursion offset if it's after the start of this
3586      group. */
3587    
3588      if (hc >= cd->hwm)
3589        {
3590        offset = (int)GET(ptr, 1);
3591        if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
3592        }
3593    
3594      case ESC_w:    ptr += 1 + LINK_SIZE;
3595      return c > 255 || (cd->ctypes[c] & ctype_word) == 0;    }
3596    }
3597    
     case ESC_W:  
     return c <= 255 && (cd->ctypes[c] & ctype_word) != 0;  
3598    
     case ESC_h:  
     case ESC_H:  
     switch(c)  
       {  
       HSPACE_CASES:  
       return escape != ESC_h;  
3599    
3600        default:  /*************************************************
3601        return escape == ESC_h;  *        Insert an automatic callout point       *
3602        }  *************************************************/
3603    
3604      case ESC_v:  /* This function is called when the PCRE_AUTO_CALLOUT option is set, to insert
3605      case ESC_V:  callout points before each pattern item.
     switch(c)  
       {  
       VSPACE_CASES:  
       return escape != ESC_v;  
3606    
3607        default:  Arguments:
3608        return escape == ESC_v;    code           current code pointer
3609        }    ptr            current pattern pointer
3610      cd             pointers to tables etc
3611    
3612      /* When PCRE_UCP is set, these values get generated for \d etc. Find  Returns:         new code pointer
3613      their substitutions and process them. The result will always be either  */
     ESC_p or ESC_P. Then fall through to process those values. */  
3614    
3615  #ifdef SUPPORT_UCP  static pcre_uchar *
3616      case ESC_du:  auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
3617      case ESC_DU:  {
3618      case ESC_wu:  *code++ = OP_CALLOUT;
3619      case ESC_WU:  *code++ = 255;
3620      case ESC_su:  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
3621      case ESC_SU:  PUT(code, LINK_SIZE, 0);                       /* Default length */
3622        {  return code + 2 * LINK_SIZE;
3623        int temperrorcode = 0;  }
       ptr = substitutes[escape - ESC_DU];  
       escape = check_escape(&ptr, &next, &temperrorcode, 0, options, FALSE);  
       if (temperrorcode != 0) return FALSE;  
       ptr++;    /* For compatibility */  
       }  
     /* Fall through */  
3624    
     case ESC_p:  
     case ESC_P:  
       {  
       unsigned int ptype = 0, pdata = 0;  
       int errorcodeptr;  
       BOOL negated;  
3625    
       ptr--;      /* Make ptr point at the p or P */  
       if (!get_ucp(&ptr, &negated, &ptype, &pdata, &errorcodeptr))  
         return FALSE;  
       ptr++;      /* Point past the final curly ket */  
3626    
3627        /* If the property item is optional, we have to give up. (When generated  /*************************************************
3628        from \d etc by PCRE_UCP, this test will have been applied much earlier,  *         Complete a callout item                *
3629        to the original \d etc. At this point, ptr will point to a zero byte. */  *************************************************/
3630    
3631        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||  /* A callout item contains the length of the next item in the pattern, which
3632          STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)  we can't fill in till after we have reached the relevant point. This is used
3633            return FALSE;  for both automatic and manual callouts.
3634    
3635        /* Do the property check. */  Arguments:
3636      previous_callout   points to previous callout item
3637      ptr                current pattern pointer
3638      cd                 pointers to tables etc
3639    
3640        return check_char_prop(c, ptype, pdata, (escape == ESC_P) != negated);  Returns:             nothing
3641        }  */
 #endif  
3642    
3643      default:  static void
3644      return FALSE;  complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
3645      }  {
3646    int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
3647    PUT(previous_callout, 2 + LINK_SIZE, length);
3648    }
3649    
   /* In principle, support for Unicode properties should be integrated here as  
   well. It means re-organizing the above code so as to get hold of the property  
   values before switching on the op-code. However, I wonder how many patterns  
   combine ASCII \d etc with Unicode properties? (Note that if PCRE_UCP is set,  
   these op-codes are never generated.) */  
3650    
   case OP_DIGIT:  
   return escape == ESC_D || escape == ESC_s || escape == ESC_W ||  
          escape == ESC_h || escape == ESC_v || escape == ESC_R;  
3651    
3652    case OP_NOT_DIGIT:  #ifdef SUPPORT_UCP
3653    return escape == ESC_d;  /*************************************************
3654    *           Get othercase range                  *
3655    *************************************************/
3656    
3657    case OP_WHITESPACE:  /* This function is passed the start and end of a class range, in UTF-8 mode
3658    return escape == ESC_S || escape == ESC_d || escape == ESC_w;  with UCP support. It searches up the characters, looking for ranges of
3659    characters in the "other" case. Each call returns the next one, updating the
3660    start address. A character with multiple other cases is returned on its own
3661    with a special return value.
3662    
3663    case OP_NOT_WHITESPACE:  Arguments:
3664    return escape == ESC_s || escape == ESC_h || escape == ESC_v || escape == ESC_R;    cptr        points to starting character value; updated
3665      d           end value
3666      ocptr       where to put start of othercase range
3667      odptr       where to put end of othercase range
3668    
3669    case OP_HSPACE:  Yield:        -1 when no more
3670    return escape == ESC_S || escape == ESC_H || escape == ESC_d ||                 0 when a range is returned
3671           escape == ESC_w || escape == ESC_v || escape == ESC_R;                >0 the CASESET offset for char with multiple other cases
3672                    in this case, ocptr contains the original
3673    */
3674    
3675    case OP_NOT_HSPACE:  static int
3676    return escape == ESC_h;  get_othercase_range(pcre_uint32 *cptr, pcre_uint32 d, pcre_uint32 *ocptr,
3677      pcre_uint32 *odptr)
3678    {
3679    pcre_uint32 c, othercase, next;
3680    unsigned int co;
3681    
3682    /* Can't have \S in here because VT matches \S (Perl anomaly) */  /* Find the first character that has an other case. If it has multiple other
3683    case OP_ANYNL:  cases, return its case offset value. */
   case OP_VSPACE:  
   return escape == ESC_V || escape == ESC_d || escape == ESC_w;  
3684    
3685    case OP_NOT_VSPACE:  for (c = *cptr; c <= d; c++)
3686    return escape == ESC_v || escape == ESC_R;    {
3687      if ((co = UCD_CASESET(c)) != 0)
3688        {
3689        *ocptr = c++;   /* Character that has the set */
3690        *cptr = c;      /* Rest of input range */
3691        return (int)co;
3692        }
3693      if ((othercase = UCD_OTHERCASE(c)) != c) break;
3694      }
3695    
3696    case OP_WORDCHAR:  if (c > d) return -1;  /* Reached end of range */
   return escape == ESC_W || escape == ESC_s || escape == ESC_h ||  
          escape == ESC_v || escape == ESC_R;  
3697    
3698    case OP_NOT_WORDCHAR:  *ocptr = othercase;
3699    return escape == ESC_w || escape == ESC_d;  next = othercase + 1;
3700    
3701    default:  for (++c; c <= d; c++)
3702    return FALSE;    {
3703      if (UCD_OTHERCASE(c) != next) break;
3704      next++;
3705    }    }
3706    
3707  /* Control does not reach here */  *odptr = next - 1;     /* End of othercase range */
3708    *cptr = c;             /* Rest of input range */
3709    return 0;
3710  }  }
3711    #endif  /* SUPPORT_UCP */
3712    
3713    
3714    
# Line 3670  to find out the amount of memory needed, Line 3961  to find out the amount of memory needed,
3961  phase. The value of lengthptr distinguishes the two phases.  phase. The value of lengthptr distinguishes the two phases.
3962    
3963  Arguments:  Arguments:
3964    optionsptr     pointer to the option bits    optionsptr        pointer to the option bits
3965    codeptr        points to the pointer to the current code point    codeptr           points to the pointer to the current code point
3966    ptrptr         points to the current pattern pointer    ptrptr            points to the current pattern pointer
3967    errorcodeptr   points to error code variable    errorcodeptr      points to error code variable
3968    firstcharptr    place to put the first required character    firstcharptr      place to put the first required character
3969    firstcharflagsptr place to put the first character flags, or a negative number    firstcharflagsptr place to put the first character flags, or a negative number
3970    reqcharptr     place to put the last required character    reqcharptr        place to put the last required character
3971    reqcharflagsptr place to put the last required character flags, or a negative number    reqcharflagsptr   place to put the last required character flags, or a negative number
3972    bcptr          points to current branch chain    bcptr             points to current branch chain
3973    cond_depth     conditional nesting depth    cond_depth        conditional nesting depth
3974    cd             contains pointers to tables etc.    cd                contains pointers to tables etc.
3975    lengthptr      NULL during the real compile phase    lengthptr         NULL during the real compile phase
3976                   points to length accumulator during pre-compile phase                      points to length accumulator during pre-compile phase
3977    
3978  Returns:         TRUE on success  Returns:            TRUE on success
3979                   FALSE, with *errorcodeptr set non-zero on error                      FALSE, with *errorcodeptr set non-zero on error
3980  */  */
3981    
3982  static BOOL  static BOOL
# Line 4849  for (;; ptr++) Line 5140  for (;; ptr++)
5140            }            }
5141          }          }
5142    
       /* If the repetition is unlimited, it pays to see if the next thing on  
       the line is something that cannot possibly match this character. If so,  
       automatically possessifying this item gains some performance in the case  
       where the match fails. */  
   
       if (!possessive_quantifier &&  
           repeat_max < 0 &&  
           check_auto_possessive(previous, utf, ptr + 1, options, cd))  
         {  
         repeat_type = 0;    /* Force greedy */  
         possessive_quantifier = TRUE;  
         }  
   
5143        goto OUTPUT_SINGLE_REPEAT;   /* Code shared with single character types */        goto OUTPUT_SINGLE_REPEAT;   /* Code shared with single character types */
5144        }        }
5145    
# Line 4879  for (;; ptr++) Line 5157  for (;; ptr++)
5157        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */
5158        c = *previous;        c = *previous;
5159    
       if (!possessive_quantifier &&  
           repeat_max < 0 &&  
           check_auto_possessive(previous, utf, ptr + 1, options, cd))  
         {  
         repeat_type = 0;    /* Force greedy */  
         possessive_quantifier = TRUE;  
         }  
   
5160        OUTPUT_SINGLE_REPEAT:        OUTPUT_SINGLE_REPEAT:
5161        if (*previous == OP_PROP || *previous == OP_NOTPROP)        if (*previous == OP_PROP || *previous == OP_NOTPROP)
5162          {          {
# Line 5035  for (;; ptr++) Line 5305  for (;; ptr++)
5305      /* If previous was a character class or a back reference, we put the repeat      /* If previous was a character class or a back reference, we put the repeat
5306      stuff after it, but just skip the item if the repeat was {0,0}. */      stuff after it, but just skip the item if the repeat was {0,0}. */
5307    
5308      else if (*previous == OP_CLASS ||      else if (*previous == OP_CLASS || *previous == OP_NCLASS ||
              *previous == OP_NCLASS ||  
5309  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
5310               *previous == OP_XCLASS ||               *previous == OP_XCLASS ||
5311  #endif  #endif
5312               *previous == OP_REF ||               *previous == OP_REF   || *previous == OP_REFI ||
5313               *previous == OP_REFI)               *previous == OP_DNREF || *previous == OP_DNREFI)
5314        {        {
5315        if (repeat_max == 0)        if (repeat_max == 0)
5316          {          {
# Line 5391  for (;; ptr++) Line 5660  for (;; ptr++)
5660              pcre_uchar *scode = bracode;              pcre_uchar *scode = bracode;
5661              do              do
5662                {                {
5663                if (could_be_empty_branch(scode, ketcode, utf, cd))                if (could_be_empty_branch(scode, ketcode, utf, cd, NULL))
5664                  {                  {
5665                  *bracode += OP_SBRA - OP_BRA;                  *bracode += OP_SBRA - OP_BRA;
5666                  break;                  break;
# Line 5865  for (;; ptr++) Line 6134  for (;; ptr++)
6134            slot += cd->name_entry_size;            slot += cd->name_entry_size;
6135            }            }
6136    
6137          /* Found a previous named subpattern */          /* Found the named subpattern */
6138    
6139          if (i < cd->names_found)          if (i < cd->names_found)
6140            {            {
# Line 5874  for (;; ptr++) Line 6143  for (;; ptr++)
6143            code[1+LINK_SIZE]++;            code[1+LINK_SIZE]++;
6144            }            }
6145    
         /* Search the pattern for a forward reference */  
   
         else if ((i = find_parens(cd, name, namelen,  
                         (options & PCRE_EXTENDED) != 0, utf)) > 0)  
           {  
           PUT2(code, 2+LINK_SIZE, i);  
           code[1+LINK_SIZE]++;  
           }  
   
6146          /* If terminator == CHAR_NULL it means that the name followed directly          /* If terminator == CHAR_NULL it means that the name followed directly
6147          after the opening parenthesis [e.g. (?(abc)...] and in this case there          after the opening parenthesis [e.g. (?(abc)...] and in this case there
6148          are some further alternatives to try. For the cases where terminator !=          are some further alternatives to try. For the cases where terminator !=
# Line 6046  for (;; ptr++) Line 6306  for (;; ptr++)
6306          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
6307          DEFINE_NAME:    /* Come here from (?< handling */          DEFINE_NAME:    /* Come here from (?< handling */
6308          case CHAR_APOSTROPHE:          case CHAR_APOSTROPHE:
6309            terminator = (*ptr == CHAR_LESS_THAN_SIGN)?
6310              CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
6311            name = ++ptr;
6312    
6313            while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
6314            namelen = (int)(ptr - name);
6315    
6316            /* In the pre-compile phase, do a syntax check, remember the longest
6317            name, and then remember the group in a vector, expanding it if
6318            necessary. Duplicates for the same number are skipped; other duplicates
6319            are checked for validity. In the actual compile, there is nothing to
6320            do. */
6321    
6322            if (lengthptr != NULL)
6323            {            {
6324            terminator = (*ptr == CHAR_LESS_THAN_SIGN)?            named_group *ng;
6325              CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;            pcre_uint32 number = cd->bracount + 1;
           name = ++ptr;  
6326    
6327            while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0) ptr++;            if (*ptr != (pcre_uchar)terminator)
6328            namelen = (int)(ptr - name);              {
6329                *errorcodeptr = ERR42;
6330                goto FAILED;
6331                }
6332    
6333            /* In the pre-compile phase, just do a syntax check. */            if (cd->names_found >= MAX_NAME_COUNT)
6334                {
6335                *errorcodeptr = ERR49;
6336                goto FAILED;
6337                }
6338    
6339            if (lengthptr != NULL)            if (namelen + IMM2_SIZE + 1 > cd->name_entry_size)
6340              {              {
6341              if (*ptr != (pcre_uchar)terminator)              cd->name_entry_size = namelen + IMM2_SIZE + 1;
6342                {              if (namelen > MAX_NAME_SIZE)
               *errorcodeptr = ERR42;  
               goto FAILED;  
               }  
             if (cd->names_found >= MAX_NAME_COUNT)  
6343                {                {
6344                *errorcodeptr = ERR49;                *errorcodeptr = ERR48;
6345                goto FAILED;                goto FAILED;
6346                }                }
6347              if (namelen + IMM2_SIZE + 1 > cd->name_entry_size)              }
6348    
6349              /* Scan the list to check for duplicates. For duplicate names, if the
6350              number is the same, break the loop, which causes the name to be
6351              discarded; otherwise, if DUPNAMES is not set, give an error.
6352              If it is set, allow the name with a different number, but continue
6353              scanning in case this is a duplicate with the same number. For
6354              non-duplicate names, give an error if the number is duplicated. */
6355    
6356              ng = cd->named_groups;
6357              for (i = 0; i < cd->names_found; i++, ng++)
6358                {
6359                if (namelen == ng->length &&
6360                    STRNCMP_UC_UC(name, ng->name, namelen) == 0)
6361                {                {
6362                cd->name_entry_size = namelen + IMM2_SIZE + 1;                if (ng->number == number) break;
6363                if (namelen > MAX_NAME_SIZE)                if ((options & PCRE_DUPNAMES) == 0)
6364                  {                  {
6365                  *errorcodeptr = ERR48;                  *errorcodeptr = ERR43;
6366                  goto FAILED;                  goto FAILED;
6367                  }                  }
6368                  cd->dupnames = TRUE;  /* Duplicate names exist */
6369                  }
6370                else if (ng->number == number)
6371                  {
6372                  *errorcodeptr = ERR65;
6373                  goto FAILED;
6374                }                }
6375              }              }
6376    
6377            /* In the real compile, create the entry in the table, maintaining            if (i >= cd->names_found)     /* Not a duplicate with same number */
           alphabetical order. Duplicate names for different numbers are  
           permitted only if PCRE_DUPNAMES is set. Duplicate names for the same  
           number are always OK. (An existing number can be re-used if (?|  
           appears in the pattern.) In either event, a duplicate name results in  
           a duplicate entry in the table, even if the number is the same. This  
           is because the number of names, and hence the table size, is computed  
           in the pre-compile, and it affects various numbers and pointers which  
           would all have to be modified, and the compiled code moved down, if  
           duplicates with the same number were omitted from the table. This  
           doesn't seem worth the hassle. However, *different* names for the  
           same number are not permitted. */  
   
           else  
6378              {              {
6379              BOOL dupname = FALSE;              /* Increase the list size if necessary */
             slot = cd->name_table;  
6380    
6381              for (i = 0; i < cd->names_found; i++)              if (cd->names_found >= cd->named_group_list_size)
6382                {                {
6383                int crc = memcmp(name, slot+IMM2_SIZE, IN_UCHARS(namelen));                int newsize = cd->named_group_list_size * 2;
6384                if (crc == 0)                named_group *newspace = (PUBL(malloc))
6385                  {                  (newsize * sizeof(named_group));
                 if (slot[IMM2_SIZE+namelen] == 0)  
                   {  
                   if (GET2(slot, 0) != cd->bracount + 1 &&  
                       (options & PCRE_DUPNAMES) == 0)  
                     {  
                     *errorcodeptr = ERR43;  
                     goto FAILED;  
                     }  
                   else dupname = TRUE;  
                   }  
                 else crc = -1;      /* Current name is a substring */  
                 }  
   
               /* Make space in the table and break the loop for an earlier  
               name. For a duplicate or later name, carry on. We do this for  
               duplicates so that in the simple case (when ?(| is not used) they  
               are in order of their numbers. */  
6386    
6387                if (crc < 0)                if (newspace == NULL)
6388                  {                  {
6389                  memmove(slot + cd->name_entry_size, slot,                  *errorcodeptr = ERR21;
6390                    IN_UCHARS((cd->names_found - i) * cd->name_entry_size));                  goto FAILED;
                 break;  
6391                  }                  }
6392    
6393                /* Continue the loop for a later or duplicate name */                memcpy(newspace, cd->named_groups,
6394                    cd->named_group_list_size * sizeof(named_group));
6395                slot += cd->name_entry_size;                if (cd->named_group_list_size > NAMED_GROUP_LIST_SIZE)
6396                }                  (PUBL(free))((void *)cd->named_groups);
6397                  cd->named_groups = newspace;
6398              /* For non-duplicate names, check for a duplicate number before                cd->named_group_list_size = newsize;
             adding the new name. */  
   
             if (!dupname)  
               {  
               pcre_uchar *cslot = cd->name_table;  
               for (i = 0; i < cd->names_found; i++)  
                 {  
                 if (cslot != slot)  
                   {  
                   if (GET2(cslot, 0) == cd->bracount + 1)  
                     {  
                     *errorcodeptr = ERR65;  
                     goto FAILED;  
                     }  
                   }  
                 else i--;  
                 cslot += cd->name_entry_size;  
                 }  
6399                }                }
6400    
6401              PUT2(slot, 0, cd->bracount + 1);              cd->named_groups[cd->names_found].name = name;
6402              memcpy(slot + IMM2_SIZE, name, IN_UCHARS(namelen));              cd->named_groups[cd->names_found].length = namelen;
6403              slot[IMM2_SIZE + namelen] = 0;              cd->named_groups[cd->names_found].number = number;
6404                cd->names_found++;
6405              }              }
6406            }            }
6407    
6408          /* In both pre-compile and compile, count the number of names we've          ptr++;                    /* Move past > or ' in both passes. */
         encountered. */  
   
         cd->names_found++;  
         ptr++;                    /* Move past > or ' */  
6409          goto NUMBERED_GROUP;          goto NUMBERED_GROUP;
6410    
6411    
# Line 6193  for (;; ptr++) Line 6435  for (;; ptr++)
6435    
6436          if (lengthptr != NULL)          if (lengthptr != NULL)
6437            {            {
6438            const pcre_uchar *temp;            named_group *ng;
6439    
6440            if (namelen == 0)            if (namelen == 0)
6441              {              {
# Line 6211  for (;; ptr++) Line 6453  for (;; ptr++)
6453              goto FAILED;              goto FAILED;
6454              }              }
6455    
6456            /* The name table does not exist in the first pass, so we cannot            /* The name table does not exist in the first pass; instead we must
6457            do a simple search as in the code below. Instead, we have to scan the            scan the list of names encountered so far in order to get the
6458            pattern to find the number. It is important that we scan it only as            number. If the name is not found, set the value to 0 for a forward
6459            far as we have got because the syntax of named subpatterns has not            reference. */
6460            been checked for the rest of the pattern, and find_parens() assumes  
6461            correct syntax. In any case, it's a waste of resources to scan            ng = cd->named_groups;
6462            further. We stop the scan at the current point by temporarily            for (i = 0; i < cd->names_found; i++, ng++)
6463            adjusting the value of cd->endpattern. */              {
6464                if (namelen == ng->length &&
6465            temp = cd->end_pattern;                  STRNCMP_UC_UC(name, ng->name, namelen) == 0)
6466            cd->end_pattern = ptr;                break;
6467            recno = find_parens(cd, name, namelen,              }
6468              (options & PCRE_EXTENDED) != 0, utf);            recno = (i < cd->names_found)? ng->number : 0;
6469            cd->end_pattern = temp;  
6470            if (recno < 0) recno = 0;    /* Forward ref; set dummy number */            /* Count named back references. */
6471    
6472              if (!is_recurse) cd->namedrefcount++;
6473            }            }
6474    
6475          /* In the real compile, seek the name in the table. We check the name          /* In the real compile, search the name table. We check the name
6476          first, and then check that we have reached the end of the name in the          first, and then check that we have reached the end of the name in the
6477          table. That way, if the name that is longer than any in the table,          table. That way, if the name is longer than any in the table, the
6478          the comparison will fail without reading beyond the table entry. */          comparison will fail without reading beyond the table entry. */
6479    
6480          else          else
6481            {            {
# Line 6244  for (;; ptr++) Line 6488  for (;; ptr++)
6488              slot += cd->name_entry_size;              slot += cd->name_entry_size;
6489              }              }
6490    
6491            if (i < cd->names_found)         /* Back reference */            if (i < cd->names_found)
6492              {              {
6493              recno = GET2(slot, 0);              recno = GET2(slot, 0);
6494              }              }
6495            else if ((recno =                /* Forward back reference */            else
                     find_parens(cd, name, namelen,  
                       (options & PCRE_EXTENDED) != 0, utf)) <= 0)  
6496              {              {
6497              *errorcodeptr = ERR15;              *errorcodeptr = ERR15;
6498              goto FAILED;              goto FAILED;
6499              }              }
6500            }            }
6501    
6502          /* In both phases, we can now go to the code than handles numerical          /* In both phases, for recursions, we can now go to the code than
6503          recursion or backreferences. */          handles numerical recursion. */
6504    
6505          if (is_recurse) goto HANDLE_RECURSION;          if (is_recurse) goto HANDLE_RECURSION;
6506            else goto HANDLE_REFERENCE;  
6507            /* In the second pass we must see if the name is duplicated. If so, we
6508            generate a different opcode. */
6509    
6510            if (lengthptr == NULL && cd->dupnames)
6511              {
6512              int count = 1;
6513              unsigned int index = i;
6514              pcre_uchar *cslot = slot + cd->name_entry_size;
6515    
6516              for (i++; i < cd->names_found; i++)
6517                {
6518                if (STRCMP_UC_UC(slot + IMM2_SIZE, cslot + IMM2_SIZE) != 0) break;
6519                count++;
6520                cslot += cd->name_entry_size;
6521                }
6522    
6523              if (count > 1)
6524                {
6525                if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
6526                previous = code;
6527                *code++ = ((options & PCRE_CASELESS) != 0)? OP_DNREFI : OP_DNREF;
6528                PUT2INC(code, 0, index);
6529                PUT2INC(code, 0, count);
6530    
6531                /* Process each potentially referenced group. */
6532    
6533                for (; slot < cslot; slot += cd->name_entry_size)
6534                  {
6535                  open_capitem *oc;
6536                  recno = GET2(slot, 0);
6537                  cd->backref_map |= (recno < 32)? (1 << recno) : 1;
6538                  if (recno > cd->top_backref) cd->top_backref = recno;
6539    
6540                  /* Check to see if this back reference is recursive, that it, it
6541                  is inside the group that it references. A flag is set so that the
6542                  group can be made atomic. */
6543    
6544                  for (oc = cd->open_caps; oc != NULL; oc = oc->next)
6545                    {
6546                    if (oc->number == recno)
6547                      {
6548                      oc->flag = TRUE;
6549                      break;
6550                      }
6551                    }
6552                  }
6553    
6554                continue;  /* End of back ref handling */
6555                }
6556              }
6557    
6558            /* First pass, or a non-duplicated name. */
6559    
6560            goto HANDLE_REFERENCE;
6561    
6562    
6563          /* ------------------------------------------------------------ */          /* ------------------------------------------------------------ */
# Line 6360  for (;; ptr++) Line 6656  for (;; ptr++)
6656    
6657              if (called == NULL)              if (called == NULL)
6658                {                {
6659                if (find_parens(cd, NULL, recno,                if (recno > cd->final_bracount)
                     (options & PCRE_EXTENDED) != 0, utf) < 0)  
6660                  {                  {
6661                  *errorcodeptr = ERR15;                  *errorcodeptr = ERR15;
6662                  goto FAILED;                  goto FAILED;
# Line 6845  for (;; ptr++) Line 7140  for (;; ptr++)
7140          open_capitem *oc;          open_capitem *oc;
7141          recno = -escape;          recno = -escape;
7142    
7143          HANDLE_REFERENCE:    /* Come here from named backref handling */          /* Come here from named backref handling when the reference is to a
7144            single group (i.e. not to a duplicated name. */
7145    
7146            HANDLE_REFERENCE:
7147          if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;          if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
7148          previous = code;          previous = code;
7149          *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;          *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;
# Line 6974  for (;; ptr++) Line 7272  for (;; ptr++)
7272          *code++ = OP_PROP;          *code++ = OP_PROP;
7273          *code++ = PT_CLIST;          *code++ = PT_CLIST;
7274          *code++ = c;          *code++ = c;
7275          if (firstcharflags == REQ_UNSET) firstcharflags = zerofirstcharflags = REQ_NONE;          if (firstcharflags == REQ_UNSET)
7276              firstcharflags = zerofirstcharflags = REQ_NONE;
7277          break;          break;
7278          }          }
7279        }        }
# Line 7063  out the amount of memory needed, as well Line 7362  out the amount of memory needed, as well
7362  value of lengthptr distinguishes the two phases.  value of lengthptr distinguishes the two phases.
7363    
7364  Arguments:  Arguments:
7365    options        option bits, including any changes for this subpattern    options           option bits, including any changes for this subpattern
7366    codeptr        -> the address of the current code pointer    codeptr           -> the address of the current code pointer
7367    ptrptr         -> the address of the current pattern pointer    ptrptr            -> the address of the current pattern pointer
7368    errorcodeptr   -> pointer to error code variable    errorcodeptr      -> pointer to error code variable
7369    lookbehind     TRUE if this is a lookbehind assertion    lookbehind        TRUE if this is a lookbehind assertion
7370    reset_bracount TRUE to reset the count for each branch    reset_bracount    TRUE to reset the count for each branch
7371    skipbytes      skip this many bytes at start (for brackets and OP_COND)    skipbytes         skip this many bytes at start (for brackets and OP_COND)
7372    cond_depth     depth of nesting for conditional subpatterns    cond_depth        depth of nesting for conditional subpatterns
7373    firstcharptr    place to put the first required character    firstcharptr      place to put the first required character
7374    firstcharflagsptr place to put the first character flags, or a negative number    firstcharflagsptr place to put the first character flags, or a negative number
7375    reqcharptr     place to put the last required character    reqcharptr        place to put the last required character
7376    reqcharflagsptr place to put the last required character flags, or a negative number    reqcharflagsptr   place to put the last required character flags, or a negative number
7377    bcptr          pointer to the chain of currently open branches    bcptr             pointer to the chain of currently open branches
7378    cd             points to the data block with tables pointers etc.    cd                points to the data block with tables pointers etc.
7379    lengthptr      NULL during the real compile phase    lengthptr         NULL during the real compile phase
7380                   points to length accumulator during pre-compile phase                      points to length accumulator during pre-compile phase
7381    
7382  Returns:         TRUE on success  Returns:            TRUE on success
7383  */  */
7384    
7385  static BOOL  static BOOL
# Line 7617  return TRUE; Line 7916  return TRUE;
7916  discarded, because they can cause conflicts with actual literals that follow.  discarded, because they can cause conflicts with actual literals that follow.
7917  However, if we end up without a first char setting for an unanchored pattern,  However, if we end up without a first char setting for an unanchored pattern,
7918  it is worth scanning the regex to see if there is an initial asserted first  it is worth scanning the regex to see if there is an initial asserted first
7919  char. If all branches start with the same asserted char, or with a bracket all  char. If all branches start with the same asserted char, or with a
7920  of whose alternatives start with the same asserted char (recurse ad lib), then  non-conditional bracket all of whose alternatives start with the same asserted
7921  we return that char, otherwise -1.  char (recurse ad lib), then we return that char, with the flags set to zero or
7922    REQ_CASELESS; otherwise return zero with REQ_NONE in the flags.
7923    
7924  Arguments:  Arguments:
7925    code       points to start of expression (the bracket)    code       points to start of expression (the bracket)
7926    flags       points to the first char flags, or to REQ_NONE    flags      points to the first char flags, or to REQ_NONE
7927    inassert   TRUE if in an assertion    inassert   TRUE if in an assertion
7928    
7929  Returns:     the fixed first char, or 0 with REQ_NONE in flags  Returns:     the fixed first char, or 0 with REQ_NONE in flags
# Line 7660  do { Line 7960  do {
7960       case OP_ASSERT:       case OP_ASSERT:
7961       case OP_ONCE:       case OP_ONCE:
7962       case OP_ONCE_NC:       case OP_ONCE_NC:
      case OP_COND:  
7963       d = find_firstassertedchar(scode, &dflags, op == OP_ASSERT);       d = find_firstassertedchar(scode, &dflags, op == OP_ASSERT);
7964       if (dflags < 0)       if (dflags < 0)
7965         return 0;         return 0;
# Line 7705  return c; Line 8004  return c;
8004    
8005    
8006  /*************************************************  /*************************************************
8007    *     Add an entry to the name/number table      *
8008    *************************************************/
8009    
8010    /* This function is called between compiling passes to add an entry to the
8011    name/number table, maintaining alphabetical order. Checking for permitted
8012    and forbidden duplicates has already been done.
8013    
8014    Arguments:
8015      cd           the compile data block
8016      name         the name to add
8017      length       the length of the name
8018      groupno      the group number
8019    
8020    Returns:       nothing
8021    */
8022    
8023    static void
8024    add_name(compile_data *cd, const pcre_uchar *name, int length,
8025      unsigned int groupno)
8026    {
8027    int i;
8028    pcre_uchar *slot = cd->name_table;
8029    
8030    for (i = 0; i < cd->names_found; i++)
8031      {
8032      int crc = memcmp(name, slot+IMM2_SIZE, IN_UCHARS(length));
8033      if (crc == 0 && slot[IMM2_SIZE+length] != 0)
8034        crc = -1; /* Current name is a substring */
8035    
8036      /* Make space in the table and break the loop for an earlier name. For a
8037      duplicate or later name, carry on. We do this for duplicates so that in the
8038      simple case (when ?(| is not used) they are in order of their numbers. In all
8039      cases they are in the order in which they appear in the pattern. */
8040    
8041      if (crc < 0)
8042        {
8043        memmove(slot + cd->name_entry_size, slot,
8044          IN_UCHARS((cd->names_found - i) * cd->name_entry_size));
8045        break;
8046        }
8047    
8048      /* Continue the loop for a later or duplicate name */
8049    
8050      slot += cd->name_entry_size;
8051      }
8052    
8053    PUT2(slot, 0, groupno);
8054    memcpy(slot + IMM2_SIZE, name, IN_UCHARS(length));
8055    slot[IMM2_SIZE + length] = 0;
8056    cd->names_found++;
8057    }
8058    
8059    
8060    
8061    /*************************************************
8062  *        Compile a Regular Expression            *  *        Compile a Regular Expression            *
8063  *************************************************/  *************************************************/
8064    
# Line 7791  new memory is obtained from malloc(). */ Line 8145  new memory is obtained from malloc(). */
8145    
8146  pcre_uchar cworkspace[COMPILE_WORK_SIZE];  pcre_uchar cworkspace[COMPILE_WORK_SIZE];
8147    
8148    /* This vector is used for remembering name groups during the pre-compile. In a
8149    similar way to cworkspace, it can be expanded using malloc() if necessary. */
8150    
8151    named_group named_groups[NAMED_GROUP_LIST_SIZE];
8152    
8153  /* Set this early so that early errors get offset 0. */  /* Set this early so that early errors get offset 0. */
8154    
8155  ptr = (const pcre_uchar *)pattern;  ptr = (const pcre_uchar *)pattern;
# Line 8053  cd->bracount = cd->final_bracount = 0; Line 8412  cd->bracount = cd->final_bracount = 0;
8412  cd->names_found = 0;  cd->names_found = 0;
8413  cd->name_entry_size = 0;  cd->name_entry_size = 0;
8414  cd->name_table = NULL;  cd->name_table = NULL;
8415    cd->dupnames = FALSE;
8416    cd->namedrefcount = 0;
8417  cd->start_code = cworkspace;  cd->start_code = cworkspace;
8418  cd->hwm = cworkspace;  cd->hwm = cworkspace;
8419  cd->start_workspace = cworkspace;  cd->start_workspace = cworkspace;
8420  cd->workspace_size = COMPILE_WORK_SIZE;  cd->workspace_size = COMPILE_WORK_SIZE;
8421    cd->named_groups = named_groups;
8422    cd->named_group_list_size = NAMED_GROUP_LIST_SIZE;
8423  cd->start_pattern = (const pcre_uchar *)pattern;  cd->start_pattern = (const pcre_uchar *)pattern;
8424  cd->end_pattern = (const pcre_uchar *)(pattern + STRLEN_UC((const pcre_uchar *)pattern));  cd->end_pattern = (const pcre_uchar *)(pattern + STRLEN_UC((const pcre_uchar *)pattern));
8425  cd->req_varyopt = 0;  cd->req_varyopt = 0;
# Line 8088  if (length > MAX_PATTERN_SIZE) Line 8451  if (length > MAX_PATTERN_SIZE)
8451    goto PCRE_EARLY_ERROR_RETURN;    goto PCRE_EARLY_ERROR_RETURN;
8452    }    }
8453    
8454  /* Compute the size of data block needed and get it, either from malloc or  /* If there are groups with duplicate names and there are also references by
8455  externally provided function. Integer overflow should no longer be possible  name, we must allow for the possibility of named references to duplicated
8456  because nowadays we limit the maximum value of cd->names_found and  groups. These require an extra data item each. */
 cd->name_entry_size. */  
8457    
8458  size = sizeof(REAL_PCRE) + (length + cd->names_found * cd->name_entry_size) * sizeof(pcre_uchar);  if (cd->dupnames && cd->namedrefcount > 0)
8459  re = (REAL_PCRE *)(PUBL(malloc))(size);    length += cd->namedrefcount * IMM2_SIZE * sizeof(pcre_uchar);
8460    
8461    /* Compute the size of the data block for storing the compiled pattern. Integer
8462    overflow should no longer be possible because nowadays we limit the maximum
8463    value of cd->names_found and cd->name_entry_size. */
8464    
8465    size = sizeof(REAL_PCRE) +
8466      (length + cd->names_found * cd->name_entry_size) * sizeof(pcre_uchar);
8467    
8468    /* Get the memory. */
8469    
8470    re = (REAL_PCRE *)(PUBL(malloc))(size);
8471  if (re == NULL)  if (re == NULL)
8472    {    {
8473    errorcode = ERR21;    errorcode = ERR21;
# Line 8139  cd->final_bracount = cd->bracount;  /* S Line 8511  cd->final_bracount = cd->bracount;  /* S
8511  cd->assert_depth = 0;  cd->assert_depth = 0;
8512  cd->bracount = 0;  cd->bracount = 0;
8513  cd->max_lookbehind = 0;  cd->max_lookbehind = 0;
 cd->names_found = 0;  
8514  cd->name_table = (pcre_uchar *)re + re->name_table_offset;  cd->name_table = (pcre_uchar *)re + re->name_table_offset;
8515  codestart = cd->name_table + re->name_entry_size * re->name_count;  codestart = cd->name_table + re->name_entry_size * re->name_count;
8516  cd->start_code = codestart;  cd->start_code = codestart;
# Line 8150  cd->had_pruneorskip = FALSE; Line 8521  cd->had_pruneorskip = FALSE;
8521  cd->check_lookbehind = FALSE;  cd->check_lookbehind = FALSE;
8522  cd->open_caps = NULL;  cd->open_caps = NULL;
8523    
8524    /* If any named groups were found, create the name/number table from the list
8525    created in the first pass. */
8526    
8527    if (cd->names_found > 0)
8528      {
8529      int i = cd->names_found;
8530      named_group *ng = cd->named_groups;
8531      cd->names_found = 0;
8532      for (; i > 0; i--, ng++)
8533        add_name(cd, ng->name, ng->length, ng->number);
8534      if (cd->named_group_list_size > NAMED_GROUP_LIST_SIZE)
8535        (PUBL(free))((void *)cd->named_groups);
8536      }
8537    
8538  /* Set up a starting, non-extracting bracket, then compile the expression. On  /* Set up a starting, non-extracting bracket, then compile the expression. On
8539  error, errorcode will be set non-zero, so we don't need to look at the result  error, errorcode will be set non-zero, so we don't need to look at the result
8540  of the function here. */  of the function here. */
# Line 8185  if (code - codestart > length) errorcode Line 8570  if (code - codestart > length) errorcode
8570    
8571  #ifdef SUPPORT_VALGRIND  #ifdef SUPPORT_VALGRIND
8572  /* If the estimated length exceeds the really used length, mark the extra  /* If the estimated length exceeds the really used length, mark the extra
8573  allocated memory as unadressable, so that any out-of-bound reads can be  allocated memory as unaddressable, so that any out-of-bound reads can be
8574  detected. */  detected. */
8575  VALGRIND_MAKE_MEM_NOACCESS(code, (length - (code - codestart)) * sizeof(pcre_uchar));  VALGRIND_MAKE_MEM_NOACCESS(code, (length - (code - codestart)) * sizeof(pcre_uchar));
8576  #endif  #endif
# Line 8213  if (cd->hwm > cd->start_workspace) Line 8598  if (cd->hwm > cd->start_workspace)
8598      }      }
8599    }    }
8600    
8601  /* If the workspace had to be expanded, free the new memory. */  /* If the workspace had to be expanded, free the new memory. Set the pointer to
8602    NULL to indicate that forward references have been filled in. */
8603    
8604  if (cd->workspace_size > COMPILE_WORK_SIZE)  if (cd->workspace_size > COMPILE_WORK_SIZE)
8605    (PUBL(free))((void *)cd->start_workspace);    (PUBL(free))((void *)cd->start_workspace);
8606    cd->start_workspace = NULL;
8607    
8608  /* Give an error if there's back reference to a non-existent capturing  /* Give an error if there's back reference to a non-existent capturing
8609  subpattern. */  subpattern. */
8610    
8611  if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;  if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;
8612    
8613    /* Unless disabled, check whether single character iterators can be
8614    auto-possessified. The function overwrites the appropriate opcode values. */
8615    
8616    if ((options & PCRE_NO_AUTO_POSSESSIFY) == 0)
8617      auto_possessify((pcre_uchar *)codestart, utf, cd);
8618    
8619  /* If there were any lookbehind assertions that contained OP_RECURSE  /* If there were any lookbehind assertions that contained OP_RECURSE
8620  (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,
8621  because they may contain forward references. Actual recursions cannot be fixed  because they may contain forward references. Actual recursions cannot be fixed
# Line 8420  if (code - codestart > length) Line 8813  if (code - codestart > length)
8813    }    }
8814  #endif   /* PCRE_DEBUG */  #endif   /* PCRE_DEBUG */
8815    
8816    /* Check for a pattern than can match an empty string, so that this information
8817    can be provided to applications. */
8818    
8819    do
8820      {
8821      if (could_be_empty_branch(codestart, code, utf, cd, NULL))
8822        {
8823        re->flags |= PCRE_MATCH_EMPTY;
8824        break;
8825        }
8826      codestart += GET(codestart, 1);
8827      }
8828    while (*codestart == OP_ALT);
8829    
8830  #if defined COMPILE_PCRE8  #if defined COMPILE_PCRE8
8831  return (pcre *)re;  return (pcre *)re;
8832  #elif defined COMPILE_PCRE16  #elif defined COMPILE_PCRE16

Legend:
Removed from v.1313  
changed lines
  Added in v.1363

  ViewVC Help
Powered by ViewVC 1.1.5