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

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

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

revision 807 by zherczeg, Thu Dec 15 11:57:39 2011 UTC revision 808 by ph10, Sun Dec 18 11:11:48 2011 UTC
# Line 1709  for (;;) Line 1709  for (;;)
1709    int d;    int d;
1710    pcre_uchar *ce, *cs;    pcre_uchar *ce, *cs;
1711    register int op = *cc;    register int op = *cc;
1712    
1713    switch (op)    switch (op)
1714      {      {
1715      /* We only need to continue for OP_CBRA (normal capturing bracket) and      /* We only need to continue for OP_CBRA (normal capturing bracket) and
# Line 1768  for (;;) Line 1769  for (;;)
1769      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1770      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1771      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1772      /* Fall through */      cc += PRIV(OP_lengths)[*cc];
1773        break;
1774    
1775      /* Skip over things that don't match chars */      /* Skip over things that don't match chars */
1776    
# Line 6661  for (;; ptr++) Line 6663  for (;; ptr++)
6663    
6664          if (ptr[1] != CHAR_PLUS && ptr[1] != CHAR_MINUS)          if (ptr[1] != CHAR_PLUS && ptr[1] != CHAR_MINUS)
6665            {            {
6666            BOOL isnumber = TRUE;            BOOL is_a_number = TRUE;
6667            for (p = ptr + 1; *p != 0 && *p != terminator; p++)            for (p = ptr + 1; *p != 0 && *p != terminator; p++)
6668              {              {
6669              if (!MAX_255(*p)) { isnumber = FALSE; break; }              if (!MAX_255(*p)) { is_a_number = FALSE; break; }
6670              if ((cd->ctypes[*p] & ctype_digit) == 0) isnumber = FALSE;              if ((cd->ctypes[*p] & ctype_digit) == 0) is_a_number = FALSE;
6671              if ((cd->ctypes[*p] & ctype_word) == 0) break;              if ((cd->ctypes[*p] & ctype_word) == 0) break;
6672              }              }
6673            if (*p != terminator)            if (*p != terminator)
# Line 6673  for (;; ptr++) Line 6675  for (;; ptr++)
6675              *errorcodeptr = ERR57;              *errorcodeptr = ERR57;
6676              break;              break;
6677              }              }
6678            if (isnumber)            if (is_a_number)
6679              {              {
6680              ptr++;              ptr++;
6681              goto HANDLE_NUMERICAL_RECURSION;              goto HANDLE_NUMERICAL_RECURSION;

Legend:
Removed from v.807  
changed lines
  Added in v.808

  ViewVC Help
Powered by ViewVC 1.1.5