/[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 230 by ph10, Mon Sep 10 13:23:56 2007 UTC revision 336 by ph10, Sat Apr 12 15:59:03 2008 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2007 University of Cambridge             Copyright (c) 1997-2008 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 43  supporting internal functions that are n Line 43  supporting internal functions that are n
43    
44    
45  #ifdef HAVE_CONFIG_H  #ifdef HAVE_CONFIG_H
46  #include <config.h>  #include "config.h"
47  #endif  #endif
48    
49  #define NLBLOCK cd             /* Block containing newline information */  #define NLBLOCK cd             /* Block containing newline information */
# Line 140  static const short int escapes[] = { Line 140  static const short int escapes[] = {
140  #endif  #endif
141    
142    
143  /* Table of special "verbs" like (*PRUNE) */  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is
144    searched linearly. Put all the names into a single string, in order to reduce
145    the number of relocations when a shared library is dynamically linked. */
146    
147  typedef struct verbitem {  typedef struct verbitem {
   const char *name;  
148    int   len;    int   len;
149    int   op;    int   op;
150  } verbitem;  } verbitem;
151    
152  static verbitem verbs[] = {  static const char verbnames[] =
153    { "ACCEPT", 6, OP_ACCEPT },    "ACCEPT\0"
154    { "COMMIT", 6, OP_COMMIT },    "COMMIT\0"
155    { "F",      1, OP_FAIL },    "F\0"
156    { "FAIL",   4, OP_FAIL },    "FAIL\0"
157    { "PRUNE",  5, OP_PRUNE },    "PRUNE\0"
158    { "SKIP",   4, OP_SKIP  },    "SKIP\0"
159    { "THEN",   4, OP_THEN  }    "THEN";
160    
161    static const verbitem verbs[] = {
162      { 6, OP_ACCEPT },
163      { 6, OP_COMMIT },
164      { 1, OP_FAIL },
165      { 4, OP_FAIL },
166      { 5, OP_PRUNE },
167      { 4, OP_SKIP  },
168      { 4, OP_THEN  }
169  };  };
170    
171  static int verbcount = sizeof(verbs)/sizeof(verbitem);  static const int verbcount = sizeof(verbs)/sizeof(verbitem);
172    
173    
174  /* Tables of names of POSIX character classes and their lengths. The list is  /* Tables of names of POSIX character classes and their lengths. The names are
175  terminated by a zero length entry. The first three must be alpha, lower, upper,  now all in a single string, to reduce the number of relocations when a shared
176  as this is assumed for handling case independence. */  library is dynamically loaded. The list of lengths is terminated by a zero
177    length entry. The first three must be alpha, lower, upper, as this is assumed
178  static const char *const posix_names[] = {  for handling case independence. */
179    "alpha", "lower", "upper",  
180    "alnum", "ascii", "blank", "cntrl", "digit", "graph",  static const char posix_names[] =
181    "print", "punct", "space", "word",  "xdigit" };    "alpha\0"  "lower\0"  "upper\0"  "alnum\0"  "ascii\0"  "blank\0"
182      "cntrl\0"  "digit\0"  "graph\0"  "print\0"  "punct\0"  "space\0"
183      "word\0"   "xdigit";
184    
185  static const uschar posix_name_lengths[] = {  static const uschar posix_name_lengths[] = {
186    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
# Line 207  static const int posix_class_maps[] = { Line 219  static const int posix_class_maps[] = {
219  /* The texts of compile-time error messages. These are "char *" because they  /* The texts of compile-time error messages. These are "char *" because they
220  are passed to the outside world. Do not ever re-use any error number, because  are passed to the outside world. Do not ever re-use any error number, because
221  they are documented. Always add a new error instead. Messages marked DEAD below  they are documented. Always add a new error instead. Messages marked DEAD below
222  are no longer used. */  are no longer used. This used to be a table of strings, but in order to reduce
223    the number of relocations needed when a shared library is loaded dynamically,
224  static const char *error_texts[] = {  it is now one long string. We cannot use a table of offsets, because the
225    "no error",  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
226    "\\ at end of pattern",  simply count through to the one we want - this isn't a performance issue
227    "\\c at end of pattern",  because these strings are used only when there is a compilation error. */
228    "unrecognized character follows \\",  
229    "numbers out of order in {} quantifier",  static const char error_texts[] =
230      "no error\0"
231      "\\ at end of pattern\0"
232      "\\c at end of pattern\0"
233      "unrecognized character follows \\\0"
234      "numbers out of order in {} quantifier\0"
235    /* 5 */    /* 5 */
236    "number too big in {} quantifier",    "number too big in {} quantifier\0"
237    "missing terminating ] for character class",    "missing terminating ] for character class\0"
238    "invalid escape sequence in character class",    "invalid escape sequence in character class\0"
239    "range out of order in character class",    "range out of order in character class\0"
240    "nothing to repeat",    "nothing to repeat\0"
241    /* 10 */    /* 10 */
242    "operand of unlimited repeat could match the empty string",  /** DEAD **/    "operand of unlimited repeat could match the empty string\0"  /** DEAD **/
243    "internal error: unexpected repeat",    "internal error: unexpected repeat\0"
244    "unrecognized character after (?",    "unrecognized character after (? or (?-\0"
245    "POSIX named classes are supported only within a class",    "POSIX named classes are supported only within a class\0"
246    "missing )",    "missing )\0"
247    /* 15 */    /* 15 */
248    "reference to non-existent subpattern",    "reference to non-existent subpattern\0"
249    "erroffset passed as NULL",    "erroffset passed as NULL\0"
250    "unknown option bit(s) set",    "unknown option bit(s) set\0"
251    "missing ) after comment",    "missing ) after comment\0"
252    "parentheses nested too deeply",  /** DEAD **/    "parentheses nested too deeply\0"  /** DEAD **/
253    /* 20 */    /* 20 */
254    "regular expression is too large",    "regular expression is too large\0"
255    "failed to get memory",    "failed to get memory\0"
256    "unmatched parentheses",    "unmatched parentheses\0"
257    "internal error: code overflow",    "internal error: code overflow\0"
258    "unrecognized character after (?<",    "unrecognized character after (?<\0"
259    /* 25 */    /* 25 */
260    "lookbehind assertion is not fixed length",    "lookbehind assertion is not fixed length\0"
261    "malformed number or name after (?(",    "malformed number or name after (?(\0"
262    "conditional group contains more than two branches",    "conditional group contains more than two branches\0"
263    "assertion expected after (?(",    "assertion expected after (?(\0"
264    "(?R or (?[+-]digits must be followed by )",    "(?R or (?[+-]digits must be followed by )\0"
265    /* 30 */    /* 30 */
266    "unknown POSIX class name",    "unknown POSIX class name\0"
267    "POSIX collating elements are not supported",    "POSIX collating elements are not supported\0"
268    "this version of PCRE is not compiled with PCRE_UTF8 support",    "this version of PCRE is not compiled with PCRE_UTF8 support\0"
269    "spare error",  /** DEAD **/    "spare error\0"  /** DEAD **/
270    "character value in \\x{...} sequence is too large",    "character value in \\x{...} sequence is too large\0"
271    /* 35 */    /* 35 */
272    "invalid condition (?(0)",    "invalid condition (?(0)\0"
273    "\\C not allowed in lookbehind assertion",    "\\C not allowed in lookbehind assertion\0"
274    "PCRE does not support \\L, \\l, \\N, \\U, or \\u",    "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"
275    "number after (?C is > 255",    "number after (?C is > 255\0"
276    "closing ) for (?C expected",    "closing ) for (?C expected\0"
277    /* 40 */    /* 40 */
278    "recursive call could loop indefinitely",    "recursive call could loop indefinitely\0"
279    "unrecognized character after (?P",    "unrecognized character after (?P\0"
280    "syntax error in subpattern name (missing terminator)",    "syntax error in subpattern name (missing terminator)\0"
281    "two named subpatterns have the same name",    "two named subpatterns have the same name\0"
282    "invalid UTF-8 string",    "invalid UTF-8 string\0"
283    /* 45 */    /* 45 */
284    "support for \\P, \\p, and \\X has not been compiled",    "support for \\P, \\p, and \\X has not been compiled\0"
285    "malformed \\P or \\p sequence",    "malformed \\P or \\p sequence\0"
286    "unknown property name after \\P or \\p",    "unknown property name after \\P or \\p\0"
287    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)",    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
288    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")",    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
289    /* 50 */    /* 50 */
290    "repeated subpattern is too long",    /** DEAD **/    "repeated subpattern is too long\0"    /** DEAD **/
291    "octal value is greater than \\377 (not in UTF-8 mode)",    "octal value is greater than \\377 (not in UTF-8 mode)\0"
292    "internal error: overran compiling workspace",    "internal error: overran compiling workspace\0"
293    "internal error: previously-checked referenced subpattern not found",    "internal error: previously-checked referenced subpattern not found\0"
294    "DEFINE group contains more than one branch",    "DEFINE group contains more than one branch\0"
295    /* 55 */    /* 55 */
296    "repeating a DEFINE group is not allowed",    "repeating a DEFINE group is not allowed\0"
297    "inconsistent NEWLINE options",    "inconsistent NEWLINE options\0"
298    "\\g is not followed by a braced name or an optionally braced non-zero number",    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
299    "(?+ or (?- or (?(+ or (?(- must be followed by a non-zero number",    "a numbered reference must not be zero\0"
300    "(*VERB) with an argument is not supported",    "(*VERB) with an argument is not supported\0"
301    /* 60 */    /* 60 */
302    "(*VERB) not recognized",    "(*VERB) not recognized\0"
303    "number is too big"    "number is too big\0"
304  };    "subpattern name expected\0"
305      "digit expected after (?+\0"
306      "] is an invalid data character in JavaScript compatibility mode";
307    
308    
309  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
# Line 420  static BOOL Line 439  static BOOL
439    
440    
441  /*************************************************  /*************************************************
442    *            Find an error text                  *
443    *************************************************/
444    
445    /* The error texts are now all in one long string, to save on relocations. As
446    some of the text is of unknown length, we can't use a table of offsets.
447    Instead, just count through the strings. This is not a performance issue
448    because it happens only when there has been a compilation error.
449    
450    Argument:   the error number
451    Returns:    pointer to the error string
452    */
453    
454    static const char *
455    find_error_text(int n)
456    {
457    const char *s = error_texts;
458    for (; n > 0; n--) while (*s++ != 0);
459    return s;
460    }
461    
462    
463    /*************************************************
464  *            Handle escapes                      *  *            Handle escapes                      *
465  *************************************************/  *************************************************/
466    
# Line 458  ptr--; /* Set Line 499  ptr--; /* Set
499    
500  if (c == 0) *errorcodeptr = ERR1;  if (c == 0) *errorcodeptr = ERR1;
501    
502  /* Non-alphamerics are literals. For digits or letters, do an initial lookup in  /* Non-alphanumerics are literals. For digits or letters, do an initial lookup
503  a table. A non-zero result is something that can be returned immediately.  in a table. A non-zero result is something that can be returned immediately.
504  Otherwise further processing may be required. */  Otherwise further processing may be required. */
505    
506  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII coding */
507  else if (c < '0' || c > 'z') {}                           /* Not alphameric */  else if (c < '0' || c > 'z') {}                           /* Not alphanumeric */
508  else if ((i = escapes[c - '0']) != 0) c = i;  else if ((i = escapes[c - '0']) != 0) c = i;
509    
510  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
511  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphameric */  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
512  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if ((i = escapes[c - 0x48]) != 0)  c = i;
513  #endif  #endif
514    
# Line 491  else Line 532  else
532      *errorcodeptr = ERR37;      *errorcodeptr = ERR37;
533      break;      break;
534    
535      /* \g must be followed by a number, either plain or braced. If positive, it      /* \g must be followed by one of a number of specific things:
536      is an absolute backreference. If negative, it is a relative backreference.  
537      This is a Perl 5.10 feature. Perl 5.10 also supports \g{name} as a      (1) A number, either plain or braced. If positive, it is an absolute
538      reference to a named group. This is part of Perl's movement towards a      backreference. If negative, it is a relative backreference. This is a Perl
539      unified syntax for back references. As this is synonymous with \k{name}, we      5.10 feature.
540      fudge it up by pretending it really was \k. */  
541        (2) Perl 5.10 also supports \g{name} as a reference to a named group. This
542        is part of Perl's movement towards a unified syntax for back references. As
543        this is synonymous with \k{name}, we fudge it up by pretending it really
544        was \k.
545    
546        (3) For Oniguruma compatibility we also support \g followed by a name or a
547        number either in angle brackets or in single quotes. However, these are
548        (possibly recursive) subroutine calls, _not_ backreferences. Just return
549        the -ESC_g code (cf \k). */
550    
551      case 'g':      case 'g':
552        if (ptr[1] == '<' || ptr[1] == '\'')
553          {
554          c = -ESC_g;
555          break;
556          }
557    
558        /* Handle the Perl-compatible cases */
559    
560      if (ptr[1] == '{')      if (ptr[1] == '{')
561        {        {
562        const uschar *p;        const uschar *p;
# Line 525  else Line 583  else
583      while ((digitab[ptr[1]] & ctype_digit) != 0)      while ((digitab[ptr[1]] & ctype_digit) != 0)
584        c = c * 10 + *(++ptr) - '0';        c = c * 10 + *(++ptr) - '0';
585    
586      if (c < 0)      if (c < 0)   /* Integer overflow */
587        {        {
588        *errorcodeptr = ERR61;        *errorcodeptr = ERR61;
589        break;        break;
590        }        }
591    
592      if (c == 0 || (braced && *(++ptr) != '}'))      if (braced && *(++ptr) != '}')
593        {        {
594        *errorcodeptr = ERR57;        *errorcodeptr = ERR57;
595        break;        break;
596        }        }
597    
598        if (c == 0)
599          {
600          *errorcodeptr = ERR58;
601          break;
602          }
603    
604      if (negated)      if (negated)
605        {        {
# Line 571  else Line 635  else
635        c -= '0';        c -= '0';
636        while ((digitab[ptr[1]] & ctype_digit) != 0)        while ((digitab[ptr[1]] & ctype_digit) != 0)
637          c = c * 10 + *(++ptr) - '0';          c = c * 10 + *(++ptr) - '0';
638        if (c < 0)        if (c < 0)    /* Integer overflow */
639          {          {
640          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
641          break;          break;
# Line 684  else Line 748  else
748      break;      break;
749    
750      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
751      other alphameric following \ is an error if PCRE_EXTRA was set; otherwise,      other alphanumeric following \ is an error if PCRE_EXTRA was set;
752      for Perl compatibility, it is a literal. This code looks a bit odd, but      otherwise, for Perl compatibility, it is a literal. This code looks a bit
753      there used to be some cases other than the default, and there may be again      odd, but there used to be some cases other than the default, and there may
754      in future, so I haven't "optimized" it. */      be again in future, so I haven't "optimized" it. */
755    
756      default:      default:
757      if ((options & PCRE_EXTRA) != 0) switch(c)      if ((options & PCRE_EXTRA) != 0) switch(c)
# Line 776  top = _pcre_utt_size; Line 840  top = _pcre_utt_size;
840  while (bot < top)  while (bot < top)
841    {    {
842    i = (bot + top) >> 1;    i = (bot + top) >> 1;
843    c = strcmp(name, _pcre_utt[i].name);    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);
844    if (c == 0)    if (c == 0)
845      {      {
846      *dptr = _pcre_utt[i].value;      *dptr = _pcre_utt[i].value;
# Line 1468  for (;;) Line 1532  for (;;)
1532  can match the empty string or not. It is called from could_be_empty()  can match the empty string or not. It is called from could_be_empty()
1533  below and from compile_branch() when checking for an unlimited repeat of a  below and from compile_branch() when checking for an unlimited repeat of a
1534  group that can match nothing. Note that first_significant_code() skips over  group that can match nothing. Note that first_significant_code() skips over
1535  assertions. If we hit an unclosed bracket, we return "empty" - this means we've  backward and negative forward assertions when its final argument is TRUE. If we
1536  struck an inner bracket whose current branch will already have been scanned.  hit an unclosed bracket, we return "empty" - this means we've struck an inner
1537    bracket whose current branch will already have been scanned.
1538    
1539  Arguments:  Arguments:
1540    code        points to start of search    code        points to start of search
# Line 1491  for (code = first_significant_code(code Line 1556  for (code = first_significant_code(code
1556    
1557    c = *code;    c = *code;
1558    
1559      /* Skip over forward assertions; the other assertions are skipped by
1560      first_significant_code() with a TRUE final argument. */
1561    
1562      if (c == OP_ASSERT)
1563        {
1564        do code += GET(code, 1); while (*code == OP_ALT);
1565        c = *code;
1566        continue;
1567        }
1568    
1569    /* Groups with zero repeats can of course be empty; skip them. */    /* Groups with zero repeats can of course be empty; skip them. */
1570    
1571    if (c == OP_BRAZERO || c == OP_BRAMINZERO)    if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)
1572      {      {
1573      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1574      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
# Line 1686  return TRUE; Line 1761  return TRUE;
1761  *************************************************/  *************************************************/
1762    
1763  /* This function is called when the sequence "[:" or "[." or "[=" is  /* This function is called when the sequence "[:" or "[." or "[=" is
1764  encountered in a character class. It checks whether this is followed by an  encountered in a character class. It checks whether this is followed by a
1765  optional ^ and then a sequence of letters, terminated by a matching ":]" or  sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
1766  ".]" or "=]".  reach an unescaped ']' without the special preceding character, return FALSE.
1767    
1768    Originally, this function only recognized a sequence of letters between the
1769    terminators, but it seems that Perl recognizes any sequence of characters,
1770    though of course unknown POSIX names are subsequently rejected. Perl gives an
1771    "Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
1772    didn't consider this to be a POSIX class. Likewise for [:1234:].
1773    
1774    The problem in trying to be exactly like Perl is in the handling of escapes. We
1775    have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
1776    class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
1777    below handles the special case of \], but does not try to do any other escape
1778    processing. This makes it different from Perl for cases such as [:l\ower:]
1779    where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize
1780    "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
1781    I think.
1782    
1783  Argument:  Arguments:
1784    ptr      pointer to the initial [    ptr      pointer to the initial [
1785    endptr   where to return the end pointer    endptr   where to return the end pointer
   cd       pointer to compile data  
1786    
1787  Returns:   TRUE or FALSE  Returns:   TRUE or FALSE
1788  */  */
1789    
1790  static BOOL  static BOOL
1791  check_posix_syntax(const uschar *ptr, const uschar **endptr, compile_data *cd)  check_posix_syntax(const uschar *ptr, const uschar **endptr)
1792  {  {
1793  int terminator;          /* Don't combine these lines; the Solaris cc */  int terminator;          /* Don't combine these lines; the Solaris cc */
1794  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
1795  if (*(++ptr) == '^') ptr++;  for (++ptr; *ptr != 0; ptr++)
 while ((cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;  
 if (*ptr == terminator && ptr[1] == ']')  
1796    {    {
1797    *endptr = ptr;    if (*ptr == '\\' && ptr[1] == ']') ptr++; else
1798    return TRUE;      {
1799        if (*ptr == ']') return FALSE;
1800        if (*ptr == terminator && ptr[1] == ']')
1801          {
1802          *endptr = ptr;
1803          return TRUE;
1804          }
1805        }
1806    }    }
1807  return FALSE;  return FALSE;
1808  }  }
# Line 1733  Returns: a value representing the na Line 1827  Returns: a value representing the na
1827  static int  static int
1828  check_posix_name(const uschar *ptr, int len)  check_posix_name(const uschar *ptr, int len)
1829  {  {
1830    const char *pn = posix_names;
1831  register int yield = 0;  register int yield = 0;
1832  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
1833    {    {
1834    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
1835      strncmp((const char *)ptr, posix_names[yield], len) == 0) return yield;      strncmp((const char *)ptr, pn, len) == 0) return yield;
1836      pn += posix_name_lengths[yield] + 1;
1837    yield++;    yield++;
1838    }    }
1839  return -1;  return -1;
# Line 1752  return -1; Line 1848  return -1;
1848  that is referenced. This means that groups can be replicated for fixed  that is referenced. This means that groups can be replicated for fixed
1849  repetition simply by copying (because the recursion is allowed to refer to  repetition simply by copying (because the recursion is allowed to refer to
1850  earlier groups that are outside the current group). However, when a group is  earlier groups that are outside the current group). However, when a group is
1851  optional (i.e. the minimum quantifier is zero), OP_BRAZERO is inserted before  optional (i.e. the minimum quantifier is zero), OP_BRAZERO or OP_SKIPZERO is
1852  it, after it has been compiled. This means that any OP_RECURSE items within it  inserted before it, after it has been compiled. This means that any OP_RECURSE
1853  that refer to the group itself or any contained groups have to have their  items within it that refer to the group itself or any contained groups have to
1854  offsets adjusted. That one of the jobs of this function. Before it is called,  have their offsets adjusted. That one of the jobs of this function. Before it
1855  the partially compiled regex must be temporarily terminated with OP_END.  is called, the partially compiled regex must be temporarily terminated with
1856    OP_END.
1857    
1858  This function has been extended with the possibility of forward references for  This function has been extended with the possibility of forward references for
1859  recursions and subroutine calls. It must also check the list of such references  recursions and subroutine calls. It must also check the list of such references
# Line 1787  while ((ptr = (uschar *)find_recurse(ptr Line 1884  while ((ptr = (uschar *)find_recurse(ptr
1884    
1885    /* See if this recursion is on the forward reference list. If so, adjust the    /* See if this recursion is on the forward reference list. If so, adjust the
1886    reference. */    reference. */
1887    
1888    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
1889      {      {
1890      offset = GET(hc, 0);      offset = GET(hc, 0);
# Line 2041  if (next >= 0) switch(op_code) Line 2138  if (next >= 0) switch(op_code)
2138    /* For OP_NOT, "item" must be a single-byte character. */    /* For OP_NOT, "item" must be a single-byte character. */
2139    
2140    case OP_NOT:    case OP_NOT:
   if (next < 0) return FALSE;  /* Not a character */  
2141    if (item == next) return TRUE;    if (item == next) return TRUE;
2142    if ((options & PCRE_CASELESS) == 0) return FALSE;    if ((options & PCRE_CASELESS) == 0) return FALSE;
2143  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
# Line 2304  uschar classbits[32]; Line 2400  uschar classbits[32];
2400  BOOL class_utf8;  BOOL class_utf8;
2401  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf8 = (options & PCRE_UTF8) != 0;
2402  uschar *class_utf8data;  uschar *class_utf8data;
2403    uschar *class_utf8data_base;
2404  uschar utf8_char[6];  uschar utf8_char[6];
2405  #else  #else
2406  BOOL utf8 = FALSE;  BOOL utf8 = FALSE;
# Line 2343  req_caseopt = ((options & PCRE_CASELESS) Line 2440  req_caseopt = ((options & PCRE_CASELESS)
2440  for (;; ptr++)  for (;; ptr++)
2441    {    {
2442    BOOL negate_class;    BOOL negate_class;
2443      BOOL should_flip_negation;
2444    BOOL possessive_quantifier;    BOOL possessive_quantifier;
2445    BOOL is_quantifier;    BOOL is_quantifier;
2446    BOOL is_recurse;    BOOL is_recurse;
# Line 2362  for (;; ptr++) Line 2460  for (;; ptr++)
2460    /* Get next byte in the pattern */    /* Get next byte in the pattern */
2461    
2462    c = *ptr;    c = *ptr;
2463    
2464    /* If we are in the pre-compile phase, accumulate the length used for the    /* If we are in the pre-compile phase, accumulate the length used for the
2465    previous cycle of this loop. */    previous cycle of this loop. */
2466    
# Line 2557  for (;; ptr++) Line 2655  for (;; ptr++)
2655      opcode is compiled. It may optionally have a bit map for characters < 256,      opcode is compiled. It may optionally have a bit map for characters < 256,
2656      but those above are are explicitly listed afterwards. A flag byte tells      but those above are are explicitly listed afterwards. A flag byte tells
2657      whether the bitmap is present, and whether this is a negated class or not.      whether the bitmap is present, and whether this is a negated class or not.
2658      */  
2659        In JavaScript compatibility mode, an isolated ']' causes an error. In
2660        default (Perl) mode, it is treated as a data character. */
2661    
2662        case ']':
2663        if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
2664          {
2665          *errorcodeptr = ERR64;
2666          goto FAILED;
2667          }
2668        goto NORMAL_CHAR;
2669    
2670      case '[':      case '[':
2671      previous = code;      previous = code;
# Line 2566  for (;; ptr++) Line 2674  for (;; ptr++)
2674      they are encountered at the top level, so we'll do that too. */      they are encountered at the top level, so we'll do that too. */
2675    
2676      if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&      if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
2677          check_posix_syntax(ptr, &tempptr, cd))          check_posix_syntax(ptr, &tempptr))
2678        {        {
2679        *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;        *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;
2680        goto FAILED;        goto FAILED;
# Line 2591  for (;; ptr++) Line 2699  for (;; ptr++)
2699        else break;        else break;
2700        }        }
2701    
2702        /* If a class contains a negative special such as \S, we need to flip the
2703        negation flag at the end, so that support for characters > 255 works
2704        correctly (they are all included in the class). */
2705    
2706        should_flip_negation = FALSE;
2707    
2708      /* Keep a count of chars with values < 256 so that we can optimize the case      /* Keep a count of chars with values < 256 so that we can optimize the case
2709      of just a single character (as long as it's < 256). However, For higher      of just a single character (as long as it's < 256). However, For higher
2710      valued UTF-8 characters, we don't yet do any optimization. */      valued UTF-8 characters, we don't yet do any optimization. */
# Line 2608  for (;; ptr++) Line 2722  for (;; ptr++)
2722  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2723      class_utf8 = FALSE;                       /* No chars >= 256 */      class_utf8 = FALSE;                       /* No chars >= 256 */
2724      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */
2725        class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */
2726  #endif  #endif
2727    
2728      /* Process characters until ] is reached. By writing this as a "do" it      /* Process characters until ] is reached. By writing this as a "do" it
# Line 2623  for (;; ptr++) Line 2738  for (;; ptr++)
2738          {                           /* Braces are required because the */          {                           /* Braces are required because the */
2739          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
2740          }          }
2741    
2742          /* In the pre-compile phase, accumulate the length of any UTF-8 extra
2743          data and reset the pointer. This is so that very large classes that
2744          contain a zillion UTF-8 characters no longer overwrite the work space
2745          (which is on the stack). */
2746    
2747          if (lengthptr != NULL)
2748            {
2749            *lengthptr += class_utf8data - class_utf8data_base;
2750            class_utf8data = class_utf8data_base;
2751            }
2752    
2753  #endif  #endif
2754    
2755        /* Inside \Q...\E everything is literal except \E */        /* Inside \Q...\E everything is literal except \E */
# Line 2646  for (;; ptr++) Line 2773  for (;; ptr++)
2773    
2774        if (c == '[' &&        if (c == '[' &&
2775            (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&            (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
2776            check_posix_syntax(ptr, &tempptr, cd))            check_posix_syntax(ptr, &tempptr))
2777          {          {
2778          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
2779          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
# Line 2663  for (;; ptr++) Line 2790  for (;; ptr++)
2790          if (*ptr == '^')          if (*ptr == '^')
2791            {            {
2792            local_negate = TRUE;            local_negate = TRUE;
2793              should_flip_negation = TRUE;  /* Note negative special */
2794            ptr++;            ptr++;
2795            }            }
2796    
# Line 2737  for (;; ptr++) Line 2865  for (;; ptr++)
2865          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
2866          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
2867    
2868          if (-c == ESC_b) c = '\b';       /* \b is backslash in a class */          if (-c == ESC_b) c = '\b';       /* \b is backspace in a class */
2869          else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */          else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */
2870          else if (-c == ESC_R) c = 'R';   /* \R is literal R in a class */          else if (-c == ESC_R) c = 'R';   /* \R is literal R in a class */
2871          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
# Line 2765  for (;; ptr++) Line 2893  for (;; ptr++)
2893              continue;              continue;
2894    
2895              case ESC_D:              case ESC_D:
2896                should_flip_negation = TRUE;
2897              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];
2898              continue;              continue;
2899    
# Line 2773  for (;; ptr++) Line 2902  for (;; ptr++)
2902              continue;              continue;
2903    
2904              case ESC_W:              case ESC_W:
2905                should_flip_negation = TRUE;
2906              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
2907              continue;              continue;
2908    
# Line 2782  for (;; ptr++) Line 2912  for (;; ptr++)
2912              continue;              continue;
2913    
2914              case ESC_S:              case ESC_S:
2915                should_flip_negation = TRUE;
2916              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
2917              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
2918              continue;              continue;
2919    
             case ESC_E: /* Perl ignores an orphan \E */  
             continue;  
   
2920              default:    /* Not recognized; fall through */              default:    /* Not recognized; fall through */
2921              break;      /* Need "default" setting to stop compiler warning. */              break;      /* Need "default" setting to stop compiler warning. */
2922              }              }
# Line 2975  for (;; ptr++) Line 3103  for (;; ptr++)
3103          }          }
3104    
3105        oldptr = ptr;        oldptr = ptr;
3106    
3107        /* Remember \r or \n */        /* Remember \r or \n */
3108    
3109        if (c == '\r' || c == '\n') cd->external_flags |= PCRE_HASCRORLF;        if (c == '\r' || c == '\n') cd->external_flags |= PCRE_HASCRORLF;
3110    
3111        /* Check for range */        /* Check for range */
3112    
3113        if (!inescq && ptr[1] == '-')        if (!inescq && ptr[1] == '-')
# Line 3023  for (;; ptr++) Line 3151  for (;; ptr++)
3151            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3152            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
3153    
3154            /* \b is backslash; \X is literal X; \R is literal R; any other            /* \b is backspace; \X is literal X; \R is literal R; any other
3155            special means the '-' was literal */            special means the '-' was literal */
3156    
3157            if (d < 0)            if (d < 0)
# Line 3050  for (;; ptr++) Line 3178  for (;; ptr++)
3178          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */
3179    
3180          /* Remember \r or \n */          /* Remember \r or \n */
3181    
3182          if (d == '\r' || d == '\n') cd->external_flags |= PCRE_HASCRORLF;          if (d == '\r' || d == '\n') cd->external_flags |= PCRE_HASCRORLF;
3183    
3184          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
3185          matching, we have to use an XCLASS with extra data items. Caseless          matching, we have to use an XCLASS with extra data items. Caseless
3186          matching for characters > 127 is available only if UCP support is          matching for characters > 127 is available only if UCP support is
# Line 3157  for (;; ptr++) Line 3285  for (;; ptr++)
3285        apparent range that isn't. */        apparent range that isn't. */
3286    
3287        LONE_SINGLE_CHARACTER:        LONE_SINGLE_CHARACTER:
3288    
3289        /* Handle a character that cannot go in the bit map */        /* Handle a character that cannot go in the bit map */
3290    
3291  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
# Line 3205  for (;; ptr++) Line 3333  for (;; ptr++)
3333        *errorcodeptr = ERR6;        *errorcodeptr = ERR6;
3334        goto FAILED;        goto FAILED;
3335        }        }
3336    
3337    
3338  /* This code has been disabled because it would mean that \s counts as  /* This code has been disabled because it would mean that \s counts as
3339  an explicit \r or \n reference, and that's not really what is wanted. Now  an explicit \r or \n reference, and that's not really what is wanted. Now
3340  we set the flag only if there is a literal "\r" or "\n" in the class. */  we set the flag only if there is a literal "\r" or "\n" in the class. */
# Line 3223  we set the flag only if there is a liter Line 3351  we set the flag only if there is a liter
3351        if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;        if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;
3352        }        }
3353  #endif  #endif
3354    
3355    
3356      /* If class_charcount is 1, we saw precisely one character whose value is      /* If class_charcount is 1, we saw precisely one character whose value is
3357      less than 256. As long as there were no characters >= 128 and there was no      less than 256. As long as there were no characters >= 128 and there was no
# Line 3287  we set the flag only if there is a liter Line 3415  we set the flag only if there is a liter
3415      zeroreqbyte = reqbyte;      zeroreqbyte = reqbyte;
3416    
3417      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
3418      extended class, with its own opcode. If there are no characters < 256,      extended class, with its own opcode, unless there was a negated special
3419      we can omit the bitmap in the actual compiled code. */      such as \S in the class, because in that case all characters > 255 are in
3420        the class, so any that were explicitly given as well can be ignored. If
3421        (when there are explicit characters > 255 that must be listed) there are no
3422        characters < 256, we can omit the bitmap in the actual compiled code. */
3423    
3424  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3425      if (class_utf8)      if (class_utf8 && !should_flip_negation)
3426        {        {
3427        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
3428        *code++ = OP_XCLASS;        *code++ = OP_XCLASS;
# Line 3317  we set the flag only if there is a liter Line 3448  we set the flag only if there is a liter
3448        }        }
3449  #endif  #endif
3450    
3451      /* If there are no characters > 255, negate the 32-byte map if necessary,      /* If there are no characters > 255, set the opcode to OP_CLASS or
3452      and copy it into the code vector. If this is the first thing in the branch,      OP_NCLASS, depending on whether the whole class was negated and whether
3453      there can be no first char setting, whatever the repeat count. Any reqbyte      there were negative specials such as \S in the class. Then copy the 32-byte
3454      setting must remain unchanged after any kind of repeat. */      map into the code vector, negating it if necessary. */
3455    
3456        *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
3457      if (negate_class)      if (negate_class)
3458        {        {
       *code++ = OP_NCLASS;  
3459        if (lengthptr == NULL)    /* Save time in the pre-compile phase */        if (lengthptr == NULL)    /* Save time in the pre-compile phase */
3460          for (c = 0; c < 32; c++) code[c] = ~classbits[c];          for (c = 0; c < 32; c++) code[c] = ~classbits[c];
3461        }        }
3462      else      else
3463        {        {
       *code++ = OP_CLASS;  
3464        memcpy(code, classbits, 32);        memcpy(code, classbits, 32);
3465        }        }
3466      code += 32;      code += 32;
# Line 3724  we set the flag only if there is a liter Line 3854  we set the flag only if there is a liter
3854    
3855        if (repeat_min == 0)        if (repeat_min == 0)
3856          {          {
3857          /* If the maximum is also zero, we just omit the group from the output          /* If the maximum is also zero, we used to just omit the group from the
3858          altogether. */          output altogether, like this:
3859    
3860          if (repeat_max == 0)          ** if (repeat_max == 0)
3861            {          **   {
3862            code = previous;          **   code = previous;
3863            goto END_REPEAT;          **   goto END_REPEAT;
3864            }          **   }
3865    
3866          /* If the maximum is 1 or unlimited, we just have to stick in the          However, that fails when a group is referenced as a subroutine from
3867          BRAZERO and do no more at this point. However, we do need to adjust          elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it
3868          any OP_RECURSE calls inside the group that refer to the group itself or          so that it is skipped on execution. As we don't have a list of which
3869          any internal or forward referenced group, because the offset is from          groups are referenced, we cannot do this selectively.
3870          the start of the whole regex. Temporarily terminate the pattern while  
3871          doing this. */          If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
3872            and do no more at this point. However, we do need to adjust any
3873            OP_RECURSE calls inside the group that refer to the group itself or any
3874            internal or forward referenced group, because the offset is from the
3875            start of the whole regex. Temporarily terminate the pattern while doing
3876            this. */
3877    
3878          if (repeat_max <= 1)          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
3879            {            {
3880            *code = OP_END;            *code = OP_END;
3881            adjust_recurse(previous, 1, utf8, cd, save_hwm);            adjust_recurse(previous, 1, utf8, cd, save_hwm);
3882            memmove(previous+1, previous, len);            memmove(previous+1, previous, len);
3883            code++;            code++;
3884              if (repeat_max == 0)
3885                {
3886                *previous++ = OP_SKIPZERO;
3887                goto END_REPEAT;
3888                }
3889            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
3890            }            }
3891    
# Line 3966  we set the flag only if there is a liter Line 4106  we set the flag only if there is a liter
4106        int len;        int len;
4107        if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||        if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||
4108            *tempcode == OP_NOTEXACT)            *tempcode == OP_NOTEXACT)
4109          tempcode += _pcre_OP_lengths[*tempcode];          tempcode += _pcre_OP_lengths[*tempcode] +
4110              ((*tempcode == OP_TYPEEXACT &&
4111                 (tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP))? 2:0);
4112        len = code - tempcode;        len = code - tempcode;
4113        if (len > 0) switch (*tempcode)        if (len > 0) switch (*tempcode)
4114          {          {
# Line 4018  we set the flag only if there is a liter Line 4160  we set the flag only if there is a liter
4160      bravalue = OP_CBRA;      bravalue = OP_CBRA;
4161      save_hwm = cd->hwm;      save_hwm = cd->hwm;
4162      reset_bracount = FALSE;      reset_bracount = FALSE;
4163    
4164      /* First deal with various "verbs" that can be introduced by '*'. */      /* First deal with various "verbs" that can be introduced by '*'. */
4165    
4166      if (*(++ptr) == '*' && (cd->ctypes[ptr[1]] & ctype_letter) != 0)      if (*(++ptr) == '*' && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
4167        {        {
4168        int i, namelen;        int i, namelen;
4169          const char *vn = verbnames;
4170        const uschar *name = ++ptr;        const uschar *name = ++ptr;
4171        previous = NULL;        previous = NULL;
4172        while ((cd->ctypes[*++ptr] & ctype_letter) != 0);        while ((cd->ctypes[*++ptr] & ctype_letter) != 0);
# Line 4041  we set the flag only if there is a liter Line 4184  we set the flag only if there is a liter
4184        for (i = 0; i < verbcount; i++)        for (i = 0; i < verbcount; i++)
4185          {          {
4186          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
4187              strncmp((char *)name, verbs[i].name, namelen) == 0)              strncmp((char *)name, vn, namelen) == 0)
4188            {            {
4189            *code = verbs[i].op;            *code = verbs[i].op;
4190            if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;            if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;
4191            break;            break;
4192            }            }
4193            vn += verbs[i].len + 1;
4194          }          }
4195        if (i < verbcount) continue;        if (i < verbcount) continue;
4196        *errorcodeptr = ERR60;        *errorcodeptr = ERR60;
# Line 4191  we set the flag only if there is a liter Line 4335  we set the flag only if there is a liter
4335              *errorcodeptr = ERR58;              *errorcodeptr = ERR58;
4336              goto FAILED;              goto FAILED;
4337              }              }
4338            if (refsign == '-')            recno = (refsign == '-')?
4339                cd->bracount - recno + 1 : recno +cd->bracount;
4340              if (recno <= 0 || recno > cd->final_bracount)
4341              {              {
4342              recno = cd->bracount - recno + 1;              *errorcodeptr = ERR15;
4343              if (recno <= 0)              goto FAILED;
               {  
               *errorcodeptr = ERR15;  
               goto FAILED;  
               }  
4344              }              }
           else recno += cd->bracount;  
4345            PUT2(code, 2+LINK_SIZE, recno);            PUT2(code, 2+LINK_SIZE, recno);
4346            break;            break;
4347            }            }
# Line 4272  we set the flag only if there is a liter Line 4413  we set the flag only if there is a liter
4413            skipbytes = 1;            skipbytes = 1;
4414            }            }
4415    
4416          /* Check for the "name" actually being a subpattern number. */          /* Check for the "name" actually being a subpattern number. We are
4417            in the second pass here, so final_bracount is set. */
4418    
4419          else if (recno > 0)          else if (recno > 0 && recno <= cd->final_bracount)
4420            {            {
4421            PUT2(code, 2+LINK_SIZE, recno);            PUT2(code, 2+LINK_SIZE, recno);
4422            }            }
# Line 4468  we set the flag only if there is a liter Line 4610  we set the flag only if there is a liter
4610    
4611          /* We come here from the Python syntax above that handles both          /* We come here from the Python syntax above that handles both
4612          references (?P=name) and recursion (?P>name), as well as falling          references (?P=name) and recursion (?P>name), as well as falling
4613          through from the Perl recursion syntax (?&name). */          through from the Perl recursion syntax (?&name). We also come here from
4614            the Perl \k<name> or \k'name' back reference syntax and the \k{name}
4615            .NET syntax, and the Oniguruma \g<...> and \g'...' subroutine syntax. */
4616    
4617          NAMED_REF_OR_RECURSE:          NAMED_REF_OR_RECURSE:
4618          name = ++ptr;          name = ++ptr;
# Line 4480  we set the flag only if there is a liter Line 4624  we set the flag only if there is a liter
4624    
4625          if (lengthptr != NULL)          if (lengthptr != NULL)
4626            {            {
4627              if (namelen == 0)
4628                {
4629                *errorcodeptr = ERR62;
4630                goto FAILED;
4631                }
4632            if (*ptr != terminator)            if (*ptr != terminator)
4633              {              {
4634              *errorcodeptr = ERR42;              *errorcodeptr = ERR42;
# Line 4493  we set the flag only if there is a liter Line 4642  we set the flag only if there is a liter
4642            recno = 0;            recno = 0;
4643            }            }
4644    
4645          /* In the real compile, seek the name in the table */          /* In the real compile, seek the name in the table. We check the name
4646            first, and then check that we have reached the end of the name in the
4647            table. That way, if the name that is longer than any in the table,
4648            the comparison will fail without reading beyond the table entry. */
4649    
4650          else          else
4651            {            {
4652            slot = cd->name_table;            slot = cd->name_table;
4653            for (i = 0; i < cd->names_found; i++)            for (i = 0; i < cd->names_found; i++)
4654              {              {
4655              if (strncmp((char *)name, (char *)slot+2, namelen) == 0) break;              if (strncmp((char *)name, (char *)slot+2, namelen) == 0 &&
4656                    slot[2+namelen] == 0)
4657                  break;
4658              slot += cd->name_entry_size;              slot += cd->name_entry_size;
4659              }              }
4660    
# Line 4536  we set the flag only if there is a liter Line 4690  we set the flag only if there is a liter
4690          case '5': case '6': case '7': case '8': case '9':   /* subroutine */          case '5': case '6': case '7': case '8': case '9':   /* subroutine */
4691            {            {
4692            const uschar *called;            const uschar *called;
4693              terminator = ')';
4694    
4695              /* Come here from the \g<...> and \g'...' code (Oniguruma
4696              compatibility). However, the syntax has been checked to ensure that
4697              the ... are a (signed) number, so that neither ERR63 nor ERR29 will
4698              be called on this path, nor with the jump to OTHER_CHAR_AFTER_QUERY
4699              ever be taken. */
4700    
4701              HANDLE_NUMERICAL_RECURSION:
4702    
4703            if ((refsign = *ptr) == '+') ptr++;            if ((refsign = *ptr) == '+')
4704                {
4705                ptr++;
4706                if ((digitab[*ptr] & ctype_digit) == 0)
4707                  {
4708                  *errorcodeptr = ERR63;
4709                  goto FAILED;
4710                  }
4711                }
4712            else if (refsign == '-')            else if (refsign == '-')
4713              {              {
4714              if ((digitab[ptr[1]] & ctype_digit) == 0)              if ((digitab[ptr[1]] & ctype_digit) == 0)
# Line 4549  we set the flag only if there is a liter Line 4720  we set the flag only if there is a liter
4720            while((digitab[*ptr] & ctype_digit) != 0)            while((digitab[*ptr] & ctype_digit) != 0)
4721              recno = recno * 10 + *ptr++ - '0';              recno = recno * 10 + *ptr++ - '0';
4722    
4723            if (*ptr != ')')            if (*ptr != terminator)
4724              {              {
4725              *errorcodeptr = ERR29;              *errorcodeptr = ERR29;
4726              goto FAILED;              goto FAILED;
# Line 4945  we set the flag only if there is a liter Line 5116  we set the flag only if there is a liter
5116      back references and those types that consume a character may be repeated.      back references and those types that consume a character may be repeated.
5117      We can test for values between ESC_b and ESC_Z for the latter; this may      We can test for values between ESC_b and ESC_Z for the latter; this may
5118      have to change if any new ones are ever created. */      have to change if any new ones are ever created. */
5119    
5120      case '\\':      case '\\':
5121      tempptr = ptr;      tempptr = ptr;
5122      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);      c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);
# Line 4972  we set the flag only if there is a liter Line 5143  we set the flag only if there is a liter
5143    
5144        zerofirstbyte = firstbyte;        zerofirstbyte = firstbyte;
5145        zeroreqbyte = reqbyte;        zeroreqbyte = reqbyte;
5146    
5147          /* \g<name> or \g'name' is a subroutine call by name and \g<n> or \g'n'
5148          is a subroutine call by number (Oniguruma syntax). In fact, the value
5149          -ESC_g is returned only for these cases. So we don't need to check for <
5150          or ' if the value is -ESC_g. For the Perl syntax \g{n} the value is
5151          -ESC_REF+n, and for the Perl syntax \g{name} the result is -ESC_k (as
5152          that is a synonym for a named back reference). */
5153    
5154          if (-c == ESC_g)
5155            {
5156            const uschar *p;
5157            save_hwm = cd->hwm;   /* Normally this is set when '(' is read */
5158            terminator = (*(++ptr) == '<')? '>' : '\'';
5159    
5160            /* These two statements stop the compiler for warning about possibly
5161            unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In
5162            fact, because we actually check for a number below, the paths that
5163            would actually be in error are never taken. */
5164    
5165            skipbytes = 0;
5166            reset_bracount = FALSE;
5167    
5168            /* Test for a name */
5169    
5170            if (ptr[1] != '+' && ptr[1] != '-')
5171              {
5172              BOOL isnumber = TRUE;
5173              for (p = ptr + 1; *p != 0 && *p != terminator; p++)
5174                {
5175                if ((cd->ctypes[*p] & ctype_digit) == 0) isnumber = FALSE;
5176                if ((cd->ctypes[*p] & ctype_word) == 0) break;
5177                }
5178              if (*p != terminator)
5179                {
5180                *errorcodeptr = ERR57;
5181                break;
5182                }
5183              if (isnumber)
5184                {
5185                ptr++;
5186                goto HANDLE_NUMERICAL_RECURSION;
5187                }
5188              is_recurse = TRUE;
5189              goto NAMED_REF_OR_RECURSE;
5190              }
5191    
5192            /* Test a signed number in angle brackets or quotes. */
5193    
5194            p = ptr + 2;
5195            while ((digitab[*p] & ctype_digit) != 0) p++;
5196            if (*p != terminator)
5197              {
5198              *errorcodeptr = ERR57;
5199              break;
5200              }
5201            ptr++;
5202            goto HANDLE_NUMERICAL_RECURSION;
5203            }
5204    
5205        /* \k<name> or \k'name' is a back reference by name (Perl syntax).        /* \k<name> or \k'name' is a back reference by name (Perl syntax).
5206        We also support \k{name} (.NET syntax) */        We also support \k{name} (.NET syntax) */
# Line 5703  to fill in forward references to subpatt Line 5932  to fill in forward references to subpatt
5932    
5933  uschar cworkspace[COMPILE_WORK_SIZE];  uschar cworkspace[COMPILE_WORK_SIZE];
5934    
   
5935  /* Set this early so that early errors get offset 0. */  /* Set this early so that early errors get offset 0. */
5936    
5937  ptr = (const uschar *)pattern;  ptr = (const uschar *)pattern;
# Line 5763  cd->fcc = tables + fcc_offset; Line 5991  cd->fcc = tables + fcc_offset;
5991  cd->cbits = tables + cbits_offset;  cd->cbits = tables + cbits_offset;
5992  cd->ctypes = tables + ctypes_offset;  cd->ctypes = tables + ctypes_offset;
5993    
5994  /* Check for newline settings at the start of the pattern, and remember the  /* Check for global one-time settings at the start of the pattern, and remember
5995  offset for later. */  the offset for later. */
5996    
5997  if (ptr[0] == '(' && ptr[1] == '*')  while (ptr[skipatstart] == '(' && ptr[skipatstart+1] == '*')
5998    {    {
5999    int newnl = 0;    int newnl = 0;
6000    if (strncmp((char *)(ptr+2), "CR)", 3) == 0)    int newbsr = 0;
6001      { skipatstart = 5; newnl = PCRE_NEWLINE_CR; }  
6002    else if (strncmp((char *)(ptr+2), "LF)", 3)  == 0)    if (strncmp((char *)(ptr+skipatstart+2), "CR)", 3) == 0)
6003      { skipatstart = 5; newnl = PCRE_NEWLINE_LF; }      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
6004    else if (strncmp((char *)(ptr+2), "CRLF)", 5)  == 0)    else if (strncmp((char *)(ptr+skipatstart+2), "LF)", 3)  == 0)
6005      { skipatstart = 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }      { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
6006    else if (strncmp((char *)(ptr+2), "ANY)", 4) == 0)    else if (strncmp((char *)(ptr+skipatstart+2), "CRLF)", 5)  == 0)
6007      { skipatstart = 6; newnl = PCRE_NEWLINE_ANY; }      { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
6008    else if (strncmp((char *)(ptr+2), "ANYCRLF)", 8)  == 0)    else if (strncmp((char *)(ptr+skipatstart+2), "ANY)", 4) == 0)
6009      { skipatstart = 10; newnl = PCRE_NEWLINE_ANYCRLF; }      { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
6010    if (skipatstart > 0)    else if (strncmp((char *)(ptr+skipatstart+2), "ANYCRLF)", 8)  == 0)
6011        { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
6012    
6013      else if (strncmp((char *)(ptr+skipatstart+2), "BSR_ANYCRLF)", 12) == 0)
6014        { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
6015      else if (strncmp((char *)(ptr+skipatstart+2), "BSR_UNICODE)", 12) == 0)
6016        { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
6017    
6018      if (newnl != 0)
6019      options = (options & ~PCRE_NEWLINE_BITS) | newnl;      options = (options & ~PCRE_NEWLINE_BITS) | newnl;
6020      else if (newbsr != 0)
6021        options = (options & ~(PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) | newbsr;
6022      else break;
6023      }
6024    
6025    /* Check validity of \R options. */
6026    
6027    switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
6028      {
6029      case 0:
6030      case PCRE_BSR_ANYCRLF:
6031      case PCRE_BSR_UNICODE:
6032      break;
6033      default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
6034    }    }
6035    
6036  /* Handle different types of newline. The three bits give seven cases. The  /* Handle different types of newline. The three bits give seven cases. The
# Line 5842  to compile parts of the pattern into; th Line 6092  to compile parts of the pattern into; th
6092  no longer needed, so hopefully this workspace will never overflow, though there  no longer needed, so hopefully this workspace will never overflow, though there
6093  is a test for its doing so. */  is a test for its doing so. */
6094    
6095  cd->bracount = 0;  cd->bracount = cd->final_bracount = 0;
6096  cd->names_found = 0;  cd->names_found = 0;
6097  cd->name_entry_size = 0;  cd->name_entry_size = 0;
6098  cd->name_table = NULL;  cd->name_table = NULL;
# Line 5892  if (re == NULL) Line 6142  if (re == NULL)
6142    goto PCRE_EARLY_ERROR_RETURN;    goto PCRE_EARLY_ERROR_RETURN;
6143    }    }
6144    
6145  /* Put in the magic number, and save the sizes, initial options, internal  /* Put in the magic number, and save the sizes, initial options, internal
6146  flags, and character table pointer. NULL is used for the default character  flags, and character table pointer. NULL is used for the default character
6147  tables. The nullpad field is at the end; it's there to help in the case when a  tables. The nullpad field is at the end; it's there to help in the case when a
6148  regex compiled on a system with 4-byte pointers is run on another with 8-byte  regex compiled on a system with 4-byte pointers is run on another with 8-byte
# Line 5919  field. Reset the bracket count and the n Line 6169  field. Reset the bracket count and the n
6169  field; this time it's used for remembering forward references to subpatterns.  field; this time it's used for remembering forward references to subpatterns.
6170  */  */
6171    
6172    cd->final_bracount = cd->bracount;  /* Save for checking forward references */
6173  cd->bracount = 0;  cd->bracount = 0;
6174  cd->names_found = 0;  cd->names_found = 0;
6175  cd->name_table = (uschar *)re + re->name_table_offset;  cd->name_table = (uschar *)re + re->name_table_offset;
# Line 5969  while (errorcode == 0 && cd->hwm > cwork Line 6220  while (errorcode == 0 && cd->hwm > cwork
6220    if (groupptr == NULL) errorcode = ERR53;    if (groupptr == NULL) errorcode = ERR53;
6221      else PUT(((uschar *)codestart), offset, groupptr - codestart);      else PUT(((uschar *)codestart), offset, groupptr - codestart);
6222    }    }
6223    
6224  /* 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
6225  subpattern. */  subpattern. */
6226    
# Line 5983  if (errorcode != 0) Line 6234  if (errorcode != 0)
6234    PCRE_EARLY_ERROR_RETURN:    PCRE_EARLY_ERROR_RETURN:
6235    *erroroffset = ptr - (const uschar *)pattern;    *erroroffset = ptr - (const uschar *)pattern;
6236    PCRE_EARLY_ERROR_RETURN2:    PCRE_EARLY_ERROR_RETURN2:
6237    *errorptr = error_texts[errorcode];    *errorptr = find_error_text(errorcode);
6238    if (errorcodeptr != NULL) *errorcodeptr = errorcode;    if (errorcodeptr != NULL) *errorcodeptr = errorcode;
6239    return NULL;    return NULL;
6240    }    }
# Line 6068  was compiled can be seen. */ Line 6319  was compiled can be seen. */
6319  if (code - codestart > length)  if (code - codestart > length)
6320    {    {
6321    (pcre_free)(re);    (pcre_free)(re);
6322    *errorptr = error_texts[ERR23];    *errorptr = find_error_text(ERR23);
6323    *erroroffset = ptr - (uschar *)pattern;    *erroroffset = ptr - (uschar *)pattern;
6324    if (errorcodeptr != NULL) *errorcodeptr = ERR23;    if (errorcodeptr != NULL) *errorcodeptr = ERR23;
6325    return NULL;    return NULL;
Legend:
Removed from v.230  
changed lines
  Added in v.336
webmaster@exim.org
 ViewVC Help
Powered by ViewVC 1.1.12