/[pcre]/code/tags/pcre-8.33/pcre_compile.c
ViewVC logotype

Diff of /code/tags/pcre-8.33/pcre_compile.c

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

revision 1071 by chpe, Tue Oct 16 15:54:37 2012 UTC revision 1152 by chpe, Sun Oct 21 16:53:51 2012 UTC
# Line 84  static int Line 84  static int
84      const pcre_uint32 *, unsigned int);      const pcre_uint32 *, unsigned int);
85    
86  static BOOL  static BOOL
87    compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL,    compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,
88      int, int, int *, int *, branch_chain *, compile_data *, int *);      pcre_uint32 *, pcre_int32 *, pcre_uint32 *, pcre_int32 *, branch_chain *,
89        compile_data *, int *);
90    
91    
92    
# Line 121  overrun before it actually does run off Line 122  overrun before it actually does run off
122    
123  /* Private flags added to firstchar and reqchar. */  /* Private flags added to firstchar and reqchar. */
124    
125  #define REQ_CASELESS   0x10000000l      /* Indicates caselessness */  #define REQ_CASELESS    (1 << 0)        /* Indicates caselessness */
126  #define REQ_VARY       0x20000000l      /* Reqchar followed non-literal item */  #define REQ_VARY        (1 << 1)        /* Reqchar followed non-literal item */
127  #define REQ_MASK       (REQ_CASELESS | REQ_VARY)  /* Negative values for the firstchar and reqchar flags */
128    #define REQ_UNSET       (-2)
129    #define REQ_NONE        (-1)
130    
131  /* Repeated character flags. */  /* Repeated character flags. */
132    
# Line 645  static const pcre_uint8 ebcdic_chartab[] Line 648  static const pcre_uint8 ebcdic_chartab[]
648    
649    
650    
   
651  /*************************************************  /*************************************************
652  *            Find an error text                  *  *            Find an error text                  *
653  *************************************************/  *************************************************/
# Line 1201  escape sequence. Line 1203  escape sequence.
1203  Argument:  Argument:
1204    ptrptr         points to the pattern position pointer    ptrptr         points to the pattern position pointer
1205    negptr         points to a boolean that is set TRUE for negation else FALSE    negptr         points to a boolean that is set TRUE for negation else FALSE
1206    dptr           points to an int that is set to the detailed property value    ptypeptr       points to an unsigned int that is set to the type value
1207      pdataptr       points to an unsigned int that is set to the detailed property value
1208    errorcodeptr   points to the error code variable    errorcodeptr   points to the error code variable
1209    
1210  Returns:         type value from ucp_type_table, or -1 for an invalid type  Returns:         TRUE if the type value was found, or FALSE for an invalid type
1211  */  */
1212    
1213  static int  static BOOL
1214  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, unsigned int *ptypeptr,
1215      unsigned int *pdataptr, int *errorcodeptr)
1216  {  {
1217  pcre_uchar c;  pcre_uchar c;
1218  int i, bot, top;  int i, bot, top;
# Line 1263  while (bot < top) Line 1267  while (bot < top)
1267    r = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);    r = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
1268    if (r == 0)    if (r == 0)
1269      {      {
1270      *dptr = PRIV(utt)[i].value;      *ptypeptr = PRIV(utt)[i].type;
1271      return PRIV(utt)[i].type;      *pdataptr = PRIV(utt)[i].value;
1272        return TRUE;
1273      }      }
1274    if (r > 0) bot = i + 1; else top = i;    if (r > 0) bot = i + 1; else top = i;
1275    }    }
1276    
1277  *errorcodeptr = ERR47;  *errorcodeptr = ERR47;
1278  *ptrptr = ptr;  *ptrptr = ptr;
1279  return -1;  return FALSE;
1280    
1281  ERROR_RETURN:  ERROR_RETURN:
1282  *errorcodeptr = ERR46;  *errorcodeptr = ERR46;
1283  *ptrptr = ptr;  *ptrptr = ptr;
1284  return -1;  return FALSE;
1285  }  }
1286  #endif  #endif
1287    
# Line 1852  for (;;) Line 1857  for (;;)
1857      case OP_NOTI:      case OP_NOTI:
1858      branchlength++;      branchlength++;
1859      cc += 2;      cc += 2;
1860  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32  #ifdef SUPPORT_UTF
1861      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1862  #endif  #endif
1863      break;      break;
# Line 1866  for (;;) Line 1871  for (;;)
1871      case OP_NOTEXACTI:      case OP_NOTEXACTI:
1872      branchlength += (int)GET2(cc,1);      branchlength += (int)GET2(cc,1);
1873      cc += 2 + IMM2_SIZE;      cc += 2 + IMM2_SIZE;
1874  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32  #ifdef SUPPORT_UTF
1875      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1876  #endif  #endif
1877      break;      break;
# Line 1909  for (;;) Line 1914  for (;;)
1914    
1915      /* Check a class for variable quantification */      /* Check a class for variable quantification */
1916    
 #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32  
     case OP_XCLASS:  
     cc += GET(cc, 1) - PRIV(OP_lengths)[OP_CLASS];  
     /* Fall through */  
 #endif  
   
1917      case OP_CLASS:      case OP_CLASS:
1918      case OP_NCLASS:      case OP_NCLASS:
1919    #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1920        case OP_XCLASS:
1921        /* The original code caused an unsigned overflow in 64 bit systems,
1922        so now we use a conditional statement. */
1923        if (op == OP_XCLASS)
1924          cc += GET(cc, 1);
1925        else
1926          cc += PRIV(OP_lengths)[OP_CLASS];
1927    #else
1928      cc += PRIV(OP_lengths)[OP_CLASS];      cc += PRIV(OP_lengths)[OP_CLASS];
1929    #endif
1930    
1931      switch (*cc)      switch (*cc)
1932        {        {
# Line 2706  Returns:   TRUE or FALSE Line 2715  Returns:   TRUE or FALSE
2715  static BOOL  static BOOL
2716  check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)  check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
2717  {  {
2718  int terminator;          /* Don't combine these lines; the Solaris cc */  pcre_uchar terminator;          /* Don't combine these lines; the Solaris cc */
2719  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2720  for (++ptr; *ptr != 0; ptr++)  for (++ptr; *ptr != 0; ptr++)
2721    {    {
# Line 2755  register int yield = 0; Line 2764  register int yield = 0;
2764  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
2765    {    {
2766    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
2767      STRNCMP_UC_C8(ptr, pn, len) == 0) return yield;      STRNCMP_UC_C8(ptr, pn, (unsigned int)len) == 0) return yield;
2768    pn += posix_name_lengths[yield] + 1;    pn += posix_name_lengths[yield] + 1;
2769    yield++;    yield++;
2770    }    }
# Line 2810  while ((ptr = (pcre_uchar *)find_recurse Line 2819  while ((ptr = (pcre_uchar *)find_recurse
2819    
2820    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
2821      {      {
2822      offset = GET(hc, 0);      offset = (int)GET(hc, 0);
2823      if (cd->start_code + offset == ptr + 1)      if (cd->start_code + offset == ptr + 1)
2824        {        {
2825        PUT(hc, 0, offset + adjust);        PUT(hc, 0, offset + adjust);
# Line 2823  while ((ptr = (pcre_uchar *)find_recurse Line 2832  while ((ptr = (pcre_uchar *)find_recurse
2832    
2833    if (hc >= cd->hwm)    if (hc >= cd->hwm)
2834      {      {
2835      offset = GET(ptr, 1);      offset = (int)GET(ptr, 1);
2836      if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);      if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
2837      }      }
2838    
# Line 2913  get_othercase_range(pcre_uint32 *cptr, p Line 2922  get_othercase_range(pcre_uint32 *cptr, p
2922    pcre_uint32 *odptr)    pcre_uint32 *odptr)
2923  {  {
2924  pcre_uint32 c, othercase, next;  pcre_uint32 c, othercase, next;
2925  int co;  unsigned int co;
2926    
2927  /* Find the first character that has an other case. If it has multiple other  /* Find the first character that has an other case. If it has multiple other
2928  cases, return its case offset value. */  cases, return its case offset value. */
# Line 2924  for (c = *cptr; c <= d; c++) Line 2933  for (c = *cptr; c <= d; c++)
2933      {      {
2934      *ocptr = c++;   /* Character that has the set */      *ocptr = c++;   /* Character that has the set */
2935      *cptr = c;      /* Rest of input range */      *cptr = c;      /* Rest of input range */
2936      return co;      return (int)co;
2937      }      }
2938    if ((othercase = UCD_OTHERCASE(c)) != c) break;    if ((othercase = UCD_OTHERCASE(c)) != c) break;
2939    }    }
# Line 2964  Returns:       TRUE if auto-possessifyin Line 2973  Returns:       TRUE if auto-possessifyin
2973  */  */
2974    
2975  static BOOL  static BOOL
2976  check_char_prop(pcre_uint32 c, int ptype, int pdata, BOOL negated)  check_char_prop(pcre_uint32 c, unsigned int ptype, unsigned int pdata, BOOL negated)
2977  {  {
2978  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2979  const pcre_uint32 *p;  const pcre_uint32 *p;
# Line 3053  check_auto_possessive(const pcre_uchar * Line 3062  check_auto_possessive(const pcre_uchar *
3062  pcre_uint32 c = NOTACHAR;  pcre_uint32 c = NOTACHAR;
3063  pcre_uint32 next;  pcre_uint32 next;
3064  int escape;  int escape;
3065  int op_code = *previous++;  pcre_uchar op_code = *previous++;
3066    
3067  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
3068    
# Line 3131  if (*ptr == CHAR_ASTERISK || *ptr == CHA Line 3140  if (*ptr == CHAR_ASTERISK || *ptr == CHA
3140    
3141  if (op_code == OP_CHAR || op_code == OP_CHARI ||  if (op_code == OP_CHAR || op_code == OP_CHARI ||
3142      op_code == OP_NOT || op_code == OP_NOTI)      op_code == OP_NOT || op_code == OP_NOTI)
   //if (escape == 0) switch(op_code)  
3143    {    {
3144  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
3145    GETCHARTEST(c, previous);    GETCHARTEST(c, previous);
# Line 3151  if (escape == 0) Line 3159  if (escape == 0)
3159  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3160    if (utf && c != NOTACHAR && (options & PCRE_CASELESS) != 0)    if (utf && c != NOTACHAR && (options & PCRE_CASELESS) != 0)
3161      {      {
3162      int ocs = UCD_CASESET(next);      unsigned int ocs = UCD_CASESET(next);
3163      if (ocs > 0) return check_char_prop(c, PT_CLIST, ocs, op_code >= OP_NOT);      if (ocs > 0) return check_char_prop(c, PT_CLIST, ocs, op_code >= OP_NOT);
3164      }      }
3165  #endif  #endif
# Line 3337  switch(op_code) Line 3345  switch(op_code)
3345      case ESC_p:      case ESC_p:
3346      case ESC_P:      case ESC_P:
3347        {        {
3348        int ptype, pdata, errorcodeptr;        unsigned int ptype = 0, pdata = 0;
3349          int errorcodeptr;
3350        BOOL negated;        BOOL negated;
3351    
3352        ptr--;      /* Make ptr point at the p or P */        ptr--;      /* Make ptr point at the p or P */
3353        ptype = get_ucp(&ptr, &negated, &pdata, &errorcodeptr);        if (!get_ucp(&ptr, &negated, &ptype, &pdata, &errorcodeptr))
3354        if (ptype < 0) return FALSE;          return FALSE;
3355        ptr++;      /* Point past the final curly ket */        ptr++;      /* Point past the final curly ket */
3356    
3357        /* If the property item is optional, we have to give up. (When generated        /* If the property item is optional, we have to give up. (When generated
# Line 3666  Arguments: Line 3675  Arguments:
3675    codeptr        points to the pointer to the current code point    codeptr        points to the pointer to the current code point
3676    ptrptr         points to the current pattern pointer    ptrptr         points to the current pattern pointer
3677    errorcodeptr   points to error code variable    errorcodeptr   points to error code variable
3678    firstcharptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)    firstcharptr    place to put the first required character
3679    reqcharptr     set to the last literal character required, else < 0    firstcharflagsptr place to put the first character flags, or a negative number
3680      reqcharptr     place to put the last required character
3681      reqcharflagsptr place to put the last required character flags, or a negative number
3682    bcptr          points to current branch chain    bcptr          points to current branch chain
3683    cond_depth     conditional nesting depth    cond_depth     conditional nesting depth
3684    cd             contains pointers to tables etc.    cd             contains pointers to tables etc.
# Line 3680  Returns:         TRUE on success Line 3691  Returns:         TRUE on success
3691    
3692  static BOOL  static BOOL
3693  compile_branch(int *optionsptr, pcre_uchar **codeptr,  compile_branch(int *optionsptr, pcre_uchar **codeptr,
3694    const pcre_uchar **ptrptr, int *errorcodeptr, pcre_int32 *firstcharptr,    const pcre_uchar **ptrptr, int *errorcodeptr,
3695    pcre_int32 *reqcharptr, branch_chain *bcptr, int cond_depth,    pcre_uint32 *firstcharptr, pcre_int32 *firstcharflagsptr,
3696      pcre_uint32 *reqcharptr, pcre_int32 *reqcharflagsptr,
3697      branch_chain *bcptr, int cond_depth,
3698    compile_data *cd, int *lengthptr)    compile_data *cd, int *lengthptr)
3699  {  {
3700  int repeat_type, op_type;  int repeat_type, op_type;
3701  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
3702  int bravalue = 0;  int bravalue = 0;
3703  int greedy_default, greedy_non_default;  int greedy_default, greedy_non_default;
3704  pcre_int32 firstchar, reqchar;  pcre_uint32 firstchar, reqchar;
3705  pcre_int32 zeroreqchar, zerofirstchar;  pcre_int32 firstcharflags, reqcharflags;
3706    pcre_uint32 zeroreqchar, zerofirstchar;
3707    pcre_int32 zeroreqcharflags, zerofirstcharflags;
3708  pcre_int32 req_caseopt, reqvary, tempreqvary;  pcre_int32 req_caseopt, reqvary, tempreqvary;
3709  int options = *optionsptr;               /* May change dynamically */  int options = *optionsptr;               /* May change dynamically */
3710  int after_manual_callout = 0;  int after_manual_callout = 0;
# Line 3717  dynamically as we process the pattern. * Line 3732  dynamically as we process the pattern. *
3732  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
3733  /* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */  /* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */
3734  BOOL utf = (options & PCRE_UTF8) != 0;  BOOL utf = (options & PCRE_UTF8) != 0;
3735    #ifndef COMPILE_PCRE32
3736  pcre_uchar utf_chars[6];  pcre_uchar utf_chars[6];
3737    #endif
3738  #else  #else
3739  BOOL utf = FALSE;  BOOL utf = FALSE;
3740  #endif  #endif
# Line 3752  to take the zero repeat into account. Th Line 3769  to take the zero repeat into account. Th
3769  zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual  zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual
3770  item types that can be repeated set these backoff variables appropriately. */  item types that can be repeated set these backoff variables appropriately. */
3771    
3772  firstchar = reqchar = zerofirstchar = zeroreqchar = REQ_UNSET;  firstchar = reqchar = zerofirstchar = zeroreqchar = 0;
3773    firstcharflags = reqcharflags = zerofirstcharflags = zeroreqcharflags = REQ_UNSET;
3774    
3775  /* The variable req_caseopt contains either the REQ_CASELESS value  /* The variable req_caseopt contains either the REQ_CASELESS value
3776  or zero, according to the current setting of the caseless flag. The  or zero, according to the current setting of the caseless flag. The
# Line 3778  for (;; ptr++) Line 3796  for (;; ptr++)
3796    int recno;    int recno;
3797    int refsign;    int refsign;
3798    int skipbytes;    int skipbytes;
3799    int subreqchar;    pcre_uint32 subreqchar, subfirstchar;
3800    int subfirstchar;    pcre_int32 subreqcharflags, subfirstcharflags;
3801    int terminator;    int terminator;
3802    int mclength;    unsigned int mclength;
3803    int tempbracount;    unsigned int tempbracount;
3804    int ec; // FIXMEchpe pcre_uint32    pcre_uint32 ec;
3805    pcre_uchar mcbuffer[8];    pcre_uchar mcbuffer[8];
3806    
3807    /* Get next character in the pattern */    /* Get next character in the pattern */
# Line 3946  for (;; ptr++) Line 3964  for (;; ptr++)
3964      case CHAR_VERTICAL_LINE:       /* or | or ) */      case CHAR_VERTICAL_LINE:       /* or | or ) */
3965      case CHAR_RIGHT_PARENTHESIS:      case CHAR_RIGHT_PARENTHESIS:
3966      *firstcharptr = firstchar;      *firstcharptr = firstchar;
3967        *firstcharflagsptr = firstcharflags;
3968      *reqcharptr = reqchar;      *reqcharptr = reqchar;
3969        *reqcharflagsptr = reqcharflags;
3970      *codeptr = code;      *codeptr = code;
3971      *ptrptr = ptr;      *ptrptr = ptr;
3972      if (lengthptr != NULL)      if (lengthptr != NULL)
# Line 3970  for (;; ptr++) Line 3990  for (;; ptr++)
3990      previous = NULL;      previous = NULL;
3991      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
3992        {        {
3993        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;        if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
3994        *code++ = OP_CIRCM;        *code++ = OP_CIRCM;
3995        }        }
3996      else *code++ = OP_CIRC;      else *code++ = OP_CIRC;
# Line 3985  for (;; ptr++) Line 4005  for (;; ptr++)
4005      repeats. The value of reqchar doesn't change either. */      repeats. The value of reqchar doesn't change either. */
4006    
4007      case CHAR_DOT:      case CHAR_DOT:
4008      if (firstchar == REQ_UNSET) firstchar = REQ_NONE;      if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
4009      zerofirstchar = firstchar;      zerofirstchar = firstchar;
4010        zerofirstcharflags = firstcharflags;
4011      zeroreqchar = reqchar;      zeroreqchar = reqchar;
4012        zeroreqcharflags = reqcharflags;
4013      previous = code;      previous = code;
4014      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
4015      break;      break;
# Line 4061  for (;; ptr++) Line 4083  for (;; ptr++)
4083          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
4084        {        {
4085        *code++ = negate_class? OP_ALLANY : OP_FAIL;        *code++ = negate_class? OP_ALLANY : OP_FAIL;
4086        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;        if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
4087        zerofirstchar = firstchar;        zerofirstchar = firstchar;
4088          zerofirstcharflags = firstcharflags;
4089        break;        break;
4090        }        }
4091    
# Line 4101  for (;; ptr++) Line 4124  for (;; ptr++)
4124        {        {
4125        const pcre_uchar *oldptr;        const pcre_uchar *oldptr;
4126    
4127  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32  #ifdef SUPPORT_UTF
4128        if (utf && HAS_EXTRALEN(c))        if (utf && HAS_EXTRALEN(c))
4129          {                           /* Braces are required because the */          {                           /* Braces are required because the */
4130          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
# Line 4360  for (;; ptr++) Line 4383  for (;; ptr++)
4383              case ESC_P:              case ESC_P:
4384                {                {
4385                BOOL negated;                BOOL negated;
4386                int pdata;                unsigned int ptype = 0, pdata = 0;
4387                int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);                if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr))
4388                if (ptype < 0) goto FAILED;                  goto FAILED;
4389                *class_uchardata++ = ((escape == ESC_p) != negated)?                *class_uchardata++ = ((escape == ESC_p) != negated)?
4390                  XCL_PROP : XCL_NOTPROP;                  XCL_PROP : XCL_NOTPROP;
4391                *class_uchardata++ = ptype;                *class_uchardata++ = ptype;
# Line 4416  for (;; ptr++) Line 4439  for (;; ptr++)
4439    
4440        if (!inescq && ptr[1] == CHAR_MINUS)        if (!inescq && ptr[1] == CHAR_MINUS)
4441          {          {
4442          int d;          pcre_uint32 d;
4443          ptr += 2;          ptr += 2;
4444          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;          while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;
4445    
# Line 4522  for (;; ptr++) Line 4545  for (;; ptr++)
4545          {          {
4546          ptr++;          ptr++;
4547          zeroreqchar = reqchar;          zeroreqchar = reqchar;
4548            zeroreqcharflags = reqcharflags;
4549    
4550          if (negate_class)          if (negate_class)
4551            {            {
4552  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
             // FIXMEchpe pcreuint32?  
4553            int d;            int d;
4554  #endif  #endif
4555            if (firstchar == REQ_UNSET) firstchar = REQ_NONE;            if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
4556            zerofirstchar = firstchar;            zerofirstchar = firstchar;
4557              zerofirstcharflags = firstcharflags;
4558    
4559            /* For caseless UTF-8 mode when UCP support is available, check            /* For caseless UTF-8 mode when UCP support is available, check
4560            whether this character has more than one other case. If so, generate            whether this character has more than one other case. If so, generate
# Line 4618  for (;; ptr++) Line 4642  for (;; ptr++)
4642      setting, whatever the repeat count. Any reqchar setting must remain      setting, whatever the repeat count. Any reqchar setting must remain
4643      unchanged after any kind of repeat. */      unchanged after any kind of repeat. */
4644    
4645      if (firstchar == REQ_UNSET) firstchar = REQ_NONE;      if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
4646      zerofirstchar = firstchar;      zerofirstchar = firstchar;
4647        zerofirstcharflags = firstcharflags;
4648      zeroreqchar = reqchar;      zeroreqchar = reqchar;
4649        zeroreqcharflags = reqcharflags;
4650    
4651      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
4652      extended class, with its own opcode, unless there was a negated special      extended class, with its own opcode, unless there was a negated special
# Line 4715  for (;; ptr++) Line 4741  for (;; ptr++)
4741      if (repeat_min == 0)      if (repeat_min == 0)
4742        {        {
4743        firstchar = zerofirstchar;    /* Adjust for zero repeat */        firstchar = zerofirstchar;    /* Adjust for zero repeat */
4744          firstcharflags = zerofirstcharflags;
4745        reqchar = zeroreqchar;        /* Ditto */        reqchar = zeroreqchar;        /* Ditto */
4746          reqcharflags = zeroreqcharflags;
4747        }        }
4748    
4749      /* Remember whether this is a variable length repeat */      /* Remember whether this is a variable length repeat */
# Line 4818  for (;; ptr++) Line 4846  for (;; ptr++)
4846          {          {
4847          c = code[-1];          c = code[-1];
4848          if (*previous <= OP_CHARI && repeat_min > 1)          if (*previous <= OP_CHARI && repeat_min > 1)
4849            reqchar = c | req_caseopt | cd->req_varyopt;            {
4850              reqchar = c;
4851              reqcharflags = req_caseopt | cd->req_varyopt;
4852              }
4853          }          }
4854    
4855        /* If the repetition is unlimited, it pays to see if the next thing on        /* If the repetition is unlimited, it pays to see if the next thing on
# Line 5200  for (;; ptr++) Line 5231  for (;; ptr++)
5231    
5232            else            else
5233              {              {
5234              if (groupsetfirstchar && reqchar < 0) reqchar = firstchar;              if (groupsetfirstchar && reqcharflags < 0)
5235                  {
5236                  reqchar = firstchar;
5237                  reqcharflags = firstcharflags;
5238                  }
5239    
5240              for (i = 1; i < repeat_min; i++)              for (i = 1; i < repeat_min; i++)
5241                {                {
# Line 5479  for (;; ptr++) Line 5514  for (;; ptr++)
5514        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
5515          {          {
5516          tempcode += PRIV(OP_lengths)[*tempcode];          tempcode += PRIV(OP_lengths)[*tempcode];
5517  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32  #ifdef SUPPORT_UTF
5518          if (utf && HAS_EXTRALEN(tempcode[-1]))          if (utf && HAS_EXTRALEN(tempcode[-1]))
5519            tempcode += GET_EXTRALEN(tempcode[-1]);            tempcode += GET_EXTRALEN(tempcode[-1]);
5520  #endif  #endif
# Line 5620  for (;; ptr++) Line 5655  for (;; ptr++)
5655                (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;                (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
5656    
5657              /* Do not set firstchar after *ACCEPT */              /* Do not set firstchar after *ACCEPT */
5658              if (firstchar == REQ_UNSET) firstchar = REQ_NONE;              if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
5659              }              }
5660    
5661            /* Handle other cases with/without an argument */            /* Handle other cases with/without an argument */
# Line 5786  for (;; ptr++) Line 5821  for (;; ptr++)
5821          while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0)          while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0)
5822            {            {
5823            if (recno >= 0)            if (recno >= 0)
5824              recno = (IS_DIGIT(*ptr))? recno * 10 + *ptr - CHAR_0 : -1;              recno = (IS_DIGIT(*ptr))? recno * 10 + (int)(*ptr - CHAR_0) : -1;
5825            ptr++;            ptr++;
5826            }            }
5827          namelen = (int)(ptr - name);          namelen = (int)(ptr - name);
5828    
5829          if ((terminator > 0 && *ptr++ != terminator) ||          if ((terminator > 0 && *ptr++ != (pcre_uchar)terminator) ||
5830              *ptr++ != CHAR_RIGHT_PARENTHESIS)              *ptr++ != CHAR_RIGHT_PARENTHESIS)
5831            {            {
5832            ptr--;      /* Error offset */            ptr--;      /* Error offset */
# Line 6031  for (;; ptr++) Line 6066  for (;; ptr++)
6066    
6067            if (lengthptr != NULL)            if (lengthptr != NULL)
6068              {              {
6069              if (*ptr != terminator)              if (*ptr != (pcre_uchar)terminator)
6070                {                {
6071                *errorcodeptr = ERR42;                *errorcodeptr = ERR42;
6072                goto FAILED;                goto FAILED;
# Line 6173  for (;; ptr++) Line 6208  for (;; ptr++)
6208              *errorcodeptr = ERR62;              *errorcodeptr = ERR62;
6209              goto FAILED;              goto FAILED;
6210              }              }
6211            if (*ptr != terminator)            if (*ptr != (pcre_uchar)terminator)
6212              {              {
6213              *errorcodeptr = ERR42;              *errorcodeptr = ERR42;
6214              goto FAILED;              goto FAILED;
# Line 6279  for (;; ptr++) Line 6314  for (;; ptr++)
6314            while(IS_DIGIT(*ptr))            while(IS_DIGIT(*ptr))
6315              recno = recno * 10 + *ptr++ - CHAR_0;              recno = recno * 10 + *ptr++ - CHAR_0;
6316    
6317            if (*ptr != terminator)            if (*ptr != (pcre_uchar)terminator)
6318              {              {
6319              *errorcodeptr = ERR29;              *errorcodeptr = ERR29;
6320              goto FAILED;              goto FAILED;
# Line 6383  for (;; ptr++) Line 6418  for (;; ptr++)
6418    
6419          /* Can't determine a first byte now */          /* Can't determine a first byte now */
6420    
6421          if (firstchar == REQ_UNSET) firstchar = REQ_NONE;          if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
6422          continue;          continue;
6423    
6424    
# Line 6517  for (;; ptr++) Line 6552  for (;; ptr++)
6552           cond_depth +           cond_depth +
6553             ((bravalue == OP_COND)?1:0),   /* Depth of condition subpatterns */             ((bravalue == OP_COND)?1:0),   /* Depth of condition subpatterns */
6554           &subfirstchar,                   /* For possible first char */           &subfirstchar,                   /* For possible first char */
6555             &subfirstcharflags,
6556           &subreqchar,                     /* For possible last char */           &subreqchar,                     /* For possible last char */
6557             &subreqcharflags,
6558           bcptr,                           /* Current branch chain */           bcptr,                           /* Current branch chain */
6559           cd,                              /* Tables block */           cd,                              /* Tables block */
6560           (lengthptr == NULL)? NULL :      /* Actual compile phase */           (lengthptr == NULL)? NULL :      /* Actual compile phase */
# Line 6578  for (;; ptr++) Line 6615  for (;; ptr++)
6615            *errorcodeptr = ERR27;            *errorcodeptr = ERR27;
6616            goto FAILED;            goto FAILED;
6617            }            }
6618          if (condcount == 1) subfirstchar = subreqchar = REQ_NONE;          if (condcount == 1) subfirstcharflags = subreqcharflags = REQ_NONE;
6619          }          }
6620        }        }
6621    
# Line 6627  for (;; ptr++) Line 6664  for (;; ptr++)
6664      back off. */      back off. */
6665    
6666      zeroreqchar = reqchar;      zeroreqchar = reqchar;
6667        zeroreqcharflags = reqcharflags;
6668      zerofirstchar = firstchar;      zerofirstchar = firstchar;
6669        zerofirstcharflags = firstcharflags;
6670      groupsetfirstchar = FALSE;      groupsetfirstchar = FALSE;
6671    
6672      if (bravalue >= OP_ONCE)      if (bravalue >= OP_ONCE)
# Line 6638  for (;; ptr++) Line 6677  for (;; ptr++)
6677        no firstchar, set "none" for the whole branch. In both cases, a zero        no firstchar, set "none" for the whole branch. In both cases, a zero
6678        repeat forces firstchar to "none". */        repeat forces firstchar to "none". */
6679    
6680        if (firstchar == REQ_UNSET)        if (firstcharflags == REQ_UNSET)
6681          {          {
6682          if (subfirstchar >= 0)          if (subfirstcharflags >= 0)
6683            {            {
6684            firstchar = subfirstchar;            firstchar = subfirstchar;
6685              firstcharflags = subfirstcharflags;
6686            groupsetfirstchar = TRUE;            groupsetfirstchar = TRUE;
6687            }            }
6688          else firstchar = REQ_NONE;          else firstcharflags = REQ_NONE;
6689          zerofirstchar = REQ_NONE;          zerofirstcharflags = REQ_NONE;
6690          }          }
6691    
6692        /* If firstchar was previously set, convert the subpattern's firstchar        /* If firstchar was previously set, convert the subpattern's firstchar
6693        into reqchar if there wasn't one, using the vary flag that was in        into reqchar if there wasn't one, using the vary flag that was in
6694        existence beforehand. */        existence beforehand. */
6695    
6696        else if (subfirstchar >= 0 && subreqchar < 0)        else if (subfirstcharflags >= 0 && subreqcharflags < 0)
6697          subreqchar = subfirstchar | tempreqvary;          {
6698            subreqchar = subfirstchar;
6699            subreqcharflags = subfirstcharflags | tempreqvary;
6700            }
6701    
6702        /* If the subpattern set a required byte (or set a first byte that isn't        /* If the subpattern set a required byte (or set a first byte that isn't
6703        really the first byte - see above), set it. */        really the first byte - see above), set it. */
6704    
6705        if (subreqchar >= 0) reqchar = subreqchar;        if (subreqcharflags >= 0)
6706            {
6707            reqchar = subreqchar;
6708            reqcharflags = subreqcharflags;
6709            }
6710        }        }
6711    
6712      /* For a forward assertion, we take the reqchar, if set. This can be      /* For a forward assertion, we take the reqchar, if set. This can be
# Line 6670  for (;; ptr++) Line 6717  for (;; ptr++)
6717      of a firstchar. This is overcome by a scan at the end if there's no      of a firstchar. This is overcome by a scan at the end if there's no
6718      firstchar, looking for an asserted first char. */      firstchar, looking for an asserted first char. */
6719    
6720      else if (bravalue == OP_ASSERT && subreqchar >= 0) reqchar = subreqchar;      else if (bravalue == OP_ASSERT && subreqcharflags >= 0)
6721          {
6722          reqchar = subreqchar;
6723          reqcharflags = subreqcharflags;
6724          }
6725      break;     /* End of processing '(' */      break;     /* End of processing '(' */
6726    
6727    
# Line 6706  for (;; ptr++) Line 6757  for (;; ptr++)
6757        /* For metasequences that actually match a character, we disable the        /* For metasequences that actually match a character, we disable the
6758        setting of a first character if it hasn't already been set. */        setting of a first character if it hasn't already been set. */
6759    
6760        if (firstchar == REQ_UNSET && escape > ESC_b && escape < ESC_Z)        if (firstcharflags == REQ_UNSET && escape > ESC_b && escape < ESC_Z)
6761          firstchar = REQ_NONE;          firstcharflags = REQ_NONE;
6762    
6763        /* Set values to reset to if this is followed by a zero repeat. */        /* Set values to reset to if this is followed by a zero repeat. */
6764    
6765        zerofirstchar = firstchar;        zerofirstchar = firstchar;
6766          zerofirstcharflags = firstcharflags;
6767        zeroreqchar = reqchar;        zeroreqchar = reqchar;
6768          zeroreqcharflags = reqcharflags;
6769    
6770        /* \g<name> or \g'name' is a subroutine call by name and \g<n> or \g'n'        /* \g<name> or \g'name' is a subroutine call by name and \g<n> or \g'n'
6771        is a subroutine call by number (Oniguruma syntax). In fact, the value        is a subroutine call by number (Oniguruma syntax). In fact, the value
# Line 6741  for (;; ptr++) Line 6794  for (;; ptr++)
6794          if (ptr[1] != CHAR_PLUS && ptr[1] != CHAR_MINUS)          if (ptr[1] != CHAR_PLUS && ptr[1] != CHAR_MINUS)
6795            {            {
6796            BOOL is_a_number = TRUE;            BOOL is_a_number = TRUE;
6797            for (p = ptr + 1; *p != 0 && *p != terminator; p++)            for (p = ptr + 1; *p != 0 && *p != (pcre_uchar)terminator; p++)
6798              {              {
6799              if (!MAX_255(*p)) { is_a_number = FALSE; break; }              if (!MAX_255(*p)) { is_a_number = FALSE; break; }
6800              if ((cd->ctypes[*p] & ctype_digit) == 0) is_a_number = FALSE;              if ((cd->ctypes[*p] & ctype_digit) == 0) is_a_number = FALSE;
6801              if ((cd->ctypes[*p] & ctype_word) == 0) break;              if ((cd->ctypes[*p] & ctype_word) == 0) break;
6802              }              }
6803            if (*p != terminator)            if (*p != (pcre_uchar)terminator)
6804              {              {
6805              *errorcodeptr = ERR57;              *errorcodeptr = ERR57;
6806              break;              break;
# Line 6765  for (;; ptr++) Line 6818  for (;; ptr++)
6818    
6819          p = ptr + 2;          p = ptr + 2;
6820          while (IS_DIGIT(*p)) p++;          while (IS_DIGIT(*p)) p++;
6821          if (*p != terminator)          if (*p != (pcre_uchar)terminator)
6822            {            {
6823            *errorcodeptr = ERR57;            *errorcodeptr = ERR57;
6824            break;            break;
# Line 6802  for (;; ptr++) Line 6855  for (;; ptr++)
6855          recno = -escape;          recno = -escape;
6856    
6857          HANDLE_REFERENCE:    /* Come here from named backref handling */          HANDLE_REFERENCE:    /* Come here from named backref handling */
6858          if (firstchar == REQ_UNSET) firstchar = REQ_NONE;          if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
6859          previous = code;          previous = code;
6860          *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;          *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;
6861          PUT2INC(code, 0, recno);          PUT2INC(code, 0, recno);
# Line 6829  for (;; ptr++) Line 6882  for (;; ptr++)
6882        else if (escape == ESC_P || escape == ESC_p)        else if (escape == ESC_P || escape == ESC_p)
6883          {          {
6884          BOOL negated;          BOOL negated;
6885          int pdata;          unsigned int ptype = 0, pdata = 0;
6886          int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);          if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr))
6887          if (ptype < 0) goto FAILED;            goto FAILED;
6888          previous = code;          previous = code;
6889          *code++ = ((escape == ESC_p) != negated)? OP_PROP : OP_NOTPROP;          *code++ = ((escape == ESC_p) != negated)? OP_PROP : OP_NOTPROP;
6890          *code++ = ptype;          *code++ = ptype;
# Line 6905  for (;; ptr++) Line 6958  for (;; ptr++)
6958      mclength = 1;      mclength = 1;
6959      mcbuffer[0] = c;      mcbuffer[0] = c;
6960    
6961  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32  #ifdef SUPPORT_UTF
6962      if (utf && HAS_EXTRALEN(c))      if (utf && HAS_EXTRALEN(c))
6963        ACROSSCHAR(TRUE, ptr[1], mcbuffer[mclength++] = *(++ptr));        ACROSSCHAR(TRUE, ptr[1], mcbuffer[mclength++] = *(++ptr));
6964  #endif  #endif
# Line 6929  for (;; ptr++) Line 6982  for (;; ptr++)
6982          *code++ = OP_PROP;          *code++ = OP_PROP;
6983          *code++ = PT_CLIST;          *code++ = PT_CLIST;
6984          *code++ = c;          *code++ = c;
6985          if (firstchar == REQ_UNSET) firstchar = zerofirstchar = REQ_NONE;          if (firstcharflags == REQ_UNSET) firstcharflags = zerofirstcharflags = REQ_NONE;
6986          break;          break;
6987          }          }
6988        }        }
# Line 6950  for (;; ptr++) Line 7003  for (;; ptr++)
7003      Otherwise, leave the firstchar value alone, and don't change it on a zero      Otherwise, leave the firstchar value alone, and don't change it on a zero
7004      repeat. */      repeat. */
7005    
7006      if (firstchar == REQ_UNSET)      if (firstcharflags == REQ_UNSET)
7007        {        {
7008        zerofirstchar = REQ_NONE;        zerofirstcharflags = REQ_NONE;
7009        zeroreqchar = reqchar;        zeroreqchar = reqchar;
7010          zeroreqcharflags = reqcharflags;
7011    
7012        /* If the character is more than one byte long, we can set firstchar        /* If the character is more than one byte long, we can set firstchar
7013        only if it is not to be matched caselessly. */        only if it is not to be matched caselessly. */
# Line 6961  for (;; ptr++) Line 7015  for (;; ptr++)
7015        if (mclength == 1 || req_caseopt == 0)        if (mclength == 1 || req_caseopt == 0)
7016          {          {
7017          firstchar = mcbuffer[0] | req_caseopt;          firstchar = mcbuffer[0] | req_caseopt;
7018          if (mclength != 1) reqchar = code[-1] | cd->req_varyopt;          firstchar = mcbuffer[0];
7019            firstcharflags = req_caseopt;
7020    
7021            if (mclength != 1)
7022              {
7023              reqchar = code[-1];
7024              reqcharflags = cd->req_varyopt;
7025              }
7026          }          }
7027        else firstchar = reqchar = REQ_NONE;        else firstcharflags = reqcharflags = REQ_NONE;
7028        }        }
7029    
7030      /* firstchar was previously set; we can set reqchar only if the length is      /* firstchar was previously set; we can set reqchar only if the length is
# Line 6972  for (;; ptr++) Line 7033  for (;; ptr++)
7033      else      else
7034        {        {
7035        zerofirstchar = firstchar;        zerofirstchar = firstchar;
7036          zerofirstcharflags = firstcharflags;
7037        zeroreqchar = reqchar;        zeroreqchar = reqchar;
7038          zeroreqcharflags = reqcharflags;
7039        if (mclength == 1 || req_caseopt == 0)        if (mclength == 1 || req_caseopt == 0)
7040          reqchar = code[-1] | req_caseopt | cd->req_varyopt;          {
7041            reqchar = code[-1];
7042            reqcharflags = req_caseopt | cd->req_varyopt;
7043            }
7044        }        }
7045    
7046      break;            /* End of literal character handling */      break;            /* End of literal character handling */
# Line 6993  return FALSE; Line 7059  return FALSE;
7059    
7060    
7061    
   
7062  /*************************************************  /*************************************************
7063  *     Compile sequence of alternatives           *  *     Compile sequence of alternatives           *
7064  *************************************************/  *************************************************/
# Line 7014  Arguments: Line 7079  Arguments:
7079    reset_bracount TRUE to reset the count for each branch    reset_bracount TRUE to reset the count for each branch
7080    skipbytes      skip this many bytes at start (for brackets and OP_COND)    skipbytes      skip this many bytes at start (for brackets and OP_COND)
7081    cond_depth     depth of nesting for conditional subpatterns    cond_depth     depth of nesting for conditional subpatterns
7082    firstcharptr   place to put the first required character, or a negative number    firstcharptr    place to put the first required character
7083    reqcharptr     place to put the last required character, or a negative number    firstcharflagsptr place to put the first character flags, or a negative number
7084      reqcharptr     place to put the last required character
7085      reqcharflagsptr place to put the last required character flags, or a negative number
7086    bcptr          pointer to the chain of currently open branches    bcptr          pointer to the chain of currently open branches
7087    cd             points to the data block with tables pointers etc.    cd             points to the data block with tables pointers etc.
7088    lengthptr      NULL during the real compile phase    lengthptr      NULL during the real compile phase
# Line 7027  Returns:         TRUE on success Line 7094  Returns:         TRUE on success
7094  static BOOL  static BOOL
7095  compile_regex(int options, pcre_uchar **codeptr, const pcre_uchar **ptrptr,  compile_regex(int options, pcre_uchar **codeptr, const pcre_uchar **ptrptr,
7096    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
7097    int cond_depth, pcre_int32 *firstcharptr, pcre_int32 *reqcharptr,    int cond_depth,
7098      pcre_uint32 *firstcharptr, pcre_int32 *firstcharflagsptr,
7099      pcre_uint32 *reqcharptr, pcre_int32 *reqcharflagsptr,
7100    branch_chain *bcptr, compile_data *cd, int *lengthptr)    branch_chain *bcptr, compile_data *cd, int *lengthptr)
7101  {  {
7102  const pcre_uchar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
# Line 7037  pcre_uchar *start_bracket = code; Line 7106  pcre_uchar *start_bracket = code;
7106  pcre_uchar *reverse_count = NULL;  pcre_uchar *reverse_count = NULL;
7107  open_capitem capitem;  open_capitem capitem;
7108  int capnumber = 0;  int capnumber = 0;
7109  pcre_int32 firstchar, reqchar;  pcre_uint32 firstchar, reqchar;
7110  pcre_int32 branchfirstchar, branchreqchar;  pcre_int32 firstcharflags, reqcharflags;
7111    pcre_uint32 branchfirstchar, branchreqchar;
7112    pcre_int32 branchfirstcharflags, branchreqcharflags;
7113  int length;  int length;
7114  int orig_bracount;  unsigned int orig_bracount;
7115  int max_bracount;  unsigned int max_bracount;
7116  branch_chain bc;  branch_chain bc;
7117    
7118  bc.outer = bcptr;  bc.outer = bcptr;
7119  bc.current_branch = code;  bc.current_branch = code;
7120    
7121  firstchar = reqchar = REQ_UNSET;  firstchar = reqchar = 0;
7122    firstcharflags = reqcharflags = REQ_UNSET;
7123    
7124  /* Accumulate the length for use in the pre-compile phase. Start with the  /* Accumulate the length for use in the pre-compile phase. Start with the
7125  length of the BRA and KET and any extra bytes that are required at the  length of the BRA and KET and any extra bytes that are required at the
# Line 7107  for (;;) Line 7179  for (;;)
7179    into the length. */    into the length. */
7180    
7181    if (!compile_branch(&options, &code, &ptr, errorcodeptr, &branchfirstchar,    if (!compile_branch(&options, &code, &ptr, errorcodeptr, &branchfirstchar,
7182          &branchreqchar, &bc, cond_depth, cd,          &branchfirstcharflags, &branchreqchar, &branchreqcharflags, &bc,
7183          (lengthptr == NULL)? NULL : &length))          cond_depth, cd, (lengthptr == NULL)? NULL : &length))
7184      {      {
7185      *ptrptr = ptr;      *ptrptr = ptr;
7186      return FALSE;      return FALSE;
# Line 7129  for (;;) Line 7201  for (;;)
7201      if (*last_branch != OP_ALT)      if (*last_branch != OP_ALT)
7202        {        {
7203        firstchar = branchfirstchar;        firstchar = branchfirstchar;
7204          firstcharflags = branchfirstcharflags;
7205        reqchar = branchreqchar;        reqchar = branchreqchar;
7206          reqcharflags = branchreqcharflags;
7207        }        }
7208    
7209      /* If this is not the first branch, the first char and reqchar have to      /* If this is not the first branch, the first char and reqchar have to
# Line 7143  for (;;) Line 7217  for (;;)
7217        we have to abandon the firstchar for the regex, but if there was        we have to abandon the firstchar for the regex, but if there was
7218        previously no reqchar, it takes on the value of the old firstchar. */        previously no reqchar, it takes on the value of the old firstchar. */
7219    
7220        if (firstchar >= 0 && firstchar != branchfirstchar)        if (firstcharflags >= 0 &&
7221              (firstcharflags != branchfirstcharflags || firstchar != branchfirstchar))
7222          {          {
7223          if (reqchar < 0) reqchar = firstchar;          if (reqcharflags < 0)
7224          firstchar = REQ_NONE;            {
7225              reqchar = firstchar;
7226              reqcharflags = firstcharflags;
7227              }
7228            firstcharflags = REQ_NONE;
7229          }          }
7230    
7231        /* If we (now or from before) have no firstchar, a firstchar from the        /* If we (now or from before) have no firstchar, a firstchar from the
7232        branch becomes a reqchar if there isn't a branch reqchar. */        branch becomes a reqchar if there isn't a branch reqchar. */
7233    
7234        if (firstchar < 0 && branchfirstchar >= 0 && branchreqchar < 0)        if (firstcharflags < 0 && branchfirstcharflags >= 0 && branchreqcharflags < 0)
7235            branchreqchar = branchfirstchar;          {
7236            branchreqchar = branchfirstchar;
7237            branchreqcharflags = branchfirstcharflags;
7238            }
7239    
7240        /* Now ensure that the reqchars match */        /* Now ensure that the reqchars match */
7241    
7242        if ((reqchar & ~REQ_VARY) != (branchreqchar & ~REQ_VARY))        if (((reqcharflags & ~REQ_VARY) != (branchreqcharflags & ~REQ_VARY)) ||
7243          reqchar = REQ_NONE;            reqchar != branchreqchar)
7244        else reqchar |= branchreqchar;   /* To "or" REQ_VARY */          reqcharflags = REQ_NONE;
7245          else
7246            {
7247            reqchar = branchreqchar;
7248            reqcharflags |= branchreqcharflags; /* To "or" REQ_VARY */
7249            }
7250        }        }
7251    
7252      /* If lookbehind, check that this branch matches a fixed-length string, and      /* If lookbehind, check that this branch matches a fixed-length string, and
# Line 7255  for (;;) Line 7342  for (;;)
7342      *codeptr = code;      *codeptr = code;
7343      *ptrptr = ptr;      *ptrptr = ptr;
7344      *firstcharptr = firstchar;      *firstcharptr = firstchar;
7345        *firstcharflagsptr = firstcharflags;
7346      *reqcharptr = reqchar;      *reqcharptr = reqchar;
7347        *reqcharflagsptr = reqcharflags;
7348      if (lengthptr != NULL)      if (lengthptr != NULL)
7349        {        {
7350        if (OFLOW_MAX - *lengthptr < length)        if (OFLOW_MAX - *lengthptr < length)
# Line 7542  we return that char, otherwise -1. Line 7631  we return that char, otherwise -1.
7631    
7632  Arguments:  Arguments:
7633    code       points to start of expression (the bracket)    code       points to start of expression (the bracket)
7634      flags       points to the first char flags, or to REQ_NONE
7635    inassert   TRUE if in an assertion    inassert   TRUE if in an assertion
7636    
7637  Returns:     -1 or the fixed first char  Returns:     the fixed first char, or 0 with REQ_NONE in flags
7638  */  */
7639    
7640  static int  static pcre_uint32
7641  find_firstassertedchar(const pcre_uchar *code, BOOL inassert)  find_firstassertedchar(const pcre_uchar *code, pcre_int32 *flags,
7642      BOOL inassert)
7643  {  {
7644  register int c = -1;  register pcre_uint32 c = 0;
7645    int cflags = REQ_NONE;
7646    
7647    *flags = REQ_NONE;
7648  do {  do {
7649     int d;     pcre_uint32 d;
7650       int dflags;
7651     int xl = (*code == OP_CBRA || *code == OP_SCBRA ||     int xl = (*code == OP_CBRA || *code == OP_SCBRA ||
7652               *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? IMM2_SIZE:0;               *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? IMM2_SIZE:0;
7653     const pcre_uchar *scode = first_significant_code(code + 1+LINK_SIZE + xl,     const pcre_uchar *scode = first_significant_code(code + 1+LINK_SIZE + xl,
7654       TRUE);       TRUE);
7655     register int op = *scode;     register pcre_uchar op = *scode;
7656    
7657     switch(op)     switch(op)
7658       {       {
7659       default:       default:
7660       return -1;       return 0;
7661    
7662       case OP_BRA:       case OP_BRA:
7663       case OP_BRAPOS:       case OP_BRAPOS:
# Line 7574  do { Line 7669  do {
7669       case OP_ONCE:       case OP_ONCE:
7670       case OP_ONCE_NC:       case OP_ONCE_NC:
7671       case OP_COND:       case OP_COND:
7672       if ((d = find_firstassertedchar(scode, op == OP_ASSERT)) < 0)       d = find_firstassertedchar(scode, &dflags, op == OP_ASSERT);
7673         return -1;       if (dflags < 0)
7674       if (c < 0) c = d; else if (c != d) return -1;         return 0;
7675         if (cflags < 0) { c = d; cflags = dflags; } else if (c != d || cflags != dflags) return 0;
7676       break;       break;
7677    
7678       case OP_EXACT:       case OP_EXACT:
# Line 7587  do { Line 7683  do {
7683       case OP_PLUS:       case OP_PLUS:
7684       case OP_MINPLUS:       case OP_MINPLUS:
7685       case OP_POSPLUS:       case OP_POSPLUS:
7686       if (!inassert) return -1;       if (!inassert) return 0;
7687       if (c < 0) c = scode[1];       if (cflags < 0) { c = scode[1]; cflags = 0; }
7688         else if (c != scode[1]) return -1;         else if (c != scode[1]) return 0;
7689       break;       break;
7690    
7691       case OP_EXACTI:       case OP_EXACTI:
# Line 7600  do { Line 7696  do {
7696       case OP_PLUSI:       case OP_PLUSI:
7697       case OP_MINPLUSI:       case OP_MINPLUSI:
7698       case OP_POSPLUSI:       case OP_POSPLUSI:
7699       if (!inassert) return -1;       if (!inassert) return 0;
7700       if (c < 0) c = scode[1] | REQ_CASELESS;       if (cflags < 0) { c = scode[1]; cflags = REQ_CASELESS; }
7701         else if (c != scode[1]) return -1;         else if (c != scode[1]) return 0;
7702       break;       break;
7703       }       }
7704    
7705     code += GET(code, 1);     code += GET(code, 1);
7706     }     }
7707  while (*code == OP_ALT);  while (*code == OP_ALT);
7708    
7709    *flags = cflags;
7710  return c;  return c;
7711  }  }
7712    
# Line 7676  pcre32_compile2(PCRE_SPTR32 pattern, int Line 7774  pcre32_compile2(PCRE_SPTR32 pattern, int
7774  {  {
7775  REAL_PCRE *re;  REAL_PCRE *re;
7776  int length = 1;  /* For final END opcode */  int length = 1;  /* For final END opcode */
7777  pcre_int32 firstchar, reqchar;  pcre_uint32 firstchar, reqchar;
7778    pcre_int32 firstcharflags, reqcharflags;
7779  int newline;  int newline;
7780  int errorcode = 0;  int errorcode = 0;
7781  int skipatstart = 0;  int skipatstart = 0;
# Line 7926  ptr += skipatstart; Line 8025  ptr += skipatstart;
8025  code = cworkspace;  code = cworkspace;
8026  *code = OP_BRA;  *code = OP_BRA;
8027  (void)compile_regex(cd->external_options, &code, &ptr, &errorcode, FALSE,  (void)compile_regex(cd->external_options, &code, &ptr, &errorcode, FALSE,
8028    FALSE, 0, 0, &firstchar, &reqchar, NULL, cd, &length);    FALSE, 0, 0, &firstchar, &firstcharflags, &reqchar, &reqcharflags, NULL,
8029      cd, &length);
8030  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;  if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
8031    
8032  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,  DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
# Line 8004  ptr = (const pcre_uchar *)pattern + skip Line 8104  ptr = (const pcre_uchar *)pattern + skip
8104  code = (pcre_uchar *)codestart;  code = (pcre_uchar *)codestart;
8105  *code = OP_BRA;  *code = OP_BRA;
8106  (void)compile_regex(re->options, &code, &ptr, &errorcode, FALSE, FALSE, 0, 0,  (void)compile_regex(re->options, &code, &ptr, &errorcode, FALSE, FALSE, 0, 0,
8107    &firstchar, &reqchar, NULL, cd, NULL);    &firstchar, &firstcharflags, &reqchar, &reqcharflags, NULL, cd, NULL);
8108  re->top_bracket = cd->bracount;  re->top_bracket = cd->bracount;
8109  re->top_backref = cd->top_backref;  re->top_backref = cd->top_backref;
8110  re->max_lookbehind = cd->max_lookbehind;  re->max_lookbehind = cd->max_lookbehind;
8111  re->flags = cd->external_flags | PCRE_MODE;  re->flags = cd->external_flags | PCRE_MODE;
8112    
8113  if (cd->had_accept) reqchar = REQ_NONE;   /* Must disable after (*ACCEPT) */  if (cd->had_accept)
8114      {
8115      reqchar = 0;              /* Must disable after (*ACCEPT) */
8116      reqcharflags = REQ_NONE;
8117      }
8118    
8119  /* If not reached end of pattern on success, there's an excess bracket. */  /* If not reached end of pattern on success, there's an excess bracket. */
8120    
# Line 8025  if debugging, leave the test till after Line 8129  if debugging, leave the test till after
8129  if (code - codestart > length) errorcode = ERR23;  if (code - codestart > length) errorcode = ERR23;
8130  #endif  #endif
8131    
8132    #ifdef SUPPORT_VALGRIND
8133    /* If the estimated length exceeds the really used length, mark the extra
8134    allocated memory as unadressable, so that any out-of-bound reads can be
8135    detected. */
8136    VALGRIND_MAKE_MEM_NOACCESS(code, (length - (code - codestart)) * sizeof(pcre_uchar));
8137    #endif
8138    
8139  /* Fill in any forward references that are required. There may be repeated  /* Fill in any forward references that are required. There may be repeated
8140  references; optimize for them, as searching a large regex takes time. */  references; optimize for them, as searching a large regex takes time. */
8141    
# Line 8060  if (errorcode == 0 && re->top_backref > Line 8171  if (errorcode == 0 && re->top_backref >
8171    
8172  /* If there were any lookbehind assertions that contained OP_RECURSE  /* If there were any lookbehind assertions that contained OP_RECURSE
8173  (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,
8174  because they may contain forward references. Actual recursions can't be fixed  because they may contain forward references. Actual recursions cannot be fixed
8175  length, but subroutine calls can. It is done like this so that those without  length, but subroutine calls can. It is done like this so that those without
8176  OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The  OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
8177  exceptional ones forgo this. We scan the pattern to check that they are fixed  exceptional ones forgo this. We scan the pattern to check that they are fixed
# Line 8131  if ((re->options & PCRE_ANCHORED) == 0) Line 8242  if ((re->options & PCRE_ANCHORED) == 0)
8242    if (is_anchored(codestart, 0, cd, 0)) re->options |= PCRE_ANCHORED;    if (is_anchored(codestart, 0, cd, 0)) re->options |= PCRE_ANCHORED;
8243    else    else
8244      {      {
8245      if (firstchar < 0)      if (firstcharflags < 0)
8246        firstchar = find_firstassertedchar(codestart, FALSE);        firstchar = find_firstassertedchar(codestart, &firstcharflags, FALSE);
8247      if (firstchar >= 0)   /* Remove caseless flag for non-caseable chars */      if (firstcharflags >= 0)   /* Remove caseless flag for non-caseable chars */
8248        {        {
8249  #if defined COMPILE_PCRE8  #if defined COMPILE_PCRE8
8250        re->first_char = firstchar & 0xff;        re->first_char = firstchar & 0xff;
8251  #elif defined COMPILE_PCRE16  #elif defined COMPILE_PCRE16
8252        re->first_char = firstchar & 0xffff;        re->first_char = firstchar & 0xffff;
8253  #elif defined COMPILE_PCRE32  #elif defined COMPILE_PCRE32
8254        re->first_char = firstchar & ~REQ_MASK;        re->first_char = firstchar;
8255  #endif  #endif
8256        if ((firstchar & REQ_CASELESS) != 0)        if ((firstcharflags & REQ_CASELESS) != 0)
8257          {          {
8258  #if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)  #if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
8259          /* We ignore non-ASCII first chars in 8 bit mode. */          /* We ignore non-ASCII first chars in 8 bit mode. */
# Line 8174  if ((re->options & PCRE_ANCHORED) == 0) Line 8285  if ((re->options & PCRE_ANCHORED) == 0)
8285  variable length item in the regex. Remove the caseless flag for non-caseable  variable length item in the regex. Remove the caseless flag for non-caseable
8286  bytes. */  bytes. */
8287    
8288  if (reqchar >= 0 &&  if (reqcharflags >= 0 &&
8289       ((re->options & PCRE_ANCHORED) == 0 || (reqchar & REQ_VARY) != 0))       ((re->options & PCRE_ANCHORED) == 0 || (reqcharflags & REQ_VARY) != 0))
8290    {    {
8291  #if defined COMPILE_PCRE8  #if defined COMPILE_PCRE8
8292    re->req_char = reqchar & 0xff;    re->req_char = reqchar & 0xff;
8293  #elif defined COMPILE_PCRE16  #elif defined COMPILE_PCRE16
8294    re->req_char = reqchar & 0xffff;    re->req_char = reqchar & 0xffff;
8295  #elif defined COMPILE_PCRE32  #elif defined COMPILE_PCRE32
8296    re->req_char = reqchar & ~REQ_MASK;    re->req_char = reqchar;
8297  #endif  #endif
8298    if ((reqchar & REQ_CASELESS) != 0)    if ((reqcharflags & REQ_CASELESS) != 0)
8299      {      {
8300  #if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)  #if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
8301      /* We ignore non-ASCII first chars in 8 bit mode. */      /* We ignore non-ASCII first chars in 8 bit mode. */

Legend:
Removed from v.1071  
changed lines
  Added in v.1152

  ViewVC Help
Powered by ViewVC 1.1.5