/[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 964 by ph10, Fri May 4 13:03:39 2012 UTC revision 1498 by ph10, Fri Aug 8 15:22:51 2014 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-2012 University of Cambridge             Copyright (c) 1997-2014 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 47  supporting internal functions that are n Line 47  supporting internal functions that are n
47  #endif  #endif
48    
49  #define NLBLOCK cd             /* Block containing newline information */  #define NLBLOCK cd             /* Block containing newline information */
50  #define PSSTART start_pattern  /* Field containing processed string start */  #define PSSTART start_pattern  /* Field containing pattern start */
51  #define PSEND   end_pattern    /* Field containing processed string end */  #define PSEND   end_pattern    /* Field containing pattern end */
52    
53  #include "pcre_internal.h"  #include "pcre_internal.h"
54    
55    
56  /* When PCRE_DEBUG is defined, we need the pcre(16)_printint() function, which  /* When PCRE_DEBUG is defined, we need the pcre(16|32)_printint() function, which
57  is 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. We do not need to select pcre16_printint.c specially, because the  library. We do not need to select pcre16_printint.c specially, because the
59  COMPILE_PCREx macro will already be appropriately set. */  COMPILE_PCREx macro will already be appropriately set. */
# Line 68  COMPILE_PCREx macro will already be appr Line 68  COMPILE_PCREx macro will already be appr
68    
69  /* Macro for setting individual bits in class bitmaps. */  /* Macro for setting individual bits in class bitmaps. */
70    
71  #define SETBIT(a,b) a[b/8] |= (1 << (b%8))  #define SETBIT(a,b) a[(b)/8] |= (1 << ((b)&7))
72    
73  /* Maximum length value to check against when making sure that the integer that  /* Maximum length value to check against when making sure that the integer that
74  holds the compiled pattern length does not overflow. We make it a bit less than  holds the compiled pattern length does not overflow. We make it a bit less than
# Line 77  to check them every time. */ Line 77  to check them every time. */
77    
78  #define OFLOW_MAX (INT_MAX - 20)  #define OFLOW_MAX (INT_MAX - 20)
79    
80    /* Definitions to allow mutual recursion */
81    
82    static int
83      add_list_to_class(pcre_uint8 *, pcre_uchar **, int, compile_data *,
84        const pcre_uint32 *, unsigned int);
85    
86    static BOOL
87      compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,
88        pcre_uint32 *, pcre_int32 *, pcre_uint32 *, pcre_int32 *, branch_chain *,
89        compile_data *, int *);
90    
91    
92    
93  /*************************************************  /*************************************************
94  *      Code parameters and static tables         *  *      Code parameters and static tables         *
# Line 103  kicks in at the same number of forward r Line 115  kicks in at the same number of forward r
115  #define COMPILE_WORK_SIZE (2048*LINK_SIZE)  #define COMPILE_WORK_SIZE (2048*LINK_SIZE)
116  #define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)  #define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)
117    
118    /* This value determines the size of the initial vector that is used for
119    remembering named groups during the pre-compile. It is allocated on the stack,
120    but if it is too small, it is expanded using malloc(), in a similar way to the
121    workspace. The value is the number of slots in the list. */
122    
123    #define NAMED_GROUP_LIST_SIZE  20
124    
125  /* The overrun tests check for a slightly smaller size so that they detect the  /* The overrun tests check for a slightly smaller size so that they detect the
126  overrun before it actually does run off the end of the data block. */  overrun before it actually does run off the end of the data block. */
127    
# Line 110  overrun before it actually does run off Line 129  overrun before it actually does run off
129    
130  /* Private flags added to firstchar and reqchar. */  /* Private flags added to firstchar and reqchar. */
131    
132  #define REQ_CASELESS   0x10000000l      /* Indicates caselessness */  #define REQ_CASELESS    (1 << 0)        /* Indicates caselessness */
133  #define REQ_VARY       0x20000000l      /* Reqchar followed non-literal item */  #define REQ_VARY        (1 << 1)        /* Reqchar followed non-literal item */
134    /* Negative values for the firstchar and reqchar flags */
135    #define REQ_UNSET       (-2)
136    #define REQ_NONE        (-1)
137    
138  /* Repeated character flags. */  /* Repeated character flags. */
139    
# Line 238  static const verbitem verbs[] = { Line 260  static const verbitem verbs[] = {
260  static const int verbcount = sizeof(verbs)/sizeof(verbitem);  static const int verbcount = sizeof(verbs)/sizeof(verbitem);
261    
262    
263    /* Substitutes for [[:<:]] and [[:>:]], which mean start and end of word in
264    another regex library. */
265    
266    static const pcre_uchar sub_start_of_word[] = {
267      CHAR_BACKSLASH, CHAR_b, CHAR_LEFT_PARENTHESIS, CHAR_QUESTION_MARK,
268      CHAR_EQUALS_SIGN, CHAR_BACKSLASH, CHAR_w, CHAR_RIGHT_PARENTHESIS, '\0' };
269    
270    static const pcre_uchar sub_end_of_word[] = {
271      CHAR_BACKSLASH, CHAR_b, CHAR_LEFT_PARENTHESIS, CHAR_QUESTION_MARK,
272      CHAR_LESS_THAN_SIGN, CHAR_EQUALS_SIGN, CHAR_BACKSLASH, CHAR_w,
273      CHAR_RIGHT_PARENTHESIS, '\0' };
274    
275    
276  /* Tables of names of POSIX character classes and their lengths. The names are  /* Tables of names of POSIX character classes and their lengths. The names are
277  now all in a single string, to reduce the number of relocations when a shared  now all in a single string, to reduce the number of relocations when a shared
278  library is dynamically loaded. The list of lengths is terminated by a zero  library is dynamically loaded. The list of lengths is terminated by a zero
279  length entry. The first three must be alpha, lower, upper, as this is assumed  length entry. The first three must be alpha, lower, upper, as this is assumed
280  for handling case independence. */  for handling case independence. The indices for graph, print, and punct are
281    needed, so identify them. */
282    
283  static const char posix_names[] =  static const char posix_names[] =
284    STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0    STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
# Line 253  static const char posix_names[] = Line 289  static const char posix_names[] =
289  static const pcre_uint8 posix_name_lengths[] = {  static const pcre_uint8 posix_name_lengths[] = {
290    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 };
291    
292    #define PC_GRAPH  8
293    #define PC_PRINT  9
294    #define PC_PUNCT 10
295    
296    
297  /* 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
298  base map, with an optional addition or removal of another map. Then, for some  base map, with an optional addition or removal of another map. Then, for some
299  classes, there is some additional tweaking: for [:blank:] the vertical space  classes, there is some additional tweaking: for [:blank:] the vertical space
# Line 280  static const int posix_class_maps[] = { Line 321  static const int posix_class_maps[] = {
321    cbit_xdigit,-1,          0              /* xdigit */    cbit_xdigit,-1,          0              /* xdigit */
322  };  };
323    
324  /* Table of substitutes for \d etc when PCRE_UCP is set. The POSIX class  /* Table of substitutes for \d etc when PCRE_UCP is set. They are replaced by
325  substitutes must be in the order of the names, defined above, and there are  Unicode property escapes. */
 both positive and negative cases. NULL means no substitute. */  
326    
327  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
328  static const pcre_uchar string_PNd[]  = {  static const pcre_uchar string_PNd[]  = {
# Line 307  static const pcre_uchar string_pXwd[] = Line 347  static const pcre_uchar string_pXwd[] =
347  static const pcre_uchar *substitutes[] = {  static const pcre_uchar *substitutes[] = {
348    string_PNd,           /* \D */    string_PNd,           /* \D */
349    string_pNd,           /* \d */    string_pNd,           /* \d */
350    string_PXsp,          /* \S */       /* NOTE: Xsp is Perl space */    string_PXsp,          /* \S */   /* Xsp is Perl space, but from 8.34, Perl */
351    string_pXsp,          /* \s */    string_pXsp,          /* \s */   /* space and POSIX space are the same. */
352    string_PXwd,          /* \W */    string_PXwd,          /* \W */
353    string_pXwd           /* \w */    string_pXwd           /* \w */
354  };  };
355    
356    /* The POSIX class substitutes must be in the order of the POSIX class names,
357    defined above, and there are both positive and negative cases. NULL means no
358    general substitute of a Unicode property escape (\p or \P). However, for some
359    POSIX classes (e.g. graph, print, punct) a special property code is compiled
360    directly. */
361    
362  static const pcre_uchar string_pL[] =   {  static const pcre_uchar string_pL[] =   {
363    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,    CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
364    CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };    CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
# Line 360  static const pcre_uchar *posix_substitut Line 406  static const pcre_uchar *posix_substitut
406    NULL,                 /* graph */    NULL,                 /* graph */
407    NULL,                 /* print */    NULL,                 /* print */
408    NULL,                 /* punct */    NULL,                 /* punct */
409    string_pXps,          /* space */    /* NOTE: Xps is POSIX space */    string_pXps,          /* space */   /* Xps is POSIX space, but from 8.34 */
410    string_pXwd,          /* word */    string_pXwd,          /* word  */   /* Perl and POSIX space are the same */
411    NULL,                 /* xdigit */    NULL,                 /* xdigit */
412    /* Negated cases */    /* Negated cases */
413    string_PL,            /* ^alpha */    string_PL,            /* ^alpha */
# Line 375  static const pcre_uchar *posix_substitut Line 421  static const pcre_uchar *posix_substitut
421    NULL,                 /* ^graph */    NULL,                 /* ^graph */
422    NULL,                 /* ^print */    NULL,                 /* ^print */
423    NULL,                 /* ^punct */    NULL,                 /* ^punct */
424    string_PXps,          /* ^space */   /* NOTE: Xps is POSIX space */    string_PXps,          /* ^space */  /* Xps is POSIX space, but from 8.34 */
425    string_PXwd,          /* ^word */    string_PXwd,          /* ^word */   /* Perl and POSIX space are the same */
426    NULL                  /* ^xdigit */    NULL                  /* ^xdigit */
427  };  };
428  #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))  #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
# Line 440  static const char error_texts[] = Line 486  static const char error_texts[] =
486    "POSIX collating elements are not supported\0"    "POSIX collating elements are not supported\0"
487    "this version of PCRE is compiled without UTF support\0"    "this version of PCRE is compiled without UTF support\0"
488    "spare error\0"  /** DEAD **/    "spare error\0"  /** DEAD **/
489    "character value in \\x{...} sequence is too large\0"    "character value in \\x{} or \\o{} is too large\0"
490    /* 35 */    /* 35 */
491    "invalid condition (?(0)\0"    "invalid condition (?(0)\0"
492    "\\C not allowed in lookbehind assertion\0"    "\\C not allowed in lookbehind assertion\0"
# Line 472  static const char error_texts[] = Line 518  static const char error_texts[] =
518    "a numbered reference must not be zero\0"    "a numbered reference must not be zero\0"
519    "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"    "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
520    /* 60 */    /* 60 */
521    "(*VERB) not recognized\0"    "(*VERB) not recognized or malformed\0"
522    "number is too big\0"    "number is too big\0"
523    "subpattern name expected\0"    "subpattern name expected\0"
524    "digit expected after (?+\0"    "digit expected after (?+\0"
# Line 490  static const char error_texts[] = Line 536  static const char error_texts[] =
536    "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"    "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
537    "invalid UTF-16 string\0"    "invalid UTF-16 string\0"
538    /* 75 */    /* 75 */
539    "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0"    "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0"
540      "character value in \\u.... sequence is too large\0"
541      "invalid UTF-32 string\0"
542      "setting UTF is disabled by the application\0"
543      "non-hex character in \\x{} (closing brace missing?)\0"
544      /* 80 */
545      "non-octal character in \\o{} (closing brace missing?)\0"
546      "missing opening brace after \\o\0"
547      "parentheses are too deeply nested\0"
548      "invalid range in character class\0"
549      "group name must start with a non-digit\0"
550      /* 85 */
551      "parentheses are too deeply nested (stack check)\0"
552      "digits missing in \\x{} or \\o{}\0"
553    ;    ;
554    
555  /* 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 630  static const pcre_uint8 ebcdic_chartab[] Line 689  static const pcre_uint8 ebcdic_chartab[]
689  #endif  #endif
690    
691    
692  /* Definition to allow mutual recursion */  /* This table is used to check whether auto-possessification is possible
693    between adjacent character-type opcodes. The left-hand (repeated) opcode is
694    used to select the row, and the right-hand opcode is use to select the column.
695    A value of 1 means that auto-possessification is OK. For example, the second
696    value in the first row means that \D+\d can be turned into \D++\d.
697    
698    The Unicode property types (\P and \p) have to be present to fill out the table
699    because of what their opcode values are, but the table values should always be
700    zero because property types are handled separately in the code. The last four
701    columns apply to items that cannot be repeated, so there is no need to have
702    rows for them. Note that OP_DIGIT etc. are generated only when PCRE_UCP is
703    *not* set. When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
704    
705    #define APTROWS (LAST_AUTOTAB_LEFT_OP - FIRST_AUTOTAB_OP + 1)
706    #define APTCOLS (LAST_AUTOTAB_RIGHT_OP - FIRST_AUTOTAB_OP + 1)
707    
708    static const pcre_uint8 autoposstab[APTROWS][APTCOLS] = {
709    /* \D \d \S \s \W \w  . .+ \C \P \p \R \H \h \V \v \X \Z \z  $ $M */
710      { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \D */
711      { 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \d */
712      { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \S */
713      { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \s */
714      { 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \W */
715      { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \w */
716      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* .  */
717      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* .+ */
718      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \C */
719      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* \P */
720      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* \p */
721      { 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 },  /* \R */
722      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 },  /* \H */
723      { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0 },  /* \h */
724      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0 },  /* \V */
725      { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0 },  /* \v */
726      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }   /* \X */
727    };
728    
729    
730  static BOOL  /* This table is used to check whether auto-possessification is possible
731    compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,  between adjacent Unicode property opcodes (OP_PROP and OP_NOTPROP). The
732      int *, int *, branch_chain *, compile_data *, int *);  left-hand (repeated) opcode is used to select the row, and the right-hand
733    opcode is used to select the column. The values are as follows:
734    
735      0   Always return FALSE (never auto-possessify)
736      1   Character groups are distinct (possessify if both are OP_PROP)
737      2   Check character categories in the same group (general or particular)
738      3   TRUE if the two opcodes are not the same (PROP vs NOTPROP)
739    
740      4   Check left general category vs right particular category
741      5   Check right general category vs left particular category
742    
743      6   Left alphanum vs right general category
744      7   Left space vs right general category
745      8   Left word vs right general category
746    
747      9   Right alphanum vs left general category
748     10   Right space vs left general category
749     11   Right word vs left general category
750    
751     12   Left alphanum vs right particular category
752     13   Left space vs right particular category
753     14   Left word vs right particular category
754    
755     15   Right alphanum vs left particular category
756     16   Right space vs left particular category
757     17   Right word vs left particular category
758    */
759    
760    static const pcre_uint8 propposstab[PT_TABSIZE][PT_TABSIZE] = {
761    /* ANY LAMP GC  PC  SC ALNUM SPACE PXSPACE WORD CLIST UCNC */
762      { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   0 },  /* PT_ANY */
763      { 0,  3,  0,  0,  0,    3,    1,      1,   0,    0,   0 },  /* PT_LAMP */
764      { 0,  0,  2,  4,  0,    9,   10,     10,  11,    0,   0 },  /* PT_GC */
765      { 0,  0,  5,  2,  0,   15,   16,     16,  17,    0,   0 },  /* PT_PC */
766      { 0,  0,  0,  0,  2,    0,    0,      0,   0,    0,   0 },  /* PT_SC */
767      { 0,  3,  6, 12,  0,    3,    1,      1,   0,    0,   0 },  /* PT_ALNUM */
768      { 0,  1,  7, 13,  0,    1,    3,      3,   1,    0,   0 },  /* PT_SPACE */
769      { 0,  1,  7, 13,  0,    1,    3,      3,   1,    0,   0 },  /* PT_PXSPACE */
770      { 0,  0,  8, 14,  0,    0,    1,      1,   3,    0,   0 },  /* PT_WORD */
771      { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   0 },  /* PT_CLIST */
772      { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   3 }   /* PT_UCNC */
773    };
774    
775    /* This table is used to check whether auto-possessification is possible
776    between adjacent Unicode property opcodes (OP_PROP and OP_NOTPROP) when one
777    specifies a general category and the other specifies a particular category. The
778    row is selected by the general category and the column by the particular
779    category. The value is 1 if the particular category is not part of the general
780    category. */
781    
782    static const pcre_uint8 catposstab[7][30] = {
783    /* Cc Cf Cn Co Cs Ll Lm Lo Lt Lu Mc Me Mn Nd Nl No Pc Pd Pe Pf Pi Po Ps Sc Sk Sm So Zl Zp Zs */
784      { 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* C */
785      { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* L */
786      { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* M */
787      { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* N */
788      { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1 },  /* P */
789      { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1 },  /* S */
790      { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 }   /* Z */
791    };
792    
793    /* This table is used when checking ALNUM, (PX)SPACE, SPACE, and WORD against
794    a general or particular category. The properties in each row are those
795    that apply to the character set in question. Duplication means that a little
796    unnecessary work is done when checking, but this keeps things much simpler
797    because they can all use the same code. For more details see the comment where
798    this table is used.
799    
800    Note: SPACE and PXSPACE used to be different because Perl excluded VT from
801    "space", but from Perl 5.18 it's included, so both categories are treated the
802    same here. */
803    
804    static const pcre_uint8 posspropstab[3][4] = {
805      { ucp_L, ucp_N, ucp_N, ucp_Nl },  /* ALNUM, 3rd and 4th values redundant */
806      { ucp_Z, ucp_Z, ucp_C, ucp_Cc },  /* SPACE and PXSPACE, 2nd value redundant */
807      { ucp_L, ucp_N, ucp_P, ucp_Po }   /* WORD */
808    };
809    
810    /* This table is used when converting repeating opcodes into possessified
811    versions as a result of an explicit possessive quantifier such as ++. A zero
812    value means there is no possessified version - in those cases the item in
813    question must be wrapped in ONCE brackets. The table is truncated at OP_CALLOUT
814    because all relevant opcodes are less than that. */
815    
816    static const pcre_uint8 opcode_possessify[] = {
817      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0 - 15  */
818      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 16 - 31 */
819    
820      0,                       /* NOTI */
821      OP_POSSTAR, 0,           /* STAR, MINSTAR */
822      OP_POSPLUS, 0,           /* PLUS, MINPLUS */
823      OP_POSQUERY, 0,          /* QUERY, MINQUERY */
824      OP_POSUPTO, 0,           /* UPTO, MINUPTO */
825      0,                       /* EXACT */
826      0, 0, 0, 0,              /* POS{STAR,PLUS,QUERY,UPTO} */
827    
828      OP_POSSTARI, 0,          /* STARI, MINSTARI */
829      OP_POSPLUSI, 0,          /* PLUSI, MINPLUSI */
830      OP_POSQUERYI, 0,         /* QUERYI, MINQUERYI */
831      OP_POSUPTOI, 0,          /* UPTOI, MINUPTOI */
832      0,                       /* EXACTI */
833      0, 0, 0, 0,              /* POS{STARI,PLUSI,QUERYI,UPTOI} */
834    
835      OP_NOTPOSSTAR, 0,        /* NOTSTAR, NOTMINSTAR */
836      OP_NOTPOSPLUS, 0,        /* NOTPLUS, NOTMINPLUS */
837      OP_NOTPOSQUERY, 0,       /* NOTQUERY, NOTMINQUERY */
838      OP_NOTPOSUPTO, 0,        /* NOTUPTO, NOTMINUPTO */
839      0,                       /* NOTEXACT */
840      0, 0, 0, 0,              /* NOTPOS{STAR,PLUS,QUERY,UPTO} */
841    
842      OP_NOTPOSSTARI, 0,       /* NOTSTARI, NOTMINSTARI */
843      OP_NOTPOSPLUSI, 0,       /* NOTPLUSI, NOTMINPLUSI */
844      OP_NOTPOSQUERYI, 0,      /* NOTQUERYI, NOTMINQUERYI */
845      OP_NOTPOSUPTOI, 0,       /* NOTUPTOI, NOTMINUPTOI */
846      0,                       /* NOTEXACTI */
847      0, 0, 0, 0,              /* NOTPOS{STARI,PLUSI,QUERYI,UPTOI} */
848    
849      OP_TYPEPOSSTAR, 0,       /* TYPESTAR, TYPEMINSTAR */
850      OP_TYPEPOSPLUS, 0,       /* TYPEPLUS, TYPEMINPLUS */
851      OP_TYPEPOSQUERY, 0,      /* TYPEQUERY, TYPEMINQUERY */
852      OP_TYPEPOSUPTO, 0,       /* TYPEUPTO, TYPEMINUPTO */
853      0,                       /* TYPEEXACT */
854      0, 0, 0, 0,              /* TYPEPOS{STAR,PLUS,QUERY,UPTO} */
855    
856      OP_CRPOSSTAR, 0,         /* CRSTAR, CRMINSTAR */
857      OP_CRPOSPLUS, 0,         /* CRPLUS, CRMINPLUS */
858      OP_CRPOSQUERY, 0,        /* CRQUERY, CRMINQUERY */
859      OP_CRPOSRANGE, 0,        /* CRRANGE, CRMINRANGE */
860      0, 0, 0, 0,              /* CRPOS{STAR,PLUS,QUERY,RANGE} */
861    
862      0, 0, 0,                 /* CLASS, NCLASS, XCLASS */
863      0, 0,                    /* REF, REFI */
864      0, 0,                    /* DNREF, DNREFI */
865      0, 0                     /* RECURSE, CALLOUT */
866    };
867    
868    
869    
# Line 657  find_error_text(int n) Line 886  find_error_text(int n)
886  const char *s = error_texts;  const char *s = error_texts;
887  for (; n > 0; n--)  for (; n > 0; n--)
888    {    {
889    while (*s++ != 0) {};    while (*s++ != CHAR_NULL) {};
890    if (*s == 0) return "Error text not found (please report)";    if (*s == CHAR_NULL) return "Error text not found (please report)";
891    }    }
892  return s;  return s;
893  }  }
894    
895    
896    
897  /*************************************************  /*************************************************
898  *           Expand the workspace                 *  *           Expand the workspace                 *
899  *************************************************/  *************************************************/
# Line 741  return (*p == CHAR_RIGHT_CURLY_BRACKET); Line 971  return (*p == CHAR_RIGHT_CURLY_BRACKET);
971  *************************************************/  *************************************************/
972    
973  /* This function is called when a \ has been encountered. It either returns a  /* This function is called when a \ has been encountered. It either returns a
974  positive value for a simple escape such as \n, or a negative value which  positive value for a simple escape such as \n, or 0 for a data character which
975  encodes one of the more complicated things such as \d. A backreference to group  will be placed in chptr. A backreference to group n is returned as negative n.
976  n is returned as -(ESC_REF + n); ESC_REF is the highest ESC_xxx macro. When  When UTF-8 is enabled, a positive value greater than 255 may be returned in
977  UTF-8 is enabled, a positive value greater than 255 may be returned. On entry,  chptr. On entry, ptr is pointing at the \. On exit, it is on the final
978  ptr is pointing at the \. On exit, it is on the final character of the escape  character of the escape sequence.
 sequence.  
979    
980  Arguments:  Arguments:
981    ptrptr         points to the pattern position pointer    ptrptr         points to the pattern position pointer
982      chptr          points to a returned data character
983    errorcodeptr   points to the errorcode variable    errorcodeptr   points to the errorcode variable
984    bracount       number of previous extracting brackets    bracount       number of previous extracting brackets
985    options        the options bits    options        the options bits
986    isclass        TRUE if inside a character class    isclass        TRUE if inside a character class
987    
988  Returns:         zero or positive => a data character  Returns:         zero => a data character
989                   negative => a special escape sequence                   positive => a special escape sequence
990                     negative => a back reference
991                   on error, errorcodeptr is set                   on error, errorcodeptr is set
992  */  */
993    
994  static int  static int
995  check_escape(const pcre_uchar **ptrptr, int *errorcodeptr, int bracount,  check_escape(const pcre_uchar **ptrptr, pcre_uint32 *chptr, int *errorcodeptr,
996    int options, BOOL isclass)    int bracount, int options, BOOL isclass)
997  {  {
998  /* PCRE_UTF16 has the same value as PCRE_UTF8. */  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
999  BOOL utf = (options & PCRE_UTF8) != 0;  BOOL utf = (options & PCRE_UTF8) != 0;
1000  const pcre_uchar *ptr = *ptrptr + 1;  const pcre_uchar *ptr = *ptrptr + 1;
1001  pcre_int32 c;  pcre_uint32 c;
1002    int escape = 0;
1003  int i;  int i;
1004    
1005  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
# Line 775  ptr--;                            /* Set Line 1007  ptr--;                            /* Set
1007    
1008  /* If backslash is at the end of the pattern, it's an error. */  /* If backslash is at the end of the pattern, it's an error. */
1009    
1010  if (c == 0) *errorcodeptr = ERR1;  if (c == CHAR_NULL) *errorcodeptr = ERR1;
1011    
1012  /* Non-alphanumerics are literals. For digits or letters, do an initial lookup  /* Non-alphanumerics are literals. For digits or letters, do an initial lookup
1013  in a table. A non-zero result is something that can be returned immediately.  in a table. A non-zero result is something that can be returned immediately.
# Line 784  Otherwise further processing may be requ Line 1016  Otherwise further processing may be requ
1016  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1017  /* Not alphanumeric */  /* Not alphanumeric */
1018  else if (c < CHAR_0 || c > CHAR_z) {}  else if (c < CHAR_0 || c > CHAR_z) {}
1019  else if ((i = escapes[c - CHAR_0]) != 0) c = i;  else if ((i = escapes[c - CHAR_0]) != 0)
1020      { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
1021    
1022  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
1023  /* Not alphanumeric */  /* Not alphanumeric */
1024  else if (c < 'a' || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}  else if (c < CHAR_a || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}
1025  else if ((i = escapes[c - 0x48]) != 0)  c = i;  else if ((i = escapes[c - 0x48]) != 0)  { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
1026  #endif  #endif
1027    
1028  /* Escapes that need further processing, or are illegal. */  /* Escapes that need further processing, or are illegal. */
# Line 797  else if ((i = escapes[c - 0x48]) != 0) Line 1030  else if ((i = escapes[c - 0x48]) != 0)
1030  else  else
1031    {    {
1032    const pcre_uchar *oldptr;    const pcre_uchar *oldptr;
1033    BOOL braced, negated;    BOOL braced, negated, overflow;
1034      int s;
1035    
1036    switch (c)    switch (c)
1037      {      {
# Line 822  else Line 1056  else
1056          c = 0;          c = 0;
1057          for (i = 0; i < 4; ++i)          for (i = 0; i < 4; ++i)
1058            {            {
1059            register int cc = *(++ptr);            register pcre_uint32 cc = *(++ptr);
1060  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1061            if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */            if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
1062            c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));            c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
# Line 831  else Line 1065  else
1065            c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));            c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1066  #endif  #endif
1067            }            }
1068    
1069    #if defined COMPILE_PCRE8
1070            if (c > (utf ? 0x10ffffU : 0xffU))
1071    #elif defined COMPILE_PCRE16
1072            if (c > (utf ? 0x10ffffU : 0xffffU))
1073    #elif defined COMPILE_PCRE32
1074            if (utf && c > 0x10ffffU)
1075    #endif
1076              {
1077              *errorcodeptr = ERR76;
1078              }
1079            else if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
1080          }          }
1081        }        }
1082      else      else
# Line 857  else Line 1103  else
1103      (3) For Oniguruma compatibility we also support \g followed by a name or a      (3) For Oniguruma compatibility we also support \g followed by a name or a
1104      number either in angle brackets or in single quotes. However, these are      number either in angle brackets or in single quotes. However, these are
1105      (possibly recursive) subroutine calls, _not_ backreferences. Just return      (possibly recursive) subroutine calls, _not_ backreferences. Just return
1106      the -ESC_g code (cf \k). */      the ESC_g code (cf \k). */
1107    
1108      case CHAR_g:      case CHAR_g:
1109      if (isclass) break;      if (isclass) break;
1110      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
1111        {        {
1112        c = -ESC_g;        escape = ESC_g;
1113        break;        break;
1114        }        }
1115    
# Line 872  else Line 1118  else
1118      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
1119        {        {
1120        const pcre_uchar *p;        const pcre_uchar *p;
1121        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)        for (p = ptr+2; *p != CHAR_NULL && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
1122          if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;          if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
1123        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)        if (*p != CHAR_NULL && *p != CHAR_RIGHT_CURLY_BRACKET)
1124          {          {
1125          c = -ESC_k;          escape = ESC_k;
1126          break;          break;
1127          }          }
1128        braced = TRUE;        braced = TRUE;
# Line 892  else Line 1138  else
1138      else negated = FALSE;      else negated = FALSE;
1139    
1140      /* The integer range is limited by the machine's int representation. */      /* The integer range is limited by the machine's int representation. */
1141      c = 0;      s = 0;
1142        overflow = FALSE;
1143      while (IS_DIGIT(ptr[1]))      while (IS_DIGIT(ptr[1]))
1144        {        {
1145        if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */        if (s > INT_MAX / 10 - 1) /* Integer overflow */
1146          {          {
1147          c = -1;          overflow = TRUE;
1148          break;          break;
1149          }          }
1150        c = c * 10 + *(++ptr) - CHAR_0;        s = s * 10 + (int)(*(++ptr) - CHAR_0);
1151        }        }
1152      if (((unsigned int)c) > INT_MAX) /* Integer overflow */      if (overflow) /* Integer overflow */
1153        {        {
1154        while (IS_DIGIT(ptr[1]))        while (IS_DIGIT(ptr[1]))
1155          ptr++;          ptr++;
# Line 916  else Line 1163  else
1163        break;        break;
1164        }        }
1165    
1166      if (c == 0)      if (s == 0)
1167        {        {
1168        *errorcodeptr = ERR58;        *errorcodeptr = ERR58;
1169        break;        break;
# Line 924  else Line 1171  else
1171    
1172      if (negated)      if (negated)
1173        {        {
1174        if (c > bracount)        if (s > bracount)
1175          {          {
1176          *errorcodeptr = ERR15;          *errorcodeptr = ERR15;
1177          break;          break;
1178          }          }
1179        c = bracount - (c - 1);        s = bracount - (s - 1);
1180        }        }
1181    
1182      c = -(ESC_REF + c);      escape = -s;
1183      break;      break;
1184    
1185      /* The handling of escape sequences consisting of a string of digits      /* The handling of escape sequences consisting of a string of digits
1186      starting with one that is not zero is not straightforward. By experiment,      starting with one that is not zero is not straightforward. Perl has changed
1187      the way Perl works seems to be as follows:      over the years. Nowadays \g{} for backreferences and \o{} for octal are
1188        recommended to avoid the ambiguities in the old syntax.
1189    
1190      Outside a character class, the digits are read as a decimal number. If the      Outside a character class, the digits are read as a decimal number. If the
1191      number is less than 10, or if there are that many previous extracting      number is less than 8 (used to be 10), or if there are that many previous
1192      left brackets, then it is a back reference. Otherwise, up to three octal      extracting left brackets, then it is a back reference. Otherwise, up to
1193      digits are read to form an escaped byte. Thus \123 is likely to be octal      three octal digits are read to form an escaped byte. Thus \123 is likely to
1194      123 (cf \0123, which is octal 012 followed by the literal 3). If the octal      be octal 123 (cf \0123, which is octal 012 followed by the literal 3). If
1195      value is greater than 377, the least significant 8 bits are taken. Inside a      the octal value is greater than 377, the least significant 8 bits are
1196      character class, \ followed by a digit is always an octal number. */      taken. \8 and \9 are treated as the literal characters 8 and 9.
1197    
1198        Inside a character class, \ followed by a digit is always either a literal
1199        8 or 9 or an octal number. */
1200    
1201      case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4: case CHAR_5:      case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4: case CHAR_5:
1202      case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:      case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
# Line 954  else Line 1205  else
1205        {        {
1206        oldptr = ptr;        oldptr = ptr;
1207        /* The integer range is limited by the machine's int representation. */        /* The integer range is limited by the machine's int representation. */
1208        c -= CHAR_0;        s = (int)(c -CHAR_0);
1209          overflow = FALSE;
1210        while (IS_DIGIT(ptr[1]))        while (IS_DIGIT(ptr[1]))
1211          {          {
1212          if (((unsigned int)c) > INT_MAX / 10) /* Integer overflow */          if (s > INT_MAX / 10 - 1) /* Integer overflow */
1213            {            {
1214            c = -1;            overflow = TRUE;
1215            break;            break;
1216            }            }
1217          c = c * 10 + *(++ptr) - CHAR_0;          s = s * 10 + (int)(*(++ptr) - CHAR_0);
1218          }          }
1219        if (((unsigned int)c) > INT_MAX) /* Integer overflow */        if (overflow) /* Integer overflow */
1220          {          {
1221          while (IS_DIGIT(ptr[1]))          while (IS_DIGIT(ptr[1]))
1222            ptr++;            ptr++;
1223          *errorcodeptr = ERR61;          *errorcodeptr = ERR61;
1224          break;          break;
1225          }          }
1226        if (c < 10 || c <= bracount)        if (s < 8 || s <= bracount)  /* Check for back reference */
1227          {          {
1228          c = -(ESC_REF + c);          escape = -s;
1229          break;          break;
1230          }          }
1231        ptr = oldptr;      /* Put the pointer back and fall through */        ptr = oldptr;      /* Put the pointer back and fall through */
1232        }        }
1233    
1234      /* Handle an octal number following \. If the first digit is 8 or 9, Perl      /* Handle a digit following \ when the number is not a back reference. If
1235      generates a binary zero byte and treats the digit as a following literal.      the first digit is 8 or 9, Perl used to generate a binary zero byte and
1236      Thus we have to pull back the pointer by one. */      then treat the digit as a following literal. At least by Perl 5.18 this
1237        changed so as not to insert the binary zero. */
1238    
1239      if ((c = *ptr) >= CHAR_8)      if ((c = *ptr) >= CHAR_8) break;
1240        {  
1241        ptr--;      /* Fall through with a digit less than 8 */
       c = 0;  
       break;  
       }  
1242    
1243      /* \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
1244      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
# Line 1005  else Line 1255  else
1255  #endif  #endif
1256      break;      break;
1257    
1258      /* \x is complicated. \x{ddd} is a character number which can be greater      /* \o is a relatively new Perl feature, supporting a more general way of
1259      than 0xff in utf or non-8bit mode, but only if the ddd are hex digits.      specifying character codes in octal. The only supported form is \o{ddd}. */
1260      If not, { is treated as a data character. */  
1261        case CHAR_o:
1262        if (ptr[1] != CHAR_LEFT_CURLY_BRACKET) *errorcodeptr = ERR81; else
1263        if (ptr[2] == CHAR_RIGHT_CURLY_BRACKET) *errorcodeptr = ERR86; else
1264          {
1265          ptr += 2;
1266          c = 0;
1267          overflow = FALSE;
1268          while (*ptr >= CHAR_0 && *ptr <= CHAR_7)
1269            {
1270            register pcre_uint32 cc = *ptr++;
1271            if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
1272    #ifdef COMPILE_PCRE32
1273            if (c >= 0x20000000l) { overflow = TRUE; break; }
1274    #endif
1275            c = (c << 3) + cc - CHAR_0 ;
1276    #if defined COMPILE_PCRE8
1277            if (c > (utf ? 0x10ffffU : 0xffU)) { overflow = TRUE; break; }
1278    #elif defined COMPILE_PCRE16
1279            if (c > (utf ? 0x10ffffU : 0xffffU)) { overflow = TRUE; break; }
1280    #elif defined COMPILE_PCRE32
1281            if (utf && c > 0x10ffffU) { overflow = TRUE; break; }
1282    #endif
1283            }
1284          if (overflow)
1285            {
1286            while (*ptr >= CHAR_0 && *ptr <= CHAR_7) ptr++;
1287            *errorcodeptr = ERR34;
1288            }
1289          else if (*ptr == CHAR_RIGHT_CURLY_BRACKET)
1290            {
1291            if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
1292            }
1293          else *errorcodeptr = ERR80;
1294          }
1295        break;
1296    
1297        /* \x is complicated. In JavaScript, \x must be followed by two hexadecimal
1298        numbers. Otherwise it is a lowercase x letter. */
1299    
1300      case CHAR_x:      case CHAR_x:
1301      if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)      if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
1302        {        {
       /* In JavaScript, \x must be followed by two hexadecimal numbers.  
       Otherwise it is a lowercase x letter. */  
1303        if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0        if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
1304          && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)          && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)
1305          {          {
1306          c = 0;          c = 0;
1307          for (i = 0; i < 2; ++i)          for (i = 0; i < 2; ++i)
1308            {            {
1309            register int cc = *(++ptr);            register pcre_uint32 cc = *(++ptr);
1310  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1311            if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */            if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
1312            c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));            c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
# Line 1030  else Line 1316  else
1316  #endif  #endif
1317            }            }
1318          }          }
1319        break;        }    /* End JavaScript handling */
       }  
1320    
1321      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      /* Handle \x in Perl's style. \x{ddd} is a character number which can be
1322        {      greater than 0xff in utf or non-8bit mode, but only if the ddd are hex
1323        const pcre_uchar *pt = ptr + 2;      digits. If not, { used to be treated as a data character. However, Perl
1324        seems to read hex digits up to the first non-such, and ignore the rest, so
1325        that, for example \x{zz} matches a binary zero. This seems crazy, so PCRE
1326        now gives an error. */
1327    
1328        c = 0;      else
1329        while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0)        {
1330          if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
1331          {          {
1332          register int cc = *pt++;          ptr += 2;
1333          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */          if (*ptr == CHAR_RIGHT_CURLY_BRACKET)
1334              {
1335              *errorcodeptr = ERR86;
1336              break;
1337              }
1338            c = 0;
1339            overflow = FALSE;
1340            while (MAX_255(*ptr) && (digitab[*ptr] & ctype_xdigit) != 0)
1341              {
1342              register pcre_uint32 cc = *ptr++;
1343              if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
1344    
1345    #ifdef COMPILE_PCRE32
1346              if (c >= 0x10000000l) { overflow = TRUE; break; }
1347    #endif
1348    
1349  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1350          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */            if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
1351          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));            c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
1352  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
1353          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 */
1354          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));            c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1355  #endif  #endif
1356    
1357  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
1358          if (c > (utf ? 0x10ffff : 0xff)) { c = -1; break; }            if (c > (utf ? 0x10ffffU : 0xffU)) { overflow = TRUE; break; }
1359  #else  #elif defined COMPILE_PCRE16
1360  #ifdef COMPILE_PCRE16            if (c > (utf ? 0x10ffffU : 0xffffU)) { overflow = TRUE; break; }
1361          if (c > (utf ? 0x10ffff : 0xffff)) { c = -1; break; }  #elif defined COMPILE_PCRE32
1362  #endif            if (utf && c > 0x10ffffU) { overflow = TRUE; break; }
1363  #endif  #endif
1364          }            }
1365    
1366        if (c < 0)          if (overflow)
1367          {            {
1368          while (MAX_255(*pt) && (digitab[*pt] & ctype_xdigit) != 0) pt++;            while (MAX_255(*ptr) && (digitab[*ptr] & ctype_xdigit) != 0) ptr++;
1369          *errorcodeptr = ERR34;            *errorcodeptr = ERR34;
1370          }            }
1371    
1372        if (*pt == CHAR_RIGHT_CURLY_BRACKET)          else if (*ptr == CHAR_RIGHT_CURLY_BRACKET)
1373          {            {
1374          if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;            if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
1375          ptr = pt;            }
         break;  
         }  
1376    
1377        /* If the sequence of hex digits does not end with '}', then we don't          /* If the sequence of hex digits does not end with '}', give an error.
1378        recognize this construct; fall through to the normal \x handling. */          We used just to recognize this construct and fall through to the normal
1379        }          \x handling, but nowadays Perl gives an error, which seems much more
1380            sensible, so we do too. */
1381    
1382      /* Read just a single-byte hex-defined char */          else *errorcodeptr = ERR79;
1383            }   /* End of \x{} processing */
1384    
1385      c = 0;        /* Read a single-byte hex-defined char (up to two hex digits after \x) */
1386      while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)  
1387        {        else
1388        int cc;                                  /* Some compilers don't like */          {
1389        cc = *(++ptr);                           /* ++ in initializers */          c = 0;
1390            while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)
1391              {
1392              pcre_uint32 cc;                          /* Some compilers don't like */
1393              cc = *(++ptr);                           /* ++ in initializers */
1394  #ifndef EBCDIC  /* ASCII/UTF-8 coding */  #ifndef EBCDIC  /* ASCII/UTF-8 coding */
1395        if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */            if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
1396        c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));            c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
1397  #else           /* EBCDIC coding */  #else           /* EBCDIC coding */
1398        if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */            if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
1399        c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));            c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
1400  #endif  #endif
1401        }            }
1402            }     /* End of \xdd handling */
1403          }       /* End of Perl-style \x handling */
1404      break;      break;
1405    
1406      /* For \c, a following letter is upper-cased; then the 0x40 bit is flipped.      /* For \c, a following letter is upper-cased; then the 0x40 bit is flipped.
# Line 1101  else Line 1410  else
1410    
1411      case CHAR_c:      case CHAR_c:
1412      c = *(++ptr);      c = *(++ptr);
1413      if (c == 0)      if (c == CHAR_NULL)
1414        {        {
1415        *errorcodeptr = ERR2;        *errorcodeptr = ERR2;
1416        break;        break;
# Line 1141  else Line 1450  else
1450  newline". PCRE does not support \N{name}. However, it does support  newline". PCRE does not support \N{name}. However, it does support
1451  quantification such as \N{2,3}. */  quantification such as \N{2,3}. */
1452    
1453  if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&  if (escape == ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
1454       !is_counted_repeat(ptr+2))       !is_counted_repeat(ptr+2))
1455    *errorcodeptr = ERR37;    *errorcodeptr = ERR37;
1456    
1457  /* If PCRE_UCP is set, we change the values for \d etc. */  /* If PCRE_UCP is set, we change the values for \d etc. */
1458    
1459  if ((options & PCRE_UCP) != 0 && c <= -ESC_D && c >= -ESC_w)  if ((options & PCRE_UCP) != 0 && escape >= ESC_D && escape <= ESC_w)
1460    c -= (ESC_DU - ESC_D);    escape += (ESC_DU - ESC_D);
1461    
1462  /* Set the pointer to the final character before returning. */  /* Set the pointer to the final character before returning. */
1463    
1464  *ptrptr = ptr;  *ptrptr = ptr;
1465  return c;  *chptr = c;
1466    return escape;
1467  }  }
1468    
1469    
# Line 1171  escape sequence. Line 1481  escape sequence.
1481  Argument:  Argument:
1482    ptrptr         points to the pattern position pointer    ptrptr         points to the pattern position pointer
1483    negptr         points to a boolean that is set TRUE for negation else FALSE    negptr         points to a boolean that is set TRUE for negation else FALSE
1484    dptr           points to an int that is set to the detailed property value    ptypeptr       points to an unsigned int that is set to the type value
1485      pdataptr       points to an unsigned int that is set to the detailed property value
1486    errorcodeptr   points to the error code variable    errorcodeptr   points to the error code variable
1487    
1488  Returns:         type value from ucp_type_table, or -1 for an invalid type  Returns:         TRUE if the type value was found, or FALSE for an invalid type
1489  */  */
1490    
1491  static int  static BOOL
1492  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)  get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, unsigned int *ptypeptr,
1493      unsigned int *pdataptr, int *errorcodeptr)
1494  {  {
1495  int c, i, bot, top;  pcre_uchar c;
1496    int i, bot, top;
1497  const pcre_uchar *ptr = *ptrptr;  const pcre_uchar *ptr = *ptrptr;
1498  pcre_uchar name[32];  pcre_uchar name[32];
1499    
1500  c = *(++ptr);  c = *(++ptr);
1501  if (c == 0) goto ERROR_RETURN;  if (c == CHAR_NULL) goto ERROR_RETURN;
1502    
1503  *negptr = FALSE;  *negptr = FALSE;
1504    
# Line 1202  if (c == CHAR_LEFT_CURLY_BRACKET) Line 1515  if (c == CHAR_LEFT_CURLY_BRACKET)
1515    for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)    for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
1516      {      {
1517      c = *(++ptr);      c = *(++ptr);
1518      if (c == 0) goto ERROR_RETURN;      if (c == CHAR_NULL) goto ERROR_RETURN;
1519      if (c == CHAR_RIGHT_CURLY_BRACKET) break;      if (c == CHAR_RIGHT_CURLY_BRACKET) break;
1520      name[i] = c;      name[i] = c;
1521      }      }
# Line 1227  top = PRIV(utt_size); Line 1540  top = PRIV(utt_size);
1540    
1541  while (bot < top)  while (bot < top)
1542    {    {
1543      int r;
1544    i = (bot + top) >> 1;    i = (bot + top) >> 1;
1545    c = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);    r = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
1546    if (c == 0)    if (r == 0)
1547      {      {
1548      *dptr = PRIV(utt)[i].value;      *ptypeptr = PRIV(utt)[i].type;
1549      return PRIV(utt)[i].type;      *pdataptr = PRIV(utt)[i].value;
1550        return TRUE;
1551      }      }
1552    if (c > 0) bot = i + 1; else top = i;    if (r > 0) bot = i + 1; else top = i;
1553    }    }
1554    
1555  *errorcodeptr = ERR47;  *errorcodeptr = ERR47;
1556  *ptrptr = ptr;  *ptrptr = ptr;
1557  return -1;  return FALSE;
1558    
1559  ERROR_RETURN:  ERROR_RETURN:
1560  *errorcodeptr = ERR46;  *errorcodeptr = ERR46;
1561  *ptrptr = ptr;  *ptrptr = ptr;
1562  return -1;  return FALSE;
1563  }  }
1564  #endif  #endif
1565    
1566    
1567    
   
1568  /*************************************************  /*************************************************
1569  *         Read repeat counts                     *  *         Read repeat counts                     *
1570  *************************************************/  *************************************************/
# Line 1276  read_repeat_counts(const pcre_uchar *p, Line 1590  read_repeat_counts(const pcre_uchar *p,
1590  int min = 0;  int min = 0;
1591  int max = -1;  int max = -1;
1592    
1593  /* Read the minimum value and do a paranoid check: a negative value indicates  while (IS_DIGIT(*p))
 an integer overflow. */  
   
 while (IS_DIGIT(*p)) min = min * 10 + *p++ - CHAR_0;  
 if (min < 0 || min > 65535)  
1594    {    {
1595    *errorcodeptr = ERR5;    min = min * 10 + (int)(*p++ - CHAR_0);
1596    return p;    if (min > 65535)
1597        {
1598        *errorcodeptr = ERR5;
1599        return p;
1600        }
1601    }    }
1602    
 /* Read the maximum value if there is one, and again do a paranoid on its size.  
 Also, max must not be less than min. */  
   
1603  if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else  if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
1604    {    {
1605    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)    if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
1606      {      {
1607      max = 0;      max = 0;
1608      while(IS_DIGIT(*p)) max = max * 10 + *p++ - CHAR_0;      while(IS_DIGIT(*p))
     if (max < 0 || max > 65535)  
1609        {        {
1610        *errorcodeptr = ERR5;        max = max * 10 + (int)(*p++ - CHAR_0);
1611        return p;        if (max > 65535)
1612            {
1613            *errorcodeptr = ERR5;
1614            return p;
1615            }
1616        }        }
1617      if (max < min)      if (max < min)
1618        {        {
# Line 1308  if (*p == CHAR_RIGHT_CURLY_BRACKET) max Line 1622  if (*p == CHAR_RIGHT_CURLY_BRACKET) max
1622      }      }
1623    }    }
1624    
 /* Fill in the required variables, and pass back the pointer to the terminating  
 '}'. */  
   
1625  *minp = min;  *minp = min;
1626  *maxp = max;  *maxp = max;
1627  return p;  return p;
# Line 1319  return p; Line 1630  return p;
1630    
1631    
1632  /*************************************************  /*************************************************
 *  Subroutine for finding forward reference      *  
 *************************************************/  
   
 /* This recursive function is called only from find_parens() below. The  
 top-level call starts at the beginning of the pattern. All other calls must  
 start at a parenthesis. It scans along a pattern's text looking for capturing  
 subpatterns, and counting them. If it finds a named pattern that matches the  
 name it is given, it returns its number. Alternatively, if the name is NULL, it  
 returns when it reaches a given numbered subpattern. Recursion is used to keep  
 track of subpatterns that reset the capturing group numbers - the (?| feature.  
   
 This function was originally called only from the second pass, in which we know  
 that if (?< or (?' or (?P< is encountered, the name will be correctly  
 terminated because that is checked in the first pass. There is now one call to  
 this function in the first pass, to check for a recursive back reference by  
 name (so that we can make the whole group atomic). In this case, we need check  
 only up to the current position in the pattern, and that is still OK because  
 and previous occurrences will have been checked. To make this work, the test  
 for "end of pattern" is a check against cd->end_pattern in the main loop,  
 instead of looking for a binary zero. This means that the special first-pass  
 call can adjust cd->end_pattern temporarily. (Checks for binary zero while  
 processing items within the loop are OK, because afterwards the main loop will  
 terminate.)  
   
 Arguments:  
   ptrptr       address of the current character pointer (updated)  
   cd           compile background data  
   name         name to seek, or NULL if seeking a numbered subpattern  
   lorn         name length, or subpattern number if name is NULL  
   xmode        TRUE if we are in /x mode  
   utf          TRUE if we are in UTF-8 / UTF-16 mode  
   count        pointer to the current capturing subpattern number (updated)  
   
 Returns:       the number of the named subpattern, or -1 if not found  
 */  
   
 static int  
 find_parens_sub(pcre_uchar **ptrptr, compile_data *cd, const pcre_uchar *name, int lorn,  
   BOOL xmode, BOOL utf, int *count)  
 {  
 pcre_uchar *ptr = *ptrptr;  
 int start_count = *count;  
 int hwm_count = start_count;  
 BOOL dup_parens = FALSE;  
   
 /* If the first character is a parenthesis, check on the type of group we are  
 dealing with. The very first call may not start with a parenthesis. */  
   
 if (ptr[0] == CHAR_LEFT_PARENTHESIS)  
   {  
   /* Handle specials such as (*SKIP) or (*UTF8) etc. */  
   
   if (ptr[1] == CHAR_ASTERISK) ptr += 2;  
   
   /* Handle a normal, unnamed capturing parenthesis. */  
   
   else if (ptr[1] != CHAR_QUESTION_MARK)  
     {  
     *count += 1;  
     if (name == NULL && *count == lorn) return *count;  
     ptr++;  
     }  
   
   /* All cases now have (? at the start. Remember when we are in a group  
   where the parenthesis numbers are duplicated. */  
   
   else if (ptr[2] == CHAR_VERTICAL_LINE)  
     {  
     ptr += 3;  
     dup_parens = TRUE;  
     }  
   
   /* Handle comments; all characters are allowed until a ket is reached. */  
   
   else if (ptr[2] == CHAR_NUMBER_SIGN)  
     {  
     for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;  
     goto FAIL_EXIT;  
     }  
   
   /* Handle a condition. If it is an assertion, just carry on so that it  
   is processed as normal. If not, skip to the closing parenthesis of the  
   condition (there can't be any nested parens). */  
   
   else if (ptr[2] == CHAR_LEFT_PARENTHESIS)  
     {  
     ptr += 2;  
     if (ptr[1] != CHAR_QUESTION_MARK)  
       {  
       while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;  
       if (*ptr != 0) ptr++;  
       }  
     }  
   
   /* Start with (? but not a condition. */  
   
   else  
     {  
     ptr += 2;  
     if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */  
   
     /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */  
   
     if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&  
         ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)  
       {  
       int term;  
       const pcre_uchar *thisname;  
       *count += 1;  
       if (name == NULL && *count == lorn) return *count;  
       term = *ptr++;  
       if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;  
       thisname = ptr;  
       while (*ptr != term) ptr++;  
       if (name != NULL && lorn == ptr - thisname &&  
           STRNCMP_UC_UC(name, thisname, lorn) == 0)  
         return *count;  
       term++;  
       }  
     }  
   }  
   
 /* Past any initial parenthesis handling, scan for parentheses or vertical  
 bars. Stop if we get to cd->end_pattern. Note that this is important for the  
 first-pass call when this value is temporarily adjusted to stop at the current  
 position. So DO NOT change this to a test for binary zero. */  
   
 for (; ptr < cd->end_pattern; ptr++)  
   {  
   /* Skip over backslashed characters and also entire \Q...\E */  
   
   if (*ptr == CHAR_BACKSLASH)  
     {  
     if (*(++ptr) == 0) goto FAIL_EXIT;  
     if (*ptr == CHAR_Q) for (;;)  
       {  
       while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};  
       if (*ptr == 0) goto FAIL_EXIT;  
       if (*(++ptr) == CHAR_E) break;  
       }  
     continue;  
     }  
   
   /* Skip over character classes; this logic must be similar to the way they  
   are handled for real. If the first character is '^', skip it. Also, if the  
   first few characters (either before or after ^) are \Q\E or \E we skip them  
   too. This makes for compatibility with Perl. Note the use of STR macros to  
   encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */  
   
   if (*ptr == CHAR_LEFT_SQUARE_BRACKET)  
     {  
     BOOL negate_class = FALSE;  
     for (;;)  
       {  
       if (ptr[1] == CHAR_BACKSLASH)  
         {  
         if (ptr[2] == CHAR_E)  
           ptr+= 2;  
         else if (STRNCMP_UC_C8(ptr + 2,  
                  STR_Q STR_BACKSLASH STR_E, 3) == 0)  
           ptr += 4;  
         else  
           break;  
         }  
       else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)  
         {  
         negate_class = TRUE;  
         ptr++;  
         }  
       else break;  
       }  
   
     /* If the next character is ']', it is a data character that must be  
     skipped, except in JavaScript compatibility mode. */  
   
     if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&  
         (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)  
       ptr++;  
   
     while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)  
       {  
       if (*ptr == 0) return -1;  
       if (*ptr == CHAR_BACKSLASH)  
         {  
         if (*(++ptr) == 0) goto FAIL_EXIT;  
         if (*ptr == CHAR_Q) for (;;)  
           {  
           while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};  
           if (*ptr == 0) goto FAIL_EXIT;  
           if (*(++ptr) == CHAR_E) break;  
           }  
         continue;  
         }  
       }  
     continue;  
     }  
   
   /* Skip comments in /x mode */  
   
   if (xmode && *ptr == CHAR_NUMBER_SIGN)  
     {  
     ptr++;  
     while (*ptr != 0)  
       {  
       if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }  
       ptr++;  
 #ifdef SUPPORT_UTF  
       if (utf) FORWARDCHAR(ptr);  
 #endif  
       }  
     if (*ptr == 0) goto FAIL_EXIT;  
     continue;  
     }  
   
   /* Check for the special metacharacters */  
   
   if (*ptr == CHAR_LEFT_PARENTHESIS)  
     {  
     int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, count);  
     if (rc > 0) return rc;  
     if (*ptr == 0) goto FAIL_EXIT;  
     }  
   
   else if (*ptr == CHAR_RIGHT_PARENTHESIS)  
     {  
     if (dup_parens && *count < hwm_count) *count = hwm_count;  
     goto FAIL_EXIT;  
     }  
   
   else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)  
     {  
     if (*count > hwm_count) hwm_count = *count;  
     *count = start_count;  
     }  
   }  
   
 FAIL_EXIT:  
 *ptrptr = ptr;  
 return -1;  
 }  
   
   
   
   
 /*************************************************  
 *       Find forward referenced subpattern       *  
 *************************************************/  
   
 /* This function scans along a pattern's text looking for capturing  
 subpatterns, and counting them. If it finds a named pattern that matches the  
 name it is given, it returns its number. Alternatively, if the name is NULL, it  
 returns when it reaches a given numbered subpattern. This is used for forward  
 references to subpatterns. We used to be able to start this scan from the  
 current compiling point, using the current count value from cd->bracount, and  
 do it all in a single loop, but the addition of the possibility of duplicate  
 subpattern numbers means that we have to scan from the very start, in order to  
 take account of such duplicates, and to use a recursive function to keep track  
 of the different types of group.  
   
 Arguments:  
   cd           compile background data  
   name         name to seek, or NULL if seeking a numbered subpattern  
   lorn         name length, or subpattern number if name is NULL  
   xmode        TRUE if we are in /x mode  
   utf          TRUE if we are in UTF-8 / UTF-16 mode  
   
 Returns:       the number of the found subpattern, or -1 if not found  
 */  
   
 static int  
 find_parens(compile_data *cd, const pcre_uchar *name, int lorn, BOOL xmode,  
   BOOL utf)  
 {  
 pcre_uchar *ptr = (pcre_uchar *)cd->start_pattern;  
 int count = 0;  
 int rc;  
   
 /* If the pattern does not start with an opening parenthesis, the first call  
 to find_parens_sub() will scan right to the end (if necessary). However, if it  
 does start with a parenthesis, find_parens_sub() will return when it hits the  
 matching closing parens. That is why we have to have a loop. */  
   
 for (;;)  
   {  
   rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, &count);  
   if (rc > 0 || *ptr++ == 0) break;  
   }  
   
 return rc;  
 }  
   
   
   
   
 /*************************************************  
1633  *      Find first significant op code            *  *      Find first significant op code            *
1634  *************************************************/  *************************************************/
1635    
# Line 1652  for (;;) Line 1668  for (;;)
1668    
1669      case OP_CALLOUT:      case OP_CALLOUT:
1670      case OP_CREF:      case OP_CREF:
1671      case OP_NCREF:      case OP_DNCREF:
1672      case OP_RREF:      case OP_RREF:
1673      case OP_NRREF:      case OP_DNRREF:
1674      case OP_DEF:      case OP_DEF:
1675      code += PRIV(OP_lengths)[*code];      code += PRIV(OP_lengths)[*code];
1676      break;      break;
# Line 1668  for (;;) Line 1684  for (;;)
1684    
1685    
1686    
   
1687  /*************************************************  /*************************************************
1688  *        Find the fixed length of a branch       *  *        Find the fixed length of a branch       *
1689  *************************************************/  *************************************************/
# Line 1686  and doing the check at the end; a flag s Line 1701  and doing the check at the end; a flag s
1701    
1702  Arguments:  Arguments:
1703    code     points to the start of the pattern (the bracket)    code     points to the start of the pattern (the bracket)
1704    utf      TRUE in UTF-8 / UTF-16 mode    utf      TRUE in UTF-8 / UTF-16 / UTF-32 mode
1705    atend    TRUE if called when the pattern is complete    atend    TRUE if called when the pattern is complete
1706    cd       the "compile data" structure    cd       the "compile data" structure
1707    
# Line 1712  for (;;) Line 1727  for (;;)
1727    {    {
1728    int d;    int d;
1729    pcre_uchar *ce, *cs;    pcre_uchar *ce, *cs;
1730    register int op = *cc;    register pcre_uchar op = *cc;
1731    
1732    switch (op)    switch (op)
1733      {      {
# Line 1792  for (;;) Line 1807  for (;;)
1807      case OP_COMMIT:      case OP_COMMIT:
1808      case OP_CREF:      case OP_CREF:
1809      case OP_DEF:      case OP_DEF:
1810        case OP_DNCREF:
1811        case OP_DNRREF:
1812      case OP_DOLL:      case OP_DOLL:
1813      case OP_DOLLM:      case OP_DOLLM:
1814      case OP_EOD:      case OP_EOD:
1815      case OP_EODN:      case OP_EODN:
1816      case OP_FAIL:      case OP_FAIL:
     case OP_NCREF:  
     case OP_NRREF:  
1817      case OP_NOT_WORD_BOUNDARY:      case OP_NOT_WORD_BOUNDARY:
1818      case OP_PRUNE:      case OP_PRUNE:
1819      case OP_REVERSE:      case OP_REVERSE:
# Line 1832  for (;;) Line 1847  for (;;)
1847      case OP_EXACTI:      case OP_EXACTI:
1848      case OP_NOTEXACT:      case OP_NOTEXACT:
1849      case OP_NOTEXACTI:      case OP_NOTEXACTI:
1850      branchlength += GET2(cc,1);      branchlength += (int)GET2(cc,1);
1851      cc += 2 + IMM2_SIZE;      cc += 2 + IMM2_SIZE;
1852  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
1853      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
# Line 1841  for (;;) Line 1856  for (;;)
1856    
1857      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1858      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1859      if (cc[1 + IMM2_SIZE] == OP_PROP || cc[1 + IMM2_SIZE] == OP_NOTPROP) cc += 2;      if (cc[1 + IMM2_SIZE] == OP_PROP || cc[1 + IMM2_SIZE] == OP_NOTPROP)
1860          cc += 2;
1861      cc += 1 + IMM2_SIZE + 1;      cc += 1 + IMM2_SIZE + 1;
1862      break;      break;
1863    
# Line 1876  for (;;) Line 1892  for (;;)
1892    
1893      /* Check a class for variable quantification */      /* Check a class for variable quantification */
1894    
 #if defined SUPPORT_UTF || defined COMPILE_PCRE16  
     case OP_XCLASS:  
     cc += GET(cc, 1) - PRIV(OP_lengths)[OP_CLASS];  
     /* Fall through */  
 #endif  
   
1895      case OP_CLASS:      case OP_CLASS:
1896      case OP_NCLASS:      case OP_NCLASS:
1897      cc += PRIV(OP_lengths)[OP_CLASS];  #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1898        case OP_XCLASS:
1899        /* The original code caused an unsigned overflow in 64 bit systems,
1900        so now we use a conditional statement. */
1901        if (op == OP_XCLASS)
1902          cc += GET(cc, 1);
1903        else
1904          cc += PRIV(OP_lengths)[OP_CLASS];
1905    #else
1906        cc += PRIV(OP_lengths)[OP_CLASS];
1907    #endif
1908    
1909      switch (*cc)      switch (*cc)
1910        {        {
       case OP_CRPLUS:  
       case OP_CRMINPLUS:  
1911        case OP_CRSTAR:        case OP_CRSTAR:
1912        case OP_CRMINSTAR:        case OP_CRMINSTAR:
1913          case OP_CRPLUS:
1914          case OP_CRMINPLUS:
1915        case OP_CRQUERY:        case OP_CRQUERY:
1916        case OP_CRMINQUERY:        case OP_CRMINQUERY:
1917          case OP_CRPOSSTAR:
1918          case OP_CRPOSPLUS:
1919          case OP_CRPOSQUERY:
1920        return -1;        return -1;
1921    
1922        case OP_CRRANGE:        case OP_CRRANGE:
1923        case OP_CRMINRANGE:        case OP_CRMINRANGE:
1924          case OP_CRPOSRANGE:
1925        if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;        if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
1926        branchlength += GET2(cc,1);        branchlength += (int)GET2(cc,1);
1927        cc += 1 + 2 * IMM2_SIZE;        cc += 1 + 2 * IMM2_SIZE;
1928        break;        break;
1929    
# Line 1966  for (;;) Line 1990  for (;;)
1990      case OP_QUERYI:      case OP_QUERYI:
1991      case OP_REF:      case OP_REF:
1992      case OP_REFI:      case OP_REFI:
1993        case OP_DNREF:
1994        case OP_DNREFI:
1995      case OP_SBRA:      case OP_SBRA:
1996      case OP_SBRAPOS:      case OP_SBRAPOS:
1997      case OP_SCBRA:      case OP_SCBRA:
# Line 2002  for (;;) Line 2028  for (;;)
2028    
2029    
2030    
   
2031  /*************************************************  /*************************************************
2032  *    Scan compiled regex for specific bracket    *  *    Scan compiled regex for specific bracket    *
2033  *************************************************/  *************************************************/
# Line 2015  length. Line 2040  length.
2040    
2041  Arguments:  Arguments:
2042    code        points to start of expression    code        points to start of expression
2043    utf         TRUE in UTF-8 / UTF-16 mode    utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
2044    number      the required bracket number or negative to find a lookbehind    number      the required bracket number or negative to find a lookbehind
2045    
2046  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
# Line 2026  PRIV(find_bracket)(const pcre_uchar *cod Line 2051  PRIV(find_bracket)(const pcre_uchar *cod
2051  {  {
2052  for (;;)  for (;;)
2053    {    {
2054    register int c = *code;    register pcre_uchar c = *code;
2055    
2056    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
2057    
# Line 2049  for (;;) Line 2074  for (;;)
2074    else if (c == OP_CBRA || c == OP_SCBRA ||    else if (c == OP_CBRA || c == OP_SCBRA ||
2075             c == OP_CBRAPOS || c == OP_SCBRAPOS)             c == OP_CBRAPOS || c == OP_SCBRAPOS)
2076      {      {
2077      int n = GET2(code, 1+LINK_SIZE);      int n = (int)GET2(code, 1+LINK_SIZE);
2078      if (n == number) return (pcre_uchar *)code;      if (n == number) return (pcre_uchar *)code;
2079      code += PRIV(OP_lengths)[c];      code += PRIV(OP_lengths)[c];
2080      }      }
# Line 2079  for (;;) Line 2104  for (;;)
2104        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2105        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2106        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
2107        if (code[1 + IMM2_SIZE] == OP_PROP        if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
2108          || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;          code += 2;
2109        break;        break;
2110    
2111        case OP_MARK:        case OP_MARK:
2112        case OP_PRUNE_ARG:        case OP_PRUNE_ARG:
2113        case OP_SKIP_ARG:        case OP_SKIP_ARG:
       code += code[1];  
       break;  
   
2114        case OP_THEN_ARG:        case OP_THEN_ARG:
2115        code += code[1];        code += code[1];
2116        break;        break;
# Line 2102  for (;;) Line 2124  for (;;)
2124    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
2125    arrange to skip the extra bytes. */    arrange to skip the extra bytes. */
2126    
2127  #ifdef SUPPORT_UTF  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2128      if (utf) switch(c)      if (utf) switch(c)
2129        {        {
2130        case OP_CHAR:        case OP_CHAR:
# Line 2154  instance of OP_RECURSE. Line 2176  instance of OP_RECURSE.
2176    
2177  Arguments:  Arguments:
2178    code        points to start of expression    code        points to start of expression
2179    utf         TRUE in UTF-8 / UTF-16 mode    utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
2180    
2181  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
2182  */  */
# Line 2164  find_recurse(const pcre_uchar *code, BOO Line 2186  find_recurse(const pcre_uchar *code, BOO
2186  {  {
2187  for (;;)  for (;;)
2188    {    {
2189    register int c = *code;    register pcre_uchar c = *code;
2190    if (c == OP_END) return NULL;    if (c == OP_END) return NULL;
2191    if (c == OP_RECURSE) return code;    if (c == OP_RECURSE) return code;
2192    
# Line 2199  for (;;) Line 2221  for (;;)
2221        case OP_TYPEUPTO:        case OP_TYPEUPTO:
2222        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
2223        case OP_TYPEEXACT:        case OP_TYPEEXACT:
2224        if (code[1 + IMM2_SIZE] == OP_PROP        if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
2225          || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;          code += 2;
2226        break;        break;
2227    
2228        case OP_MARK:        case OP_MARK:
2229        case OP_PRUNE_ARG:        case OP_PRUNE_ARG:
2230        case OP_SKIP_ARG:        case OP_SKIP_ARG:
       code += code[1];  
       break;  
   
2231        case OP_THEN_ARG:        case OP_THEN_ARG:
2232        code += code[1];        code += code[1];
2233        break;        break;
# Line 2222  for (;;) Line 2241  for (;;)
2241      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
2242      to arrange to skip the extra bytes. */      to arrange to skip the extra bytes. */
2243    
2244  #ifdef SUPPORT_UTF  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2245      if (utf) switch(c)      if (utf) switch(c)
2246        {        {
2247        case OP_CHAR:        case OP_CHAR:
# Line 2308  bracket whose current branch will alread Line 2327  bracket whose current branch will alread
2327  Arguments:  Arguments:
2328    code        points to start of search    code        points to start of search
2329    endcode     points to where to stop    endcode     points to where to stop
2330    utf         TRUE if in UTF-8 / UTF-16 mode    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
2331    cd          contains pointers to tables etc.    cd          contains pointers to tables etc.
2332      recurses    chain of recurse_check to catch mutual recursion
2333    
2334  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2335  */  */
2336    
2337    typedef struct recurse_check {
2338      struct recurse_check *prev;
2339      const pcre_uchar *group;
2340    } recurse_check;
2341    
2342  static BOOL  static BOOL
2343  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,  could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
2344    BOOL utf, compile_data *cd)    BOOL utf, compile_data *cd, recurse_check *recurses)
2345  {  {
2346  register int c;  register pcre_uchar c;
2347    recurse_check this_recurse;
2348    
2349  for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);  for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
2350       code < endcode;       code < endcode;
2351       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))       code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
# Line 2346  for (code = first_significant_code(code Line 2373  for (code = first_significant_code(code
2373    
2374    if (c == OP_RECURSE)    if (c == OP_RECURSE)
2375      {      {
2376      const pcre_uchar *scode;      const pcre_uchar *scode = cd->start_code + GET(code, 1);
2377        const pcre_uchar *endgroup = scode;
2378      BOOL empty_branch;      BOOL empty_branch;
2379    
2380      /* Test for forward reference */      /* Test for forward reference or uncompleted reference. This is disabled
2381        when called to scan a completed pattern by setting cd->start_workspace to
2382        NULL. */
2383    
2384      for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE)      if (cd->start_workspace != NULL)
2385        if (GET(scode, 0) == code + 1 - cd->start_code) return TRUE;        {
2386          const pcre_uchar *tcode;
2387          for (tcode = cd->start_workspace; tcode < cd->hwm; tcode += LINK_SIZE)
2388            if ((int)GET(tcode, 0) == (int)(code + 1 - cd->start_code)) return TRUE;
2389          if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
2390          }
2391    
2392      /* Not a forward reference, test for completed backward reference */      /* If the reference is to a completed group, we need to detect whether this
2393        is a recursive call, as otherwise there will be an infinite loop. If it is
2394        a recursion, just skip over it. Simple recursions are easily detected. For
2395        mutual recursions we keep a chain on the stack. */
2396    
2397      empty_branch = FALSE;      do endgroup += GET(endgroup, 1); while (*endgroup == OP_ALT);
2398      scode = cd->start_code + GET(code, 1);      if (code >= scode && code <= endgroup) continue;  /* Simple recursion */
2399      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */      else
2400          {
2401          recurse_check *r = recurses;
2402          for (r = recurses; r != NULL; r = r->prev)
2403            if (r->group == scode) break;
2404          if (r != NULL) continue;   /* Mutual recursion */
2405          }
2406    
2407      /* Completed backwards reference */      /* Completed reference; scan the referenced group, remembering it on the
2408        stack chain to detect mutual recursions. */
2409    
2410        empty_branch = FALSE;
2411        this_recurse.prev = recurses;
2412        this_recurse.group = scode;
2413    
2414      do      do
2415        {        {
2416        if (could_be_empty_branch(scode, endcode, utf, cd))        if (could_be_empty_branch(scode, endcode, utf, cd, &this_recurse))
2417          {          {
2418          empty_branch = TRUE;          empty_branch = TRUE;
2419          break;          break;
# Line 2420  for (code = first_significant_code(code Line 2469  for (code = first_significant_code(code
2469        empty_branch = FALSE;        empty_branch = FALSE;
2470        do        do
2471          {          {
2472          if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd))          if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd, NULL))
2473            empty_branch = TRUE;            empty_branch = TRUE;
2474          code += GET(code, 1);          code += GET(code, 1);
2475          }          }
# Line 2462  for (code = first_significant_code(code Line 2511  for (code = first_significant_code(code
2511        case OP_CRMINSTAR:        case OP_CRMINSTAR:
2512        case OP_CRQUERY:        case OP_CRQUERY:
2513        case OP_CRMINQUERY:        case OP_CRMINQUERY:
2514          case OP_CRPOSSTAR:
2515          case OP_CRPOSQUERY:
2516        break;        break;
2517    
2518        default:                   /* Non-repeat => class must match */        default:                   /* Non-repeat => class must match */
2519        case OP_CRPLUS:            /* These repeats aren't empty */        case OP_CRPLUS:            /* These repeats aren't empty */
2520        case OP_CRMINPLUS:        case OP_CRMINPLUS:
2521          case OP_CRPOSPLUS:
2522        return FALSE;        return FALSE;
2523    
2524        case OP_CRRANGE:        case OP_CRRANGE:
2525        case OP_CRMINRANGE:        case OP_CRMINRANGE:
2526          case OP_CRPOSRANGE:
2527        if (GET2(ccode, 1) > 0) return FALSE;  /* Minimum > 0 */        if (GET2(ccode, 1) > 0) return FALSE;  /* Minimum > 0 */
2528        break;        break;
2529        }        }
# Line 2478  for (code = first_significant_code(code Line 2531  for (code = first_significant_code(code
2531    
2532      /* Opcodes that must match a character */      /* Opcodes that must match a character */
2533    
2534        case OP_ANY:
2535        case OP_ALLANY:
2536        case OP_ANYBYTE:
2537    
2538      case OP_PROP:      case OP_PROP:
2539      case OP_NOTPROP:      case OP_NOTPROP:
2540        case OP_ANYNL:
2541    
2542        case OP_NOT_HSPACE:
2543        case OP_HSPACE:
2544        case OP_NOT_VSPACE:
2545        case OP_VSPACE:
2546      case OP_EXTUNI:      case OP_EXTUNI:
2547    
2548      case OP_NOT_DIGIT:      case OP_NOT_DIGIT:
2549      case OP_DIGIT:      case OP_DIGIT:
2550      case OP_NOT_WHITESPACE:      case OP_NOT_WHITESPACE:
2551      case OP_WHITESPACE:      case OP_WHITESPACE:
2552      case OP_NOT_WORDCHAR:      case OP_NOT_WORDCHAR:
2553      case OP_WORDCHAR:      case OP_WORDCHAR:
2554      case OP_ANY:  
     case OP_ALLANY:  
     case OP_ANYBYTE:  
2555      case OP_CHAR:      case OP_CHAR:
2556      case OP_CHARI:      case OP_CHARI:
2557      case OP_NOT:      case OP_NOT:
2558      case OP_NOTI:      case OP_NOTI:
2559    
2560      case OP_PLUS:      case OP_PLUS:
2561        case OP_PLUSI:
2562      case OP_MINPLUS:      case OP_MINPLUS:
2563      case OP_POSPLUS:      case OP_MINPLUSI:
2564      case OP_EXACT:  
2565      case OP_NOTPLUS:      case OP_NOTPLUS:
2566        case OP_NOTPLUSI:
2567      case OP_NOTMINPLUS:      case OP_NOTMINPLUS:
2568        case OP_NOTMINPLUSI:
2569    
2570        case OP_POSPLUS:
2571        case OP_POSPLUSI:
2572      case OP_NOTPOSPLUS:      case OP_NOTPOSPLUS:
2573        case OP_NOTPOSPLUSI:
2574    
2575        case OP_EXACT:
2576        case OP_EXACTI:
2577      case OP_NOTEXACT:      case OP_NOTEXACT:
2578        case OP_NOTEXACTI:
2579    
2580      case OP_TYPEPLUS:      case OP_TYPEPLUS:
2581      case OP_TYPEMINPLUS:      case OP_TYPEMINPLUS:
2582      case OP_TYPEPOSPLUS:      case OP_TYPEPOSPLUS:
2583      case OP_TYPEEXACT:      case OP_TYPEEXACT:
2584    
2585      return FALSE;      return FALSE;
2586    
2587      /* These are going to continue, as they may be empty, but we have to      /* These are going to continue, as they may be empty, but we have to
# Line 2525  for (code = first_significant_code(code Line 2601  for (code = first_significant_code(code
2601      case OP_TYPEUPTO:      case OP_TYPEUPTO:
2602      case OP_TYPEMINUPTO:      case OP_TYPEMINUPTO:
2603      case OP_TYPEPOSUPTO:      case OP_TYPEPOSUPTO:
2604      if (code[1 + IMM2_SIZE] == OP_PROP      if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
2605        || code[1 + IMM2_SIZE] == OP_NOTPROP) code += 2;        code += 2;
2606      break;      break;
2607    
2608      /* End of branch */      /* End of branch */
# Line 2539  for (code = first_significant_code(code Line 2615  for (code = first_significant_code(code
2615      return TRUE;      return TRUE;
2616    
2617      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,      /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
2618      MINUPTO, and POSUPTO may be followed by a multibyte character */      MINUPTO, and POSUPTO and their caseless and negative versions may be
2619        followed by a multibyte character. */
2620    
2621  #ifdef SUPPORT_UTF  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2622      case OP_STAR:      case OP_STAR:
2623      case OP_STARI:      case OP_STARI:
2624        case OP_NOTSTAR:
2625        case OP_NOTSTARI:
2626    
2627      case OP_MINSTAR:      case OP_MINSTAR:
2628      case OP_MINSTARI:      case OP_MINSTARI:
2629        case OP_NOTMINSTAR:
2630        case OP_NOTMINSTARI:
2631    
2632      case OP_POSSTAR:      case OP_POSSTAR:
2633      case OP_POSSTARI:      case OP_POSSTARI:
2634        case OP_NOTPOSSTAR:
2635        case OP_NOTPOSSTARI:
2636    
2637      case OP_QUERY:      case OP_QUERY:
2638      case OP_QUERYI:      case OP_QUERYI:
2639        case OP_NOTQUERY:
2640        case OP_NOTQUERYI:
2641    
2642      case OP_MINQUERY:      case OP_MINQUERY:
2643      case OP_MINQUERYI:      case OP_MINQUERYI:
2644        case OP_NOTMINQUERY:
2645        case OP_NOTMINQUERYI:
2646    
2647      case OP_POSQUERY:      case OP_POSQUERY:
2648      case OP_POSQUERYI:      case OP_POSQUERYI:
2649        case OP_NOTPOSQUERY:
2650        case OP_NOTPOSQUERYI:
2651    
2652      if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);      if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
2653      break;      break;
2654    
2655      case OP_UPTO:      case OP_UPTO:
2656      case OP_UPTOI:      case OP_UPTOI:
2657        case OP_NOTUPTO:
2658        case OP_NOTUPTOI:
2659    
2660      case OP_MINUPTO:      case OP_MINUPTO:
2661      case OP_MINUPTOI:      case OP_MINUPTOI:
2662        case OP_NOTMINUPTO:
2663        case OP_NOTMINUPTOI:
2664    
2665      case OP_POSUPTO:      case OP_POSUPTO:
2666      case OP_POSUPTOI:      case OP_POSUPTOI:
2667        case OP_NOTPOSUPTO:
2668        case OP_NOTPOSUPTOI:
2669    
2670      if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);      if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);
2671      break;      break;
2672  #endif  #endif
# Line 2573  for (code = first_significant_code(code Line 2677  for (code = first_significant_code(code
2677      case OP_MARK:      case OP_MARK:
2678      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
2679      case OP_SKIP_ARG:      case OP_SKIP_ARG:
     code += code[1];  
     break;  
   
2680      case OP_THEN_ARG:      case OP_THEN_ARG:
2681      code += code[1];      code += code[1];
2682      break;      break;
# Line 2607  Arguments: Line 2708  Arguments:
2708    code        points to start of the recursion    code        points to start of the recursion
2709    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2710    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2711    utf         TRUE if in UTF-8 / UTF-16 mode    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
2712    cd          pointers to tables etc    cd          pointers to tables etc
2713    
2714  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
# Line 2619  could_be_empty(const pcre_uchar *code, c Line 2720  could_be_empty(const pcre_uchar *code, c
2720  {  {
2721  while (bcptr != NULL && bcptr->current_branch >= code)  while (bcptr != NULL && bcptr->current_branch >= code)
2722    {    {
2723    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd))    if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd, NULL))
2724      return FALSE;      return FALSE;
2725    bcptr = bcptr->outer;    bcptr = bcptr->outer;
2726    }    }
# Line 2629  return TRUE; Line 2730  return TRUE;
2730    
2731    
2732  /*************************************************  /*************************************************
2733  *           Check for POSIX class syntax         *  *        Base opcode of repeated opcodes         *
2734  *************************************************/  *************************************************/
2735    
2736  /* This function is called when the sequence "[:" or "[." or "[=" is  /* Returns the base opcode for repeated single character type opcodes. If the
2737  encountered in a character class. It checks whether this is followed by a  opcode is not a repeated character type, it returns with the original value.
 sequence of characters terminated by a matching ":]" or ".]" or "=]". If we  
 reach an unescaped ']' without the special preceding character, return FALSE.  
2738    
2739  Originally, this function only recognized a sequence of letters between the  Arguments:  c opcode
2740  terminators, but it seems that Perl recognizes any sequence of characters,  Returns:    base opcode for the type
2741  though of course unknown POSIX names are subsequently rejected. Perl gives an  */
 "Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE  
 didn't consider this to be a POSIX class. Likewise for [:1234:].  
2742    
2743  The problem in trying to be exactly like Perl is in the handling of escapes. We  static pcre_uchar
2744  have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX  get_repeat_base(pcre_uchar c)
2745  class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code  {
2746  below handles the special case of \], but does not try to do any other escape  return (c > OP_TYPEPOSUPTO)? c :
2747  processing. This makes it different from Perl for cases such as [:l\ower:]         (c >= OP_TYPESTAR)?   OP_TYPESTAR :
2748  where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize         (c >= OP_NOTSTARI)?   OP_NOTSTARI :
2749  "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,         (c >= OP_NOTSTAR)?    OP_NOTSTAR :
2750  I think.         (c >= OP_STARI)?      OP_STARI :
2751                                 OP_STAR;
2752    }
2753    
 A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.  
 It seems that the appearance of a nested POSIX class supersedes an apparent  
 external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or  
 a digit.  
2754    
2755  In Perl, unescaped square brackets may also appear as part of class names. For  
2756  example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for  #ifdef SUPPORT_UCP
2757  [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not  /*************************************************
2758  seem right at all. PCRE does not allow closing square brackets in POSIX class  *        Check a character and a property        *
2759  names.  *************************************************/
2760    
2761    /* This function is called by check_auto_possessive() when a property item
2762    is adjacent to a fixed character.
2763    
2764  Arguments:  Arguments:
2765    ptr      pointer to the initial [    c            the character
2766    endptr   where to return the end pointer    ptype        the property type
2767      pdata        the data for the type
2768      negated      TRUE if it's a negated property (\P or \p{^)
2769    
2770  Returns:   TRUE or FALSE  Returns:       TRUE if auto-possessifying is OK
2771  */  */
2772    
2773  static BOOL  static BOOL
2774  check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)  check_char_prop(pcre_uint32 c, unsigned int ptype, unsigned int pdata,
2775      BOOL negated)
2776  {  {
2777  int terminator;          /* Don't combine these lines; the Solaris cc */  const pcre_uint32 *p;
2778  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  const ucd_record *prop = GET_UCD(c);
2779  for (++ptr; *ptr != 0; ptr++)  
2780    switch(ptype)
2781    {    {
2782    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)    case PT_LAMP:
2783      ptr++;    return (prop->chartype == ucp_Lu ||
2784    else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;            prop->chartype == ucp_Ll ||
2785    else            prop->chartype == ucp_Lt) == negated;
     {  
     if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)  
       {  
       *endptr = ptr;  
       return TRUE;  
       }  
     if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&  
          (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||  
           ptr[1] == CHAR_EQUALS_SIGN) &&  
         check_posix_syntax(ptr, endptr))  
       return FALSE;  
     }  
   }  
 return FALSE;  
 }  
2786    
2787      case PT_GC:
2788      return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
2789    
2790      case PT_PC:
2791      return (pdata == prop->chartype) == negated;
2792    
2793      case PT_SC:
2794      return (pdata == prop->script) == negated;
2795    
2796  /*************************************************    /* These are specials */
 *          Check POSIX class name                *  
 *************************************************/  
2797    
2798  /* This function is called to check the name given in a POSIX-style class entry    case PT_ALNUM:
2799  such as [:alnum:].    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2800              PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
2801    
2802  Arguments:    /* Perl space used to exclude VT, but from Perl 5.18 it is included, which
2803    ptr        points to the first letter    means that Perl space and POSIX space are now identical. PCRE was changed
2804    len        the length of the name    at release 8.34. */
2805    
2806  Returns:     a value representing the name, or -1 if unknown    case PT_SPACE:    /* Perl space */
2807  */    case PT_PXSPACE:  /* POSIX space */
2808      switch(c)
2809        {
2810        HSPACE_CASES:
2811        VSPACE_CASES:
2812        return negated;
2813    
2814  static int      default:
2815  check_posix_name(const pcre_uchar *ptr, int len)      return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z) == negated;
2816  {      }
2817  const char *pn = posix_names;    break;  /* Control never reaches here */
2818  register int yield = 0;  
2819  while (posix_name_lengths[yield] != 0)    case PT_WORD:
2820    {    return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2821    if (len == posix_name_lengths[yield] &&            PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2822      STRNCMP_UC_C8(ptr, pn, len) == 0) return yield;            c == CHAR_UNDERSCORE) == negated;
2823    pn += posix_name_lengths[yield] + 1;  
2824    yield++;    case PT_CLIST:
2825      p = PRIV(ucd_caseless_sets) + prop->caseset;
2826      for (;;)
2827        {
2828        if (c < *p) return !negated;
2829        if (c == *p++) return negated;
2830        }
2831      break;  /* Control never reaches here */
2832    }    }
2833  return -1;  
2834    return FALSE;
2835  }  }
2836    #endif  /* SUPPORT_UCP */
2837    
2838    
2839    
2840  /*************************************************  /*************************************************
2841  *    Adjust OP_RECURSE items in repeated group   *  *        Fill the character property list        *
2842  *************************************************/  *************************************************/
2843    
2844  /* OP_RECURSE items contain an offset from the start of the regex to the group  /* Checks whether the code points to an opcode that can take part in auto-
2845  that is referenced. This means that groups can be replicated for fixed  possessification, and if so, fills a list with its properties.
 repetition simply by copying (because the recursion is allowed to refer to  
 earlier groups that are outside the current group). However, when a group is  
 optional (i.e. the minimum quantifier is zero), OP_BRAZERO or OP_SKIPZERO is  
 inserted before it, after it has been compiled. This means that any OP_RECURSE  
 items within it that refer to the group itself or any contained groups have to  
 have their offsets adjusted. That one of the jobs of this function. Before it  
 is called, the partially compiled regex must be temporarily terminated with  
 OP_END.  
   
 This function has been extended with the possibility of forward references for  
 recursions and subroutine calls. It must also check the list of such references  
 for the group we are dealing with. If it finds that one of the recursions in  
 the current group is on this list, it adjusts the offset in the list, not the  
 value in the reference (which is a group number).  
2846    
2847  Arguments:  Arguments:
2848    group      points to the start of the group    code        points to start of expression
2849    adjust     the amount by which the group is to be moved    utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
2850    utf        TRUE in UTF-8 / UTF-16 mode    fcc         points to case-flipping table
2851    cd         contains pointers to tables etc.    list        points to output list
2852    save_hwm   the hwm forward reference pointer at the start of the group                list[0] will be filled with the opcode
2853                  list[1] will be non-zero if this opcode
2854                    can match an empty character string
2855                  list[2..7] depends on the opcode
2856    
2857  Returns:     nothing  Returns:      points to the start of the next opcode if *code is accepted
2858                  NULL if *code is not accepted
2859  */  */
2860    
2861  static void  static const pcre_uchar *
2862  adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,  get_chr_property_list(const pcre_uchar *code, BOOL utf,
2863    pcre_uchar *save_hwm)    const pcre_uint8 *fcc, pcre_uint32 *list)
2864  {  {
2865  pcre_uchar *ptr = group;  pcre_uchar c = *code;
2866    pcre_uchar base;
2867    const pcre_uchar *end;
2868    pcre_uint32 chr;
2869    
2870  while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)  #ifdef SUPPORT_UCP
2871    pcre_uint32 *clist_dest;
2872    const pcre_uint32 *clist_src;
2873    #else
2874    utf = utf;  /* Suppress "unused parameter" compiler warning */
2875    #endif
2876    
2877    list[0] = c;
2878    list[1] = FALSE;
2879    code++;
2880    
2881    if (c >= OP_STAR && c <= OP_TYPEPOSUPTO)
2882    {    {
2883    int offset;    base = get_repeat_base(c);
2884    pcre_uchar *hc;    c -= (base - OP_STAR);
2885    
2886    /* See if this recursion is on the forward reference list. If so, adjust the    if (c == OP_UPTO || c == OP_MINUPTO || c == OP_EXACT || c == OP_POSUPTO)
2887    reference. */      code += IMM2_SIZE;
2888    
2889    for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)    list[1] = (c != OP_PLUS && c != OP_MINPLUS && c != OP_EXACT && c != OP_POSPLUS);
2890    
2891      switch(base)
2892      {      {
2893      offset = GET(hc, 0);      case OP_STAR:
2894      if (cd->start_code + offset == ptr + 1)      list[0] = OP_CHAR;
2895        {      break;
2896        PUT(hc, 0, offset + adjust);  
2897        case OP_STARI:
2898        list[0] = OP_CHARI;
2899        break;
2900    
2901        case OP_NOTSTAR:
2902        list[0] = OP_NOT;
2903        break;
2904    
2905        case OP_NOTSTARI:
2906        list[0] = OP_NOTI;
2907        break;
2908    
2909        case OP_TYPESTAR:
2910        list[0] = *code;
2911        code++;
2912        break;
2913        }
2914      c = list[0];
2915      }
2916    
2917    switch(c)
2918      {
2919      case OP_NOT_DIGIT:
2920      case OP_DIGIT:
2921      case OP_NOT_WHITESPACE:
2922      case OP_WHITESPACE:
2923      case OP_NOT_WORDCHAR:
2924      case OP_WORDCHAR:
2925      case OP_ANY:
2926      case OP_ALLANY:
2927      case OP_ANYNL:
2928      case OP_NOT_HSPACE:
2929      case OP_HSPACE:
2930      case OP_NOT_VSPACE:
2931      case OP_VSPACE:
2932      case OP_EXTUNI:
2933      case OP_EODN:
2934      case OP_EOD:
2935      case OP_DOLL:
2936      case OP_DOLLM:
2937      return code;
2938    
2939      case OP_CHAR:
2940      case OP_NOT:
2941      GETCHARINCTEST(chr, code);
2942      list[2] = chr;
2943      list[3] = NOTACHAR;
2944      return code;
2945    
2946      case OP_CHARI:
2947      case OP_NOTI:
2948      list[0] = (c == OP_CHARI) ? OP_CHAR : OP_NOT;
2949      GETCHARINCTEST(chr, code);
2950      list[2] = chr;
2951    
2952    #ifdef SUPPORT_UCP
2953      if (chr < 128 || (chr < 256 && !utf))
2954        list[3] = fcc[chr];
2955      else
2956        list[3] = UCD_OTHERCASE(chr);
2957    #elif defined SUPPORT_UTF || !defined COMPILE_PCRE8
2958      list[3] = (chr < 256) ? fcc[chr] : chr;
2959    #else
2960      list[3] = fcc[chr];
2961    #endif
2962    
2963      /* The othercase might be the same value. */
2964    
2965      if (chr == list[3])
2966        list[3] = NOTACHAR;
2967      else
2968        list[4] = NOTACHAR;
2969      return code;
2970    
2971    #ifdef SUPPORT_UCP
2972      case OP_PROP:
2973      case OP_NOTPROP:
2974      if (code[0] != PT_CLIST)
2975        {
2976        list[2] = code[0];
2977        list[3] = code[1];
2978        return code + 2;
2979        }
2980    
2981      /* Convert only if we have enough space. */
2982    
2983      clist_src = PRIV(ucd_caseless_sets) + code[1];
2984      clist_dest = list + 2;
2985      code += 2;
2986    
2987      do {
2988         if (clist_dest >= list + 8)
2989           {
2990           /* Early return if there is not enough space. This should never
2991           happen, since all clists are shorter than 5 character now. */
2992           list[2] = code[0];
2993           list[3] = code[1];
2994           return code;
2995           }
2996         *clist_dest++ = *clist_src;
2997         }
2998      while(*clist_src++ != NOTACHAR);
2999    
3000      /* All characters are stored. The terminating NOTACHAR
3001      is copied form the clist itself. */
3002    
3003      list[0] = (c == OP_PROP) ? OP_CHAR : OP_NOT;
3004      return code;
3005    #endif
3006    
3007      case OP_NCLASS:
3008      case OP_CLASS:
3009    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3010      case OP_XCLASS:
3011      if (c == OP_XCLASS)
3012        end = code + GET(code, 0) - 1;
3013      else
3014    #endif
3015        end = code + 32 / sizeof(pcre_uchar);
3016    
3017      switch(*end)
3018        {
3019        case OP_CRSTAR:
3020        case OP_CRMINSTAR:
3021        case OP_CRQUERY:
3022        case OP_CRMINQUERY:
3023        case OP_CRPOSSTAR:
3024        case OP_CRPOSQUERY:
3025        list[1] = TRUE;
3026        end++;
3027        break;
3028    
3029        case OP_CRPLUS:
3030        case OP_CRMINPLUS:
3031        case OP_CRPOSPLUS:
3032        end++;
3033        break;
3034    
3035        case OP_CRRANGE:
3036        case OP_CRMINRANGE:
3037        case OP_CRPOSRANGE:
3038        list[1] = (GET2(end, 1) == 0);
3039        end += 1 + 2 * IMM2_SIZE;
3040        break;
3041        }
3042      list[2] = (pcre_uint32)(end - code);
3043      return end;
3044      }
3045    return NULL;    /* Opcode not accepted */
3046    }
3047    
3048    
3049    
3050    /*************************************************
3051    *    Scan further character sets for match       *
3052    *************************************************/
3053    
3054    /* Checks whether the base and the current opcode have a common character, in
3055    which case the base cannot be possessified.
3056    
3057    Arguments:
3058      code        points to the byte code
3059      utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
3060      cd          static compile data
3061      base_list   the data list of the base opcode
3062    
3063    Returns:      TRUE if the auto-possessification is possible
3064    */
3065    
3066    static BOOL
3067    compare_opcodes(const pcre_uchar *code, BOOL utf, const compile_data *cd,
3068      const pcre_uint32 *base_list, const pcre_uchar *base_end)
3069    {
3070    pcre_uchar c;
3071    pcre_uint32 list[8];
3072    const pcre_uint32 *chr_ptr;
3073    const pcre_uint32 *ochr_ptr;
3074    const pcre_uint32 *list_ptr;
3075    const pcre_uchar *next_code;
3076    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3077    const pcre_uchar *xclass_flags;
3078    #endif
3079    const pcre_uint8 *class_bitset;
3080    const pcre_uint8 *set1, *set2, *set_end;
3081    pcre_uint32 chr;
3082    BOOL accepted, invert_bits;
3083    BOOL entered_a_group = FALSE;
3084    
3085    /* Note: the base_list[1] contains whether the current opcode has greedy
3086    (represented by a non-zero value) quantifier. This is a different from
3087    other character type lists, which stores here that the character iterator
3088    matches to an empty string (also represented by a non-zero value). */
3089    
3090    for(;;)
3091      {
3092      /* All operations move the code pointer forward.
3093      Therefore infinite recursions are not possible. */
3094    
3095      c = *code;
3096    
3097      /* Skip over callouts */
3098    
3099      if (c == OP_CALLOUT)
3100        {
3101        code += PRIV(OP_lengths)[c];
3102        continue;
3103        }
3104    
3105      if (c == OP_ALT)
3106        {
3107        do code += GET(code, 1); while (*code == OP_ALT);
3108        c = *code;
3109        }
3110    
3111      switch(c)
3112        {
3113        case OP_END:
3114        case OP_KETRPOS:
3115        /* TRUE only in greedy case. The non-greedy case could be replaced by
3116        an OP_EXACT, but it is probably not worth it. (And note that OP_EXACT
3117        uses more memory, which we cannot get at this stage.) */
3118    
3119        return base_list[1] != 0;
3120    
3121        case OP_KET:
3122        /* If the bracket is capturing, and referenced by an OP_RECURSE, or
3123        it is an atomic sub-pattern (assert, once, etc.) the non-greedy case
3124        cannot be converted to a possessive form. */
3125    
3126        if (base_list[1] == 0) return FALSE;
3127    
3128        switch(*(code - GET(code, 1)))
3129          {
3130          case OP_ASSERT:
3131          case OP_ASSERT_NOT:
3132          case OP_ASSERTBACK:
3133          case OP_ASSERTBACK_NOT:
3134          case OP_ONCE:
3135          case OP_ONCE_NC:
3136          /* Atomic sub-patterns and assertions can always auto-possessify their
3137          last iterator. However, if the group was entered as a result of checking
3138          a previous iterator, this is not possible. */
3139    
3140          return !entered_a_group;
3141          }
3142    
3143        code += PRIV(OP_lengths)[c];
3144        continue;
3145    
3146        case OP_ONCE:
3147        case OP_ONCE_NC:
3148        case OP_BRA:
3149        case OP_CBRA:
3150        next_code = code + GET(code, 1);
3151        code += PRIV(OP_lengths)[c];
3152    
3153        while (*next_code == OP_ALT)
3154          {
3155          if (!compare_opcodes(code, utf, cd, base_list, base_end)) return FALSE;
3156          code = next_code + 1 + LINK_SIZE;
3157          next_code += GET(next_code, 1);
3158          }
3159    
3160        entered_a_group = TRUE;
3161        continue;
3162    
3163        case OP_BRAZERO:
3164        case OP_BRAMINZERO:
3165    
3166        next_code = code + 1;
3167        if (*next_code != OP_BRA && *next_code != OP_CBRA
3168            && *next_code != OP_ONCE && *next_code != OP_ONCE_NC) return FALSE;
3169    
3170        do next_code += GET(next_code, 1); while (*next_code == OP_ALT);
3171    
3172        /* The bracket content will be checked by the
3173        OP_BRA/OP_CBRA case above. */
3174        next_code += 1 + LINK_SIZE;
3175        if (!compare_opcodes(next_code, utf, cd, base_list, base_end))
3176          return FALSE;
3177    
3178        code += PRIV(OP_lengths)[c];
3179        continue;
3180    
3181        default:
3182        break;
3183        }
3184    
3185      /* Check for a supported opcode, and load its properties. */
3186    
3187      code = get_chr_property_list(code, utf, cd->fcc, list);
3188      if (code == NULL) return FALSE;    /* Unsupported */
3189    
3190      /* If either opcode is a small character list, set pointers for comparing
3191      characters from that list with another list, or with a property. */
3192    
3193      if (base_list[0] == OP_CHAR)
3194        {
3195        chr_ptr = base_list + 2;
3196        list_ptr = list;
3197        }
3198      else if (list[0] == OP_CHAR)
3199        {
3200        chr_ptr = list + 2;
3201        list_ptr = base_list;
3202        }
3203    
3204      /* Character bitsets can also be compared to certain opcodes. */
3205    
3206      else if (base_list[0] == OP_CLASS || list[0] == OP_CLASS
3207    #ifdef COMPILE_PCRE8
3208          /* In 8 bit, non-UTF mode, OP_CLASS and OP_NCLASS are the same. */
3209          || (!utf && (base_list[0] == OP_NCLASS || list[0] == OP_NCLASS))
3210    #endif
3211          )
3212        {
3213    #ifdef COMPILE_PCRE8
3214        if (base_list[0] == OP_CLASS || (!utf && base_list[0] == OP_NCLASS))
3215    #else
3216        if (base_list[0] == OP_CLASS)
3217    #endif
3218          {
3219          set1 = (pcre_uint8 *)(base_end - base_list[2]);
3220          list_ptr = list;
3221          }
3222        else
3223          {
3224          set1 = (pcre_uint8 *)(code - list[2]);
3225          list_ptr = base_list;
3226          }
3227    
3228        invert_bits = FALSE;
3229        switch(list_ptr[0])
3230          {
3231          case OP_CLASS:
3232          case OP_NCLASS:
3233          set2 = (pcre_uint8 *)
3234            ((list_ptr == list ? code : base_end) - list_ptr[2]);
3235          break;
3236    
3237    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3238          case OP_XCLASS:
3239          xclass_flags = (list_ptr == list ? code : base_end) - list_ptr[2] + LINK_SIZE;
3240          if ((*xclass_flags & XCL_HASPROP) != 0) return FALSE;
3241          if ((*xclass_flags & XCL_MAP) == 0)
3242            {
3243            /* No bits are set for characters < 256. */
3244            if (list[1] == 0) return TRUE;
3245            /* Might be an empty repeat. */
3246            continue;
3247            }
3248          set2 = (pcre_uint8 *)(xclass_flags + 1);
3249          break;
3250    #endif
3251    
3252          case OP_NOT_DIGIT:
3253          invert_bits = TRUE;
3254          /* Fall through */
3255          case OP_DIGIT:
3256          set2 = (pcre_uint8 *)(cd->cbits + cbit_digit);
3257          break;
3258    
3259          case OP_NOT_WHITESPACE:
3260          invert_bits = TRUE;
3261          /* Fall through */
3262          case OP_WHITESPACE:
3263          set2 = (pcre_uint8 *)(cd->cbits + cbit_space);
3264          break;
3265    
3266          case OP_NOT_WORDCHAR:
3267          invert_bits = TRUE;
3268          /* Fall through */
3269          case OP_WORDCHAR:
3270          set2 = (pcre_uint8 *)(cd->cbits + cbit_word);
3271          break;
3272    
3273          default:
3274          return FALSE;
3275          }
3276    
3277        /* Because the sets are unaligned, we need
3278        to perform byte comparison here. */
3279        set_end = set1 + 32;
3280        if (invert_bits)
3281          {
3282          do
3283            {
3284            if ((*set1++ & ~(*set2++)) != 0) return FALSE;
3285            }
3286          while (set1 < set_end);
3287          }
3288        else
3289          {
3290          do
3291            {
3292            if ((*set1++ & *set2++) != 0) return FALSE;
3293            }
3294          while (set1 < set_end);
3295          }
3296    
3297        if (list[1] == 0) return TRUE;
3298        /* Might be an empty repeat. */
3299        continue;
3300        }
3301    
3302      /* Some property combinations also acceptable. Unicode property opcodes are
3303      processed specially; the rest can be handled with a lookup table. */
3304    
3305      else
3306        {
3307        pcre_uint32 leftop, rightop;
3308    
3309        leftop = base_list[0];
3310        rightop = list[0];
3311    
3312    #ifdef SUPPORT_UCP
3313        accepted = FALSE; /* Always set in non-unicode case. */
3314        if (leftop == OP_PROP || leftop == OP_NOTPROP)
3315          {
3316          if (rightop == OP_EOD)
3317            accepted = TRUE;
3318          else if (rightop == OP_PROP || rightop == OP_NOTPROP)
3319            {
3320            int n;
3321            const pcre_uint8 *p;
3322            BOOL same = leftop == rightop;
3323            BOOL lisprop = leftop == OP_PROP;
3324            BOOL risprop = rightop == OP_PROP;
3325            BOOL bothprop = lisprop && risprop;
3326    
3327            /* There's a table that specifies how each combination is to be
3328            processed:
3329              0   Always return FALSE (never auto-possessify)
3330              1   Character groups are distinct (possessify if both are OP_PROP)
3331              2   Check character categories in the same group (general or particular)
3332              3   Return TRUE if the two opcodes are not the same
3333              ... see comments below
3334            */
3335    
3336            n = propposstab[base_list[2]][list[2]];
3337            switch(n)
3338              {
3339              case 0: break;
3340              case 1: accepted = bothprop; break;
3341              case 2: accepted = (base_list[3] == list[3]) != same; break;
3342              case 3: accepted = !same; break;
3343    
3344              case 4:  /* Left general category, right particular category */
3345              accepted = risprop && catposstab[base_list[3]][list[3]] == same;
3346              break;
3347    
3348              case 5:  /* Right general category, left particular category */
3349              accepted = lisprop && catposstab[list[3]][base_list[3]] == same;
3350              break;
3351    
3352              /* This code is logically tricky. Think hard before fiddling with it.
3353              The posspropstab table has four entries per row. Each row relates to
3354              one of PCRE's special properties such as ALNUM or SPACE or WORD.
3355              Only WORD actually needs all four entries, but using repeats for the
3356              others means they can all use the same code below.
3357    
3358              The first two entries in each row are Unicode general categories, and
3359              apply always, because all the characters they include are part of the
3360              PCRE character set. The third and fourth entries are a general and a
3361              particular category, respectively, that include one or more relevant
3362              characters. One or the other is used, depending on whether the check
3363              is for a general or a particular category. However, in both cases the
3364              category contains more characters than the specials that are defined
3365              for the property being tested against. Therefore, it cannot be used
3366              in a NOTPROP case.
3367    
3368              Example: the row for WORD contains ucp_L, ucp_N, ucp_P, ucp_Po.
3369              Underscore is covered by ucp_P or ucp_Po. */
3370    
3371              case 6:  /* Left alphanum vs right general category */
3372              case 7:  /* Left space vs right general category */
3373              case 8:  /* Left word vs right general category */
3374              p = posspropstab[n-6];
3375              accepted = risprop && lisprop ==
3376                (list[3] != p[0] &&
3377                 list[3] != p[1] &&
3378                (list[3] != p[2] || !lisprop));
3379              break;
3380    
3381              case 9:   /* Right alphanum vs left general category */
3382              case 10:  /* Right space vs left general category */
3383              case 11:  /* Right word vs left general category */
3384              p = posspropstab[n-9];
3385              accepted = lisprop && risprop ==
3386                (base_list[3] != p[0] &&
3387                 base_list[3] != p[1] &&
3388                (base_list[3] != p[2] || !risprop));
3389              break;
3390    
3391              case 12:  /* Left alphanum vs right particular category */
3392              case 13:  /* Left space vs right particular category */
3393              case 14:  /* Left word vs right particular category */
3394              p = posspropstab[n-12];
3395              accepted = risprop && lisprop ==
3396                (catposstab[p[0]][list[3]] &&
3397                 catposstab[p[1]][list[3]] &&
3398                (list[3] != p[3] || !lisprop));
3399              break;
3400    
3401              case 15:  /* Right alphanum vs left particular category */
3402              case 16:  /* Right space vs left particular category */
3403              case 17:  /* Right word vs left particular category */
3404              p = posspropstab[n-15];
3405              accepted = lisprop && risprop ==
3406                (catposstab[p[0]][base_list[3]] &&
3407                 catposstab[p[1]][base_list[3]] &&
3408                (base_list[3] != p[3] || !risprop));
3409              break;
3410              }
3411            }
3412          }
3413    
3414        else
3415    #endif  /* SUPPORT_UCP */
3416    
3417        accepted = leftop >= FIRST_AUTOTAB_OP && leftop <= LAST_AUTOTAB_LEFT_OP &&
3418               rightop >= FIRST_AUTOTAB_OP && rightop <= LAST_AUTOTAB_RIGHT_OP &&
3419               autoposstab[leftop - FIRST_AUTOTAB_OP][rightop - FIRST_AUTOTAB_OP];
3420    
3421        if (!accepted) return FALSE;
3422    
3423        if (list[1] == 0) return TRUE;
3424        /* Might be an empty repeat. */
3425        continue;
3426        }
3427    
3428      /* Control reaches here only if one of the items is a small character list.
3429      All characters are checked against the other side. */
3430    
3431      do
3432        {
3433        chr = *chr_ptr;
3434    
3435        switch(list_ptr[0])
3436          {
3437          case OP_CHAR:
3438          ochr_ptr = list_ptr + 2;
3439          do
3440            {
3441            if (chr == *ochr_ptr) return FALSE;
3442            ochr_ptr++;
3443            }
3444          while(*ochr_ptr != NOTACHAR);
3445          break;
3446    
3447          case OP_NOT:
3448          ochr_ptr = list_ptr + 2;
3449          do
3450            {
3451            if (chr == *ochr_ptr)
3452              break;
3453            ochr_ptr++;
3454            }
3455          while(*ochr_ptr != NOTACHAR);
3456          if (*ochr_ptr == NOTACHAR) return FALSE;   /* Not found */
3457          break;
3458    
3459          /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not*
3460          set. When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
3461    
3462          case OP_DIGIT:
3463          if (chr < 256 && (cd->ctypes[chr] & ctype_digit) != 0) return FALSE;
3464          break;
3465    
3466          case OP_NOT_DIGIT:
3467          if (chr > 255 || (cd->ctypes[chr] & ctype_digit) == 0) return FALSE;
3468          break;
3469    
3470          case OP_WHITESPACE:
3471          if (chr < 256 && (cd->ctypes[chr] & ctype_space) != 0) return FALSE;
3472          break;
3473    
3474          case OP_NOT_WHITESPACE:
3475          if (chr > 255 || (cd->ctypes[chr] & ctype_space) == 0) return FALSE;
3476          break;
3477    
3478          case OP_WORDCHAR:
3479          if (chr < 255 && (cd->ctypes[chr] & ctype_word) != 0) return FALSE;
3480          break;
3481    
3482          case OP_NOT_WORDCHAR:
3483          if (chr > 255 || (cd->ctypes[chr] & ctype_word) == 0) return FALSE;
3484          break;
3485    
3486          case OP_HSPACE:
3487          switch(chr)
3488            {
3489            HSPACE_CASES: return FALSE;
3490            default: break;
3491            }
3492          break;
3493    
3494          case OP_NOT_HSPACE:
3495          switch(chr)
3496            {
3497            HSPACE_CASES: break;
3498            default: return FALSE;
3499            }
3500          break;
3501    
3502          case OP_ANYNL:
3503          case OP_VSPACE:
3504          switch(chr)
3505            {
3506            VSPACE_CASES: return FALSE;
3507            default: break;
3508            }
3509          break;
3510    
3511          case OP_NOT_VSPACE:
3512          switch(chr)
3513            {
3514            VSPACE_CASES: break;
3515            default: return FALSE;
3516            }
3517          break;
3518    
3519          case OP_DOLL:
3520          case OP_EODN:
3521          switch (chr)
3522            {
3523            case CHAR_CR:
3524            case CHAR_LF:
3525            case CHAR_VT:
3526            case CHAR_FF:
3527            case CHAR_NEL:
3528    #ifndef EBCDIC
3529            case 0x2028:
3530            case 0x2029:
3531    #endif  /* Not EBCDIC */
3532            return FALSE;
3533            }
3534          break;
3535    
3536          case OP_EOD:    /* Can always possessify before \z */
3537          break;
3538    
3539    #ifdef SUPPORT_UCP
3540          case OP_PROP:
3541          case OP_NOTPROP:
3542          if (!check_char_prop(chr, list_ptr[2], list_ptr[3],
3543                list_ptr[0] == OP_NOTPROP))
3544            return FALSE;
3545          break;
3546    #endif
3547    
3548          case OP_NCLASS:
3549          if (chr > 255) return FALSE;
3550          /* Fall through */
3551    
3552          case OP_CLASS:
3553          if (chr > 255) break;
3554          class_bitset = (pcre_uint8 *)
3555            ((list_ptr == list ? code : base_end) - list_ptr[2]);
3556          if ((class_bitset[chr >> 3] & (1 << (chr & 7))) != 0) return FALSE;
3557          break;
3558    
3559    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3560          case OP_XCLASS:
3561          if (PRIV(xclass)(chr, (list_ptr == list ? code : base_end) -
3562              list_ptr[2] + LINK_SIZE, utf)) return FALSE;
3563          break;
3564    #endif
3565    
3566          default:
3567          return FALSE;
3568          }
3569    
3570        chr_ptr++;
3571        }
3572      while(*chr_ptr != NOTACHAR);
3573    
3574      /* At least one character must be matched from this opcode. */
3575    
3576      if (list[1] == 0) return TRUE;
3577      }
3578    
3579    /* Control never reaches here. There used to be a fail-save return FALSE; here,
3580    but some compilers complain about an unreachable statement. */
3581    
3582    }
3583    
3584    
3585    
3586    /*************************************************
3587    *    Scan compiled regex for auto-possession     *
3588    *************************************************/
3589    
3590    /* Replaces single character iterations with their possessive alternatives
3591    if appropriate. This function modifies the compiled opcode!
3592    
3593    Arguments:
3594      code        points to start of the byte code
3595      utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
3596      cd          static compile data
3597    
3598    Returns:      nothing
3599    */
3600    
3601    static void
3602    auto_possessify(pcre_uchar *code, BOOL utf, const compile_data *cd)
3603    {
3604    register pcre_uchar c;
3605    const pcre_uchar *end;
3606    pcre_uchar *repeat_opcode;
3607    pcre_uint32 list[8];
3608    
3609    for (;;)
3610      {
3611      c = *code;
3612    
3613      if (c >= OP_STAR && c <= OP_TYPEPOSUPTO)
3614        {
3615        c -= get_repeat_base(c) - OP_STAR;
3616        end = (c <= OP_MINUPTO) ?
3617          get_chr_property_list(code, utf, cd->fcc, list) : NULL;
3618        list[1] = c == OP_STAR || c == OP_PLUS || c == OP_QUERY || c == OP_UPTO;
3619    
3620        if (end != NULL && compare_opcodes(end, utf, cd, list, end))
3621          {
3622          switch(c)
3623            {
3624            case OP_STAR:
3625            *code += OP_POSSTAR - OP_STAR;
3626            break;
3627    
3628            case OP_MINSTAR:
3629            *code += OP_POSSTAR - OP_MINSTAR;
3630            break;
3631    
3632            case OP_PLUS:
3633            *code += OP_POSPLUS - OP_PLUS;
3634            break;
3635    
3636            case OP_MINPLUS:
3637            *code += OP_POSPLUS - OP_MINPLUS;
3638            break;
3639    
3640            case OP_QUERY:
3641            *code += OP_POSQUERY - OP_QUERY;
3642            break;
3643    
3644            case OP_MINQUERY:
3645            *code += OP_POSQUERY - OP_MINQUERY;
3646            break;
3647    
3648            case OP_UPTO:
3649            *code += OP_POSUPTO - OP_UPTO;
3650            break;
3651    
3652            case OP_MINUPTO:
3653            *code += OP_POSUPTO - OP_MINUPTO;
3654            break;
3655            }
3656          }
3657        c = *code;
3658        }
3659      else if (c == OP_CLASS || c == OP_NCLASS || c == OP_XCLASS)
3660        {
3661    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3662        if (c == OP_XCLASS)
3663          repeat_opcode = code + GET(code, 1);
3664        else
3665    #endif
3666          repeat_opcode = code + 1 + (32 / sizeof(pcre_uchar));
3667    
3668        c = *repeat_opcode;
3669        if (c >= OP_CRSTAR && c <= OP_CRMINRANGE)
3670          {
3671          /* end must not be NULL. */
3672          end = get_chr_property_list(code, utf, cd->fcc, list);
3673    
3674          list[1] = (c & 1) == 0;
3675    
3676          if (compare_opcodes(end, utf, cd, list, end))
3677            {
3678            switch (c)
3679              {
3680              case OP_CRSTAR:
3681              case OP_CRMINSTAR:
3682              *repeat_opcode = OP_CRPOSSTAR;
3683              break;
3684    
3685              case OP_CRPLUS:
3686              case OP_CRMINPLUS:
3687              *repeat_opcode = OP_CRPOSPLUS;
3688              break;
3689    
3690              case OP_CRQUERY:
3691              case OP_CRMINQUERY:
3692              *repeat_opcode = OP_CRPOSQUERY;
3693              break;
3694    
3695              case OP_CRRANGE:
3696              case OP_CRMINRANGE:
3697              *repeat_opcode = OP_CRPOSRANGE;
3698              break;
3699              }
3700            }
3701          }
3702        c = *code;
3703        }
3704    
3705      switch(c)
3706        {
3707        case OP_END:
3708        return;
3709    
3710        case OP_TYPESTAR:
3711        case OP_TYPEMINSTAR:
3712        case OP_TYPEPLUS:
3713        case OP_TYPEMINPLUS:
3714        case OP_TYPEQUERY:
3715        case OP_TYPEMINQUERY:
3716        case OP_TYPEPOSSTAR:
3717        case OP_TYPEPOSPLUS:
3718        case OP_TYPEPOSQUERY:
3719        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
3720        break;
3721    
3722        case OP_TYPEUPTO:
3723        case OP_TYPEMINUPTO:
3724        case OP_TYPEEXACT:
3725        case OP_TYPEPOSUPTO:
3726        if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
3727          code += 2;
3728        break;
3729    
3730    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3731        case OP_XCLASS:
3732        code += GET(code, 1);
3733        break;
3734    #endif
3735    
3736        case OP_MARK:
3737        case OP_PRUNE_ARG:
3738        case OP_SKIP_ARG:
3739        case OP_THEN_ARG:
3740        code += code[1];
3741        break;
3742        }
3743    
3744      /* Add in the fixed length from the table */
3745    
3746      code += PRIV(OP_lengths)[c];
3747    
3748      /* In UTF-8 mode, opcodes that are followed by a character may be followed by
3749      a multi-byte character. The length in the table is a minimum, so we have to
3750      arrange to skip the extra bytes. */
3751    
3752    #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
3753      if (utf) switch(c)
3754        {
3755        case OP_CHAR:
3756        case OP_CHARI:
3757        case OP_NOT:
3758        case OP_NOTI:
3759        case OP_STAR:
3760        case OP_MINSTAR:
3761        case OP_PLUS:
3762        case OP_MINPLUS:
3763        case OP_QUERY:
3764        case OP_MINQUERY:
3765        case OP_UPTO:
3766        case OP_MINUPTO:
3767        case OP_EXACT:
3768        case OP_POSSTAR:
3769        case OP_POSPLUS:
3770        case OP_POSQUERY:
3771        case OP_POSUPTO:
3772        case OP_STARI:
3773        case OP_MINSTARI:
3774        case OP_PLUSI:
3775        case OP_MINPLUSI:
3776        case OP_QUERYI:
3777        case OP_MINQUERYI:
3778        case OP_UPTOI:
3779        case OP_MINUPTOI:
3780        case OP_EXACTI:
3781        case OP_POSSTARI:
3782        case OP_POSPLUSI:
3783        case OP_POSQUERYI:
3784        case OP_POSUPTOI:
3785        case OP_NOTSTAR:
3786        case OP_NOTMINSTAR:
3787        case OP_NOTPLUS:
3788        case OP_NOTMINPLUS:
3789        case OP_NOTQUERY:
3790        case OP_NOTMINQUERY:
3791        case OP_NOTUPTO:
3792        case OP_NOTMINUPTO:
3793        case OP_NOTEXACT:
3794        case OP_NOTPOSSTAR:
3795        case OP_NOTPOSPLUS:
3796        case OP_NOTPOSQUERY:
3797        case OP_NOTPOSUPTO:
3798        case OP_NOTSTARI:
3799        case OP_NOTMINSTARI:
3800        case OP_NOTPLUSI:
3801        case OP_NOTMINPLUSI:
3802        case OP_NOTQUERYI:
3803        case OP_NOTMINQUERYI:
3804        case OP_NOTUPTOI:
3805        case OP_NOTMINUPTOI:
3806        case OP_NOTEXACTI:
3807        case OP_NOTPOSSTARI:
3808        case OP_NOTPOSPLUSI:
3809        case OP_NOTPOSQUERYI:
3810        case OP_NOTPOSUPTOI:
3811        if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
3812        break;
3813        }
3814    #else
3815      (void)(utf);  /* Keep compiler happy by referencing function argument */
3816    #endif
3817      }
3818    }
3819    
3820    
3821    
3822    /*************************************************
3823    *           Check for POSIX class syntax         *
3824    *************************************************/
3825    
3826    /* This function is called when the sequence "[:" or "[." or "[=" is
3827    encountered in a character class. It checks whether this is followed by a
3828    sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
3829    reach an unescaped ']' without the special preceding character, return FALSE.
3830    
3831    Originally, this function only recognized a sequence of letters between the
3832    terminators, but it seems that Perl recognizes any sequence of characters,
3833    though of course unknown POSIX names are subsequently rejected. Perl gives an
3834    "Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
3835    didn't consider this to be a POSIX class. Likewise for [:1234:].
3836    
3837    The problem in trying to be exactly like Perl is in the handling of escapes. We
3838    have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
3839    class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
3840    below handles the special case of \], but does not try to do any other escape
3841    processing. This makes it different from Perl for cases such as [:l\ower:]
3842    where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize
3843    "l\ower". This is a lesser evil than not diagnosing bad classes when Perl does,
3844    I think.
3845    
3846    A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
3847    It seems that the appearance of a nested POSIX class supersedes an apparent
3848    external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
3849    a digit.
3850    
3851    In Perl, unescaped square brackets may also appear as part of class names. For
3852    example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
3853    [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
3854    seem right at all. PCRE does not allow closing square brackets in POSIX class
3855    names.
3856    
3857    Arguments:
3858      ptr      pointer to the initial [
3859      endptr   where to return the end pointer
3860    
3861    Returns:   TRUE or FALSE
3862    */
3863    
3864    static BOOL
3865    check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
3866    {
3867    pcre_uchar terminator;          /* Don't combine these lines; the Solaris cc */
3868    terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
3869    for (++ptr; *ptr != CHAR_NULL; ptr++)
3870      {
3871      if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
3872        ptr++;
3873      else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
3874      else
3875        {
3876        if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
3877          {
3878          *endptr = ptr;
3879          return TRUE;
3880          }
3881        if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&
3882             (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
3883              ptr[1] == CHAR_EQUALS_SIGN) &&
3884            check_posix_syntax(ptr, endptr))
3885          return FALSE;
3886        }
3887      }
3888    return FALSE;
3889    }
3890    
3891    
3892    
3893    
3894    /*************************************************
3895    *          Check POSIX class name                *
3896    *************************************************/
3897    
3898    /* This function is called to check the name given in a POSIX-style class entry
3899    such as [:alnum:].
3900    
3901    Arguments:
3902      ptr        points to the first letter
3903      len        the length of the name
3904    
3905    Returns:     a value representing the name, or -1 if unknown
3906    */
3907    
3908    static int
3909    check_posix_name(const pcre_uchar *ptr, int len)
3910    {
3911    const char *pn = posix_names;
3912    register int yield = 0;
3913    while (posix_name_lengths[yield] != 0)
3914      {
3915      if (len == posix_name_lengths[yield] &&
3916        STRNCMP_UC_C8(ptr, pn, (unsigned int)len) == 0) return yield;
3917      pn += posix_name_lengths[yield] + 1;
3918      yield++;
3919      }
3920    return -1;
3921    }
3922    
3923    
3924    /*************************************************
3925    *    Adjust OP_RECURSE items in repeated group   *
3926    *************************************************/
3927    
3928    /* OP_RECURSE items contain an offset from the start of the regex to the group
3929    that is referenced. This means that groups can be replicated for fixed
3930    repetition simply by copying (because the recursion is allowed to refer to
3931    earlier groups that are outside the current group). However, when a group is
3932    optional (i.e. the minimum quantifier is zero), OP_BRAZERO or OP_SKIPZERO is
3933    inserted before it, after it has been compiled. This means that any OP_RECURSE
3934    items within it that refer to the group itself or any contained groups have to
3935    have their offsets adjusted. That one of the jobs of this function. Before it
3936    is called, the partially compiled regex must be temporarily terminated with
3937    OP_END.
3938    
3939    This function has been extended with the possibility of forward references for
3940    recursions and subroutine calls. It must also check the list of such references
3941    for the group we are dealing with. If it finds that one of the recursions in
3942    the current group is on this list, it adjusts the offset in the list, not the
3943    value in the reference (which is a group number).
3944    
3945    Arguments:
3946      group      points to the start of the group
3947      adjust     the amount by which the group is to be moved
3948      utf        TRUE in UTF-8 / UTF-16 / UTF-32 mode
3949      cd         contains pointers to tables etc.
3950      save_hwm   the hwm forward reference pointer at the start of the group
3951    
3952    Returns:     nothing
3953    */
3954    
3955    static void
3956    adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
3957      pcre_uchar *save_hwm)
3958    {
3959    pcre_uchar *ptr = group;
3960    
3961    while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
3962      {
3963      int offset;
3964      pcre_uchar *hc;
3965    
3966      /* See if this recursion is on the forward reference list. If so, adjust the
3967      reference. */
3968    
3969      for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
3970        {
3971        offset = (int)GET(hc, 0);
3972        if (cd->start_code + offset == ptr + 1)
3973          {
3974          PUT(hc, 0, offset + adjust);
3975        break;        break;
3976        }        }
3977      }      }
# Line 2790  while ((ptr = (pcre_uchar *)find_recurse Line 3981  while ((ptr = (pcre_uchar *)find_recurse
3981    
3982    if (hc >= cd->hwm)    if (hc >= cd->hwm)
3983      {      {
3984      offset = GET(ptr, 1);      offset = (int)GET(ptr, 1);
3985      if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);      if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
3986      }      }
3987    
# Line 2858  PUT(previous_callout, 2 + LINK_SIZE, len Line 4049  PUT(previous_callout, 2 + LINK_SIZE, len
4049  *************************************************/  *************************************************/
4050    
4051  /* This function is passed the start and end of a class range, in UTF-8 mode  /* This function is passed the start and end of a class range, in UTF-8 mode
4052  with UCP support. It searches up the characters, looking for internal ranges of  with UCP support. It searches up the characters, looking for ranges of
4053  characters in the "other" case. Each call returns the next one, updating the  characters in the "other" case. Each call returns the next one, updating the
4054  start address.  start address. A character with multiple other cases is returned on its own
4055    with a special return value.
4056    
4057  Arguments:  Arguments:
4058    cptr        points to starting character value; updated    cptr        points to starting character value; updated
4059    d           end value    d           end value
4060    ocptr       where to put start of othercase range    ocptr       where to put start of othercase range
4061    odptr       where to put end of othercase range    odptr       where to put end of othercase range
   
 Yield:        TRUE when range returned; FALSE when no more  
 */  
   
 static BOOL  
 get_othercase_range(unsigned int *cptr, unsigned int d, unsigned int *ocptr,  
   unsigned int *odptr)  
 {  
 unsigned int c, othercase, next;  
   
 for (c = *cptr; c <= d; c++)  
   { if ((othercase = UCD_OTHERCASE(c)) != c) break; }  
   
 if (c > d) return FALSE;  
   
 *ocptr = othercase;  
 next = othercase + 1;  
   
 for (++c; c <= d; c++)  
   {  
   if (UCD_OTHERCASE(c) != next) break;  
   next++;  
   }  
   
 *odptr = next - 1;  
 *cptr = c;  
   
 return TRUE;  
 }  
   
   
   
 /*************************************************  
 *        Check a character and a property        *  
 *************************************************/  
   
 /* This function is called by check_auto_possessive() when a property item  
 is adjacent to a fixed character.  
   
 Arguments:  
   c            the character  
   ptype        the property type  
   pdata        the data for the type  
   negated      TRUE if it's a negated property (\P or \p{^)  
   
 Returns:       TRUE if auto-possessifying is OK  
 */  
   
 static BOOL  
 check_char_prop(int c, int ptype, int pdata, BOOL negated)  
 {  
 const ucd_record *prop = GET_UCD(c);  
 switch(ptype)  
   {  
   case PT_LAMP:  
   return (prop->chartype == ucp_Lu ||  
           prop->chartype == ucp_Ll ||  
           prop->chartype == ucp_Lt) == negated;  
   
   case PT_GC:  
   return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;  
   
   case PT_PC:  
   return (pdata == prop->chartype) == negated;  
   
   case PT_SC:  
   return (pdata == prop->script) == negated;  
   
   /* These are specials */  
   
   case PT_ALNUM:  
   return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||  
           PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;  
   
   case PT_SPACE:    /* Perl space */  
   return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||  
           c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)  
           == negated;  
   
   case PT_PXSPACE:  /* POSIX space */  
   return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||  
           c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||  
           c == CHAR_FF || c == CHAR_CR)  
           == negated;  
   
   case PT_WORD:  
   return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||  
           PRIV(ucp_gentype)[prop->chartype] == ucp_N ||  
           c == CHAR_UNDERSCORE) == negated;  
   }  
 return FALSE;  
 }  
 #endif  /* SUPPORT_UCP */  
   
   
   
 /*************************************************  
 *     Check if auto-possessifying is possible    *  
 *************************************************/  
   
 /* This function is called for unlimited repeats of certain items, to see  
 whether the next thing could possibly match the repeated item. If not, it makes  
 sense to automatically possessify the repeated item.  
   
 Arguments:  
   previous      pointer to the repeated opcode  
   utf           TRUE in UTF-8 / UTF-16 mode  
   ptr           next character in pattern  
   options       options bits  
   cd            contains pointers to tables etc.  
4062    
4063  Returns:        TRUE if possessifying is wanted  Yield:        -1 when no more
4064                   0 when a range is returned
4065                  >0 the CASESET offset for char with multiple other cases
4066                    in this case, ocptr contains the original
4067  */  */
4068    
4069  static BOOL  static int
4070  check_auto_possessive(const pcre_uchar *previous, BOOL utf,  get_othercase_range(pcre_uint32 *cptr, pcre_uint32 d, pcre_uint32 *ocptr,
4071    const pcre_uchar *ptr, int options, compile_data *cd)    pcre_uint32 *odptr)
4072  {  {
4073  pcre_int32 c, next;  pcre_uint32 c, othercase, next;
4074  int op_code = *previous++;  unsigned int co;
4075    
4076  /* Skip whitespace and comments in extended mode */  /* Find the first character that has an other case. If it has multiple other
4077    cases, return its case offset value. */
4078    
4079  if ((options & PCRE_EXTENDED) != 0)  for (c = *cptr; c <= d; c++)
4080    {    {
4081    for (;;)    if ((co = UCD_CASESET(c)) != 0)
4082      {      {
4083      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;      *ocptr = c++;   /* Character that has the set */
4084      if (*ptr == CHAR_NUMBER_SIGN)      *cptr = c;      /* Rest of input range */
4085        {      return (int)co;
       ptr++;  
       while (*ptr != 0)  
         {  
         if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }  
         ptr++;  
 #ifdef SUPPORT_UTF  
         if (utf) FORWARDCHAR(ptr);  
 #endif  
         }  
       }  
     else break;  
4086      }      }
4087      if ((othercase = UCD_OTHERCASE(c)) != c) break;
4088    }    }
4089    
4090  /* If the next item is one that we can handle, get its value. A non-negative  if (c > d) return -1;  /* Reached end of range */
 value is a character, a negative value is an escape value. */  
4091    
4092  if (*ptr == CHAR_BACKSLASH)  /* Found a character that has a single other case. Search for the end of the
4093    {  range, which is either the end of the input range, or a character that has zero
4094    int temperrorcode = 0;  or more than one other cases. */
   next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);  
   if (temperrorcode != 0) return FALSE;  
   ptr++;    /* Point after the escape sequence */  
   }  
 else if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_meta) == 0)  
   {  
 #ifdef SUPPORT_UTF  
   if (utf) { GETCHARINC(next, ptr); } else  
 #endif  
   next = *ptr++;  
   }  
 else return FALSE;  
4095    
4096  /* Skip whitespace and comments in extended mode */  *ocptr = othercase;
4097    next = othercase + 1;
4098    
4099  if ((options & PCRE_EXTENDED) != 0)  for (++c; c <= d; c++)
4100    {    {
4101    for (;;)    if ((co = UCD_CASESET(c)) != 0 || UCD_OTHERCASE(c) != next) break;
4102      {    next++;
     while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_space) != 0) ptr++;  
     if (*ptr == CHAR_NUMBER_SIGN)  
       {  
       ptr++;  
       while (*ptr != 0)  
         {  
         if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }  
         ptr++;  
 #ifdef SUPPORT_UTF  
         if (utf) FORWARDCHAR(ptr);  
 #endif  
         }  
       }  
     else break;  
     }  
4103    }    }
4104    
4105  /* If the next thing is itself optional, we have to give up. */  *odptr = next - 1;     /* End of othercase range */
4106    *cptr = c;             /* Rest of input range */
4107    return 0;
4108    }
4109    #endif  /* SUPPORT_UCP */
4110    
 if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||  
   STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)  
     return FALSE;  
4111    
 /* Now compare the next item with the previous opcode. First, handle cases when  
 the next item is a character. */  
4112    
4113  if (next >= 0) switch(op_code)  /*************************************************
4114    {  *        Add a character or range to a class     *
4115    case OP_CHAR:  *************************************************/
 #ifdef SUPPORT_UTF  
   GETCHARTEST(c, previous);  
 #else  
   c = *previous;  
 #endif  
   return c != next;  
4116    
4117    /* For CHARI (caseless character) we must check the other case. If we have  /* This function packages up the logic of adding a character or range of
4118    Unicode property support, we can use it to test the other case of  characters to a class. The character values in the arguments will be within the
4119    high-valued characters. */  valid values for the current mode (8-bit, 16-bit, UTF, etc). This function is
4120    mutually recursive with the function immediately below.
4121    
4122    case OP_CHARI:  Arguments:
4123  #ifdef SUPPORT_UTF    classbits     the bit map for characters < 256
4124    GETCHARTEST(c, previous);    uchardptr     points to the pointer for extra data
4125  #else    options       the options word
4126    c = *previous;    cd            contains pointers to tables etc.
4127  #endif    start         start of range character
4128    if (c == next) return FALSE;    end           end of range character
 #ifdef SUPPORT_UTF  
   if (utf)  
     {  
     unsigned int othercase;  
     if (next < 128) othercase = cd->fcc[next]; else  
 #ifdef SUPPORT_UCP  
     othercase = UCD_OTHERCASE((unsigned int)next);  
 #else  
     othercase = NOTACHAR;  
 #endif  
     return (unsigned int)c != othercase;  
     }  
   else  
 #endif  /* SUPPORT_UTF */  
   return (c != TABLE_GET((unsigned int)next, cd->fcc, next));  /* Non-UTF-8 mode */  
4129    
4130    case OP_NOT:  Returns:        the number of < 256 characters added
4131  #ifdef SUPPORT_UTF                  the pointer to extra data is updated
4132    GETCHARTEST(c, previous);  */
 #else  
   c = *previous;  
 #endif  
   return c == next;  
4133    
4134    case OP_NOTI:  static int
4135  #ifdef SUPPORT_UTF  add_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
4136    GETCHARTEST(c, previous);    compile_data *cd, pcre_uint32 start, pcre_uint32 end)
4137  #else  {
4138    c = *previous;  pcre_uint32 c;
4139  #endif  pcre_uint32 classbits_end = (end <= 0xff ? end : 0xff);
4140    if (c == next) return TRUE;  int n8 = 0;
4141  #ifdef SUPPORT_UTF  
4142    if (utf)  /* If caseless matching is required, scan the range and process alternate
4143      {  cases. In Unicode, there are 8-bit characters that have alternate cases that
4144      unsigned int othercase;  are greater than 255 and vice-versa. Sometimes we can just extend the original
4145      if (next < 128) othercase = cd->fcc[next]; else  range. */
 #ifdef SUPPORT_UCP  
     othercase = UCD_OTHERCASE((unsigned int)next);  
 #else  
     othercase = NOTACHAR;  
 #endif  
     return (unsigned int)c == othercase;  
     }  
   else  
 #endif  /* SUPPORT_UTF */  
   return (c == TABLE_GET((unsigned int)next, cd->fcc, next));  /* Non-UTF-8 mode */  
4146    
4147    /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.  if ((options & PCRE_CASELESS) != 0)
4148    When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */    {
4149    #ifdef SUPPORT_UCP
4150      if ((options & PCRE_UTF8) != 0)
4151        {
4152        int rc;
4153        pcre_uint32 oc, od;
4154    
4155    case OP_DIGIT:      options &= ~PCRE_CASELESS;   /* Remove for recursive calls */
4156    return next > 255 || (cd->ctypes[next] & ctype_digit) == 0;      c = start;
4157    
4158    case OP_NOT_DIGIT:      while ((rc = get_othercase_range(&c, end, &oc, &od)) >= 0)
4159    return next <= 255 && (cd->ctypes[next] & ctype_digit) != 0;        {
4160          /* Handle a single character that has more than one other case. */
4161    
4162    case OP_WHITESPACE:        if (rc > 0) n8 += add_list_to_class(classbits, uchardptr, options, cd,
4163    return next > 255 || (cd->ctypes[next] & ctype_space) == 0;          PRIV(ucd_caseless_sets) + rc, oc);
4164    
4165    case OP_NOT_WHITESPACE:        /* Do nothing if the other case range is within the original range. */
   return next <= 255 && (cd->ctypes[next] & ctype_space) != 0;  
4166    
4167    case OP_WORDCHAR:        else if (oc >= start && od <= end) continue;
   return next > 255 || (cd->ctypes[next] & ctype_word) == 0;  
4168    
4169    case OP_NOT_WORDCHAR:        /* Extend the original range if there is overlap, noting that if oc < c, we
4170    return next <= 255 && (cd->ctypes[next] & ctype_word) != 0;        can't have od > end because a subrange is always shorter than the basic
4171          range. Otherwise, use a recursive call to add the additional range. */
4172    
4173    case OP_HSPACE:        else if (oc < start && od >= start - 1) start = oc; /* Extend downwards */
4174    case OP_NOT_HSPACE:        else if (od > end && oc <= end + 1) end = od;       /* Extend upwards */
4175    switch(next)        else n8 += add_to_class(classbits, uchardptr, options, cd, oc, od);
4176      {        }
     case 0x09:  
     case 0x20:  
     case 0xa0:  
     case 0x1680:  
     case 0x180e:  
     case 0x2000:  
     case 0x2001:  
     case 0x2002:  
     case 0x2003:  
     case 0x2004:  
     case 0x2005:  
     case 0x2006:  
     case 0x2007:  
     case 0x2008:  
     case 0x2009:  
     case 0x200A:  
     case 0x202f:  
     case 0x205f:  
     case 0x3000:  
     return op_code == OP_NOT_HSPACE;  
     default:  
     return op_code != OP_NOT_HSPACE;  
4177      }      }
4178      else
4179    #endif  /* SUPPORT_UCP */
4180    
4181    case OP_ANYNL:    /* Not UTF-mode, or no UCP */
4182    case OP_VSPACE:  
4183    case OP_NOT_VSPACE:    for (c = start; c <= classbits_end; c++)
   switch(next)  
4184      {      {
4185      case 0x0a:      SETBIT(classbits, cd->fcc[c]);
4186      case 0x0b:      n8++;
     case 0x0c:  
     case 0x0d:  
     case 0x85:  
     case 0x2028:  
     case 0x2029:  
     return op_code == OP_NOT_VSPACE;  
     default:  
     return op_code != OP_NOT_VSPACE;  
4187      }      }
   
 #ifdef SUPPORT_UCP  
   case OP_PROP:  
   return check_char_prop(next, previous[0], previous[1], FALSE);  
   
   case OP_NOTPROP:  
   return check_char_prop(next, previous[0], previous[1], TRUE);  
 #endif  
   
   default:  
   return FALSE;  
4188    }    }
4189    
4190    /* Now handle the original range. Adjust the final value according to the bit
4191    length - this means that the same lists of (e.g.) horizontal spaces can be used
4192    in all cases. */
4193    
4194  /* Handle the case when the next item is \d, \s, etc. Note that when PCRE_UCP  #if defined COMPILE_PCRE8
 is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are  
 generated only when PCRE_UCP is *not* set, that is, when only ASCII  
 characteristics are recognized. Similarly, the opcodes OP_DIGIT etc. are  
 replaced by OP_PROP codes when PCRE_UCP is set. */  
   
 switch(op_code)  
   {  
   case OP_CHAR:  
   case OP_CHARI:  
4195  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
4196    GETCHARTEST(c, previous);    if ((options & PCRE_UTF8) == 0)
 #else  
   c = *previous;  
4197  #endif  #endif
4198    switch(-next)    if (end > 0xff) end = 0xff;
     {  
     case ESC_d:  
     return c > 255 || (cd->ctypes[c] & ctype_digit) == 0;  
4199    
4200      case ESC_D:  #elif defined COMPILE_PCRE16
4201      return c <= 255 && (cd->ctypes[c] & ctype_digit) != 0;  #ifdef SUPPORT_UTF
4202      if ((options & PCRE_UTF16) == 0)
4203    #endif
4204      if (end > 0xffff) end = 0xffff;
4205    
4206      case ESC_s:  #endif /* COMPILE_PCRE[8|16] */
     return c > 255 || (cd->ctypes[c] & ctype_space) == 0;  
4207    
4208      case ESC_S:  /* Use the bitmap for characters < 256. Otherwise use extra data.*/
     return c <= 255 && (cd->ctypes[c] & ctype_space) != 0;  
4209    
4210      case ESC_w:  for (c = start; c <= classbits_end; c++)
4211      return c > 255 || (cd->ctypes[c] & ctype_word) == 0;    {
4212      /* Regardless of start, c will always be <= 255. */
4213      SETBIT(classbits, c);
4214      n8++;
4215      }
4216    
4217      case ESC_W:  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
4218      return c <= 255 && (cd->ctypes[c] & ctype_word) != 0;  if (start <= 0xff) start = 0xff + 1;
4219    
4220      case ESC_h:  if (end >= start)
4221      case ESC_H:    {
4222      switch(c)    pcre_uchar *uchardata = *uchardptr;
4223    #ifdef SUPPORT_UTF
4224      if ((options & PCRE_UTF8) != 0)  /* All UTFs use the same flag bit */
4225        {
4226        if (start < end)
4227        {        {
4228        case 0x09:        *uchardata++ = XCL_RANGE;
4229        case 0x20:        uchardata += PRIV(ord2utf)(start, uchardata);
4230        case 0xa0:        uchardata += PRIV(ord2utf)(end, uchardata);
       case 0x1680:  
       case 0x180e:  
       case 0x2000:  
       case 0x2001:  
       case 0x2002:  
       case 0x2003:  
       case 0x2004:  
       case 0x2005:  
       case 0x2006:  
       case 0x2007:  
       case 0x2008:  
       case 0x2009:  
       case 0x200A:  
       case 0x202f:  
       case 0x205f:  
       case 0x3000:  
       return -next != ESC_h;  
       default:  
       return -next == ESC_h;  
4231        }        }
4232        else if (start == end)
     case ESC_v:  
     case ESC_V:  
     switch(c)  
4233        {        {
4234        case 0x0a:        *uchardata++ = XCL_SINGLE;
4235        case 0x0b:        uchardata += PRIV(ord2utf)(start, uchardata);
       case 0x0c:  
       case 0x0d:  
       case 0x85:  
       case 0x2028:  
       case 0x2029:  
       return -next != ESC_v;  
       default:  
       return -next == ESC_v;  
       }  
   
     /* When PCRE_UCP is set, these values get generated for \d etc. Find  
     their substitutions and process them. The result will always be either  
     -ESC_p or -ESC_P. Then fall through to process those values. */  
   
 #ifdef SUPPORT_UCP  
     case ESC_du:  
     case ESC_DU:  
     case ESC_wu:  
     case ESC_WU:  
     case ESC_su:  
     case ESC_SU:  
       {  
       int temperrorcode = 0;  
       ptr = substitutes[-next - ESC_DU];  
       next = check_escape(&ptr, &temperrorcode, 0, options, FALSE);  
       if (temperrorcode != 0) return FALSE;  
       ptr++;    /* For compatibility */  
4236        }        }
4237      /* Fall through */      }
4238      else
4239    #endif  /* SUPPORT_UTF */
4240    
4241      case ESC_p:    /* Without UTF support, character values are constrained by the bit length,
4242      case ESC_P:    and can only be > 256 for 16-bit and 32-bit libraries. */
       {  
       int ptype, pdata, errorcodeptr;  
       BOOL negated;  
4243    
4244        ptr--;      /* Make ptr point at the p or P */  #ifdef COMPILE_PCRE8
4245        ptype = get_ucp(&ptr, &negated, &pdata, &errorcodeptr);      {}
4246        if (ptype < 0) return FALSE;  #else
4247        ptr++;      /* Point past the final curly ket */    if (start < end)
4248        {
4249        *uchardata++ = XCL_RANGE;
4250        *uchardata++ = start;
4251        *uchardata++ = end;
4252        }
4253      else if (start == end)
4254        {
4255        *uchardata++ = XCL_SINGLE;
4256        *uchardata++ = start;
4257        }
4258    #endif
4259    
4260        /* If the property item is optional, we have to give up. (When generated    *uchardptr = uchardata;   /* Updata extra data pointer */
4261        from \d etc by PCRE_UCP, this test will have been applied much earlier,    }
4262        to the original \d etc. At this point, ptr will point to a zero byte. */  #endif /* SUPPORT_UTF || !COMPILE_PCRE8 */
4263    
4264        if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||  return n8;    /* Number of 8-bit characters */
4265          STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)  }
           return FALSE;  
4266    
       /* Do the property check. */  
4267    
       return check_char_prop(c, ptype, pdata, (next == -ESC_P) != negated);  
       }  
 #endif  
4268    
     default:  
     return FALSE;  
     }  
4269    
4270    /* In principle, support for Unicode properties should be integrated here as  /*************************************************
4271    well. It means re-organizing the above code so as to get hold of the property  *        Add a list of characters to a class     *
4272    values before switching on the op-code. However, I wonder how many patterns  *************************************************/
   combine ASCII \d etc with Unicode properties? (Note that if PCRE_UCP is set,  
   these op-codes are never generated.) */  
4273    
4274    case OP_DIGIT:  /* This function is used for adding a list of case-equivalent characters to a
4275    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||  class, and also for adding a list of horizontal or vertical whitespace. If the
4276           next == -ESC_h || next == -ESC_v || next == -ESC_R;  list is in order (which it should be), ranges of characters are detected and
4277    handled appropriately. This function is mutually recursive with the function
4278    above.
4279    
4280    case OP_NOT_DIGIT:  Arguments:
4281    return next == -ESC_d;    classbits     the bit map for characters < 256
4282      uchardptr     points to the pointer for extra data
4283      options       the options word
4284      cd            contains pointers to tables etc.
4285      p             points to row of 32-bit values, terminated by NOTACHAR
4286      except        character to omit; this is used when adding lists of
4287                      case-equivalent characters to avoid including the one we
4288                      already know about
4289    
4290    case OP_WHITESPACE:  Returns:        the number of < 256 characters added
4291    return next == -ESC_S || next == -ESC_d || next == -ESC_w;                  the pointer to extra data is updated
4292    */
4293    
4294    case OP_NOT_WHITESPACE:  static int
4295    return next == -ESC_s || next == -ESC_h || next == -ESC_v || next == -ESC_R;  add_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
4296      compile_data *cd, const pcre_uint32 *p, unsigned int except)
4297    {
4298    int n8 = 0;
4299    while (p[0] < NOTACHAR)
4300      {
4301      int n = 0;
4302      if (p[0] != except)
4303        {
4304        while(p[n+1] == p[0] + n + 1) n++;
4305        n8 += add_to_class(classbits, uchardptr, options, cd, p[0], p[n]);
4306        }
4307      p += n + 1;
4308      }
4309    return n8;
4310    }
4311    
   case OP_HSPACE:  
   return next == -ESC_S || next == -ESC_H || next == -ESC_d ||  
          next == -ESC_w || next == -ESC_v || next == -ESC_R;  
4312    
   case OP_NOT_HSPACE:  
   return next == -ESC_h;  
4313    
4314    /* Can't have \S in here because VT matches \S (Perl anomaly) */  /*************************************************
4315    case OP_ANYNL:  *    Add characters not in a list to a class     *
4316    case OP_VSPACE:  *************************************************/
   return next == -ESC_V || next == -ESC_d || next == -ESC_w;  
4317    
4318    case OP_NOT_VSPACE:  /* This function is used for adding the complement of a list of horizontal or
4319    return next == -ESC_v || next == -ESC_R;  vertical whitespace to a class. The list must be in order.
4320    
4321    case OP_WORDCHAR:  Arguments:
4322    return next == -ESC_W || next == -ESC_s || next == -ESC_h ||    classbits     the bit map for characters < 256
4323           next == -ESC_v || next == -ESC_R;    uchardptr     points to the pointer for extra data
4324      options       the options word
4325      cd            contains pointers to tables etc.
4326      p             points to row of 32-bit values, terminated by NOTACHAR
4327    
4328    case OP_NOT_WORDCHAR:  Returns:        the number of < 256 characters added
4329    return next == -ESC_w || next == -ESC_d;                  the pointer to extra data is updated
4330    */
4331    
4332    default:  static int
4333    return FALSE;  add_not_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr,
4334      int options, compile_data *cd, const pcre_uint32 *p)
4335    {
4336    BOOL utf = (options & PCRE_UTF8) != 0;
4337    int n8 = 0;
4338    if (p[0] > 0)
4339      n8 += add_to_class(classbits, uchardptr, options, cd, 0, p[0] - 1);
4340    while (p[0] < NOTACHAR)
4341      {
4342      while (p[1] == p[0] + 1) p++;
4343      n8 += add_to_class(classbits, uchardptr, options, cd, p[0] + 1,
4344        (p[1] == NOTACHAR) ? (utf ? 0x10ffffu : 0xffffffffu) : p[1] - 1);
4345      p++;
4346    }    }
4347    return n8;
 /* Control does not reach here */  
4348  }  }
4349    
4350    
# Line 3398  to find out the amount of memory needed, Line 4360  to find out the amount of memory needed,
4360  phase. The value of lengthptr distinguishes the two phases.  phase. The value of lengthptr distinguishes the two phases.
4361    
4362  Arguments:  Arguments:
4363    optionsptr     pointer to the option bits    optionsptr        pointer to the option bits
4364    codeptr        points to the pointer to the current code point    codeptr           points to the pointer to the current code point
4365    ptrptr         points to the current pattern pointer    ptrptr            points to the current pattern pointer
4366    errorcodeptr   points to error code variable    errorcodeptr      points to error code variable
4367    firstcharptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)    firstcharptr      place to put the first required character
4368    reqcharptr     set to the last literal character required, else < 0    firstcharflagsptr place to put the first character flags, or a negative number
4369    bcptr          points to current branch chain    reqcharptr        place to put the last required character
4370    cond_depth     conditional nesting depth    reqcharflagsptr   place to put the last required character flags, or a negative number
4371    cd             contains pointers to tables etc.    bcptr             points to current branch chain
4372    lengthptr      NULL during the real compile phase    cond_depth        conditional nesting depth
4373                   points to length accumulator during pre-compile phase    cd                contains pointers to tables etc.
4374      lengthptr         NULL during the real compile phase
4375                        points to length accumulator during pre-compile phase
4376    
4377  Returns:         TRUE on success  Returns:            TRUE on success
4378                   FALSE, with *errorcodeptr set non-zero on error                      FALSE, with *errorcodeptr set non-zero on error
4379  */  */
4380    
4381  static BOOL  static BOOL
4382  compile_branch(int *optionsptr, pcre_uchar **codeptr,  compile_branch(int *optionsptr, pcre_uchar **codeptr,
4383    const pcre_uchar **ptrptr, int *errorcodeptr, pcre_int32 *firstcharptr,    const pcre_uchar **ptrptr, int *errorcodeptr,
4384    pcre_int32 *reqcharptr, branch_chain *bcptr, int cond_depth,    pcre_uint32 *firstcharptr, pcre_int32 *firstcharflagsptr,
4385      pcre_uint32 *reqcharptr, pcre_int32 *reqcharflagsptr,
4386      branch_chain *bcptr, int cond_depth,
4387    compile_data *cd, int *lengthptr)    compile_data *cd, int *lengthptr)
4388  {  {
4389  int repeat_type, op_type;  int repeat_type, op_type;
4390  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
4391  int bravalue = 0;  int bravalue = 0;
4392  int greedy_default, greedy_non_default;  int greedy_default, greedy_non_default;
4393  pcre_int32 firstchar, reqchar;  pcre_uint32 firstchar, reqchar;
4394  pcre_int32 zeroreqchar, zerofirstchar;  pcre_int32 firstcharflags, reqcharflags;
4395    pcre_uint32 zeroreqchar, zerofirstchar;
4396    pcre_int32 zeroreqcharflags, zerofirstcharflags;
4397  pcre_int32 req_caseopt, reqvary, tempreqvary;  pcre_int32 req_caseopt, reqvary, tempreqvary;
4398  int options = *optionsptr;               /* May change dynamically */  int options = *optionsptr;               /* May change dynamically */
4399  int after_manual_callout = 0;  int after_manual_callout = 0;
4400  int length_prevgroup = 0;  int length_prevgroup = 0;
4401  register int c;  register pcre_uint32 c;
4402    int escape;
4403  register pcre_uchar *code = *codeptr;  register pcre_uchar *code = *codeptr;
4404  pcre_uchar *last_code = code;  pcre_uchar *last_code = code;
4405  pcre_uchar *orig_code = code;  pcre_uchar *orig_code = code;
# Line 3450  must not do this for other options (e.g. Line 4419  must not do this for other options (e.g.
4419  dynamically as we process the pattern. */  dynamically as we process the pattern. */
4420    
4421  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
4422  /* PCRE_UTF16 has the same value as PCRE_UTF8. */  /* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */
4423  BOOL utf = (options & PCRE_UTF8) != 0;  BOOL utf = (options & PCRE_UTF8) != 0;
4424    #ifndef COMPILE_PCRE32
4425  pcre_uchar utf_c