/[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 574 by ph10, Sat Nov 20 17:47:27 2010 UTC revision 905 by zherczeg, Mon Jan 23 19:26:03 2012 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-2010 University of Cambridge             Copyright (c) 1997-2012 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 53  supporting internal functions that are n Line 53  supporting internal functions that are n
53  #include "pcre_internal.h"  #include "pcre_internal.h"
54    
55    
56  /* When PCRE_DEBUG is defined, we need the pcre_printint() function, which is  /* When PCRE_DEBUG is defined, we need the pcre(16)_printint() function, which
57  also used by pcretest. PCRE_DEBUG is not defined when building a production  is also used by pcretest. PCRE_DEBUG is not defined when building a production
58  library. */  library. We do not need to select pcre16_printint.c specially, because the
59    COMPILE_PCREx macro will already be appropriately set. */
60    
61  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
62  #include "pcre_printint.src"  /* pcre_printint.c should not include any headers */
63    #define PCRE_INCLUDED
64    #include "pcre_printint.c"
65    #undef PCRE_INCLUDED
66  #endif  #endif
67    
68    
# Line 88  so this number is very generous. Line 92  so this number is very generous.
92  The same workspace is used during the second, actual compile phase for  The same workspace is used during the second, actual compile phase for
93  remembering forward references to groups so that they can be filled in at the  remembering forward references to groups so that they can be filled in at the
94  end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE  end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE
95  is 4 there is plenty of room. */  is 4 there is plenty of room for most patterns. However, the memory can get
96    filled up by repetitions of forward references, for example patterns like
97    /(?1){0,1999}(b)/, and one user did hit the limit. The code has been changed so
98    that the workspace is expanded using malloc() in this situation. The value
99    below is therefore a minimum, and we put a maximum on it for safety. The
100    minimum is now also defined in terms of LINK_SIZE so that the use of malloc()
101    kicks in at the same number of forward references in all cases. */
102    
103  #define COMPILE_WORK_SIZE (4096)  #define COMPILE_WORK_SIZE (2048*LINK_SIZE)
104    #define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)
105    
106  /* The overrun tests check for a slightly smaller size so that they detect the  /* The overrun tests check for a slightly smaller size so that they detect the
107  overrun before it actually does run off the end of the data block. */  overrun before it actually does run off the end of the data block. */
108    
109  #define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100)  #define WORK_SIZE_SAFETY_MARGIN (100)
110    
111    /* Private flags added to firstchar and reqchar. */
112    
113    #define REQ_CASELESS   0x10000000l      /* Indicates caselessness */
114    #define REQ_VARY       0x20000000l      /* Reqchar followed non-literal item */
115    
116    /* Repeated character flags. */
117    
118    #define UTF_LENGTH     0x10000000l      /* The char contains its length. */
119    
120  /* Table for handling escaped characters in the range '0'-'z'. Positive returns  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
121  are simple data values; negative values are for special things like \d and so  are simple data values; negative values are for special things like \d and so
# Line 231  static const char posix_names[] = Line 250  static const char posix_names[] =
250    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0    STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
251    STRING_word0  STRING_xdigit;    STRING_word0  STRING_xdigit;
252    
253  static const uschar posix_name_lengths[] = {  static const pcre_uint8 posix_name_lengths[] = {
254    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 };
255    
256  /* Table of class bit maps for each POSIX class. Each class is formed from a  /* Table of class bit maps for each POSIX class. Each class is formed from a
# Line 266  substitutes must be in the order of the Line 285  substitutes must be in the order of the
285  both positive and negative cases. NULL means no substitute. */  both positive and negative cases. NULL means no substitute. */
286    
287  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
288  static const uschar *substitutes[] = {  static const pcre_uchar string_PNd[]  = {
289    (uschar *)"\\P{Nd}",    /* \D */    CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
290    (uschar *)"\\p{Nd}",    /* \d */    CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
291    (uschar *)"\\P{Xsp}",   /* \S */       /* NOTE: Xsp is Perl space */  static const pcre_uchar string_pNd[]  = {
292    (uschar *)"\\p{Xsp}",   /* \s */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
293    (uschar *)"\\P{Xwd}",   /* \W */    CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
294    (uschar *)"\\p{Xwd}"    /* \w */  static const pcre_uchar string_PXsp[] = {
295      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
296      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
297    static const pcre_uchar string_pXsp[] = {
298      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
299      CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
300    static const pcre_uchar string_PXwd[] = {
301      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
302      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
303    static const pcre_uchar string_pXwd[] = {
304      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
305      CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
306    
307    static const pcre_uchar *substitutes[] = {
308      string_PNd,           /* \D */
309      string_pNd,           /* \d */
310      string_PXsp,          /* \S */       /* NOTE: Xsp is Perl space */
311      string_pXsp,          /* \s */
312      string_PXwd,          /* \W */
313      string_pXwd           /* \w */
314  };  };
315    
316  static const uschar *posix_substitutes[] = {  static const pcre_uchar string_pL[] =   {
317    (uschar *)"\\p{L}",     /* alpha */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
318    (uschar *)"\\p{Ll}",    /* lower */    CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
319    (uschar *)"\\p{Lu}",    /* upper */  static const pcre_uchar string_pLl[] =  {
320    (uschar *)"\\p{Xan}",   /* alnum */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
321    NULL,                   /* ascii */    CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
322    (uschar *)"\\h",        /* blank */  static const pcre_uchar string_pLu[] =  {
323    NULL,                   /* cntrl */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
324    (uschar *)"\\p{Nd}",    /* digit */    CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
325    NULL,                   /* graph */  static const pcre_uchar string_pXan[] = {
326    NULL,                   /* print */    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
327    NULL,                   /* punct */    CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
328    (uschar *)"\\p{Xps}",   /* space */    /* NOTE: Xps is POSIX space */  static const pcre_uchar string_h[] =    {
329    (uschar *)"\\p{Xwd}",   /* word */    CHAR_BACKSLASH, CHAR_h, '\0' };
330    NULL,                   /* xdigit */  static const pcre_uchar string_pXps[] = {
331      CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
332      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
333    static const pcre_uchar string_PL[] =   {
334      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
335      CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
336    static const pcre_uchar string_PLl[] =  {
337      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
338      CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
339    static const pcre_uchar string_PLu[] =  {
340      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
341      CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
342    static const pcre_uchar string_PXan[] = {
343      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
344      CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
345    static const pcre_uchar string_H[] =    {
346      CHAR_BACKSLASH, CHAR_H, '\0' };
347    static const pcre_uchar string_PXps[] = {
348      CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
349      CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
350    
351    static const pcre_uchar *posix_substitutes[] = {
352      string_pL,            /* alpha */
353      string_pLl,           /* lower */
354      string_pLu,           /* upper */
355      string_pXan,          /* alnum */
356      NULL,                 /* ascii */
357      string_h,             /* blank */
358      NULL,                 /* cntrl */
359      string_pNd,           /* digit */
360      NULL,                 /* graph */
361      NULL,                 /* print */
362      NULL,                 /* punct */
363      string_pXps,          /* space */    /* NOTE: Xps is POSIX space */
364      string_pXwd,          /* word */
365      NULL,                 /* xdigit */
366    /* Negated cases */    /* Negated cases */
367    (uschar *)"\\P{L}",     /* ^alpha */    string_PL,            /* ^alpha */
368    (uschar *)"\\P{Ll}",    /* ^lower */    string_PLl,           /* ^lower */
369    (uschar *)"\\P{Lu}",    /* ^upper */    string_PLu,           /* ^upper */
370    (uschar *)"\\P{Xan}",   /* ^alnum */    string_PXan,          /* ^alnum */
371    NULL,                   /* ^ascii */    NULL,                 /* ^ascii */
372    (uschar *)"\\H",        /* ^blank */    string_H,             /* ^blank */
373    NULL,                   /* ^cntrl */    NULL,                 /* ^cntrl */
374    (uschar *)"\\P{Nd}",    /* ^digit */    string_PNd,           /* ^digit */
375    NULL,                   /* ^graph */    NULL,                 /* ^graph */
376    NULL,                   /* ^print */    NULL,                 /* ^print */
377    NULL,                   /* ^punct */    NULL,                 /* ^punct */
378    (uschar *)"\\P{Xps}",   /* ^space */   /* NOTE: Xps is POSIX space */    string_PXps,          /* ^space */   /* NOTE: Xps is POSIX space */
379    (uschar *)"\\P{Xwd}",   /* ^word */    string_PXwd,          /* ^word */
380    NULL                    /* ^xdigit */    NULL                  /* ^xdigit */
381  };  };
382  #define POSIX_SUBSIZE (sizeof(posix_substitutes)/sizeof(uschar *))  #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
383  #endif  #endif
384    
385  #define STRING(a)  # a  #define STRING(a)  # a
# Line 365  static const char error_texts[] = Line 438  static const char error_texts[] =
438    /* 30 */    /* 30 */
439    "unknown POSIX class name\0"    "unknown POSIX class name\0"
440    "POSIX collating elements are not supported\0"    "POSIX collating elements are not supported\0"
441    "this version of PCRE is not compiled with PCRE_UTF8 support\0"    "this version of PCRE is compiled without UTF support\0"
442    "spare error\0"  /** DEAD **/    "spare error\0"  /** DEAD **/
443    "character value in \\x{...} sequence is too large\0"    "character value in \\x{...} sequence is too large\0"
444    /* 35 */    /* 35 */
# Line 388  static const char error_texts[] = Line 461  static const char error_texts[] =
461    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
462    /* 50 */    /* 50 */
463    "repeated subpattern is too long\0"    /** DEAD **/    "repeated subpattern is too long\0"    /** DEAD **/
464    "octal value is greater than \\377 (not in UTF-8 mode)\0"    "octal value is greater than \\377 in 8-bit non-UTF-8 mode\0"
465    "internal error: overran compiling workspace\0"    "internal error: overran compiling workspace\0"
466    "internal error: previously-checked referenced subpattern not found\0"    "internal error: previously-checked referenced subpattern not found\0"
467    "DEFINE group contains more than one branch\0"    "DEFINE group contains more than one branch\0"
468    /* 55 */    /* 55 */
469    "repeating a DEFINE group is not allowed\0"    "repeating a DEFINE group is not allowed\0"  /** DEAD **/
470    "inconsistent NEWLINE options\0"    "inconsistent NEWLINE options\0"
471    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
472    "a numbered reference must not be zero\0"    "a numbered reference must not be zero\0"
# Line 407  static const char error_texts[] = Line 480  static const char error_texts[] =
480    /* 65 */    /* 65 */
481    "different names for subpatterns of the same number are not allowed\0"    "different names for subpatterns of the same number are not allowed\0"
482    "(*MARK) must have an argument\0"    "(*MARK) must have an argument\0"
483    "this version of PCRE is not compiled with PCRE_UCP support\0"    "this version of PCRE is not compiled with Unicode property support\0"
484    "\\c must be followed by an ASCII character\0"    "\\c must be followed by an ASCII character\0"
485      "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
486      /* 70 */
487      "internal error: unknown opcode in find_fixedlength()\0"
488      "\\N is not supported in a class\0"
489      "too many forward references\0"
490      "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
491      "invalid UTF-16 string\0"
492    ;    ;
493    
494  /* 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 427  For convenience, we use the same bit def Line 507  For convenience, we use the same bit def
507    
508  Then we can use ctype_digit and ctype_xdigit in the code. */  Then we can use ctype_digit and ctype_xdigit in the code. */
509    
510    /* Using a simple comparison for decimal numbers rather than a memory read
511    is much faster, and the resulting code is simpler (the compiler turns it
512    into a subtraction and unsigned comparison). */
513    
514    #define IS_DIGIT(x) ((x) >= CHAR_0 && (x) <= CHAR_9)
515    
516  #ifndef EBCDIC  #ifndef EBCDIC
517    
518  /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in  /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
519  UTF-8 mode. */  UTF-8 mode. */
520    
521  static const unsigned char digitab[] =  static const pcre_uint8 digitab[] =
522    {    {
523    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
524    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */
# Line 471  static const unsigned char digitab[] = Line 557  static const unsigned char digitab[] =
557    
558  /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */  /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
559    
560  static const unsigned char digitab[] =  static const pcre_uint8 digitab[] =
561    {    {
562    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
563    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */
# Line 506  static const unsigned char digitab[] = Line 592  static const unsigned char digitab[] =
592    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */    0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */
593    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */    0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */
594    
595  static const unsigned char ebcdic_chartab[] = { /* chartable partial dup */  static const pcre_uint8 ebcdic_chartab[] = { /* chartable partial dup */
596    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */    0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */
597    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */    0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
598    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */    0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */
# Line 545  static const unsigned char ebcdic_charta Line 631  static const unsigned char ebcdic_charta
631  /* Definition to allow mutual recursion */  /* Definition to allow mutual recursion */
632    
633  static BOOL  static BOOL
634    compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,    compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,
635      int *, int *, branch_chain *, compile_data *, int *);      int *, int *, branch_chain *, compile_data *, int *);
636    
637    
# Line 577  return s; Line 663  return s;
663    
664    
665  /*************************************************  /*************************************************
666    *           Expand the workspace                 *
667    *************************************************/
668    
669    /* This function is called during the second compiling phase, if the number of
670    forward references fills the existing workspace, which is originally a block on
671    the stack. A larger block is obtained from malloc() unless the ultimate limit
672    has been reached or the increase will be rather small.
673    
674    Argument: pointer to the compile data block
675    Returns:  0 if all went well, else an error number
676    */
677    
678    static int
679    expand_workspace(compile_data *cd)
680    {
681    pcre_uchar *newspace;
682    int newsize = cd->workspace_size * 2;
683    
684    if (newsize > COMPILE_WORK_SIZE_MAX) newsize = COMPILE_WORK_SIZE_MAX;
685    if (cd->workspace_size >= COMPILE_WORK_SIZE_MAX ||
686        newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)
687     return ERR72;
688    
689    newspace = (PUBL(malloc))(IN_UCHARS(newsize));
690    if (newspace == NULL) return ERR21;
691    memcpy(newspace, cd->start_workspace, cd->workspace_size * sizeof(pcre_uchar));
692    cd->hwm = (pcre_uchar *)newspace + (cd->hwm - cd->start_workspace);
693    if (cd->workspace_size > COMPILE_WORK_SIZE)
694      (PUBL(free))((void *)cd->start_workspace);
695    cd->start_workspace = newspace;
696    cd->workspace_size = newsize;
697    return 0;
698    }
699    
700    
701    
702    /*************************************************
703    *            Check for counted repeat            *
704    *************************************************/
705    
706    /* This function is called when a '{' is encountered in a place where it might
707    start a quantifier. It looks ahead to see if it really is a quantifier or not.
708    It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
709    where the ddds are digits.
710    
711    Arguments:
712      p         pointer to the first char after '{'
713    
714    Returns:    TRUE or FALSE
715    */
716    
717    static BOOL
718    is_counted_repeat(const pcre_uchar *p)
719    {
720    if (!IS_DIGIT(*p)) return FALSE;
721    p++;
722    while (IS_DIGIT(*p)) p++;
723    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
724    
725    if (*p++ != CHAR_COMMA) return FALSE;
726    if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
727    
728    if (!IS_DIGIT(*p)) return FALSE;
729    p++;
730    while (IS_DIGIT(*p)) p++;
731    
732    return (*p == CHAR_RIGHT_CURLY_BRACKET);
733    }
734    
735    
736    
737    /*************************************************
738  *            Handle escapes                      *  *            Handle escapes                      *
739  *************************************************/  *************************************************/
740    
# Line 601  Returns:         zero or positive => a d Line 759  Returns:         zero or positive => a d
759  */  */
760    
761  static int  static int
762  check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,  check_escape(const pcre_uchar **ptrptr, int *errorcodeptr, int bracount,
763    int options, BOOL isclass)    int options, BOOL isclass)
764  {  {
765  BOOL utf8 = (options & PCRE_UTF8) != 0;  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
766  const uschar *ptr = *ptrptr + 1;  BOOL utf = (options & PCRE_UTF8) != 0;
767  int c, i;  const pcre_uchar *ptr = *ptrptr + 1;
768    pcre_int32 c;
769    int i;
770    
771  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
772  ptr--;                            /* Set pointer back to the last byte */  ptr--;                            /* Set pointer back to the last byte */
# Line 620  in a table. A non-zero result is somethi Line 780  in a table. A non-zero result is somethi
780  Otherwise further processing may be required. */  Otherwise further processing may be required. */
781    
782  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
783  else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */  /* Not alphanumeric */
784    else if (c < CHAR_0 || c > CHAR_z) {}
785  else if ((i = escapes[c - CHAR_0]) != 0) c = i;  else if ((i = escapes[c - CHAR_0]) != 0) c = i;
786    
787  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
788  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */  /* Not alphanumeric */
789    else if (c < 'a' || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}
790  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if ((i = escapes[c - 0x48]) != 0)  c = i;
791  #endif  #endif
792    
# Line 632  else if ((i = escapes[c - 0x48]) != 0) Line 794  else if ((i = escapes[c - 0x48]) != 0)
794    
795  else  else
796    {    {
797    const uschar *oldptr;    const pcre_uchar *oldptr;
798    BOOL braced, negated;    BOOL braced, negated;
799    
800    switch (c)    switch (c)
# Line 642  else Line 804  else
804    
805      case CHAR_l:      case CHAR_l:
806      case CHAR_L:      case CHAR_L:
807        *errorcodeptr = ERR37;
808        break;
809    
810      case CHAR_u:      case CHAR_u:
811        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
812          {
813          /* In JavaScript, \u must be followed by four hexadecimal numbers.
814          Otherwise it is a lowercase u letter. */
815          if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
816            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0
817            && MAX_255(ptr[3]) && (digitab[ptr[3]] & ctype_xdigit) != 0
818            && MAX_255(ptr[4]) && (digitab[ptr[4]] & ctype_xdigit) != 0)
819            {
820            c = 0;
821            for (i = 0; i < 4; ++i)
822              {
823              register int cc = *(++ptr);
824    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
825              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
826              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
827    #else           /* EBCDIC coding */
828              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
829              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
830    #endif
831              }
832            }
833          }
834        else
835          *errorcodeptr = ERR37;
836        break;
837    
838      case CHAR_U:      case CHAR_U:
839      *errorcodeptr = ERR37;      /* In JavaScript, \U is an uppercase U letter. */
840        if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
841      break;      break;
842    
843      /* \g must be followed by one of a number of specific things:      /* In a character class, \g is just a literal "g". Outside a character
844        class, \g must be followed by one of a number of specific things:
845    
846      (1) A number, either plain or braced. If positive, it is an absolute      (1) A number, either plain or braced. If positive, it is an absolute
847      backreference. If negative, it is a relative backreference. This is a Perl      backreference. If negative, it is a relative backreference. This is a Perl
# Line 664  else Line 858  else
858      the -ESC_g code (cf \k). */      the -ESC_g code (cf \k). */
859    
860      case CHAR_g:      case CHAR_g:
861        if (isclass) break;
862      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
863        {        {
864        c = -ESC_g;        c = -ESC_g;
# Line 674  else Line 869  else
869    
870      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
871        {        {
872        const uschar *p;        const pcre_uchar *p;
873        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
874          if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;          if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
875        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
876          {          {
877          c = -ESC_k;          c = -ESC_k;
# Line 694  else Line 889  else
889        }        }
890      else negated = FALSE;      else negated = FALSE;
891    
892        /* The integer range is limited by the machine's int representation. */
893      c = 0;      c = 0;
894      while ((digitab[ptr[1]] & ctype_digit) != 0)      while (IS_DIGIT(ptr[1]))
895          {
896          if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */
897            {
898            c = -1;
899            break;
900            }
901        c = c * 10 + *(++ptr) - CHAR_0;        c = c * 10 + *(++ptr) - CHAR_0;
902          }
903      if (c < 0)   /* Integer overflow */      if (((unsigned int)c) > INT_MAX) /* Integer overflow */
904        {        {
905          while (IS_DIGIT(ptr[1]))
906            ptr++;
907        *errorcodeptr = ERR61;        *errorcodeptr = ERR61;
908        break;        break;
909        }        }
# Line 747  else Line 951  else
951      if (!isclass)      if (!isclass)
952        {        {
953        oldptr = ptr;        oldptr = ptr;
954          /* The integer range is limited by the machine's int representation. */
955        c -= CHAR_0;        c -= CHAR_0;
956        while ((digitab[ptr[1]] & ctype_digit) != 0)        while (IS_DIGIT(ptr[1]))
957            {
958            if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */
959              {
960              c = -1;
961              break;
962              }
963          c = c * 10 + *(++ptr) - CHAR_0;          c = c * 10 + *(++ptr) - CHAR_0;
964        if (c < 0)    /* Integer overflow */          }
965          if (((unsigned int)c) > INT_MAX) /* Integer overflow */
966          {          {
967            while (IS_DIGIT(ptr[1]))
968              ptr++;
969          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
970          break;          break;
971          }          }
# Line 777  else Line 991  else
991      /* \0 always starts an octal number, but we may drop through to here with a      /* \0 always starts an octal number, but we may drop through to here with a
992      larger first octal digit. The original code used just to take the least      larger first octal digit. The original code used just to take the least
993      significant 8 bits of octal numbers (I think this is what early Perls used      significant 8 bits of octal numbers (I think this is what early Perls used
994      to do). Nowadays we allow for larger numbers in UTF-8 mode, but no more      to do). Nowadays we allow for larger numbers in UTF-8 mode and 16-bit mode,
995      than 3 octal digits. */      but no more than 3 octal digits. */
996    
997      case CHAR_0:      case CHAR_0:
998      c -= CHAR_0;      c -= CHAR_0;
999      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)      while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
1000          c = c * 8 + *(++ptr) - CHAR_0;          c = c * 8 + *(++ptr) - CHAR_0;
1001      if (!utf8 && c > 255) *errorcodeptr = ERR51;  #ifdef COMPILE_PCRE8
1002        if (!utf && c > 0xff) *errorcodeptr = ERR51;
1003    #endif
1004      break;      break;
1005    
1006      /* \x is complicated. \x{ddd} is a character number which can be greater      /* \x is complicated. \x{ddd} is a character number which can be greater
1007      than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is      than 0xff in utf or non-8bit mode, but only if the ddd are hex digits.
1008      treated as a data character. */      If not, { is treated as a data character. */
1009    
1010      case CHAR_x:      case CHAR_x:
1011        if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
1012          {
1013          /* In JavaScript, \x must be followed by two hexadecimal numbers.
1014          Otherwise it is a lowercase x letter. */
1015          if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
1016            && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)
1017            {
1018            c = 0;
1019            for (i = 0; i < 2; ++i)
1020              {
1021              register int cc = *(++ptr);
1022    #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1023              if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
1024              c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
1025    #else           /* EBCDIC coding */
1026              if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
1027              c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1028    #endif
1029              }
1030            }
1031          break;
1032          }
1033    
1034      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
1035        {        {
1036        const uschar *pt = ptr + 2;        const pcre_uchar *pt = ptr + 2;
       int count = 0;  
1037    
1038        c = 0;        c = 0;
1039        while ((digitab[*pt] & ctype_xdigit) != 0)        while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0)
1040          {          {
1041          register int cc = *pt++;          register int cc = *pt++;
1042          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
         count++;  
1043    
1044  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1045          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
# Line 811  else Line 1048  else
1048          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
1049          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1050  #endif  #endif
1051    
1052    #ifdef COMPILE_PCRE8
1053            if (c > (utf ? 0x10ffff : 0xff)) { c = -1; break; }
1054    #else
1055    #ifdef COMPILE_PCRE16
1056            if (c > (utf ? 0x10ffff : 0xffff)) { c = -1; break; }
1057    #endif
1058    #endif
1059            }
1060    
1061          if (c < 0)
1062            {
1063            while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0) pt++;
1064            *errorcodeptr = ERR34;
1065          }          }
1066    
1067        if (*pt == CHAR_RIGHT_CURLY_BRACKET)        if (*pt == CHAR_RIGHT_CURLY_BRACKET)
1068          {          {
1069          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;          if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
1070          ptr = pt;          ptr = pt;
1071          break;          break;
1072          }          }
# Line 827  else Line 1078  else
1078      /* Read just a single-byte hex-defined char */      /* Read just a single-byte hex-defined char */
1079    
1080      c = 0;      c = 0;
1081      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)      while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)
1082        {        {
1083        int cc;                                  /* Some compilers don't like */        int cc;                                  /* Some compilers don't like */
1084        cc = *(++ptr);                           /* ++ in initializers */        cc = *(++ptr);                           /* ++ in initializers */
# Line 857  else Line 1108  else
1108      if (c > 127)  /* Excludes all non-ASCII in either mode */      if (c > 127)  /* Excludes all non-ASCII in either mode */
1109        {        {
1110        *errorcodeptr = ERR68;        *errorcodeptr = ERR68;
1111        break;        break;
1112        }        }
1113      if (c >= CHAR_a && c <= CHAR_z) c -= 32;      if (c >= CHAR_a && c <= CHAR_z) c -= 32;
1114      c ^= 0x40;      c ^= 0x40;
1115  #else             /* EBCDIC coding */  #else             /* EBCDIC coding */
# Line 885  else Line 1136  else
1136    }    }
1137    
1138  /* Perl supports \N{name} for character names, as well as plain \N for "not  /* Perl supports \N{name} for character names, as well as plain \N for "not
1139  newline". PCRE does not support \N{name}. */  newline". PCRE does not support \N{name}. However, it does support
1140    quantification such as \N{2,3}. */
1141    
1142  if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET)  if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
1143         !is_counted_repeat(ptr+2))
1144    *errorcodeptr = ERR37;    *errorcodeptr = ERR37;
1145    
1146  /* If PCRE_UCP is set, we change the values for \d etc. */  /* If PCRE_UCP is set, we change the values for \d etc. */
# Line 923  Returns:         type value from ucp_typ Line 1176  Returns:         type value from ucp_typ
1176  */  */
1177    
1178  static int  static int
1179  get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
1180  {  {
1181  int c, i, bot, top;  int c, i, bot, top;
1182  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
1183  char name[32];  pcre_uchar name[32];
1184    
1185  c = *(++ptr);  c = *(++ptr);
1186  if (c == 0) goto ERROR_RETURN;  if (c == 0) goto ERROR_RETURN;
# Line 944  if (c == CHAR_LEFT_CURLY_BRACKET) Line 1197  if (c == CHAR_LEFT_CURLY_BRACKET)
1197      *negptr = TRUE;      *negptr = TRUE;
1198      ptr++;      ptr++;
1199      }      }
1200    for (i = 0; i < (int)sizeof(name) - 1; i++)    for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
1201      {      {
1202      c = *(++ptr);      c = *(++ptr);
1203      if (c == 0) goto ERROR_RETURN;      if (c == 0) goto ERROR_RETURN;
# Line 968  else Line 1221  else
1221  /* Search for a recognized property name using binary chop */  /* Search for a recognized property name using binary chop */
1222    
1223  bot = 0;  bot = 0;
1224  top = _pcre_utt_size;  top = PRIV(utt_size);
1225    
1226  while (bot < top)  while (bot < top)
1227    {    {
1228    i = (bot + top) >> 1;    i = (bot + top) >> 1;
1229    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);    c = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
1230    if (c == 0)    if (c == 0)
1231      {      {
1232      *dptr = _pcre_utt[i].value;      *dptr = PRIV(utt)[i].value;
1233      return _pcre_utt[i].type;      return PRIV(utt)[i].type;
1234      }      }
1235    if (c > 0) bot = i + 1; else top = i;    if (c > 0) bot = i + 1; else top = i;
1236    }    }
# Line 997  return -1; Line 1250  return -1;
1250    
1251    
1252  /*************************************************  /*************************************************
 *            Check for counted repeat            *  
 *************************************************/  
   
 /* This function is called when a '{' is encountered in a place where it might  
 start a quantifier. It looks ahead to see if it really is a quantifier or not.  
 It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}  
 where the ddds are digits.  
   
 Arguments:  
   p         pointer to the first char after '{'  
   
 Returns:    TRUE or FALSE  
 */  
   
 static BOOL  
 is_counted_repeat(const uschar *p)  
 {  
 if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  
 while ((digitab[*p] & ctype_digit) != 0) p++;  
 if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  
   
 if (*p++ != CHAR_COMMA) return FALSE;  
 if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;  
   
 if ((digitab[*p++] & ctype_digit) == 0) return FALSE;  
 while ((digitab[*p] & ctype_digit) != 0) p++;  
   
 return (*p == CHAR_RIGHT_CURLY_BRACKET);  
 }  
   
   
   
 /*************************************************  
1253  *         Read repeat counts                     *  *         Read repeat counts                     *
1254  *************************************************/  *************************************************/
1255    
# Line 1048  Returns:         pointer to '}' on succe Line 1268  Returns:         pointer to '}' on succe
1268                   current ptr on error, with errorcodeptr set non-zero                   current ptr on error, with errorcodeptr set non-zero
1269  */  */
1270    
1271  static const uschar *  static const pcre_uchar *
1272  read_repeat_counts(const uschar *p, int *minp, int *maxp, int *errorcodeptr)  read_repeat_counts(const pcre_uchar *p, int *minp, int *maxp, int *errorcodeptr)
1273  {  {
1274  int min = 0;  int min = 0;
1275  int max = -1;  int max = -1;
# Line 1057  int max = -1; Line 1277  int max = -1;
1277  /* Read the minimum value and do a paranoid check: a negative value indicates  /* Read the minimum value and do a paranoid check: a negative value indicates
1278  an integer overflow. */  an integer overflow. */
1279    
1280  while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;  while (IS_DIGIT(*p)) min = min * 10 + *p++ - CHAR_0;
1281  if (min < 0 || min > 65535)  if (min < 0 || min > 65535)
1282    {    {
1283    *errorcodeptr = ERR5;    *errorcodeptr = ERR5;
# Line 1072  if (*p == CHAR_RIGHT_CURLY_BRACKET) max Line 1292  if (*p == CHAR_RIGHT_CURLY_BRACKET) max
1292    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
1293      {      {
1294      max = 0;      max = 0;
1295      while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;      while(IS_DIGIT(*p)) max = max * 10 + *p++ - CHAR_0;
1296      if (max < 0 || max > 65535)      if (max < 0 || max > 65535)
1297        {        {
1298        *errorcodeptr = ERR5;        *errorcodeptr = ERR5;
# Line 1105  top-level call starts at the beginning o Line 1325  top-level call starts at the beginning o
1325  start at a parenthesis. It scans along a pattern's text looking for capturing  start at a parenthesis. It scans along a pattern's text looking for capturing
1326  subpatterns, and counting them. If it finds a named pattern that matches the  subpatterns, and counting them. If it finds a named pattern that matches the
1327  name it is given, it returns its number. Alternatively, if the name is NULL, it  name it is given, it returns its number. Alternatively, if the name is NULL, it
1328  returns when it reaches a given numbered subpattern. We know that if (?P< is  returns when it reaches a given numbered subpattern. Recursion is used to keep
1329  encountered, the name will be terminated by '>' because that is checked in the  track of subpatterns that reset the capturing group numbers - the (?| feature.
1330  first pass. Recursion is used to keep track of subpatterns that reset the  
1331  capturing group numbers - the (?| feature.  This function was originally called only from the second pass, in which we know
1332    that if (?< or (?' or (?P< is encountered, the name will be correctly
1333    terminated because that is checked in the first pass. There is now one call to
1334    this function in the first pass, to check for a recursive back reference by
1335    name (so that we can make the whole group atomic). In this case, we need check
1336    only up to the current position in the pattern, and that is still OK because
1337    and previous occurrences will have been checked. To make this work, the test
1338    for "end of pattern" is a check against cd->end_pattern in the main loop,
1339    instead of looking for a binary zero. This means that the special first-pass
1340    call can adjust cd->end_pattern temporarily. (Checks for binary zero while
1341    processing items within the loop are OK, because afterwards the main loop will
1342    terminate.)
1343    
1344  Arguments:  Arguments:
1345    ptrptr       address of the current character pointer (updated)    ptrptr       address of the current character pointer (updated)
# Line 1116  Arguments: Line 1347  Arguments:
1347    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1348    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1349    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1350    utf8         TRUE if we are in UTF-8 mode    utf          TRUE if we are in UTF-8 / UTF-16 mode
1351    count        pointer to the current capturing subpattern number (updated)    count        pointer to the current capturing subpattern number (updated)
1352    
1353  Returns:       the number of the named subpattern, or -1 if not found  Returns:       the number of the named subpattern, or -1 if not found
1354  */  */
1355    
1356  static int  static int
1357  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,  find_parens_sub(pcre_uchar **ptrptr, compile_data *cd, const pcre_uchar *name, int lorn,
1358    BOOL xmode, BOOL utf8, int *count)    BOOL xmode, BOOL utf, int *count)
1359  {  {
1360  uschar *ptr = *ptrptr;  pcre_uchar *ptr = *ptrptr;
1361  int start_count = *count;  int start_count = *count;
1362  int hwm_count = start_count;  int hwm_count = start_count;
1363  BOOL dup_parens = FALSE;  BOOL dup_parens = FALSE;
# Line 1193  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1424  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1424          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)          ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
1425        {        {
1426        int term;        int term;
1427        const uschar *thisname;        const pcre_uchar *thisname;
1428        *count += 1;        *count += 1;
1429        if (name == NULL && *count == lorn) return *count;        if (name == NULL && *count == lorn) return *count;
1430        term = *ptr++;        term = *ptr++;
# Line 1201  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1432  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1432        thisname = ptr;        thisname = ptr;
1433        while (*ptr != term) ptr++;        while (*ptr != term) ptr++;
1434        if (name != NULL && lorn == ptr - thisname &&        if (name != NULL && lorn == ptr - thisname &&
1435            strncmp((const char *)name, (const char *)thisname, lorn) == 0)            STRNCMP_UC_UC(name, thisname, lorn) == 0)
1436          return *count;          return *count;
1437        term++;        term++;
1438        }        }
# Line 1209  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1440  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1440    }    }
1441    
1442  /* Past any initial parenthesis handling, scan for parentheses or vertical  /* Past any initial parenthesis handling, scan for parentheses or vertical
1443  bars. */  bars. Stop if we get to cd->end_pattern. Note that this is important for the
1444    first-pass call when this value is temporarily adjusted to stop at the current
1445    position. So DO NOT change this to a test for binary zero. */
1446    
1447  for (; *ptr != 0; ptr++)  for (; ptr < cd->end_pattern; ptr++)
1448    {    {
1449    /* Skip over backslashed characters and also entire \Q...\E */    /* Skip over backslashed characters and also entire \Q...\E */
1450    
# Line 1242  for (; *ptr != 0; ptr++) Line 1475  for (; *ptr != 0; ptr++)
1475          {          {
1476          if (ptr[2] == CHAR_E)          if (ptr[2] == CHAR_E)
1477            ptr+= 2;            ptr+= 2;
1478          else if (strncmp((const char *)ptr+2,          else if (STRNCMP_UC_C8(ptr + 2,
1479                   STR_Q STR_BACKSLASH STR_E, 3) == 0)                   STR_Q STR_BACKSLASH STR_E, 3) == 0)
1480            ptr += 4;            ptr += 4;
1481          else          else
# Line 1285  for (; *ptr != 0; ptr++) Line 1518  for (; *ptr != 0; ptr++)
1518    
1519    if (xmode && *ptr == CHAR_NUMBER_SIGN)    if (xmode && *ptr == CHAR_NUMBER_SIGN)
1520      {      {
1521      ptr++;      ptr++;
1522      while (*ptr != 0)      while (*ptr != 0)
1523        {        {
1524        if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }        if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
1525        ptr++;        ptr++;
1526  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1527        if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;        if (utf) FORWARDCHAR(ptr);
1528  #endif  #endif
1529        }        }
1530      if (*ptr == 0) goto FAIL_EXIT;      if (*ptr == 0) goto FAIL_EXIT;
# Line 1302  for (; *ptr != 0; ptr++) Line 1535  for (; *ptr != 0; ptr++)
1535    
1536    if (*ptr == CHAR_LEFT_PARENTHESIS)    if (*ptr == CHAR_LEFT_PARENTHESIS)
1537      {      {
1538      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, count);      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, count);
1539      if (rc > 0) return rc;      if (rc > 0) return rc;
1540      if (*ptr == 0) goto FAIL_EXIT;      if (*ptr == 0) goto FAIL_EXIT;
1541      }      }
# Line 1348  Arguments: Line 1581  Arguments:
1581    name         name to seek, or NULL if seeking a numbered subpattern    name         name to seek, or NULL if seeking a numbered subpattern
1582    lorn         name length, or subpattern number if name is NULL    lorn         name length, or subpattern number if name is NULL
1583    xmode        TRUE if we are in /x mode    xmode        TRUE if we are in /x mode
1584    utf8         TRUE if we are in UTF-8 mode    utf          TRUE if we are in UTF-8 / UTF-16 mode
1585    
1586  Returns:       the number of the found subpattern, or -1 if not found  Returns:       the number of the found subpattern, or -1 if not found
1587  */  */
1588    
1589  static int  static int
1590  find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode,  find_parens(compile_data *cd, const pcre_uchar *name, int lorn, BOOL xmode,
1591    BOOL utf8)    BOOL utf)
1592  {  {
1593  uschar *ptr = (uschar *)cd->start_pattern;  pcre_uchar *ptr = (pcre_uchar *)cd->start_pattern;
1594  int count = 0;  int count = 0;
1595  int rc;  int rc;
1596    
# Line 1368  matching closing parens. That is why we Line 1601  matching closing parens. That is why we
1601    
1602  for (;;)  for (;;)
1603    {    {
1604    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, &count);    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, &count);
1605    if (rc > 0 || *ptr++ == 0) break;    if (rc > 0 || *ptr++ == 0) break;
1606    }    }
1607    
# Line 1384  return rc; Line 1617  return rc;
1617    
1618  /* This is called by several functions that scan a compiled expression looking  /* This is called by several functions that scan a compiled expression looking
1619  for a fixed first character, or an anchoring op code etc. It skips over things  for a fixed first character, or an anchoring op code etc. It skips over things
1620  that do not influence this. For some calls, a change of option is important.  that do not influence this. For some calls, it makes sense to skip negative
1621  For some calls, it makes sense to skip negative forward and all backward  forward and all backward assertions, and also the \b assertion; for others it
1622  assertions, and also the \b assertion; for others it does not.  does not.
1623    
1624  Arguments:  Arguments:
1625    code         pointer to the start of the group    code         pointer to the start of the group
   options      pointer to external options  
   optbit       the option bit whose changing is significant, or  
                  zero if none are  
1626    skipassert   TRUE if certain assertions are to be skipped    skipassert   TRUE if certain assertions are to be skipped
1627    
1628  Returns:       pointer to the first significant opcode  Returns:       pointer to the first significant opcode
1629  */  */
1630    
1631  static const uschar*  static const pcre_uchar*
1632  first_significant_code(const uschar *code, int *options, int optbit,  first_significant_code(const pcre_uchar *code, BOOL skipassert)
   BOOL skipassert)  
1633  {  {
1634  for (;;)  for (;;)
1635    {    {
1636    switch ((int)*code)    switch ((int)*code)
1637      {      {
     case OP_OPT:  
     if (optbit > 0 && ((int)code[1] & optbit) != (*options & optbit))  
       *options = (int)code[1];  
     code += 2;  
     break;  
   
1638      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1639      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1640      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1641      if (!skipassert) return code;      if (!skipassert) return code;
1642      do code += GET(code, 1); while (*code == OP_ALT);      do code += GET(code, 1); while (*code == OP_ALT);
1643      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1644      break;      break;
1645    
1646      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
# Line 1431  for (;;) Line 1654  for (;;)
1654      case OP_RREF:      case OP_RREF:
1655      case OP_NRREF:      case OP_NRREF:
1656      case OP_DEF:      case OP_DEF:
1657      code += _pcre_OP_lengths[*code];      code += PRIV(OP_lengths)[*code];
1658      break;      break;
1659    
1660      default:      default:
# Line 1461  and doing the check at the end; a flag s Line 1684  and doing the check at the end; a flag s
1684    
1685  Arguments:  Arguments:
1686    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1687    options  the compiling options    utf      TRUE in UTF-8 / UTF-16 mode
1688    atend    TRUE if called when the pattern is complete    atend    TRUE if called when the pattern is complete
1689    cd       the "compile data" structure    cd       the "compile data" structure
1690    
1691  Returns:   the fixed length,  Returns:   the fixed length,
1692               or -1 if there is no fixed length,               or -1 if there is no fixed length,
1693               or -2 if \C was encountered               or -2 if \C was encountered (in UTF-8 mode only)
1694               or -3 if an OP_RECURSE item was encountered and atend is FALSE               or -3 if an OP_RECURSE item was encountered and atend is FALSE
1695                 or -4 if an unknown opcode was encountered (internal error)
1696  */  */
1697    
1698  static int  static int
1699  find_fixedlength(uschar *code, int options, BOOL atend, compile_data *cd)  find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd)
1700  {  {
1701  int length = -1;  int length = -1;
1702    
1703  register int branchlength = 0;  register int branchlength = 0;
1704  register uschar *cc = code + 1 + LINK_SIZE;  register pcre_uchar *cc = code + 1 + LINK_SIZE;
1705    
1706  /* Scan along the opcodes for this branch. If we get to the end of the  /* Scan along the opcodes for this branch. If we get to the end of the
1707  branch, check the length against that of the other branches. */  branch, check the length against that of the other branches. */
# Line 1485  branch, check the length against that of Line 1709  branch, check the length against that of
1709  for (;;)  for (;;)
1710    {    {
1711    int d;    int d;
1712    uschar *ce, *cs;    pcre_uchar *ce, *cs;
1713    register int op = *cc;    register int op = *cc;
1714    
1715    switch (op)    switch (op)
1716      {      {
1717        /* We only need to continue for OP_CBRA (normal capturing bracket) and
1718        OP_BRA (normal non-capturing bracket) because the other variants of these
1719        opcodes are all concerned with unlimited repeated groups, which of course
1720        are not of fixed length. */
1721    
1722      case OP_CBRA:      case OP_CBRA:
1723      case OP_BRA:      case OP_BRA:
1724      case OP_ONCE:      case OP_ONCE:
1725        case OP_ONCE_NC:
1726      case OP_COND:      case OP_COND:
1727      d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options, atend, cd);      d = find_fixedlength(cc + ((op == OP_CBRA)? IMM2_SIZE : 0), utf, atend, cd);
1728      if (d < 0) return d;      if (d < 0) return d;
1729      branchlength += d;      branchlength += d;
1730      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1731      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1732      break;      break;
1733    
1734      /* Reached end of a branch; if it's a ket it is the end of a nested      /* Reached end of a branch; if it's a ket it is the end of a nested call.
1735      call. If it's ALT it is an alternation in a nested call. If it is      If it's ALT it is an alternation in a nested call. An ACCEPT is effectively
1736      END it's the end of the outer call. All can be handled by the same code. */      an ALT. If it is END it's the end of the outer call. All can be handled by
1737        the same code. Note that we must not include the OP_KETRxxx opcodes here,
1738        because they all imply an unlimited repeat. */
1739    
1740      case OP_ALT:      case OP_ALT:
1741      case OP_KET:      case OP_KET:
     case OP_KETRMAX:  
     case OP_KETRMIN:  
1742      case OP_END:      case OP_END:
1743        case OP_ACCEPT:
1744        case OP_ASSERT_ACCEPT:
1745      if (length < 0) length = branchlength;      if (length < 0) length = branchlength;
1746        else if (length != branchlength) return -1;        else if (length != branchlength) return -1;
1747      if (*cc != OP_ALT) return length;      if (*cc != OP_ALT) return length;
# Line 1522  for (;;) Line 1755  for (;;)
1755    
1756      case OP_RECURSE:      case OP_RECURSE:
1757      if (!atend) return -3;      if (!atend) return -3;
1758      cs = ce = (uschar *)cd->start_code + GET(cc, 1);  /* Start subpattern */      cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
1759      do ce += GET(ce, 1); while (*ce == OP_ALT);       /* End subpattern */      do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
1760      if (cc > cs && cc < ce) return -1;                /* Recursion */      if (cc > cs && cc < ce) return -1;                    /* Recursion */
1761      d = find_fixedlength(cs + 2, options, atend, cd);      d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd);
1762      if (d < 0) return d;      if (d < 0) return d;
1763      branchlength += d;      branchlength += d;
1764      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
# Line 1538  for (;;) Line 1771  for (;;)
1771      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1772      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1773      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
1774      /* Fall through */      cc += PRIV(OP_lengths)[*cc];
1775        break;
1776    
1777      /* Skip over things that don't match chars */      /* Skip over things that don't match chars */
1778    
1779      case OP_REVERSE:      case OP_MARK:
1780        case OP_PRUNE_ARG:
1781        case OP_SKIP_ARG:
1782        case OP_THEN_ARG:
1783        cc += cc[1] + PRIV(OP_lengths)[*cc];
1784        break;
1785    
1786        case OP_CALLOUT:
1787        case OP_CIRC:
1788        case OP_CIRCM:
1789        case OP_CLOSE:
1790        case OP_COMMIT:
1791      case OP_CREF:      case OP_CREF:
     case OP_NCREF:  
     case OP_RREF:  
     case OP_NRREF:  
1792      case OP_DEF:      case OP_DEF:
1793      case OP_OPT:      case OP_DOLL:
1794      case OP_CALLOUT:      case OP_DOLLM:
     case OP_SOD:  
     case OP_SOM:  
     case OP_SET_SOM:  
1795      case OP_EOD:      case OP_EOD:
1796      case OP_EODN:      case OP_EODN:
1797      case OP_CIRC:      case OP_FAIL:
1798      case OP_DOLL:      case OP_NCREF:
1799        case OP_NRREF:
1800      case OP_NOT_WORD_BOUNDARY:      case OP_NOT_WORD_BOUNDARY:
1801        case OP_PRUNE:
1802        case OP_REVERSE:
1803        case OP_RREF:
1804        case OP_SET_SOM:
1805        case OP_SKIP:
1806        case OP_SOD:
1807        case OP_SOM:
1808        case OP_THEN:
1809      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
1810      cc += _pcre_OP_lengths[*cc];      cc += PRIV(OP_lengths)[*cc];
1811      break;      break;
1812    
1813      /* Handle literal characters */      /* Handle literal characters */
1814    
1815      case OP_CHAR:      case OP_CHAR:
1816      case OP_CHARNC:      case OP_CHARI:
1817      case OP_NOT:      case OP_NOT:
1818        case OP_NOTI:
1819      branchlength++;      branchlength++;
1820      cc += 2;      cc += 2;
1821  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1822      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
       cc += _pcre_utf8_table4[cc[-1] & 0x3f];  
1823  #endif  #endif
1824      break;      break;
1825    
# Line 1579  for (;;) Line 1827  for (;;)
1827      need to skip over a multibyte character in UTF8 mode.  */      need to skip over a multibyte character in UTF8 mode.  */
1828    
1829      case OP_EXACT:      case OP_EXACT:
1830        case OP_EXACTI:
1831        case OP_NOTEXACT:
1832        case OP_NOTEXACTI:
1833      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1834      cc += 4;      cc += 2 + IMM2_SIZE;
1835  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1836      if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
       cc += _pcre_utf8_table4[cc[-1] & 0x3f];  
1837  #endif  #endif
1838      break;      break;
1839    
1840      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1841      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1842      if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;      if (cc[1 + IMM2_SIZE] == OP_PROP || cc[1 + IMM2_SIZE] == OP_NOTPROP) cc += 2;
1843      cc += 4;      cc += 1 + IMM2_SIZE + 1;
1844      break;      break;
1845    
1846      /* Handle single-char matchers */      /* Handle single-char matchers */
# Line 1600  for (;;) Line 1850  for (;;)
1850      cc += 2;      cc += 2;
1851      /* Fall through */      /* Fall through */
1852    
1853        case OP_HSPACE:
1854        case OP_VSPACE:
1855        case OP_NOT_HSPACE:
1856        case OP_NOT_VSPACE:
1857      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
1858      case OP_DIGIT:      case OP_DIGIT:
1859      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
# Line 1612  for (;;) Line 1866  for (;;)
1866      cc++;      cc++;
1867      break;      break;
1868    
1869      /* The single-byte matcher isn't allowed */      /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
1870        otherwise \C is coded as OP_ALLANY. */
1871    
1872      case OP_ANYBYTE:      case OP_ANYBYTE:
1873      return -2;      return -2;
1874    
1875      /* Check a class for variable quantification */      /* Check a class for variable quantification */
1876    
1877  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || defined COMPILE_PCRE16
1878      case OP_XCLASS:      case OP_XCLASS:
1879      cc += GET(cc, 1) - 33;      cc += GET(cc, 1) - PRIV(OP_lengths)[OP_CLASS];
1880      /* Fall through */      /* Fall through */
1881  #endif  #endif
1882    
1883      case OP_CLASS:      case OP_CLASS:
1884      case OP_NCLASS:      case OP_NCLASS:
1885      cc += 33;      cc += PRIV(OP_lengths)[OP_CLASS];
1886    
1887      switch (*cc)      switch (*cc)
1888        {        {
1889          case OP_CRPLUS:
1890          case OP_CRMINPLUS:
1891        case OP_CRSTAR:        case OP_CRSTAR:
1892        case OP_CRMINSTAR:        case OP_CRMINSTAR:
1893        case OP_CRQUERY:        case OP_CRQUERY:
# Line 1639  for (;;) Line 1896  for (;;)
1896    
1897        case OP_CRRANGE:        case OP_CRRANGE:
1898        case OP_CRMINRANGE:        case OP_CRMINRANGE:
1899        if (GET2(cc,1) != GET2(cc,3)) return -1;        if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
1900        branchlength += GET2(cc,1);        branchlength += GET2(cc,1);
1901        cc += 5;        cc += 1 + 2 * IMM2_SIZE;
1902        break;        break;
1903    
1904        default:        default:
# Line 1651  for (;;) Line 1908  for (;;)
1908    
1909      /* Anything else is variable length */      /* Anything else is variable length */
1910    
1911      default:      case OP_ANYNL:
1912        case OP_BRAMINZERO:
1913        case OP_BRAPOS:
1914        case OP_BRAPOSZERO:
1915        case OP_BRAZERO:
1916        case OP_CBRAPOS:
1917        case OP_EXTUNI:
1918        case OP_KETRMAX:
1919        case OP_KETRMIN:
1920        case OP_KETRPOS:
1921        case OP_MINPLUS:
1922        case OP_MINPLUSI:
1923        case OP_MINQUERY:
1924        case OP_MINQUERYI:
1925        case OP_MINSTAR:
1926        case OP_MINSTARI:
1927        case OP_MINUPTO:
1928        case OP_MINUPTOI:
1929        case OP_NOTMINPLUS:
1930        case OP_NOTMINPLUSI:
1931        case OP_NOTMINQUERY:
1932        case OP_NOTMINQUERYI:
1933        case OP_NOTMINSTAR:
1934        case OP_NOTMINSTARI:
1935        case OP_NOTMINUPTO:
1936        case OP_NOTMINUPTOI:
1937        case OP_NOTPLUS:
1938        case OP_NOTPLUSI:
1939        case OP_NOTPOSPLUS:
1940        case OP_NOTPOSPLUSI:
1941        case OP_NOTPOSQUERY:
1942        case OP_NOTPOSQUERYI:
1943        case OP_NOTPOSSTAR:
1944        case OP_NOTPOSSTARI:
1945        case OP_NOTPOSUPTO:
1946        case OP_NOTPOSUPTOI:
1947        case OP_NOTQUERY:
1948        case OP_NOTQUERYI:
1949        case OP_NOTSTAR:
1950        case OP_NOTSTARI:
1951        case OP_NOTUPTO:
1952        case OP_NOTUPTOI:
1953        case OP_PLUS:
1954        case OP_PLUSI:
1955        case OP_POSPLUS:
1956        case OP_POSPLUSI:
1957        case OP_POSQUERY:
1958        case OP_POSQUERYI:
1959        case OP_POSSTAR:
1960        case OP_POSSTARI:
1961        case OP_POSUPTO:
1962        case OP_POSUPTOI:
1963        case OP_QUERY:
1964        case OP_QUERYI:
1965        case OP_REF:
1966        case OP_REFI:
1967        case OP_SBRA:
1968        case OP_SBRAPOS:
1969        case OP_SCBRA:
1970        case OP_SCBRAPOS:
1971        case OP_SCOND:
1972        case OP_SKIPZERO:
1973        case OP_STAR:
1974        case OP_STARI:
1975        case OP_TYPEMINPLUS:
1976        case OP_TYPEMINQUERY:
1977        case OP_TYPEMINSTAR:
1978        case OP_TYPEMINUPTO:
1979        case OP_TYPEPLUS:
1980        case OP_TYPEPOSPLUS:
1981        case OP_TYPEPOSQUERY:
1982        case OP_TYPEPOSSTAR:
1983        case OP_TYPEPOSUPTO:
1984        case OP_TYPEQUERY:
1985        case OP_TYPESTAR:
1986        case OP_TYPEUPTO:
1987        case OP_UPTO:
1988        case OP_UPTOI:
1989      return -1;      return -1;
1990    
1991        /* Catch unrecognized opcodes so that when new ones are added they
1992        are not forgotten, as has happened in the past. */
1993    
1994        default:
1995        return -4;
1996      }      }
1997    }    }
1998  /* Control never gets here */  /* Control never gets here */
# Line 1673  length. Line 2013  length.
2013    
2014  Arguments:  Arguments:
2015    code        points to start of expression    code        points to start of expression
2016    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 mode
2017    number      the required bracket number or negative to find a lookbehind    number      the required bracket number or negative to find a lookbehind
2018    
2019  Returns:      pointer to the opcode for the bracket, or NULL if not found  Returns:      pointer to the opcode for the bracket, or NULL if not found
2020  */  */
2021    
2022  const uschar *  const pcre_uchar *
2023  _pcre_find_bracket(const uschar *code, BOOL utf8, int number)  PRIV(find_bracket)(const pcre_uchar *code, BOOL utf, int number)
2024  {  {
2025  for (;;)  for (;;)
2026    {    {
2027    register int c = *code;    register int c = *code;
2028    
2029    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
2030    
2031    /* XCLASS is used for classes that cannot be represented just by a bit    /* XCLASS is used for classes that cannot be represented just by a bit
# Line 1697  for (;;) Line 2038  for (;;)
2038    
2039    else if (c == OP_REVERSE)    else if (c == OP_REVERSE)
2040      {      {
2041      if (number < 0) return (uschar *)code;      if (number < 0) return (pcre_uchar *)code;
2042      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2043      }      }
2044    
2045    /* Handle capturing bracket */    /* Handle capturing bracket */
2046    
2047    else if (c == OP_CBRA)    else if (c == OP_CBRA || c == OP_SCBRA ||
2048               c == OP_CBRAPOS || c == OP_SCBRAPOS)
2049      {      {
2050      int n = GET2(code, 1+LINK_SIZE);      int n = GET2(code, 1+LINK_SIZE);
2051      if (n == number) return (uschar *)code;      if (n == number) return (pcre_uchar *)code;
2052      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2053      }      }
2054    
2055    /* Otherwise, we can get the item's length from the table, except that for    /* Otherwise, we can get the item's length from the table, except that for
# Line 1735  for (;;) Line 2077  for (;;)
2077        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2078        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2079        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
2080        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP
2081            || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2082        break;        break;
2083    
2084        case OP_MARK:        case OP_MARK:
# Line 1745  for (;;) Line 2088  for (;;)
2088        break;        break;
2089    
2090        case OP_THEN_ARG:        case OP_THEN_ARG:
2091        code += code[1+LINK_SIZE];        code += code[1];
2092        break;        break;
2093        }        }
2094    
2095      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
2096    
2097      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2098    
2099    /* In UTF-8 mode, opcodes that are followed by a character may be followed by    /* In UTF-8 mode, opcodes that are followed by a character may be followed by
2100    a multi-byte character. The length in the table is a minimum, so we have to    a multi-byte character. The length in the table is a minimum, so we have to
2101    arrange to skip the extra bytes. */    arrange to skip the extra bytes. */
2102    
2103  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2104      if (utf8) switch(c)      if (utf) switch(c)
2105        {        {
2106        case OP_CHAR:        case OP_CHAR:
2107        case OP_CHARNC:        case OP_CHARI:
2108        case OP_EXACT:        case OP_EXACT:
2109          case OP_EXACTI:
2110        case OP_UPTO:        case OP_UPTO:
2111          case OP_UPTOI:
2112        case OP_MINUPTO:        case OP_MINUPTO:
2113          case OP_MINUPTOI:
2114        case OP_POSUPTO:        case OP_POSUPTO:
2115          case OP_POSUPTOI:
2116        case OP_STAR:        case OP_STAR:
2117          case OP_STARI:
2118        case OP_MINSTAR:        case OP_MINSTAR:
2119          case OP_MINSTARI:
2120        case OP_POSSTAR:        case OP_POSSTAR:
2121          case OP_POSSTARI:
2122        case OP_PLUS:        case OP_PLUS:
2123          case OP_PLUSI:
2124        case OP_MINPLUS:        case OP_MINPLUS:
2125          case OP_MINPLUSI:
2126        case OP_POSPLUS:        case OP_POSPLUS:
2127          case OP_POSPLUSI:
2128        case OP_QUERY:        case OP_QUERY:
2129          case OP_QUERYI:
2130        case OP_MINQUERY:        case OP_MINQUERY:
2131          case OP_MINQUERYI:
2132        case OP_POSQUERY:        case OP_POSQUERY:
2133        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_POSQUERYI:
2134          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2135        break;        break;
2136        }        }
2137  #else  #else
2138      (void)(utf8);  /* Keep compiler happy by referencing function argument */      (void)(utf);  /* Keep compiler happy by referencing function argument */
2139  #endif  #endif
2140      }      }
2141    }    }
# Line 1796  instance of OP_RECURSE. Line 2152  instance of OP_RECURSE.
2152    
2153  Arguments:  Arguments:
2154    code        points to start of expression    code        points to start of expression
2155    utf8        TRUE in UTF-8 mode    utf         TRUE in UTF-8 / UTF-16 mode
2156    
2157  Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found  Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found
2158  */  */
2159    
2160  static const uschar *  static const pcre_uchar *
2161  find_recurse(const uschar *code, BOOL utf8)  find_recurse(const pcre_uchar *code, BOOL utf)
2162  {  {
2163  for (;;)  for (;;)
2164    {    {
# Line 1841  for (;;) Line 2197  for (;;)
2197        case OP_TYPEUPTO:        case OP_TYPEUPTO:
2198        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2199        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2200        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[1 + IMM2_SIZE] == OP_PROP
2201            || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2202        break;        break;
2203    
2204        case OP_MARK:        case OP_MARK:
# Line 1851  for (;;) Line 2208  for (;;)
2208        break;        break;
2209    
2210        case OP_THEN_ARG:        case OP_THEN_ARG:
2211        code += code[1+LINK_SIZE];        code += code[1];
2212        break;        break;
2213        }        }
2214    
2215      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
2216    
2217      code += _pcre_OP_lengths[c];      code += PRIV(OP_lengths)[c];
2218    
2219      /* In UTF-8 mode, opcodes that are followed by a character may be followed      /* In UTF-8 mode, opcodes that are followed by a character may be followed
2220      by a multi-byte character. The length in the table is a minimum, so we have      by a multi-byte character. The length in the table is a minimum, so we have
2221      to arrange to skip the extra bytes. */      to arrange to skip the extra bytes. */
2222    
2223  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2224      if (utf8) switch(c)      if (utf) switch(c)
2225        {        {
2226        case OP_CHAR:        case OP_CHAR:
2227        case OP_CHARNC:        case OP_CHARI:
2228        case OP_EXACT:        case OP_EXACT:
2229          case OP_EXACTI:
2230        case OP_UPTO:        case OP_UPTO:
2231          case OP_UPTOI:
2232        case OP_MINUPTO:        case OP_MINUPTO:
2233          case OP_MINUPTOI:
2234        case OP_POSUPTO:        case OP_POSUPTO:
2235          case OP_POSUPTOI:
2236        case OP_STAR:        case OP_STAR:
2237          case OP_STARI:
2238        case OP_MINSTAR:        case OP_MINSTAR:
2239          case OP_MINSTARI:
2240        case OP_POSSTAR:        case OP_POSSTAR:
2241          case OP_POSSTARI:
2242        case OP_PLUS:        case OP_PLUS:
2243          case OP_PLUSI:
2244        case OP_MINPLUS:        case OP_MINPLUS:
2245          case OP_MINPLUSI:
2246        case OP_POSPLUS:        case OP_POSPLUS:
2247          case OP_POSPLUSI:
2248        case OP_QUERY:        case OP_QUERY:
2249          case OP_QUERYI:
2250        case OP_MINQUERY:        case OP_MINQUERY:
2251          case OP_MINQUERYI:
2252        case OP_POSQUERY:        case OP_POSQUERY:
2253        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];        case OP_POSQUERYI:
2254          if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
2255        break;        break;
2256        }        }
2257  #else  #else
2258      (void)(utf8);  /* Keep compiler happy by referencing function argument */      (void)(utf);  /* Keep compiler happy by referencing function argument */
2259  #endif  #endif
2260      }      }
2261    }    }
# Line 1908  bracket whose current branch will alread Line 2278  bracket whose current branch will alread
2278  Arguments:  Arguments:
2279    code        points to start of search    code        points to start of search
2280    endcode     points to where to stop    endcode     points to where to stop
2281    utf8        TRUE if in UTF8 mode    utf         TRUE if in UTF-8 / UTF-16 mode
2282    cd          contains pointers to tables etc.    cd          contains pointers to tables etc.
2283    
2284  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2285  */  */
2286    
2287  static BOOL  static BOOL
2288  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8,  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
2289    compile_data *cd)    BOOL utf, compile_data *cd)
2290  {  {
2291  register int c;  register int c;
2292  for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);  for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
2293       code < endcode;       code < endcode;
2294       code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
2295    {    {
2296    const uschar *ccode;    const pcre_uchar *ccode;
2297    
2298    c = *code;    c = *code;
2299    
# Line 1937  for (code = first_significant_code(code Line 2307  for (code = first_significant_code(code
2307      continue;      continue;
2308      }      }
2309    
   /* Groups with zero repeats can of course be empty; skip them. */  
   
   if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)  
     {  
     code += _pcre_OP_lengths[c];  
     do code += GET(code, 1); while (*code == OP_ALT);  
     c = *code;  
     continue;  
     }  
   
2310    /* For a recursion/subroutine call, if its end has been reached, which    /* For a recursion/subroutine call, if its end has been reached, which
2311    implies a subroutine call, we can scan it. */    implies a backward reference subroutine call, we can scan it. If it's a
2312      forward reference subroutine call, we can't. To detect forward reference
2313      we have to scan up the list that is kept in the workspace. This function is
2314      called only when doing the real compile, not during the pre-compile that
2315      measures the size of the compiled pattern. */
2316    
2317    if (c == OP_RECURSE)    if (c == OP_RECURSE)
2318      {      {
2319      BOOL empty_branch = FALSE;      const pcre_uchar *scode;
2320      const uschar *scode = cd->start_code + GET(code, 1);      BOOL empty_branch;
2321    
2322        /* Test for forward reference */
2323    
2324        for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE)
2325          if (GET(scode, 0) == code + 1 - cd->start_code) return TRUE;
2326    
2327        /* Not a forward reference, test for completed backward reference */
2328    
2329        empty_branch = FALSE;
2330        scode = cd->start_code + GET(code, 1);
2331      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
2332    
2333        /* Completed backwards reference */
2334    
2335      do      do
2336        {        {
2337        if (could_be_empty_branch(scode, endcode, utf8, cd))        if (could_be_empty_branch(scode, endcode, utf, cd))
2338          {          {
2339          empty_branch = TRUE;          empty_branch = TRUE;
2340          break;          break;
# Line 1965  for (code = first_significant_code(code Line 2342  for (code = first_significant_code(code
2342        scode += GET(scode, 1);        scode += GET(scode, 1);
2343        }        }
2344      while (*scode == OP_ALT);      while (*scode == OP_ALT);
2345    
2346      if (!empty_branch) return FALSE;  /* All branches are non-empty */      if (!empty_branch) return FALSE;  /* All branches are non-empty */
2347      continue;      continue;
2348      }      }
2349    
2350      /* Groups with zero repeats can of course be empty; skip them. */
2351    
2352      if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
2353          c == OP_BRAPOSZERO)
2354        {
2355        code += PRIV(OP_lengths)[c];
2356        do code += GET(code, 1); while (*code == OP_ALT);
2357        c = *code;
2358        continue;
2359        }
2360    
2361      /* A nested group that is already marked as "could be empty" can just be
2362      skipped. */
2363    
2364      if (c == OP_SBRA  || c == OP_SBRAPOS ||
2365          c == OP_SCBRA || c == OP_SCBRAPOS)
2366        {
2367        do code += GET(code, 1); while (*code == OP_ALT);
2368        c = *code;
2369        continue;
2370        }
2371    
2372    /* For other groups, scan the branches. */    /* For other groups, scan the branches. */
2373    
2374    if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)    if (c == OP_BRA  || c == OP_BRAPOS ||
2375          c == OP_CBRA || c == OP_CBRAPOS ||
2376          c == OP_ONCE || c == OP_ONCE_NC ||
2377          c == OP_COND)
2378      {      {
2379      BOOL empty_branch;      BOOL empty_branch;
2380      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
# Line 1987  for (code = first_significant_code(code Line 2390  for (code = first_significant_code(code
2390        empty_branch = FALSE;        empty_branch = FALSE;
2391        do        do
2392          {          {
2393          if (!empty_branch && could_be_empty_branch(code, endcode, utf8, cd))          if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd))
2394            empty_branch = TRUE;            empty_branch = TRUE;
2395          code += GET(code, 1);          code += GET(code, 1);
2396          }          }
# Line 2005  for (code = first_significant_code(code Line 2408  for (code = first_significant_code(code
2408      {      {
2409      /* Check for quantifiers after a class. XCLASS is used for classes that      /* Check for quantifiers after a class. XCLASS is used for classes that
2410      cannot be represented just by a bit map. This includes negated single      cannot be represented just by a bit map. This includes negated single
2411      high-valued characters. The length in _pcre_OP_lengths[] is zero; the      high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
2412      actual length is stored in the compiled code, so we must update "code"      actual length is stored in the compiled code, so we must update "code"
2413      here. */      here. */
2414    
2415  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2416      case OP_XCLASS:      case OP_XCLASS:
2417      ccode = code += GET(code, 1);      ccode = code += GET(code, 1);
2418      goto CHECK_CLASS_REPEAT;      goto CHECK_CLASS_REPEAT;
# Line 2017  for (code = first_significant_code(code Line 2420  for (code = first_significant_code(code
2420    
2421      case OP_CLASS:      case OP_CLASS:
2422      case OP_NCLASS:      case OP_NCLASS:
2423      ccode = code + 33;      ccode = code + PRIV(OP_lengths)[OP_CLASS];
2424    
2425  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2426      CHECK_CLASS_REPEAT:      CHECK_CLASS_REPEAT:
2427  #endif  #endif
2428    
# Line 2058  for (code = first_significant_code(code Line 2461  for (code = first_significant_code(code
2461      case OP_ALLANY:      case OP_ALLANY:
2462      case OP_ANYBYTE:      case OP_ANYBYTE:
2463      case OP_CHAR:      case OP_CHAR:
2464      case OP_CHARNC:      case OP_CHARI:
2465      case OP_NOT:      case OP_NOT:
2466        case OP_NOTI:
2467      case OP_PLUS:      case OP_PLUS:
2468      case OP_MINPLUS:      case OP_MINPLUS:
2469      case OP_POSPLUS:      case OP_POSPLUS:
# Line 2091  for (code = first_significant_code(code Line 2495  for (code = first_significant_code(code
2495      case OP_TYPEUPTO:      case OP_TYPEUPTO:
2496      case OP_TYPEMINUPTO:      case OP_TYPEMINUPTO:
2497      case OP_TYPEPOSUPTO:      case OP_TYPEPOSUPTO:
2498      if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;      if (code[1 + IMM2_SIZE] == OP_PROP
2499          || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;
2500      break;      break;
2501    
2502      /* End of branch */      /* End of branch */
# Line 2099  for (code = first_significant_code(code Line 2504  for (code = first_significant_code(code
2504      case OP_KET:      case OP_KET:
2505      case OP_KETRMAX:      case OP_KETRMAX:
2506      case OP_KETRMIN:      case OP_KETRMIN:
2507        case OP_KETRPOS:
2508      case OP_ALT:      case OP_ALT:
2509      return TRUE;      return TRUE;
2510    
2511      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
2512      MINUPTO, and POSUPTO may be followed by a multibyte character */      MINUPTO, and POSUPTO may be followed by a multibyte character */
2513    
2514  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2515      case OP_STAR:      case OP_STAR:
2516        case OP_STARI:
2517      case OP_MINSTAR:      case OP_MINSTAR:
2518        case OP_MINSTARI:
2519      case OP_POSSTAR:      case OP_POSSTAR:
2520        case OP_POSSTARI:
2521      case OP_QUERY:      case OP_QUERY:
2522        case OP_QUERYI:
2523      case OP_MINQUERY:      case OP_MINQUERY:
2524        case OP_MINQUERYI:
2525      case OP_POSQUERY:      case OP_POSQUERY:
2526      if (utf8 && code[1] >= 0xc0) code += _pcre_utf8_table4[code[1] & 0x3f];      case OP_POSQUERYI:
2527        if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
2528      break;      break;
2529    
2530      case OP_UPTO:      case OP_UPTO:
2531        case OP_UPTOI:
2532      case OP_MINUPTO:      case OP_MINUPTO:
2533        case OP_MINUPTOI:
2534      case OP_POSUPTO:      case OP_POSUPTO:
2535      if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];      case OP_POSUPTOI:
2536        if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);
2537      break;      break;
2538  #endif  #endif
2539    
# Line 2132  for (code = first_significant_code(code Line 2547  for (code = first_significant_code(code
2547      break;      break;
2548    
2549      case OP_THEN_ARG:      case OP_THEN_ARG:
2550      code += code[1+LINK_SIZE];      code += code[1];
2551      break;      break;
2552    
2553      /* None of the remaining opcodes are required to match a character. */      /* None of the remaining opcodes are required to match a character. */
# Line 2155  return TRUE; Line 2570  return TRUE;
2570  the current branch of the current pattern to see if it could match the empty  the current branch of the current pattern to see if it could match the empty
2571  string. If it could, we must look outwards for branches at other levels,  string. If it could, we must look outwards for branches at other levels,
2572  stopping when we pass beyond the bracket which is the subject of the recursion.  stopping when we pass beyond the bracket which is the subject of the recursion.
2573    This function is called only during the real compile, not during the
2574    pre-compile.
2575    
2576  Arguments:  Arguments:
2577    code        points to start of the recursion    code        points to start of the recursion
2578    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2579    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2580    utf8        TRUE if in UTF-8 mode    utf         TRUE if in UTF-8 / UTF-16 mode
2581    cd          pointers to tables etc    cd          pointers to tables etc
2582    
2583  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2584  */  */
2585    
2586  static BOOL  static BOOL
2587  could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,  could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
2588    BOOL utf8, compile_data *cd)    branch_chain *bcptr, BOOL utf, compile_data *cd)
2589  {  {
2590  while (bcptr != NULL && bcptr->current_branch >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2591    {    {
2592    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8, cd))    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd))
2593      return FALSE;      return FALSE;
2594    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2595    }    }
# Line 2205  where Perl recognizes it as the POSIX cl Line 2622  where Perl recognizes it as the POSIX cl
2622  "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,  "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
2623  I think.  I think.
2624    
2625    A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
2626    It seems that the appearance of a nested POSIX class supersedes an apparent
2627    external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
2628    a digit.
2629    
2630    In Perl, unescaped square brackets may also appear as part of class names. For
2631    example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
2632    [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
2633    seem right at all. PCRE does not allow closing square brackets in POSIX class
2634    names.
2635    
2636  Arguments:  Arguments:
2637    ptr      pointer to the initial [    ptr      pointer to the initial [
2638    endptr   where to return the end pointer    endptr   where to return the end pointer
# Line 2213  Returns:   TRUE or FALSE Line 2641  Returns:   TRUE or FALSE
2641  */  */
2642    
2643  static BOOL  static BOOL
2644  check_posix_syntax(const uschar *ptr, const uschar **endptr)  check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
2645  {  {
2646  int terminator;          /* Don't combine these lines; the Solaris cc */  int terminator;          /* Don't combine these lines; the Solaris cc */
2647  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2648  for (++ptr; *ptr != 0; ptr++)  for (++ptr; *ptr != 0; ptr++)
2649    {    {
2650    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2651        ptr++;
2652      else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
2653      else
2654      {      {
     if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;  
2655      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2656        {        {
2657        *endptr = ptr;        *endptr = ptr;
2658        return TRUE;        return TRUE;
2659        }        }
2660        if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&
2661             (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
2662              ptr[1] == CHAR_EQUALS_SIGN) &&
2663            check_posix_syntax(ptr, endptr))
2664          return FALSE;
2665      }      }
2666    }    }
2667  return FALSE;  return FALSE;
# Line 2250  Returns:     a value representing the na Line 2685  Returns:     a value representing the na
2685  */  */
2686    
2687  static int  static int
2688  check_posix_name(const uschar *ptr, int len)  check_posix_name(const pcre_uchar *ptr, int len)
2689  {  {
2690  const char *pn = posix_names;  const char *pn = posix_names;
2691  register int yield = 0;  register int yield = 0;
2692  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
2693    {    {
2694    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
2695      strncmp((const char *)ptr, pn, len) == 0) return yield;      STRNCMP_UC_C8(ptr, pn, len) == 0) return yield;
2696    pn += posix_name_lengths[yield] + 1;    pn += posix_name_lengths[yield] + 1;
2697    yield++;    yield++;
2698    }    }
# Line 2289  value in the reference (which is a group Line 2724  value in the reference (which is a group
2724  Arguments:  Arguments:
2725    group      points to the start of the group    group      points to the start of the group
2726    adjust     the amount by which the group is to be moved    adjust     the amount by which the group is to be moved
2727    utf8       TRUE in UTF-8 mode    utf        TRUE in UTF-8 / UTF-16 mode
2728    cd         contains pointers to tables etc.    cd         contains pointers to tables etc.
2729    save_hwm   the hwm forward reference pointer at the start of the group    save_hwm   the hwm forward reference pointer at the start of the group
2730    
# Line 2297  Returns:     nothing Line 2732  Returns:     nothing
2732  */  */
2733    
2734  static void  static void
2735  adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,  adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
2736    uschar *save_hwm)    pcre_uchar *save_hwm)
2737  {  {
2738  uschar *ptr = group;  pcre_uchar *ptr = group;
2739    
2740  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
2741    {    {
2742    int offset;    int offset;
2743    uschar *hc;    pcre_uchar *hc;
2744    
2745    /* 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
2746    reference. */    reference. */
# Line 2350  Arguments: Line 2785  Arguments:
2785  Returns:         new code pointer  Returns:         new code pointer
2786  */  */
2787    
2788  static uschar *  static pcre_uchar *
2789  auto_callout(uschar *code, const uschar *ptr, compile_data *cd)  auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
2790  {  {
2791  *code++ = OP_CALLOUT;  *code++ = OP_CALLOUT;
2792  *code++ = 255;  *code++ = 255;
2793  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
2794  PUT(code, LINK_SIZE, 0);                       /* Default length */  PUT(code, LINK_SIZE, 0);                       /* Default length */
2795  return code + 2*LINK_SIZE;  return code + 2 * LINK_SIZE;
2796  }  }
2797    
2798    
# Line 2379  Returns:             nothing Line 2814  Returns:             nothing
2814  */  */
2815    
2816  static void  static void
2817  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)  complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
2818  {  {
2819  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
2820  PUT(previous_callout, 2 + LINK_SIZE, length);  PUT(previous_callout, 2 + LINK_SIZE, length);
# Line 2462  switch(ptype) Line 2897  switch(ptype)
2897            prop->chartype == ucp_Lt) == negated;            prop->chartype == ucp_Lt) == negated;
2898    
2899    case PT_GC:    case PT_GC:
2900    return (pdata == _pcre_ucp_gentype[prop->chartype]) == negated;    return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
2901    
2902    case PT_PC:    case PT_PC:
2903    return (pdata == prop->chartype) == negated;    return (pdata == prop->chartype) == negated;
# Line 2473  switch(ptype) Line 2908  switch(ptype)
2908    /* These are specials */    /* These are specials */
2909    
2910    case PT_ALNUM:    case PT_ALNUM:
2911    return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2912            _pcre_ucp_gentype[prop->chartype] == ucp_N) == negated;            PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
2913    
2914    case PT_SPACE:    /* Perl space */    case PT_SPACE:    /* Perl space */
2915    return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2916            c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)            c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2917            == negated;            == negated;
2918    
2919    case PT_PXSPACE:  /* POSIX space */    case PT_PXSPACE:  /* POSIX space */
2920    return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2921            c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||            c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2922            c == CHAR_FF || c == CHAR_CR)            c == CHAR_FF || c == CHAR_CR)
2923            == negated;            == negated;
2924    
2925    case PT_WORD:    case PT_WORD:
2926    return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2927            _pcre_ucp_gentype[prop->chartype] == ucp_N ||            PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2928            c == CHAR_UNDERSCORE) == negated;            c == CHAR_UNDERSCORE) == negated;
2929    }    }
2930  return FALSE;  return FALSE;
# Line 2508  sense to automatically possessify the re Line 2943  sense to automatically possessify the re
2943    
2944  Arguments:  Arguments:
2945    previous      pointer to the repeated opcode    previous      pointer to the repeated opcode
2946    utf8          TRUE in UTF-8 mode    utf           TRUE in UTF-8 / UTF-16 mode
2947    ptr           next character in pattern    ptr           next character in pattern
2948    options       options bits    options       options bits
2949    cd            contains pointers to tables etc.    cd            contains pointers to tables etc.
# Line 2517  Returns:        TRUE if possessifying is Line 2952  Returns:        TRUE if possessifying is
2952  */  */
2953    
2954  static BOOL  static BOOL
2955  check_auto_possessive(const uschar *previous, BOOL utf8, const uschar *ptr,  check_auto_possessive(const pcre_uchar *previous, BOOL utf,
2956    int options, compile_data *cd)    const pcre_uchar *ptr, int options, compile_data *cd)
2957  {  {
2958  int c, next;  pcre_int32 c, next;
2959  int op_code = *previous++;  int op_code = *previous++;
2960    
2961  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
# Line 2529  if ((options & PCRE_EXTENDED) != 0) Line 2964  if ((options & PCRE_EXTENDED) != 0)
2964    {    {
2965    for (;;)    for (;;)
2966      {      {
2967      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
2968      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
2969        {        {
2970        ptr++;        ptr++;
2971        while (*ptr != 0)        while (*ptr != 0)
2972          {          {
2973          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
2974          ptr++;          ptr++;
2975  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2976          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
2977  #endif  #endif
2978          }          }
2979        }        }
# Line 2556  if (*ptr == CHAR_BACKSLASH) Line 2991  if (*ptr == CHAR_BACKSLASH)
2991    if (temperrorcode != 0) return FALSE;    if (temperrorcode != 0) return FALSE;
2992    ptr++;    /* Point after the escape sequence */    ptr++;    /* Point after the escape sequence */
2993    }    }
2994    else if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_meta) == 0)
 else if ((cd->ctypes[*ptr] & ctype_meta) == 0)  
2995    {    {
2996  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2997    if (utf8) { GETCHARINC(next, ptr); } else    if (utf) { GETCHARINC(next, ptr); } else
2998  #endif  #endif
2999    next = *ptr++;    next = *ptr++;
3000    }    }
   
3001  else return FALSE;  else return FALSE;
3002    
3003  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
# Line 2573  if ((options & PCRE_EXTENDED) != 0) Line 3006  if ((options & PCRE_EXTENDED) != 0)
3006    {    {
3007    for (;;)    for (;;)
3008      {      {
3009      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
3010      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
3011        {        {
3012        ptr++;        ptr++;
3013        while (*ptr != 0)        while (*ptr != 0)
3014          {          {
3015          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3016          ptr++;          ptr++;
3017  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3018          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
3019  #endif  #endif
3020          }          }
3021        }        }
# Line 2593  if ((options & PCRE_EXTENDED) != 0) Line 3026  if ((options & PCRE_EXTENDED) != 0)
3026  /* If the next thing is itself optional, we have to give up. */  /* If the next thing is itself optional, we have to give up. */
3027    
3028  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||  if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3029    strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)    STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
3030      return FALSE;      return FALSE;
3031    
3032  /* Now compare the next item with the previous opcode. First, handle cases when  /* Now compare the next item with the previous opcode. First, handle cases when
# Line 2602  the next item is a character. */ Line 3035  the next item is a character. */
3035  if (next >= 0) switch(op_code)  if (next >= 0) switch(op_code)
3036    {    {
3037    case OP_CHAR:    case OP_CHAR:
3038  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3039    GETCHARTEST(c, previous);    GETCHARTEST(c, previous);
3040  #else  #else
3041    c = *previous;    c = *previous;
3042  #endif  #endif
3043    return c != next;    return c != next;
3044    
3045    /* For CHARNC (caseless character) we must check the other case. If we have    /* For CHARI (caseless character) we must check the other case. If we have
3046    Unicode property support, we can use it to test the other case of    Unicode property support, we can use it to test the other case of
3047    high-valued characters. */    high-valued characters. */
3048    
3049    case OP_CHARNC:    case OP_CHARI:
3050  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3051    GETCHARTEST(c, previous);    GETCHARTEST(c, previous);
3052  #else  #else
3053    c = *previous;    c = *previous;
3054  #endif  #endif
3055    if (c == next) return FALSE;    if (c == next) return FALSE;
3056  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3057    if (utf8)    if (utf)
3058      {      {
3059      unsigned int othercase;      unsigned int othercase;
3060      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
# Line 2633  if (next >= 0) switch(op_code) Line 3066  if (next >= 0) switch(op_code)
3066      return (unsigned int)c != othercase;      return (unsigned int)c != othercase;
3067      }      }
3068    else    else
3069  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3070    return (c != cd->fcc[next]);  /* Non-UTF-8 mode */    return (c != TABLE_GET((unsigned int)next, cd->fcc, next));  /* Non-UTF-8 mode */
3071    
3072    /* For OP_NOT, its data is always a single-byte character. */    /* For OP_NOT and OP_NOTI, the data is always a single-byte character. These
3073      opcodes are not used for multi-byte characters, because they are coded using
3074      an XCLASS instead. */
3075    
3076    case OP_NOT:    case OP_NOT:
3077      return (c = *previous) == next;
3078    
3079      case OP_NOTI:
3080    if ((c = *previous) == next) return TRUE;    if ((c = *previous) == next) return TRUE;
3081    if ((options & PCRE_CASELESS) == 0) return FALSE;  #ifdef SUPPORT_UTF
3082  #ifdef SUPPORT_UTF8    if (utf)
   if (utf8)  
3083      {      {
3084      unsigned int othercase;      unsigned int othercase;
3085      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
# Line 2654  if (next >= 0) switch(op_code) Line 3091  if (next >= 0) switch(op_code)
3091      return (unsigned int)c == othercase;      return (unsigned int)c == othercase;
3092      }      }
3093    else    else
3094  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3095    return (c == cd->fcc[next]);  /* Non-UTF-8 mode */    return (c == (int)(TABLE_GET((unsigned int)next, cd->fcc, next)));  /* Non-UTF-8 mode */
3096    
3097    /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.    /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.
3098    When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */    When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
# Line 2745  replaced by OP_PROP codes when PCRE_UCP Line 3182  replaced by OP_PROP codes when PCRE_UCP
3182  switch(op_code)  switch(op_code)
3183    {    {
3184    case OP_CHAR:    case OP_CHAR:
3185    case OP_CHARNC:    case OP_CHARI:
3186  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3187    GETCHARTEST(c, previous);    GETCHARTEST(c, previous);
3188  #else  #else
3189    c = *previous;    c = *previous;
# Line 2851  switch(op_code) Line 3288  switch(op_code)
3288        to the original \d etc. At this point, ptr will point to a zero byte. */        to the original \d etc. At this point, ptr will point to a zero byte. */
3289    
3290        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
3291          strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)          STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
3292            return FALSE;            return FALSE;
3293    
3294        /* Do the property check. */        /* Do the property check. */
# Line 2929  Arguments: Line 3366  Arguments:
3366    codeptr        points to the pointer to the current code point    codeptr        points to the pointer to the current code point
3367    ptrptr         points to the current pattern pointer    ptrptr         points to the current pattern pointer
3368    errorcodeptr   points to error code variable    errorcodeptr   points to error code variable
3369    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)    firstcharptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)
3370    reqbyteptr     set to the last literal character required, else < 0    reqcharptr     set to the last literal character required, else < 0
3371    bcptr          points to current branch chain    bcptr          points to current branch chain
3372      cond_depth     conditional nesting depth
3373    cd             contains pointers to tables etc.    cd             contains pointers to tables etc.
3374    lengthptr      NULL during the real compile phase    lengthptr      NULL during the real compile phase
3375                   points to length accumulator during pre-compile phase                   points to length accumulator during pre-compile phase
# Line 2941  Returns:         TRUE on success Line 3379  Returns:         TRUE on success
3379  */  */
3380    
3381  static BOOL  static BOOL
3382  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,  compile_branch(int *optionsptr, pcre_uchar **codeptr,
3383    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,    const pcre_uchar **ptrptr, int *errorcodeptr, pcre_int32 *firstcharptr,
3384      pcre_int32 *reqcharptr, branch_chain *bcptr, int cond_depth,
3385    compile_data *cd, int *lengthptr)    compile_data *cd, int *lengthptr)
3386  {  {
3387  int repeat_type, op_type;  int repeat_type, op_type;
3388  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
3389  int bravalue = 0;  int bravalue = 0;
3390  int greedy_default, greedy_non_default;  int greedy_default, greedy_non_default;
3391  int firstbyte, reqbyte;  pcre_int32 firstchar, reqchar;
3392  int zeroreqbyte, zerofirstbyte;  pcre_int32 zeroreqchar, zerofirstchar;
3393  int req_caseopt, reqvary, tempreqvary;  pcre_int32 req_caseopt, reqvary, tempreqvary;
3394  int options = *optionsptr;  int options = *optionsptr;               /* May change dynamically */
3395  int after_manual_callout = 0;  int after_manual_callout = 0;
3396  int length_prevgroup = 0;  int length_prevgroup = 0;
3397  register int c;  register int c;
3398  register uschar *code = *codeptr;  register pcre_uchar *code = *codeptr;
3399  uschar *last_code = code;  pcre_uchar *last_code = code;
3400  uschar *orig_code = code;  pcre_uchar *orig_code = code;
3401  uschar *tempcode;  pcre_uchar *tempcode;
3402  BOOL inescq = FALSE;  BOOL inescq = FALSE;
3403  BOOL groupsetfirstbyte = FALSE;  BOOL groupsetfirstchar = FALSE;
3404  const uschar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
3405  const uschar *tempptr;  const pcre_uchar *tempptr;
3406  const uschar *nestptr = NULL;  const pcre_uchar *nestptr = NULL;
3407  uschar *previous = NULL;  pcre_uchar *previous = NULL;
3408  uschar *previous_callout = NULL;  pcre_uchar *previous_callout = NULL;
3409  uschar *save_hwm = NULL;  pcre_uchar *save_hwm = NULL;
3410  uschar classbits[32];  pcre_uint8 classbits[32];
3411    
3412  #ifdef SUPPORT_UTF8  /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
3413  BOOL class_utf8;  must not do this for other options (e.g. PCRE_EXTENDED) because they may change
3414  BOOL utf8 = (options & PCRE_UTF8) != 0;  dynamically as we process the pattern. */
3415  uschar *class_utf8data;  
3416  uschar *class_utf8data_base;  #ifdef SUPPORT_UTF
3417  uschar utf8_char[6];  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
3418    BOOL utf = (options & PCRE_UTF8) != 0;
3419    pcre_uchar utf_chars[6];
3420  #else  #else
3421  BOOL utf8 = FALSE;  BOOL utf = FALSE;
3422  uschar *utf8_char = NULL;  #endif
3423    
3424    /* Helper variables for OP_XCLASS opcode (for characters > 255). */
3425    
3426    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3427    BOOL xclass;
3428    pcre_uchar *class_uchardata;
3429    pcre_uchar *class_uchardata_base;
3430  #endif  #endif
3431    
3432  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 2992  greedy_non_default = greedy_default ^ 1; Line 3440  greedy_non_default = greedy_default ^ 1;
3440    
3441  /* Initialize no first byte, no required byte. REQ_UNSET means "no char  /* Initialize no first byte, no required byte. REQ_UNSET means "no char
3442  matching encountered yet". It gets changed to REQ_NONE if we hit something that  matching encountered yet". It gets changed to REQ_NONE if we hit something that
3443  matches a non-fixed char first char; reqbyte just remains unset if we never  matches a non-fixed char first char; reqchar just remains unset if we never
3444  find one.  find one.
3445    
3446  When we hit a repeat whose minimum is zero, we may have to adjust these values  When we hit a repeat whose minimum is zero, we may have to adjust these values
3447  to take the zero repeat into account. This is implemented by setting them to  to take the zero repeat into account. This is implemented by setting them to
3448  zerofirstbyte and zeroreqbyte when such a repeat is encountered. The individual  zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual
3449  item types that can be repeated set these backoff variables appropriately. */  item types that can be repeated set these backoff variables appropriately. */
3450    
3451  firstbyte = reqbyte = zerofirstbyte = zeroreqbyte = REQ_UNSET;  firstchar = reqchar = zerofirstchar = zeroreqchar = REQ_UNSET;
3452    
3453  /* The variable req_caseopt contains either the REQ_CASELESS value or zero,  /* The variable req_caseopt contains either the REQ_CASELESS value
3454  according to the current setting of the caseless flag. REQ_CASELESS is a bit  or zero, according to the current setting of the caseless flag. The
3455  value > 255. It is added into the firstbyte or reqbyte variables to record the  REQ_CASELESS leaves the lower 28 bit empty. It is added into the
3456  case status of the value. This is used only for ASCII characters. */  firstchar or reqchar variables to record the case status of the
3457    value. This is used only for ASCII characters. */
3458    
3459  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;  req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
3460    
3461  /* Switch on next character until the end of the branch */  /* Switch on next character until the end of the branch */
3462    
# Line 3019  for (;; ptr++) Line 3468  for (;; ptr++)
3468    BOOL is_quantifier;    BOOL is_quantifier;
3469    BOOL is_recurse;    BOOL is_recurse;
3470    BOOL reset_bracount;    BOOL reset_bracount;
3471    int class_charcount;    int class_has_8bitchar;
3472    int class_lastchar;    int class_single_char;
3473    int newoptions;    int newoptions;
3474    int recno;    int recno;
3475    int refsign;    int refsign;
3476    int skipbytes;    int skipbytes;
3477    int subreqbyte;    int subreqchar;
3478    int subfirstbyte;    int subfirstchar;
3479    int terminator;    int terminator;
3480    int mclength;    int mclength;
3481    uschar mcbuffer[8];    int tempbracount;
3482      pcre_uchar mcbuffer[8];
3483    
3484    /* Get next byte in the pattern */    /* Get next character in the pattern */
3485    
3486    c = *ptr;    c = *ptr;
3487    
# Line 3053  for (;; ptr++) Line 3503  for (;; ptr++)
3503  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
3504      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
3505  #endif  #endif
3506      if (code > cd->start_workspace + WORK_SIZE_CHECK)   /* Check for overrun */      if (code > cd->start_workspace + cd->workspace_size -
3507            WORK_SIZE_SAFETY_MARGIN)                       /* Check for overrun */
3508        {        {
3509        *errorcodeptr = ERR52;        *errorcodeptr = ERR52;
3510        goto FAILED;        goto FAILED;
# Line 3076  for (;; ptr++) Line 3527  for (;; ptr++)
3527        }        }
3528    
3529      *lengthptr += (int)(code - last_code);      *lengthptr += (int)(code - last_code);
3530      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));      DPRINTF(("length=%d added %d c=%c (0x%x)\n", *lengthptr,
3531          (int)(code - last_code), c, c));
3532    
3533      /* If "previous" is set and it is not at the start of the work space, move      /* If "previous" is set and it is not at the start of the work space, move
3534      it back to there, in order to avoid filling up the work space. Otherwise,      it back to there, in order to avoid filling up the work space. Otherwise,
# Line 3086  for (;; ptr++) Line 3538  for (;; ptr++)
3538        {        {
3539        if (previous > orig_code)        if (previous > orig_code)
3540          {          {
3541          memmove(orig_code, previous, code - previous);          memmove(orig_code, previous, IN_UCHARS(code - previous));
3542          code -= previous - orig_code;          code -= previous - orig_code;
3543          previous = orig_code;          previous = orig_code;
3544          }          }
# Line 3102  for (;; ptr++) Line 3554  for (;; ptr++)
3554    /* In the real compile phase, just check the workspace used by the forward    /* In the real compile phase, just check the workspace used by the forward
3555    reference list. */    reference list. */
3556    
3557    else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK)    else if (cd->hwm > cd->start_workspace + cd->workspace_size -
3558               WORK_SIZE_SAFETY_MARGIN)
3559      {      {
3560      *errorcodeptr = ERR52;      *errorcodeptr = ERR52;
3561      goto FAILED;      goto FAILED;
# Line 3150  for (;; ptr++) Line 3603  for (;; ptr++)
3603      previous_callout = NULL;      previous_callout = NULL;
3604      }      }
3605    
3606    /* In extended mode, skip white space and comments */    /* In extended mode, skip white space and comments. */
3607    
3608    if ((options & PCRE_EXTENDED) != 0)    if ((options & PCRE_EXTENDED) != 0)
3609      {      {
3610      if ((cd->ctypes[c] & ctype_space) != 0) continue;      if (MAX_255(*ptr) && (cd->ctypes[c] & ctype_space) != 0) continue;
3611      if (c == CHAR_NUMBER_SIGN)      if (c == CHAR_NUMBER_SIGN)
3612        {        {
3613        ptr++;        ptr++;
3614        while (*ptr != 0)        while (*ptr != 0)
3615          {          {
3616          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
3617          ptr++;          ptr++;
3618  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3619          if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;          if (utf) FORWARDCHAR(ptr);
3620  #endif  #endif
3621          }          }
3622        if (*ptr != 0) continue;        if (*ptr != 0) continue;
# Line 3187  for (;; ptr++) Line 3640  for (;; ptr++)
3640      case 0:                        /* The branch terminates at string end */      case 0:                        /* The branch terminates at string end */
3641      case CHAR_VERTICAL_LINE:       /* or | or ) */      case CHAR_VERTICAL_LINE:       /* or | or ) */
3642      case CHAR_RIGHT_PARENTHESIS:      case CHAR_RIGHT_PARENTHESIS:
3643      *firstbyteptr = firstbyte;      *firstcharptr = firstchar;
3644      *reqbyteptr = reqbyte;      *reqcharptr = reqchar;
3645      *codeptr = code;      *codeptr = code;
3646      *ptrptr = ptr;      *ptrptr = ptr;
3647      if (lengthptr != NULL)      if (lengthptr != NULL)
# Line 3209  for (;; ptr++) Line 3662  for (;; ptr++)
3662      the setting of any following char as a first character. */      the setting of any following char as a first character. */
3663    
3664      case CHAR_CIRCUMFLEX_ACCENT:      case CHAR_CIRCUMFLEX_ACCENT:
3665        previous = NULL;
3666      if ((options & PCRE_MULTILINE) != 0)      if ((options & PCRE_MULTILINE) != 0)
3667        {        {
3668        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
3669          *code++ = OP_CIRCM;
3670        }        }
3671      previous = NULL;      else *code++ = OP_CIRC;
     *code++ = OP_CIRC;  
3672      break;      break;
3673    
3674      case CHAR_DOLLAR_SIGN:      case CHAR_DOLLAR_SIGN:
3675      previous = NULL;      previous = NULL;
3676      *code++ = OP_DOLL;      *code++ = ((options & PCRE_MULTILINE) != 0)? OP_DOLLM : OP_DOLL;
3677      break;      break;
3678    
3679      /* There can never be a first char if '.' is first, whatever happens about      /* There can never be a first char if '.' is first, whatever happens about
3680      repeats. The value of reqbyte doesn't change either. */      repeats. The value of reqchar doesn't change either. */
3681    
3682      case CHAR_DOT:      case CHAR_DOT:
3683      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;      if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
3684      zerofirstbyte = firstbyte;      zerofirstchar = firstchar;
3685      zeroreqbyte = reqbyte;      zeroreqchar = reqchar;
3686      previous = code;      previous = code;
3687      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;      *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
3688      break;      break;
# Line 3283  for (;; ptr++) Line 3737  for (;; ptr++)
3737          {          {
3738          if (ptr[1] == CHAR_E)          if (ptr[1] == CHAR_E)
3739            ptr++;            ptr++;
3740          else if (strncmp((const char *)ptr+1,          else if (STRNCMP_UC_C8(ptr + 1, STR_Q STR_BACKSLASH STR_E, 3) == 0)
                           STR_Q STR_BACKSLASH STR_E, 3) == 0)  
3741            ptr += 3;            ptr += 3;
3742          else          else
3743            break;            break;
# Line 3303  for (;; ptr++) Line 3756  for (;; ptr++)
3756          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)          (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
3757        {        {
3758        *code++ = negate_class? OP_ALLANY : OP_FAIL;        *code++ = negate_class? OP_ALLANY : OP_FAIL;
3759        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
3760        zerofirstbyte = firstbyte;        zerofirstchar = firstchar;
3761        break;        break;
3762        }        }
3763    
# Line 3314  for (;; ptr++) Line 3767  for (;; ptr++)
3767    
3768      should_flip_negation = FALSE;      should_flip_negation = FALSE;
3769    
3770      /* Keep a count of chars with values < 256 so that we can optimize the case      /* For optimization purposes, we track some properties of the class.
3771      of just a single character (as long as it's < 256). However, For higher      class_has_8bitchar will be non-zero, if the class contains at least one
3772      valued UTF-8 characters, we don't yet do any optimization. */      < 256 character. class_single_char will be 1 if the class contains only
3773        a single character. */
3774    
3775      class_charcount = 0;      class_has_8bitchar = 0;
3776      class_lastchar = -1;      class_single_char = 0;
3777    
3778      /* Initialize the 32-char bit map to all zeros. We build the map in a      /* Initialize the 32-char bit map to all zeros. We build the map in a
3779      temporary bit of memory, in case the class contains only 1 character (less      temporary bit of memory, in case the class contains only 1 character (less
3780      than 256), because in that case the compiled code doesn't use the bit map.      than 256), because in that case the compiled code doesn't use the bit map.
3781      */      */
3782    
3783      memset(classbits, 0, 32 * sizeof(uschar));      memset(classbits, 0, 32 * sizeof(pcre_uint8));
3784    
3785  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3786      class_utf8 = FALSE;                       /* No chars >= 256 */      xclass = FALSE;                           /* No chars >= 256 */
3787      class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */      class_uchardata = code + LINK_SIZE + 2;   /* For UTF-8 items */
3788      class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */      class_uchardata_base = class_uchardata;   /* For resetting in pass 1 */
3789  #endif  #endif
3790    
3791      /* 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 3340  for (;; ptr++) Line 3794  for (;; ptr++)
3794    
3795      if (c != 0) do      if (c != 0) do
3796        {        {
3797        const uschar *oldptr;        const pcre_uchar *oldptr;
3798    
3799  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3800        if (utf8 && c > 127)        if (utf && HAS_EXTRALEN(c))
3801          {                           /* Braces are required because the */          {                           /* Braces are required because the */
3802          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
3803          }          }
3804    #endif
3805    
3806        /* In the pre-compile phase, accumulate the length of any UTF-8 extra  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3807          /* In the pre-compile phase, accumulate the length of any extra
3808        data and reset the pointer. This is so that very large classes that        data and reset the pointer. This is so that very large classes that
3809        contain a zillion UTF-8 characters no longer overwrite the work space        contain a zillion > 255 characters no longer overwrite the work space
3810        (which is on the stack). */        (which is on the stack). */
3811    
3812        if (lengthptr != NULL)        if (lengthptr != NULL)
3813          {          {
3814          *lengthptr += class_utf8data - class_utf8data_base;          *lengthptr += class_uchardata - class_uchardata_base;
3815          class_utf8data = class_utf8data_base;          class_uchardata = class_uchardata_base;
3816          }          }
   
3817  #endif  #endif
3818    
3819        /* Inside \Q...\E everything is literal except \E */        /* Inside \Q...\E everything is literal except \E */
# Line 3386  for (;; ptr++) Line 3841  for (;; ptr++)
3841          {          {
3842          BOOL local_negate = FALSE;          BOOL local_negate = FALSE;
3843          int posix_class, taboffset, tabopt;          int posix_class, taboffset, tabopt;
3844          register const uschar *cbits = cd->cbits;          register const pcre_uint8 *cbits = cd->cbits;
3845          uschar pbits[32];          pcre_uint8 pbits[32];
3846    
3847          if (ptr[1] != CHAR_COLON)          if (ptr[1] != CHAR_COLON)
3848            {            {
# Line 3442  for (;; ptr++) Line 3897  for (;; ptr++)
3897          /* Copy in the first table (always present) */          /* Copy in the first table (always present) */
3898    
3899          memcpy(pbits, cbits + posix_class_maps[posix_class],          memcpy(pbits, cbits + posix_class_maps[posix_class],
3900            32 * sizeof(uschar));            32 * sizeof(pcre_uint8));
3901    
3902          /* If there is a second table, add or remove it as required. */          /* If there is a second table, add or remove it as required. */
3903    
# Line 3473  for (;; ptr++) Line 3928  for (;; ptr++)
3928            for (c = 0; c < 32; c++) classbits[c] |= pbits[c];            for (c = 0; c < 32; c++) classbits[c] |= pbits[c];
3929    
3930          ptr = tempptr + 1;          ptr = tempptr + 1;
3931          class_charcount = 10;  /* Set > 1; assumes more than 1 per class */          /* Every class contains at least one < 256 characters. */
3932            class_has_8bitchar = 1;
3933            /* Every class contains at least two characters. */
3934            class_single_char = 2;
3935          continue;    /* End of POSIX syntax handling */          continue;    /* End of POSIX syntax handling */
3936          }          }
3937    
3938        /* Backslash may introduce a single character, or it may introduce one        /* Backslash may introduce a single character, or it may introduce one
3939        of the specials, which just set a flag. The sequence \b is a special        of the specials, which just set a flag. The sequence \b is a special
3940        case. Inside a class (and only there) it is treated as backspace. We        case. Inside a class (and only there) it is treated as backspace. We
3941        assume that other escapes have more than one character in them, so set        assume that other escapes have more than one character in them, so
3942        class_charcount bigger than one. Unrecognized escapes fall through and        speculatively set both class_has_8bitchar and class_single_char bigger
3943        are either treated as literal characters (by default), or are faulted if        than one. Unrecognized escapes fall through and are either treated
3944          as literal characters (by default), or are faulted if
3945        PCRE_EXTRA is set. */        PCRE_EXTRA is set. */
3946    
3947        if (c == CHAR_BACKSLASH)        if (c == CHAR_BACKSLASH)
# Line 3491  for (;; ptr++) Line 3950  for (;; ptr++)
3950          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
3951    
3952          if (-c == ESC_b) c = CHAR_BS;    /* \b is backspace in a class */          if (-c == ESC_b) c = CHAR_BS;    /* \b is backspace in a class */
3953            else if (-c == ESC_N)            /* \N is not supported in a class */
3954              {
3955              *errorcodeptr = ERR71;
3956              goto FAILED;
3957              }
3958          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
3959            {            {
3960            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
# Line 3504  for (;; ptr++) Line 3968  for (;; ptr++)
3968    
3969          if (c < 0)          if (c < 0)
3970            {            {
3971            register const uschar *cbits = cd->cbits;            register const pcre_uint8 *cbits = cd->cbits;
3972            class_charcount += 2;     /* Greater than 1 is what matters */            /* Every class contains at least two < 256 characters. */
3973              class_has_8bitchar++;
3974              /* Every class contains at least two characters. */
3975              class_single_char += 2;
3976    
3977            switch (-c)            switch (-c)
3978              {              {
# Line 3518  for (;; ptr++) Line 3985  for (;; ptr++)
3985              case ESC_SU:              case ESC_SU:
3986              nestptr = ptr;              nestptr = ptr;
3987              ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */              ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
3988              class_charcount -= 2;                /* Undo! */              class_has_8bitchar--;                /* Undo! */
3989              continue;              continue;
3990  #endif  #endif
3991              case ESC_d:              case ESC_d:
# Line 3540  for (;; ptr++) Line 4007  for (;; ptr++)
4007              continue;              continue;
4008    
4009              /* Perl 5.004 onwards omits VT from \s, but we must preserve it              /* Perl 5.004 onwards omits VT from \s, but we must preserve it
4010              if it was previously set by something earlier in the character              if it was previously set by something earlier in the character
4011              class. */              class. */
4012    
4013              case ESC_s:              case ESC_s:
4014              classbits[0] |= cbits[cbit_space];              classbits[0] |= cbits[cbit_space];
4015              classbits[1] |= cbits[cbit_space+1] & ~0x08;              classbits[1] |= cbits[cbit_space+1] & ~0x08;
4016              for (c = 2; c < 32; c++) classbits[c] |= cbits[c+cbit_space];              for (c = 2; c < 32; c++) classbits[c] |= cbits[c+cbit_space];
4017              continue;              continue;
4018    
# Line 3559  for (;; ptr++) Line 4026  for (;; ptr++)
4026              SETBIT(classbits, 0x09); /* VT */              SETBIT(classbits, 0x09); /* VT */
4027              SETBIT(classbits, 0x20); /* SPACE */              SETBIT(classbits, 0x20); /* SPACE */
4028              SETBIT(classbits, 0xa0); /* NSBP */              SETBIT(classbits, 0xa0); /* NSBP */
4029  #ifdef SUPPORT_UTF8  #ifndef COMPILE_PCRE8
4030              if (utf8)              xclass = TRUE;
4031                *class_uchardata++ = XCL_SINGLE;
4032                *class_uchardata++ = 0x1680;
4033                *class_uchardata++ = XCL_SINGLE;
4034                *class_uchardata++ = 0x180e;
4035                *class_uchardata++ = XCL_RANGE;
4036                *class_uchardata++ = 0x2000;
4037                *class_uchardata++ = 0x200a;
4038                *class_uchardata++ = XCL_SINGLE;
4039                *class_uchardata++ = 0x202f;
4040                *class_uchardata++ = XCL_SINGLE;
4041                *class_uchardata++ = 0x205f;
4042                *class_uchardata++ = XCL_SINGLE;
4043                *class_uchardata++ = 0x3000;
4044    #elif defined SUPPORT_UTF
4045                if (utf)
4046                {                {
4047                class_utf8 = TRUE;                xclass = TRUE;
4048                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4049                class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x1680, class_uchardata);
4050                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4051                class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x180e, class_uchardata);
4052                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4053                class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2000, class_uchardata);
4054                class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x200a, class_uchardata);
4055                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4056                class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x202f, class_uchardata);
4057                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4058                class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x205f, class_uchardata);
4059                *class_utf8data++ = XCL_SINGLE;                *class_uchardata++ = XCL_SINGLE;
4060                class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x3000, class_uchardata);
4061                }                }
4062  #endif  #endif
4063              continue;              continue;
# Line 3593  for (;; ptr++) Line 4075  for (;; ptr++)
4075                  }                  }
4076                classbits[c] |= x;                classbits[c] |= x;
4077                }                }
4078    #ifndef COMPILE_PCRE8
4079  #ifdef SUPPORT_UTF8              xclass = TRUE;
4080              if (utf8)              *class_uchardata++ = XCL_RANGE;
4081                *class_uchardata++ = 0x0100;
4082                *class_uchardata++ = 0x167f;
4083                *class_uchardata++ = XCL_RANGE;
4084                *class_uchardata++ = 0x1681;
4085                *class_uchardata++ = 0x180d;
4086                *class_uchardata++ = XCL_RANGE;
4087                *class_uchardata++ = 0x180f;
4088                *class_uchardata++ = 0x1fff;
4089                *class_uchardata++ = XCL_RANGE;
4090                *class_uchardata++ = 0x200b;
4091                *class_uchardata++ = 0x202e;
4092                *class_uchardata++ = XCL_RANGE;
4093                *class_uchardata++ = 0x2030;
4094                *class_uchardata++ = 0x205e;
4095                *class_uchardata++ = XCL_RANGE;
4096                *class_uchardata++ = 0x2060;
4097                *class_uchardata++ = 0x2fff;
4098                *class_uchardata++ = XCL_RANGE;
4099                *class_uchardata++ = 0x3001;
4100    #ifdef SUPPORT_UTF
4101                if (utf)
4102                  class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4103                else
4104    #endif
4105                  *class_uchardata++ = 0xffff;
4106    #elif defined SUPPORT_UTF
4107                if (utf)
4108                {                {
4109                class_utf8 = TRUE;                xclass = TRUE;
4110                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4111                class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x0100, class_uchardata);
4112                class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x167f, class_uchardata);
4113                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4114                class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x1681, class_uchardata);
4115                class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x180d, class_uchardata);
4116                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4117                class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x180f, class_uchardata);
4118                class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x1fff, class_uchardata);
4119                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4120                class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x200b, class_uchardata);
4121                class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x202e, class_uchardata);
4122                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4123                class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2030, class_uchardata);
4124                class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x205e, class_uchardata);
4125                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4126                class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2060, class_uchardata);
4127                class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2fff, class_uchardata);
4128                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4129                class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x3001, class_uchardata);
4130                class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4131                }                }
4132  #endif  #endif
4133              continue;              continue;
# Line 3629  for (;; ptr++) Line 4138  for (;; ptr++)
4138              SETBIT(classbits, 0x0c); /* FF */              SETBIT(classbits, 0x0c); /* FF */
4139              SETBIT(classbits, 0x0d); /* CR */              SETBIT(classbits, 0x0d); /* CR */
4140              SETBIT(classbits, 0x85); /* NEL */              SETBIT(classbits, 0x85); /* NEL */
4141  #ifdef SUPPORT_UTF8  #ifndef COMPILE_PCRE8
4142              if (utf8)              xclass = TRUE;
4143                *class_uchardata++ = XCL_RANGE;
4144                *class_uchardata++ = 0x2028;
4145                *class_uchardata++ = 0x2029;
4146    #elif defined SUPPORT_UTF
4147                if (utf)
4148                {                {
4149                class_utf8 = TRUE;                xclass = TRUE;
4150                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4151                class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2028, class_uchardata);
4152                class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2029, class_uchardata);
4153                }                }
4154  #endif  #endif
4155              continue;              continue;
# Line 3657  for (;; ptr++) Line 4171  for (;; ptr++)
4171                classbits[c] |= x;                classbits[c] |= x;
4172                }                }
4173    
4174  #ifdef SUPPORT_UTF8  #ifndef COMPILE_PCRE8
4175              if (utf8)              xclass = TRUE;
4176                *class_uchardata++ = XCL_RANGE;
4177                *class_uchardata++ = 0x0100;
4178                *class_uchardata++ = 0x2027;
4179                *class_uchardata++ = XCL_RANGE;
4180                *class_uchardata++ = 0x202a;
4181    #ifdef SUPPORT_UTF
4182                if (utf)
4183                  class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4184                else
4185    #endif
4186                  *class_uchardata++ = 0xffff;
4187    #elif defined SUPPORT_UTF
4188                if (utf)
4189                {                {
4190                class_utf8 = TRUE;                xclass = TRUE;
4191                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4192                class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x0100, class_uchardata);
4193                class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x2027, class_uchardata);
4194                *class_utf8data++ = XCL_RANGE;                *class_uchardata++ = XCL_RANGE;
4195                class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x202a, class_uchardata);
4196                class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);                class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
4197                }                }
4198  #endif  #endif
4199              continue;              continue;
# Line 3679  for (;; ptr++) Line 4206  for (;; ptr++)
4206                int pdata;                int pdata;
4207                int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);                int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
4208                if (ptype < 0) goto FAILED;                if (ptype < 0) goto FAILED;
4209                class_utf8 = TRUE;                xclass = TRUE;
4210                *class_utf8data++ = ((-c == ESC_p) != negated)?                *class_uchardata++ = ((-c == ESC_p) != negated)?
4211                  XCL_PROP : XCL_NOTPROP;                  XCL_PROP : XCL_NOTPROP;
4212                *class_utf8data++ = ptype;                *class_uchardata++ = ptype;
4213                *class_utf8data++ = pdata;                *class_uchardata++ = pdata;
4214                class_charcount -= 2;   /* Not a < 256 character */                class_has_8bitchar--;                /* Undo! */
4215                continue;                continue;
4216                }                }
4217  #endif  #endif
# Line 3698  for (;; ptr++) Line 4225  for (;; ptr++)
4225                *errorcodeptr = ERR7;                *errorcodeptr = ERR7;
4226                goto FAILED;                goto FAILED;
4227                }                }
4228              class_charcount -= 2;  /* Undo the default count from above */              class_has_8bitchar--;    /* Undo the speculative increase. */
4229              c = *ptr;              /* Get the final character and fall through */              class_single_char -= 2;  /* Undo the speculative increase. */
4230                c = *ptr;                /* Get the final character and fall through */
4231              break;              break;
4232              }              }
4233            }            }
4234    
4235          /* Fall through if we have a single character (c >= 0). This may be          /* Fall through if we have a single character (c >= 0). This may be
4236          greater than 256 in UTF-8 mode. */          greater than 256. */
4237    
4238          }   /* End of backslash handling */          }   /* End of backslash handling */
4239    
# Line 3753  for (;; ptr++) Line 4281  for (;; ptr++)
4281            goto LONE_SINGLE_CHARACTER;            goto LONE_SINGLE_CHARACTER;
4282            }            }
4283    
4284  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4285          if (utf8)          if (utf)
4286            {                           /* Braces are required because the */            {                           /* Braces are required because the */
4287            GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */            GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */
4288            }            }
# Line 3798  for (;; ptr++) Line 4326  for (;; ptr++)
4326    
4327          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;          if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
4328    
4329            /* Since we found a character range, single character optimizations
4330            cannot be done anymore. */
4331            class_single_char = 2;
4332    
4333          /* 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
4334          matching, we have to use an XCLASS with extra data items. Caseless          matching, we have to use an XCLASS with extra data items. Caseless
4335          matching for characters > 127 is available only if UCP support is          matching for characters > 127 is available only if UCP support is
4336          available. */          available. */
4337    
4338  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && !(defined COMPILE_PCRE8)
4339          if (utf8 && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127)))          if ((d > 255) || (utf && ((options & PCRE_CASELESS) != 0 && d > 127)))
4340    #elif defined  SUPPORT_UTF
4341            if (utf && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127)))
4342    #elif !(defined COMPILE_PCRE8)
4343            if (d > 255)
4344    #endif
4345    #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
4346            {            {
4347            class_utf8 = TRUE;            xclass = TRUE;
4348    
4349            /* With UCP support, we can find the other case equivalents of            /* With UCP support, we can find the other case equivalents of
4350            the relevant characters. There may be several ranges. Optimize how            the relevant characters. There may be several ranges. Optimize how
4351            they fit with the basic range. */            they fit with the basic range. */
4352    
4353  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4354    #ifndef COMPILE_PCRE8
4355              if (utf && (options & PCRE_CASELESS) != 0)
4356    #else
4357            if ((options & PCRE_CASELESS) != 0)            if ((options & PCRE_CASELESS) != 0)
4358    #endif
4359              {              {
4360              unsigned int occ, ocd;              unsigned int occ, ocd;
4361              unsigned int cc = c;              unsigned int cc = c;
# Line 3839  for (;; ptr++) Line 4381  for (;; ptr++)
4381    
4382                if (occ == ocd)                if (occ == ocd)
4383                  {                  {
4384                  *class_utf8data++ = XCL_SINGLE;                  *class_uchardata++ = XCL_SINGLE;
4385                  }                  }
4386                else                else
4387                  {                  {
4388                  *class_utf8data++ = XCL_RANGE;                  *class_uchardata++ = XCL_RANGE;
4389                  class_utf8data += _pcre_ord2utf8(occ, class_utf8data);                  class_uchardata += PRIV(ord2utf)(occ, class_uchardata);
4390                  }                  }
4391                class_utf8data += _pcre_ord2utf8(ocd, class_utf8data);                class_uchardata += PRIV(ord2utf)(ocd, class_uchardata);
4392                }                }
4393              }              }
4394  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
# Line 3854  for (;; ptr++) Line 4396  for (;; ptr++)
4396            /* Now record the original range, possibly modified for UCP caseless            /* Now record the original range, possibly modified for UCP caseless
4397            overlapping ranges. */            overlapping ranges. */
4398    
4399            *class_utf8data++ = XCL_RANGE;            *class_uchardata++ = XCL_RANGE;
4400            class_utf8data += _pcre_ord2utf8(c, class_utf8data);  #ifdef SUPPORT_UTF
4401            class_utf8data += _pcre_ord2utf8(d, class_utf8data);  #ifndef COMPILE_PCRE8
4402              if (utf)
4403                {
4404                class_uchardata += PRIV(ord2utf)(c, class_uchardata);
4405                class_uchardata += PRIV(ord2utf)(d, class_uchardata);
4406                }
4407              else
4408                {
4409                *class_uchardata++ = c;
4410                *class_uchardata++ = d;
4411                }
4412    #else
4413              class_uchardata += PRIV(ord2utf)(c, class_uchardata);
4414              class_uchardata += PRIV(ord2utf)(d, class_uchardata);
4415    #endif
4416    #else /* SUPPORT_UTF */
4417              *class_uchardata++ = c;
4418              *class_uchardata++ = d;
4419    #endif /* SUPPORT_UTF */
4420    
4421            /* With UCP support, we are done. Without UCP support, there is no            /* With UCP support, we are done. Without UCP support, there is no
4422            caseless matching for UTF-8 characters > 127; we can use the bit map            caseless matching for UTF characters > 127; we can use the bit map
4423            for the smaller ones. */            for the smaller ones. As for 16 bit characters without UTF, we
4424              can still use  */
4425    
4426  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4427            continue;    /* With next character in the class */  #ifndef COMPILE_PCRE8
4428  #else            if (utf)
4429            if ((options & PCRE_CASELESS) == 0 || c > 127) continue;  #endif
4430                continue;    /* With next character in the class */
4431    #endif  /* SUPPORT_UCP */
4432    
4433    #if defined SUPPORT_UTF && !defined(SUPPORT_UCP) && !(defined COMPILE_PCRE8)
4434              if (utf)
4435                {
4436                if ((options & PCRE_CASELESS) == 0 || c > 127) continue;
4437                /* Adjust upper limit and fall through to set up the map */
4438                d = 127;
4439                }
4440              else
4441                {
4442                if (c > 255) continue;
4443                /* Adjust upper limit and fall through to set up the map */
4444                d = 255;
4445                }
4446    #elif defined SUPPORT_UTF && !defined(SUPPORT_UCP)
4447              if ((options & PCRE_CASELESS) == 0 || c > 127) continue;
4448            /* Adjust upper limit and fall through to set up the map */            /* Adjust upper limit and fall through to set up the map */
   
4449            d = 127;            d = 127;
4450    #else
4451  #endif  /* SUPPORT_UCP */            if (c > 255) continue;
4452              /* Adjust upper limit and fall through to set up the map */
4453              d = 255;
4454    #endif  /* SUPPORT_UTF && !SUPPORT_UCP && !COMPILE_PCRE8 */
4455            }            }
4456  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF || !COMPILE_PCRE8 */
4457    
4458          /* We use the bit map for all cases when not in UTF-8 mode; else          /* We use the bit map for 8 bit mode, or when the characters fall
4459          ranges that lie entirely within 0-127 when there is UCP support; else          partially or entirely to [0-255] ([0-127] for UCP) ranges. */
         for partial ranges without UCP support. */  
4460    
4461          class_charcount += d - c + 1;          class_has_8bitchar = 1;
         class_lastchar = d;  
4462    
4463          /* We can save a bit of time by skipping this in the pre-compile. */          /* We can save a bit of time by skipping this in the pre-compile. */
4464    
# Line 3889  for (;; ptr++) Line 4467  for (;; ptr++)
4467            classbits[c/8] |= (1 << (c&7));            classbits[c/8] |= (1 << (c&7));
4468            if ((options & PCRE_CASELESS) != 0)            if ((options & PCRE_CASELESS) != 0)
4469              {              {
4470              int uc = cd->fcc[c];           /* flip case */              int uc = cd->fcc[c]; /* flip case */
4471              classbits[uc/8] |= (1 << (uc&7));              classbits[uc/8] |= (1 << (uc&7));
4472              }              }
4473            }            }
# Line 3903  for (;; ptr++) Line 4481  for (;; ptr++)
4481    
4482        LONE_SINGLE_CHARACTER:        LONE_SINGLE_CHARACTER:
4483    
4484        /* Handle a character that cannot go in the bit map */        /* Only the value of 1 matters for class_single_char. */
4485          if (class_single_char < 2) class_single_char++;
4486    
4487  #ifdef SUPPORT_UTF8        /* If class_charcount is 1, we saw precisely one character. As long as
4488        if (utf8 && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127)))        there were no negated characters >= 128 and there was no use of \p or \P,
4489          in other words, no use of any XCLASS features, we can optimize.
4490    
4491          In UTF-8 mode, we can optimize the negative case only if there were no
4492          characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
4493          operate on single-bytes characters only. This is an historical hangover.
4494          Maybe one day we can tidy these opcodes to handle multi-byte characters.
4495    
4496          The optimization throws away the bit map. We turn the item into a
4497          1-character OP_CHAR[I] if it's positive, or OP_NOT[I] if it's negative.
4498          Note that OP_NOT[I] does not support multibyte characters. In the positive
4499          case, it can cause firstchar to be set. Otherwise, there can be no first
4500          char if this item is first, whatever repeat count may follow. In the case
4501          of reqchar, save the previous value for reinstating. */
4502    
4503    #ifdef SUPPORT_UTF
4504          if (class_single_char == 1 && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET
4505            && (!utf || !negate_class || c < (MAX_VALUE_FOR_SINGLE_CHAR + 1)))
4506    #else
4507          if (class_single_char == 1 && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
4508    #endif
4509          {          {
4510          class_utf8 = TRUE;          ptr++;
4511          *class_utf8data++ = XCL_SINGLE;          zeroreqchar = reqchar;
4512          class_utf8data += _pcre_ord2utf8(c, class_utf8data);  
4513            /* The OP_NOT[I] opcodes work on single characters only. */
4514    
4515            if (negate_class)
4516              {
4517              if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
4518              zerofirstchar = firstchar;
4519              *code++ = ((options & PCRE_CASELESS) != 0)? OP_NOTI: OP_NOT;
4520              *code++ = c;
4521              goto NOT_CHAR;
4522              }
4523    
4524            /* For a single, positive character, get the value into mcbuffer, and
4525            then we can handle this with the normal one-character code. */
4526    
4527    #ifdef SUPPORT_UTF
4528            if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
4529              mclength = PRIV(ord2utf)(c, mcbuffer);
4530            else
4531    #endif
4532              {
4533              mcbuffer[0] = c;
4534              mclength = 1;
4535              }
4536            goto ONE_CHAR;
4537            }       /* End of 1-char optimization */
4538    
4539          /* Handle a character that cannot go in the bit map. */
4540    
4541    #if defined SUPPORT_UTF && !(defined COMPILE_PCRE8)
4542          if ((c > 255) || (utf && ((options & PCRE_CASELESS) != 0 && c > 127)))
4543    #elif defined SUPPORT_UTF
4544          if (utf && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127)))
4545    #elif !(defined COMPILE_PCRE8)
4546          if (c > 255)
4547    #endif
4548    
4549    #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
4550            {
4551            xclass = TRUE;
4552            *class_uchardata++ = XCL_SINGLE;
4553    #ifdef SUPPORT_UTF
4554    #ifndef COMPILE_PCRE8
4555            /* In non 8 bit mode, we can get here even if we are not in UTF mode. */
4556            if (!utf)
4557              *class_uchardata++ = c;
4558            else
4559    #endif
4560              class_uchardata += PRIV(ord2utf)(c, class_uchardata);
4561    #else /* SUPPORT_UTF */
4562            *class_uchardata++ = c;
4563    #endif /* SUPPORT_UTF */
4564    
4565  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
4566    #ifdef COMPILE_PCRE8
4567          if ((options & PCRE_CASELESS) != 0)          if ((options & PCRE_CASELESS) != 0)
4568    #else
4569            /* In non 8 bit mode, we can get here even if we are not in UTF mode. */
4570            if (utf && (options & PCRE_CASELESS) != 0)
4571    #endif
4572            {            {
4573            unsigned int othercase;            unsigned int othercase;
4574            if ((othercase = UCD_OTHERCASE(c)) != c)            if ((int)(othercase = UCD_OTHERCASE(c)) != c)
4575              {              {
4576              *class_utf8data++ = XCL_SINGLE;              *class_uchardata++ = XCL_SINGLE;
4577              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);              class_uchardata += PRIV(ord2utf)(othercase, class_uchardata);
4578              }              }
4579            }            }
4580  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
4581    
4582          }          }
4583        else        else
4584  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF || COMPILE_PCRE16 */
4585    
4586        /* Handle a single-byte character */        /* Handle a single-byte character */
4587          {          {
4588            class_has_8bitchar = 1;
4589          classbits[c/8] |= (1 << (c&7));          classbits[c/8] |= (1 << (c&7));
4590          if ((options & PCRE_CASELESS) != 0)          if ((options & PCRE_CASELESS) != 0)
4591            {            {
4592            c = cd->fcc[c];   /* flip case */            c = cd->fcc[c]; /* flip case */
4593            classbits[c/8] |= (1 << (c&7));            classbits[c/8] |= (1 << (c&7));
4594            }            }
         class_charcount++;  
         class_lastchar = c;  
4595          }          }
4596        }        }
4597    
# Line 3958  for (;; ptr++) Line 4612  for (;; ptr++)
4612        goto FAILED;        goto FAILED;
4613        }        }
4614    
4615      /* If class_charcount is 1, we saw precisely one character whose value is      /* If this is the first thing in the branch, there can be no first char
4616      less than 256. As long as there were no characters >= 128 and there was no      setting, whatever the repeat count. Any reqchar setting must remain
4617      use of \p or \P, in other words, no use of any XCLASS features, we can      unchanged after any kind of repeat. */
4618      optimize.  
4619        if (firstchar == REQ_UNSET) firstchar = REQ_NONE;
4620      In UTF-8 mode, we can optimize the negative case only if there were no      zerofirstchar = firstchar;
4621      characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR      zeroreqchar = reqchar;
     operate on single-bytes only. This is an historical hangover. Maybe one day  
     we can tidy these opcodes to handle multi-byte characters.  
   
     The optimization throws away the bit map. We turn the item into a  
     1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note  
     that OP_NOT does not support multibyte characters. In the positive case, it  
     can cause firstbyte to be set. Otherwise, there can be no first char if  
     this item is first, whatever repeat count may follow. In the case of  
     reqbyte, save the previous value for reinstating. */  
   
 #ifdef SUPPORT_UTF8  
     if (class_charcount == 1 && !class_utf8 &&  
       (!utf8 || !negate_class || class_lastchar < 128))  
 #else  
     if (class_charcount == 1)  
 #endif  
       {  
       zeroreqbyte = reqbyte;  
   
       /* The OP_NOT opcode works on one-byte characters only. */  
   
       if (negate_class)  
         {  
         if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;  
         zerofirstbyte = firstbyte;  
         *code++ = OP_NOT;  
         *code++ = class_lastchar;  
         break;  
         }  
   
       /* For a single, positive character, get the value into mcbuffer, and  
       then we can handle this with the normal one-character code. */  
   
 #ifdef SUPPORT_UTF8  
       if (utf8 && class_lastchar > 127)  
         mclength = _pcre_ord2utf8(class_lastchar, mcbuffer);  
       else  
 #endif  
         {  
         mcbuffer[0] = class_lastchar;  
         mclength = 1;  
         }  
       goto ONE_CHAR;  
       }       /* End of 1-char optimization */  
   
     /* The general case - not the one-char optimization. If this is the first  
     thing in the branch, there can be no first char setting, whatever the  
     repeat count. Any reqbyte setting must remain unchanged after any kind of  
     repeat. */  
   
     if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;  
     zerofirstbyte = firstbyte;  
     zeroreqbyte = reqbyte;  
4622    
4623      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
4624      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 4027  for (;; ptr++) Line 4628  for (;; ptr++)
4628      be listed) there are no characters < 256, we can omit the bitmap in the      be listed) there are no characters < 256, we can omit the bitmap in the
4629      actual compiled code. */      actual compiled code. */
4630    
4631  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4632      if (class_utf8 && (!should_flip_negation || (options & PCRE_UCP) != 0))      if (xclass && (!should_flip_negation || (options & PCRE_UCP) != 0))
4633    #elif !defined COMPILE_PCRE8
4634        if (xclass && !should_flip_negation)
4635    #endif
4636    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
4637        {        {
4638        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */        *class_uchardata++ = XCL_END;    /* Marks the end of extra data */
4639        *code++ = OP_XCLASS;        *code++ = OP_XCLASS;
4640        code += LINK_SIZE;        code += LINK_SIZE;
4641        *code = negate_class? XCL_NOT : 0;        *code = negate_class? XCL_NOT:0;
4642    
4643        /* If the map is required, move up the extra data to make room for it;        /* If the map is required, move up the extra data to make room for it;
4644        otherwise just move the code pointer to the end of the extra data. */        otherwise just move the code pointer to the end of the extra data. */
4645    
4646        if (class_charcount > 0)        if (class_has_8bitchar > 0)
4647          {          {
4648          *code++ |= XCL_MAP;          *code++ |= XCL_MAP;
4649          memmove(code + 32, code, class_utf8data - code);          memmove(code + (32 / sizeof(pcre_uchar)), code,
4650              IN_UCHARS(class_uchardata - code));
4651          memcpy(code, classbits, 32);          memcpy(code, classbits, 32);
4652          code = class_utf8data + 32;          code = class_uchardata + (32 / sizeof(pcre_uchar));
4653          }          }
4654        else code = class_utf8data;        else code = class_uchardata;
4655    
4656        /* Now fill in the complete length of the item */        /* Now fill in the complete length of the item */
4657    
4658        PUT(previous, 1, code - previous);        PUT(previous, 1, (int)(code - previous));
4659        break;   /* End of class handling */        break;   /* End of class handling */
4660        }        }
4661  #endif  #endif
# Line 4061  for (;; ptr++) Line 4667  for (;; ptr++)
4667      negating it if necessary. */      negating it if necessary. */
4668    
4669      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
4670      if (negate_class)      if (lengthptr == NULL)    /* Save time in the pre-compile phase */
       {  
       if (lengthptr == NULL)    /* Save time in the pre-compile phase */  
         for (c = 0; c < 32; c++) code[c] = ~classbits[c];  
       }  
     else  
4671        {        {
4672          if (negate_class)
4673            for (c = 0; c < 32; c++) classbits[c] = ~classbits[c];
4674        memcpy(code, classbits, 32);        memcpy(code, classbits, 32);
4675        }        }
4676      code += 32;      code += 32 / sizeof(pcre_uchar);
4677        NOT_CHAR:
4678      break;      break;
4679    
4680    
# Line 4107  for (;; ptr++) Line 4711  for (;; ptr++)
4711    
4712      if (repeat_min == 0)      if (repeat_min == 0)
4713        {        {
4714        firstbyte = zerofirstbyte;    /* Adjust for zero repeat */        firstchar = zerofirstchar;    /* Adjust for zero repeat */
4715        reqbyte = zeroreqbyte;        /* Ditto */        reqchar = zeroreqchar;        /* Ditto */
4716        }        }
4717    
4718      /* Remember whether this is a variable length repeat */      /* Remember whether this is a variable length repeat */
# Line 4118  for (;; ptr++) Line 4722  for (;; ptr++)
4722      op_type = 0;                    /* Default single-char op codes */      op_type = 0;                    /* Default single-char op codes */
4723      possessive_quantifier = FALSE;  /* Default not possessive quantifier */      possessive_quantifier = FALSE;  /* Default not possessive quantifier */
4724    
4725      /* Save start of previous item, in case we have to move it up to make space      /* Save start of previous item, in case we have to move it up in order to
4726      for an inserted OP_ONCE for the additional '+' extension. */      insert something before it. */
4727    
4728      tempcode = previous;      tempcode = previous;
4729    
# Line 4142  for (;; ptr++) Line 4746  for (;; ptr++)
4746        }        }
4747      else repeat_type = greedy_default;      else repeat_type = greedy_default;
4748    
4749        /* If previous was a recursion call, wrap it in atomic brackets so that
4750        previous becomes the atomic group. All recursions were so wrapped in the
4751        past, but it no longer happens for non-repeated recursions. In fact, the
4752        repeated ones could be re-implemented independently so as not to need this,
4753        but for the moment we rely on the code for repeating groups. */
4754    
4755        if (*previous == OP_RECURSE)
4756          {
4757          memmove(previous + 1 + LINK_SIZE, previous, IN_UCHARS(1 + LINK_SIZE));
4758          *previous = OP_ONCE;
4759          PUT(previous, 1, 2 + 2*LINK_SIZE);
4760          previous[2 + 2*LINK_SIZE] = OP_KET;
4761          PUT(previous, 3 + 2*LINK_SIZE, 2 + 2*LINK_SIZE);
4762          code += 2 + 2 * LINK_SIZE;
4763          length_prevgroup = 3 + 3*LINK_SIZE;
4764    
4765          /* When actually compiling, we need to check whether this was a forward
4766          reference, and if so, adjust the offset. */
4767    
4768          if (lengthptr == NULL && cd->hwm >= cd->start_workspace + LINK_SIZE)
4769            {
4770            int offset = GET(cd->hwm, -LINK_SIZE);
4771            if (offset == previous + 1 - cd->start_code)
4772              PUT(cd->hwm, -LINK_SIZE, offset + 1 + LINK_SIZE);
4773            }
4774          }
4775    
4776        /* Now handle repetition for the different types of item. */
4777    
4778      /* If previous was a character match, abolish the item and generate a      /* If previous was a character match, abolish the item and generate a
4779      repeat item instead. If a char item has a minumum of more than one, ensure      repeat item instead. If a char item has a minumum of more than one, ensure
4780      that it is set in reqbyte - it might not be if a sequence such as x{3} is      that it is set in reqchar - it might not be if a sequence such as x{3} is
4781      the first thing in a branch because the x will have gone into firstbyte      the first thing in a branch because the x will have gone into firstchar
4782      instead.  */      instead.  */
4783    
4784      if (*previous == OP_CHAR || *previous == OP_CHARNC)      if (*previous == OP_CHAR || *previous == OP_CHARI)
4785        {        {
4786        /* Deal with UTF-8 characters that take up more than one byte. It's        op_type = (*previous == OP_CHAR)? 0 : OP_STARI - OP_STAR;
4787    
4788          /* Deal with UTF characters that take up more than one character. It's
4789        easier to write this out separately than try to macrify it. Use c to        easier to write this out separately than try to macrify it. Use c to
4790        hold the length of the character in bytes, plus 0x80 to flag that it's a        hold the length of the character in bytes, plus UTF_LENGTH to flag that
4791        length rather than a small character. */        it's a length rather than a small character. */
4792    
4793  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4794        if (utf8 && (code[-1] & 0x80) != 0)        if (utf && NOT_FIRSTCHAR(code[-1]))
4795          {          {
4796          uschar *lastchar = code - 1;          pcre_uchar *lastchar = code - 1;
4797          while((*lastchar & 0xc0) == 0x80) lastchar--;          BACKCHAR(lastchar);
4798          c = code - lastchar;            /* Length of UTF-8 character */          c = (int)(code - lastchar);     /* Length of UTF-8 character */
4799          memcpy(utf8_char, lastchar, c); /* Save the char */          memcpy(utf_chars, lastchar, IN_UCHARS(c)); /* Save the char */
4800          c |= 0x80;                      /* Flag c as a length */          c |= UTF_LENGTH;                /* Flag c as a length */
4801          }          }
4802        else        else
4803  #endif  #endif /* SUPPORT_UTF */
   
       /* Handle the case of a single byte - either with no UTF8 support, or  
       with UTF-8 disabled, or for a UTF-8 character < 128. */  
4804    
4805          /* Handle the case of a single charater - either with no UTF support, or
4806          with UTF disabled, or for a single character UTF character. */
4807          {          {
4808          c = code[-1];          c = code[-1];
4809          if (repeat_min > 1) reqbyte = c | req_caseopt | cd->req_varyopt;          if (repeat_min > 1) reqchar = c | req_caseopt | cd->req_varyopt;
4810          }          }
4811    
4812        /* 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 4182  for (;; ptr++) Line 4816  for (;; ptr++)
4816    
4817        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4818            repeat_max < 0 &&            repeat_max < 0 &&
4819            check_auto_possessive(previous, utf8, ptr + 1, options, cd))            check_auto_possessive(previous, utf, ptr + 1, options, cd))
4820          {          {
4821          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4822          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 4194  for (;; ptr++) Line 4828  for (;; ptr++)
4828      /* If previous was a single negated character ([^a] or similar), we use      /* If previous was a single negated character ([^a] or similar), we use
4829      one of the special opcodes, replacing it. The code is shared with single-      one of the special opcodes, replacing it. The code is shared with single-
4830      character repeats by setting opt_type to add a suitable offset into      character repeats by setting opt_type to add a suitable offset into
4831      repeat_type. We can also test for auto-possessification. OP_NOT is      repeat_type. We can also test for auto-possessification. OP_NOT and OP_NOTI
4832      currently used only for single-byte chars. */      are currently used only for single-byte chars. */
4833    
4834      else if (*previous == OP_NOT)      else if (*previous == OP_NOT || *previous == OP_NOTI)
4835        {        {
4836        op_type = OP_NOTSTAR - OP_STAR;  /* Use "not" opcodes */        op_type = ((*previous == OP_NOT)? OP_NOTSTAR : OP_NOTSTARI) - OP_STAR;
4837        c = previous[1];        c = previous[1];
4838        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4839            repeat_max < 0 &&            repeat_max < 0 &&
4840            check_auto_possessive(previous, utf8, ptr + 1, options, cd))            check_auto_possessive(previous, utf, ptr + 1, options, cd))
4841          {          {
4842          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4843          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 4220  for (;; ptr++) Line 4854  for (;; ptr++)
4854    
4855      else if (*previous < OP_EODN)      else if (*previous < OP_EODN)
4856        {        {
4857        uschar *oldcode;        pcre_uchar *oldcode;
4858        int prop_type, prop_value;        int prop_type, prop_value;
4859        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */
4860        c = *previous;        c = *previous;
4861    
4862        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4863            repeat_max < 0 &&            repeat_max < 0 &&
4864            check_auto_possessive(previous, utf8, ptr + 1, options, cd))            check_auto_possessive(previous, utf, ptr + 1, options, cd))
4865          {          {
4866          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4867          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 4307  for (;; ptr++) Line 4941  for (;; ptr++)
4941          we have to insert the character for the previous code. For a repeated          we have to insert the character for the previous code. For a repeated
4942          Unicode property match, there are two extra bytes that define the          Unicode property match, there are two extra bytes that define the
4943          required property. In UTF-8 mode, long characters have their length in          required property. In UTF-8 mode, long characters have their length in
4944          c, with the 0x80 bit as a flag. */          c, with the UTF_LENGTH bit as a flag. */
4945    
4946          if (repeat_max < 0)          if (repeat_max < 0)
4947            {            {
4948  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4949            if (utf8 && c >= 128)            if (utf && (c & UTF_LENGTH) != 0)
4950              {              {
4951              memcpy(code, utf8_char, c & 7);              memcpy(code, utf_chars, IN_UCHARS(c & 7));
4952              code += c & 7;              code += c & 7;
4953              }              }
4954            else            else
# Line 4336  for (;; ptr++) Line 4970  for (;; ptr++)
4970    
4971          else if (repeat_max != repeat_min)          else if (repeat_max != repeat_min)
4972            {            {
4973  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4974            if (utf8 && c >= 128)            if (utf && (c & UTF_LENGTH) != 0)
4975              {              {
4976              memcpy(code, utf8_char, c & 7);              memcpy(code, utf_chars, IN_UCHARS(c & 7));
4977              code += c & 7;              code += c & 7;
4978              }              }
4979            else            else
# Line 4366  for (;; ptr++) Line 5000  for (;; ptr++)
5000    
5001        /* The character or character type itself comes last in all cases. */        /* The character or character type itself comes last in all cases. */
5002    
5003  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
5004        if (utf8 && c >= 128)        if (utf && (c & UTF_LENGTH) != 0)
5005          {          {
5006          memcpy(code, utf8_char, c & 7);          memcpy(code, utf_chars, IN_UCHARS(c & 7));
5007          code += c & 7;          code += c & 7;
5008          }          }
5009        else        else
# Line 4393  for (;; ptr++) Line 5027  for (;; ptr++)
5027    
5028      else if (*previous == OP_CLASS ||      else if (*previous == OP_CLASS ||
5029               *previous == OP_NCLASS ||               *previous == OP_NCLASS ||
5030  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
5031               *previous == OP_XCLASS ||               *previous == OP_XCLASS ||
5032  #endif  #endif
5033               *previous == OP_REF)               *previous == OP_REF ||
5034                 *previous == OP_REFI)
5035        {        {
5036        if (repeat_max == 0)        if (repeat_max == 0)
5037          {          {
# Line 4430  for (;; ptr++) Line 5065  for (;; ptr++)
5065        }        }
5066    
5067      /* If previous was a bracket group, we may have to replicate it in certain      /* If previous was a bracket group, we may have to replicate it in certain
5068      cases. */      cases. Note that at this point we can encounter only the "basic" bracket
5069        opcodes such as BRA and CBRA, as this is the place where they get converted
5070        into the more special varieties such as BRAPOS and SBRA. A test for >=
5071        OP_ASSERT and <= OP_COND includes ASSERT, ASSERT_NOT, ASSERTBACK,
5072        ASSERTBACK_NOT, ONCE, BRA, CBRA, and COND. Originally, PCRE did not allow
5073        repetition of assertions, but now it does, for Perl compatibility. */
5074    
5075      else if (*previous == OP_BRA  || *previous == OP_CBRA ||      else if (*previous >= OP_ASSERT && *previous <= OP_COND)
              *previous == OP_ONCE || *previous == OP_COND)  
5076        {        {
5077        register int i;        register int i;
       int ketoffset = 0;  
5078        int len = (int)(code - previous);        int len = (int)(code - previous);
5079        uschar *bralink = NULL;        pcre_uchar *bralink = NULL;
5080          pcre_uchar *brazeroptr = NULL;
5081    
5082        /* Repeating a DEFINE group is pointless */        /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so
5083          we just ignore the repeat. */
5084    
5085        if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)        if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)
5086          {          goto END_REPEAT;
         *errorcodeptr = ERR55;  
         goto FAILED;  
         }  
5087    
5088        /* If the maximum repeat count is unlimited, find the end of the bracket        /* There is no sense in actually repeating assertions. The only potential
5089        by scanning through from the start, and compute the offset back to it        use of repetition is in cases when the assertion is optional. Therefore,
5090        from the current code pointer. There may be an OP_OPT setting following        if the minimum is greater than zero, just ignore the repeat. If the
5091        the final KET, so we can't find the end just by going back from the code        maximum is not not zero or one, set it to 1. */
5092        pointer. */  
5093          if (*previous < OP_ONCE)    /* Assertion */
5094        if (repeat_max == -1)          {
5095          {          if (repeat_min > 0) goto END_REPEAT;
5096          register uschar *ket = previous;          if (repeat_max < 0 || repeat_max > 1) repeat_max = 1;
         do ket += GET(ket, 1); while (*ket != OP_KET);  
         ketoffset = (int)(code - ket);  
5097          }          }
5098    
5099        /* The case of a zero minimum is special because of the need to stick        /* The case of a zero minimum is special because of the need to stick
# Line 4479  for (;; ptr++) Line 5114  for (;; ptr++)
5114          **   goto END_REPEAT;          **   goto END_REPEAT;
5115          **   }          **   }
5116    
5117          However, that fails when a group is referenced as a subroutine from          However, that fails when a group or a subgroup within it is referenced
5118          elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it          as a subroutine from elsewhere in the pattern, so now we stick in
5119          so that it is skipped on execution. As we don't have a list of which          OP_SKIPZERO in front of it so that it is skipped on execution. As we
5120          groups are referenced, we cannot do this selectively.          don't have a list of which groups are referenced, we cannot do this
5121            selectively.
5122    
5123          If the maximum is 1 or unlimited, we just have to stick in the BRAZERO          If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
5124          and do no more at this point. However, we do need to adjust any          and do no more at this point. However, we do need to adjust any
# Line 4494  for (;; ptr++) Line 5130  for (;; ptr++)
5130          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */          if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
5131            {            {
5132            *code = OP_END;            *code = OP_END;
5133            adjust_recurse(previous, 1, utf8, cd, save_hwm);            adjust_recurse(previous, 1, utf, cd, save_hwm);
5134            memmove(previous+1, previous, len);            memmove(previous + 1, previous, IN_UCHARS(len));
5135            code++;            code++;
5136            if (repeat_max == 0)            if (repeat_max == 0)
5137              {              {
5138              *previous++ = OP_SKIPZERO;              *previous++ = OP_SKIPZERO;
5139              goto END_REPEAT;              goto END_REPEAT;
5140              }              }
5141              brazeroptr = previous;    /* Save for possessive optimizing */
5142            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
5143            }            }
5144    
# Line 4517  for (;; ptr++) Line 5154  for (;; ptr++)
5154            {            {
5155            int offset;            int offset;
5156            *code = OP_END;            *code = OP_END;
5157            adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd, save_hwm);            adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, save_hwm);
5158            memmove(previous + 2 + LINK_SIZE, previous, len);            memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len));
5159            code += 2 + LINK_SIZE;            code += 2 + LINK_SIZE;
5160            *previous++ = OP_BRAZERO + repeat_type;            *previous++ = OP_BRAZERO + repeat_type;
5161            *previous++ = OP_BRA;            *previous++ = OP_BRA;
# Line 4564  for (;; ptr++) Line 5201  for (;; ptr++)
5201              *lengthptr += delta;              *lengthptr += delta;
5202              }              }
5203    
5204            /* This is compiling for real */            /* This is compiling for real. If there is a set first byte for
5205              the group, and we have not yet set a "required byte", set it. Make
5206              sure there is enough workspace for copying forward references before
5207              doing the copy. */
5208    
5209            else            else
5210              {              {
5211              if (groupsetfirstbyte && reqbyte < 0) reqbyte = firstbyte;              if (groupsetfirstchar && reqchar < 0) reqchar = firstchar;
5212    
5213              for (i = 1; i < repeat_min; i++)              for (i = 1; i < repeat_min; i++)
5214                {                {
5215                uschar *hc;                pcre_uchar *hc;
5216                uschar *this_hwm = cd->hwm;                pcre_uchar *this_hwm = cd->hwm;
5217                memcpy(code, previous, len);                memcpy(code, previous, IN_UCHARS(len));
5218    
5219                  while (cd->hwm > cd->start_workspace + cd->workspace_size -
5220                         WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))
5221                    {
5222                    int save_offset = save_hwm - cd->start_workspace;
5223                    int this_offset = this_hwm - cd->start_workspace;
5224                    *errorcodeptr = expand_workspace(cd);
5225                    if (*errorcodeptr != 0) goto FAILED;
5226                    save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;
5227                    this_hwm = (pcre_uchar *)cd->start_workspace + this_offset;
5228                    }
5229    
5230                for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)                for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
5231                  {                  {
5232                  PUT(cd->hwm, 0, GET(hc, 0) + len);                  PUT(cd->hwm, 0, GET(hc, 0) + len);
# Line 4623  for (;; ptr++) Line 5276  for (;; ptr++)
5276    
5277          else for (i = repeat_max - 1; i >= 0; i--)          else for (i = repeat_max - 1; i >= 0; i--)
5278            {            {
5279            uschar *hc;            pcre_uchar *hc;
5280            uschar *this_hwm = cd->hwm;            pcre_uchar *this_hwm = cd->hwm;
5281    
5282            *code++ = OP_BRAZERO + repeat_type;            *code++ = OP_BRAZERO + repeat_type;
5283    
# Line 4640  for (;; ptr++) Line 5293  for (;; ptr++)
5293              PUTINC(code, 0, offset);              PUTINC(code, 0, offset);
5294              }              }
5295    
5296            memcpy(code, previous, len);            memcpy(code, previous, IN_UCHARS(len));
5297    
5298              /* Ensure there is enough workspace for forward references before
5299              copying them. */
5300    
5301              while (cd->hwm > cd->start_workspace + cd->workspace_size -
5302                     WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))
5303                {
5304                int save_offset = save_hwm - cd->start_workspace;
5305                int this_offset = this_hwm - cd->start_workspace;
5306                *errorcodeptr = expand_workspace(cd);
5307                if (*errorcodeptr != 0) goto FAILED;
5308                save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;
5309                this_hwm = (pcre_uchar *)cd->start_workspace + this_offset;
5310                }
5311    
5312            for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)            for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
5313              {              {
5314              PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));              PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));
# Line 4657  for (;; ptr++) Line 5325  for (;; ptr++)
5325            {            {
5326            int oldlinkoffset;            int oldlinkoffset;
5327            int offset = (int)(code - bralink + 1);            int offset = (int)(code - bralink + 1);
5328            uschar *bra = code - offset;            pcre_uchar *bra = code - offset;
5329            oldlinkoffset = GET(bra, 1);            oldlinkoffset = GET(bra, 1);
5330            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
5331            *code++ = OP_KET;            *code++ = OP_KET;
# Line 4666  for (;; ptr++) Line 5334  for (;; ptr++)
5334            }            }
5335          }          }
5336    
5337        /* If the maximum is unlimited, set a repeater in the final copy. We        /* If the maximum is unlimited, set a repeater in the final copy. For
5338        can't just offset backwards from the current code point, because we        ONCE brackets, that's all we need to do. However, possessively repeated
5339        don't know if there's been an options resetting after the ket. The        ONCE brackets can be converted into non-capturing brackets, as the
5340        correct offset was computed above.        behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to
5341          deal with possessive ONCEs specially.
5342    
5343        Then, when we are doing the actual compile phase, check to see whether        Otherwise, when we are doing the actual compile phase, check to see
5344        this group is a non-atomic one that could match an empty string. If so,        whether this group is one that could match an empty string. If so,
5345        convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so        convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
5346        that runtime checking can be done. [This check is also applied to        that runtime checking can be done. [This check is also applied to ONCE
5347        atomic groups at runtime, but in a different way.] */        groups at runtime, but in a different way.]
5348    
5349          Then, if the quantifier was possessive and the bracket is not a
5350          conditional, we convert the BRA code to the POS form, and the KET code to
5351          KETRPOS. (It turns out to be convenient at runtime to detect this kind of
5352          subpattern at both the start and at the end.) The use of special opcodes
5353          makes it possible to reduce greatly the stack usage in pcre_exec(). If
5354          the group is preceded by OP_BRAZERO, convert this to OP_BRAPOSZERO.
5355    
5356          Then, if the minimum number of matches is 1 or 0, cancel the possessive
5357          flag so that the default action below, of wrapping everything inside
5358          atomic brackets, does not happen. When the minimum is greater than 1,
5359          there will be earlier copies of the group, and so we still have to wrap
5360          the whole thing. */
5361    
5362        else        else
5363          {          {
5364          uschar *ketcode = code - ketoffset;          pcre_uchar *ketcode = code - 1 - LINK_SIZE;
5365          uschar *bracode = ketcode - GET(ketcode, 1);          pcre_uchar *bracode = ketcode - GET(ketcode, 1);
5366          *ketcode = OP_KETRMAX + repeat_type;  
5367          if (lengthptr == NULL && *bracode != OP_ONCE)          /* Convert possessive ONCE brackets to non-capturing */
5368    
5369            if ((*bracode == OP_ONCE || *bracode == OP_ONCE_NC) &&
5370                possessive_quantifier) *bracode = OP_BRA;
5371    
5372            /* For non-possessive ONCE brackets, all we need to do is to
5373            set the KET. */
5374    
5375            if (*bracode == OP_ONCE || *bracode == OP_ONCE_NC)
5376              *ketcode = OP_KETRMAX + repeat_type;
5377    
5378            /* Handle non-ONCE brackets and possessive ONCEs (which have been
5379            converted to non-capturing above). */
5380    
5381            else
5382            {            {
5383            uschar *scode = bracode;            /* In the compile phase, check for empty string matching. */
5384            do  
5385              if (lengthptr == NULL)
5386              {              {
5387              if (could_be_empty_branch(scode, ketcode, utf8, cd))              pcre_uchar *scode = bracode;
5388                do
5389                {                {
5390                *bracode += OP_SBRA - OP_BRA;                if (could_be_empty_branch(scode, ketcode, utf, cd))
5391                break;                  {
5392                    *bracode += OP_SBRA - OP_BRA;
5393                    break;
5394                    }
5395                  scode += GET(scode, 1);
5396                }                }
5397              scode += GET(scode, 1);              while (*scode == OP_ALT);
5398              }              }
5399            while (*scode == OP_ALT);  
5400              /* Handle possessive quantifiers. */
5401    
5402              if (possessive_quantifier)
5403                {
5404                /* For COND brackets, we wrap the whole thing in a possessively
5405                repeated non-capturing bracket, because we have not invented POS
5406                versions of the COND opcodes. Because we are moving code along, we
5407                must ensure that any pending recursive references are updated. */
5408    
5409                if (*bracode == OP_COND || *bracode == OP_SCOND)
5410                  {
5411                  int nlen = (int)(code - bracode);
5412                  *code = OP_END;
5413                  adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, save_hwm);
5414                  memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen));
5415                  code += 1 + LINK_SIZE;
5416                  nlen += 1 + LINK_SIZE;
5417                  *bracode = OP_BRAPOS;
5418                  *code++ = OP_KETRPOS;
5419                  PUTINC(code, 0, nlen);
5420                  PUT(bracode, 1, nlen);
5421                  }
5422    
5423                /* For non-COND brackets, we modify the BRA code and use KETRPOS. */
5424    
5425                else
5426                  {
5427                  *bracode += 1;              /* Switch to xxxPOS opcodes */
5428                  *ketcode = OP_KETRPOS;
5429                  }
5430    
5431                /* If the minimum is zero, mark it as possessive, then unset the
5432                possessive flag when the minimum is 0 or 1. */
5433    
5434                if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
5435                if (repeat_min < 2) possessive_quantifier = FALSE;
5436                }
5437