/[pcre]/code/trunk/pcre_dfa_exec.c
ViewVC logotype

Diff of /code/trunk/pcre_dfa_exec.c

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

revision 535 by ph10, Thu Jun 3 19:18:24 2010 UTC revision 1041 by ph10, Sun Sep 16 10:16:27 2012 UTC
# Line 7  and semantics are as close as possible t Line 7  and semantics are as close as possible t
7  below for why this module is different).  below for why this module is different).
8    
9                         Written by Philip Hazel                         Written by Philip Hazel
10             Copyright (c) 1997-2010 University of Cambridge             Copyright (c) 1997-2012 University of Cambridge
11    
12  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
13  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 38  POSSIBILITY OF SUCH DAMAGE. Line 38  POSSIBILITY OF SUCH DAMAGE.
38  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
39  */  */
40    
   
41  /* This module contains the external function pcre_dfa_exec(), which is an  /* This module contains the external function pcre_dfa_exec(), which is an
42  alternative matching function that uses a sort of DFA algorithm (not a true  alternative matching function that uses a sort of DFA algorithm (not a true
43  FSM). This is NOT Perl- compatible, but it has advantages in certain  FSM). This is NOT Perl-compatible, but it has advantages in certain
44  applications. */  applications. */
45    
46    
# Line 113  small value. Non-zero values in the tabl Line 112  small value. Non-zero values in the tabl
112  the character is to be found. ***NOTE*** If the start of this table is  the character is to be found. ***NOTE*** If the start of this table is
113  modified, the three tables that follow must also be modified. */  modified, the three tables that follow must also be modified. */
114    
115  static const uschar coptable[] = {  static const pcre_uint8 coptable[] = {
116    0,                             /* End                                    */    0,                             /* End                                    */
117    0, 0, 0, 0, 0,                 /* \A, \G, \K, \B, \b                     */    0, 0, 0, 0, 0,                 /* \A, \G, \K, \B, \b                     */
118    0, 0, 0, 0, 0, 0,              /* \D, \d, \S, \s, \W, \w                 */    0, 0, 0, 0, 0, 0,              /* \D, \d, \S, \s, \W, \w                 */
# Line 121  static const uschar coptable[] = { Line 120  static const uschar coptable[] = {
120    0, 0,                          /* \P, \p                                 */    0, 0,                          /* \P, \p                                 */
121    0, 0, 0, 0, 0,                 /* \R, \H, \h, \V, \v                     */    0, 0, 0, 0, 0,                 /* \R, \H, \h, \V, \v                     */
122    0,                             /* \X                                     */    0,                             /* \X                                     */
123    0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */    0, 0, 0, 0, 0, 0,              /* \Z, \z, ^, ^M, $, $M                   */
124    1,                             /* Char                                   */    1,                             /* Char                                   */
125    1,                             /* Charnc                                 */    1,                             /* Chari                                  */
126    1,                             /* not                                    */    1,                             /* not                                    */
127      1,                             /* noti                                   */
128    /* Positive single-char repeats                                          */    /* Positive single-char repeats                                          */
129    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */
130    3, 3, 3,                       /* upto, minupto, exact                   */    1+IMM2_SIZE, 1+IMM2_SIZE,      /* upto, minupto                          */
131    1, 1, 1, 3,                    /* *+, ++, ?+, upto+                      */    1+IMM2_SIZE,                   /* exact                                  */
132      1, 1, 1, 1+IMM2_SIZE,          /* *+, ++, ?+, upto+                      */
133      1, 1, 1, 1, 1, 1,              /* *I, *?I, +I, +?I, ?I, ??I              */
134      1+IMM2_SIZE, 1+IMM2_SIZE,      /* upto I, minupto I                      */
135      1+IMM2_SIZE,                   /* exact I                                */
136      1, 1, 1, 1+IMM2_SIZE,          /* *+I, ++I, ?+I, upto+I                  */
137    /* Negative single-char repeats - only for chars < 256                   */    /* Negative single-char repeats - only for chars < 256                   */
138    1, 1, 1, 1, 1, 1,              /* NOT *, *?, +, +?, ?, ??                */    1, 1, 1, 1, 1, 1,              /* NOT *, *?, +, +?, ?, ??                */
139    3, 3, 3,                       /* NOT upto, minupto, exact               */    1+IMM2_SIZE, 1+IMM2_SIZE,      /* NOT upto, minupto                      */
140    1, 1, 1, 3,                    /* NOT *+, ++, ?+, updo+                  */    1+IMM2_SIZE,                   /* NOT exact                              */
141      1, 1, 1, 1+IMM2_SIZE,          /* NOT *+, ++, ?+, upto+                  */
142      1, 1, 1, 1, 1, 1,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */
143      1+IMM2_SIZE, 1+IMM2_SIZE,      /* NOT upto I, minupto I                  */
144      1+IMM2_SIZE,                   /* NOT exact I                            */
145      1, 1, 1, 1+IMM2_SIZE,          /* NOT *+I, ++I, ?+I, upto+I              */
146    /* Positive type repeats                                                 */    /* Positive type repeats                                                 */
147    1, 1, 1, 1, 1, 1,              /* Type *, *?, +, +?, ?, ??               */    1, 1, 1, 1, 1, 1,              /* Type *, *?, +, +?, ?, ??               */
148    3, 3, 3,                       /* Type upto, minupto, exact              */    1+IMM2_SIZE, 1+IMM2_SIZE,      /* Type upto, minupto                     */
149    1, 1, 1, 3,                    /* Type *+, ++, ?+, upto+                 */    1+IMM2_SIZE,                   /* Type exact                             */
150      1, 1, 1, 1+IMM2_SIZE,          /* Type *+, ++, ?+, upto+                 */
151    /* Character class & ref repeats                                         */    /* Character class & ref repeats                                         */
152    0, 0, 0, 0, 0, 0,              /* *, *?, +, +?, ?, ??                    */    0, 0, 0, 0, 0, 0,              /* *, *?, +, +?, ?, ??                    */
153    0, 0,                          /* CRRANGE, CRMINRANGE                    */    0, 0,                          /* CRRANGE, CRMINRANGE                    */
# Line 144  static const uschar coptable[] = { Line 155  static const uschar coptable[] = {
155    0,                             /* NCLASS                                 */    0,                             /* NCLASS                                 */
156    0,                             /* XCLASS - variable length               */    0,                             /* XCLASS - variable length               */
157    0,                             /* REF                                    */    0,                             /* REF                                    */
158      0,                             /* REFI                                   */
159    0,                             /* RECURSE                                */    0,                             /* RECURSE                                */
160    0,                             /* CALLOUT                                */    0,                             /* CALLOUT                                */
161    0,                             /* Alt                                    */    0,                             /* Alt                                    */
162    0,                             /* Ket                                    */    0,                             /* Ket                                    */
163    0,                             /* KetRmax                                */    0,                             /* KetRmax                                */
164    0,                             /* KetRmin                                */    0,                             /* KetRmin                                */
165      0,                             /* KetRpos                                */
166      0,                             /* Reverse                                */
167    0,                             /* Assert                                 */    0,                             /* Assert                                 */
168    0,                             /* Assert not                             */    0,                             /* Assert not                             */
169    0,                             /* Assert behind                          */    0,                             /* Assert behind                          */
170    0,                             /* Assert behind not                      */    0,                             /* Assert behind not                      */
171    0,                             /* Reverse                                */    0, 0,                          /* ONCE, ONCE_NC                          */
172    0, 0, 0, 0,                    /* ONCE, BRA, CBRA, COND                  */    0, 0, 0, 0, 0,                 /* BRA, BRAPOS, CBRA, CBRAPOS, COND       */
173    0, 0, 0,                       /* SBRA, SCBRA, SCOND                     */    0, 0, 0, 0, 0,                 /* SBRA, SBRAPOS, SCBRA, SCBRAPOS, SCOND  */
174    0, 0,                          /* CREF, NCREF                            */    0, 0,                          /* CREF, NCREF                            */
175    0, 0,                          /* RREF, NRREF                            */    0, 0,                          /* RREF, NRREF                            */
176    0,                             /* DEF                                    */    0,                             /* DEF                                    */
177    0, 0,                          /* BRAZERO, BRAMINZERO                    */    0, 0, 0,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */
178    0, 0, 0,                       /* MARK, PRUNE, PRUNE_ARG,                */    0, 0, 0,                       /* MARK, PRUNE, PRUNE_ARG                 */
179    0, 0, 0, 0,                    /* SKIP, SKIP_ARG, THEN, THEN_ARG,        */    0, 0, 0, 0,                    /* SKIP, SKIP_ARG, THEN, THEN_ARG         */
180    0, 0, 0, 0, 0                  /* COMMIT, FAIL, ACCEPT, CLOSE, SKIPZERO  */    0, 0, 0, 0,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */
181      0, 0                           /* CLOSE, SKIPZERO  */
182  };  };
183    
184  /* This table identifies those opcodes that inspect a character. It is used to  /* This table identifies those opcodes that inspect a character. It is used to
# Line 171  remember the fact that a character could Line 186  remember the fact that a character could
186  the subject is reached. ***NOTE*** If the start of this table is modified, the  the subject is reached. ***NOTE*** If the start of this table is modified, the
187  two tables that follow must also be modified. */  two tables that follow must also be modified. */
188    
189  static const uschar poptable[] = {  static const pcre_uint8 poptable[] = {
190    0,                             /* End                                    */    0,                             /* End                                    */
191    0, 0, 0, 1, 1,                 /* \A, \G, \K, \B, \b                     */    0, 0, 0, 1, 1,                 /* \A, \G, \K, \B, \b                     */
192    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */
# Line 179  static const uschar poptable[] = { Line 194  static const uschar poptable[] = {
194    1, 1,                          /* \P, \p                                 */    1, 1,                          /* \P, \p                                 */
195    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */
196    1,                             /* \X                                     */    1,                             /* \X                                     */
197    0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */    0, 0, 0, 0, 0, 0,              /* \Z, \z, ^, ^M, $, $M                   */
198    1,                             /* Char                                   */    1,                             /* Char                                   */
199    1,                             /* Charnc                                 */    1,                             /* Chari                                  */
200    1,                             /* not                                    */    1,                             /* not                                    */
201      1,                             /* noti                                   */
202    /* Positive single-char repeats                                          */    /* Positive single-char repeats                                          */
203    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */
204    1, 1, 1,                       /* upto, minupto, exact                   */    1, 1, 1,                       /* upto, minupto, exact                   */
205    1, 1, 1, 1,                    /* *+, ++, ?+, upto+                      */    1, 1, 1, 1,                    /* *+, ++, ?+, upto+                      */
206      1, 1, 1, 1, 1, 1,              /* *I, *?I, +I, +?I, ?I, ??I              */
207      1, 1, 1,                       /* upto I, minupto I, exact I             */
208      1, 1, 1, 1,                    /* *+I, ++I, ?+I, upto+I                  */
209    /* Negative single-char repeats - only for chars < 256                   */    /* Negative single-char repeats - only for chars < 256                   */
210    1, 1, 1, 1, 1, 1,              /* NOT *, *?, +, +?, ?, ??                */    1, 1, 1, 1, 1, 1,              /* NOT *, *?, +, +?, ?, ??                */
211    1, 1, 1,                       /* NOT upto, minupto, exact               */    1, 1, 1,                       /* NOT upto, minupto, exact               */
212    1, 1, 1, 1,                    /* NOT *+, ++, ?+, upto+                  */    1, 1, 1, 1,                    /* NOT *+, ++, ?+, upto+                  */
213      1, 1, 1, 1, 1, 1,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */
214      1, 1, 1,                       /* NOT upto I, minupto I, exact I         */
215      1, 1, 1, 1,                    /* NOT *+I, ++I, ?+I, upto+I              */
216    /* Positive type repeats                                                 */    /* Positive type repeats                                                 */
217    1, 1, 1, 1, 1, 1,              /* Type *, *?, +, +?, ?, ??               */    1, 1, 1, 1, 1, 1,              /* Type *, *?, +, +?, ?, ??               */
218    1, 1, 1,                       /* Type upto, minupto, exact              */    1, 1, 1,                       /* Type upto, minupto, exact              */
# Line 202  static const uschar poptable[] = { Line 224  static const uschar poptable[] = {
224    1,                             /* NCLASS                                 */    1,                             /* NCLASS                                 */
225    1,                             /* XCLASS - variable length               */    1,                             /* XCLASS - variable length               */
226    0,                             /* REF                                    */    0,                             /* REF                                    */
227      0,                             /* REFI                                   */
228    0,                             /* RECURSE                                */    0,                             /* RECURSE                                */
229    0,                             /* CALLOUT                                */    0,                             /* CALLOUT                                */
230    0,                             /* Alt                                    */    0,                             /* Alt                                    */
231    0,                             /* Ket                                    */    0,                             /* Ket                                    */
232    0,                             /* KetRmax                                */    0,                             /* KetRmax                                */
233    0,                             /* KetRmin                                */    0,                             /* KetRmin                                */
234      0,                             /* KetRpos                                */
235      0,                             /* Reverse                                */
236    0,                             /* Assert                                 */    0,                             /* Assert                                 */
237    0,                             /* Assert not                             */    0,                             /* Assert not                             */
238    0,                             /* Assert behind                          */    0,                             /* Assert behind                          */
239    0,                             /* Assert behind not                      */    0,                             /* Assert behind not                      */
240    0,                             /* Reverse                                */    0, 0,                          /* ONCE, ONCE_NC                          */
241    0, 0, 0, 0,                    /* ONCE, BRA, CBRA, COND                  */    0, 0, 0, 0, 0,                 /* BRA, BRAPOS, CBRA, CBRAPOS, COND       */
242    0, 0, 0,                       /* SBRA, SCBRA, SCOND                     */    0, 0, 0, 0, 0,                 /* SBRA, SBRAPOS, SCBRA, SCBRAPOS, SCOND  */
243    0, 0,                          /* CREF, NCREF                            */    0, 0,                          /* CREF, NCREF                            */
244    0, 0,                          /* RREF, NRREF                            */    0, 0,                          /* RREF, NRREF                            */
245    0,                             /* DEF                                    */    0,                             /* DEF                                    */
246    0, 0,                          /* BRAZERO, BRAMINZERO                    */    0, 0, 0,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */
247    0, 0, 0,                       /* MARK, PRUNE, PRUNE_ARG,                */    0, 0, 0,                       /* MARK, PRUNE, PRUNE_ARG                 */
248    0, 0, 0, 0,                    /* SKIP, SKIP_ARG, THEN, THEN_ARG,        */    0, 0, 0, 0,                    /* SKIP, SKIP_ARG, THEN, THEN_ARG         */
249    0, 0, 0, 0, 0                  /* COMMIT, FAIL, ACCEPT, CLOSE, SKIPZERO  */    0, 0, 0, 0,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */
250      0, 0                           /* CLOSE, SKIPZERO                        */
251  };  };
252    
253  /* These 2 tables allow for compact code for testing for \D, \d, \S, \s, \W,  /* These 2 tables allow for compact code for testing for \D, \d, \S, \s, \W,
254  and \w */  and \w */
255    
256  static const uschar toptable1[] = {  static const pcre_uint8 toptable1[] = {
257    0, 0, 0, 0, 0, 0,    0, 0, 0, 0, 0, 0,
258    ctype_digit, ctype_digit,    ctype_digit, ctype_digit,
259    ctype_space, ctype_space,    ctype_space, ctype_space,
# Line 235  static const uschar toptable1[] = { Line 261  static const uschar toptable1[] = {
261    0, 0                            /* OP_ANY, OP_ALLANY */    0, 0                            /* OP_ANY, OP_ALLANY */
262  };  };
263    
264  static const uschar toptable2[] = {  static const pcre_uint8 toptable2[] = {
265    0, 0, 0, 0, 0, 0,    0, 0, 0, 0, 0, 0,
266    ctype_digit, 0,    ctype_digit, 0,
267    ctype_space, 0,    ctype_space, 0,
# Line 252  these structures in, is a vector of ints Line 278  these structures in, is a vector of ints
278  typedef struct stateblock {  typedef struct stateblock {
279    int offset;                     /* Offset to opcode */    int offset;                     /* Offset to opcode */
280    int count;                      /* Count for repeats */    int count;                      /* Count for repeats */
   int ims;                        /* ims flag bits */  
281    int data;                       /* Some use extra data */    int data;                       /* Some use extra data */
282  } stateblock;  } stateblock;
283    
284  #define INTS_PER_STATEBLOCK  (sizeof(stateblock)/sizeof(int))  #define INTS_PER_STATEBLOCK  (int)(sizeof(stateblock)/sizeof(int))
285    
286    
287  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 275  Returns:       nothing Line 300  Returns:       nothing
300  */  */
301    
302  static void  static void
303  pchars(unsigned char *p, int length, FILE *f)  pchars(const pcre_uchar *p, int length, FILE *f)
304  {  {
305  int c;  int c;
306  while (length-- > 0)  while (length-- > 0)
# Line 308  Arguments: Line 333  Arguments:
333    offsetcount       size of same    offsetcount       size of same
334    workspace         vector of workspace    workspace         vector of workspace
335    wscount           size of same    wscount           size of same
   ims               the current ims flags  
336    rlevel            function call recursion level    rlevel            function call recursion level
   recursing         regex recursive call level  
337    
338  Returns:            > 0 => number of match offset pairs placed in offsets  Returns:            > 0 => number of match offset pairs placed in offsets
339                      = 0 => offsets overflowed; longest matches are present                      = 0 => offsets overflowed; longest matches are present
# Line 325  for the current character, one for the f Line 348  for the current character, one for the f
348      { \      { \
349      next_active_state->offset = (x); \      next_active_state->offset = (x); \
350      next_active_state->count  = (y); \      next_active_state->count  = (y); \
     next_active_state->ims    = ims; \  
351      next_active_state++; \      next_active_state++; \
352      DPRINTF(("%.*sADD_ACTIVE(%d,%d)\n", rlevel*2-2, SP, (x), (y))); \      DPRINTF(("%.*sADD_ACTIVE(%d,%d)\n", rlevel*2-2, SP, (x), (y))); \
353      } \      } \
# Line 336  for the current character, one for the f Line 358  for the current character, one for the f
358      { \      { \
359      next_active_state->offset = (x); \      next_active_state->offset = (x); \
360      next_active_state->count  = (y); \      next_active_state->count  = (y); \
     next_active_state->ims    = ims; \  
361      next_active_state->data   = (z); \      next_active_state->data   = (z); \
362      next_active_state++; \      next_active_state++; \
363      DPRINTF(("%.*sADD_ACTIVE_DATA(%d,%d,%d)\n", rlevel*2-2, SP, (x), (y), (z))); \      DPRINTF(("%.*sADD_ACTIVE_DATA(%d,%d,%d)\n", rlevel*2-2, SP, (x), (y), (z))); \
# Line 348  for the current character, one for the f Line 369  for the current character, one for the f
369      { \      { \
370      next_new_state->offset = (x); \      next_new_state->offset = (x); \
371      next_new_state->count  = (y); \      next_new_state->count  = (y); \
     next_new_state->ims    = ims; \  
372      next_new_state++; \      next_new_state++; \
373      DPRINTF(("%.*sADD_NEW(%d,%d)\n", rlevel*2-2, SP, (x), (y))); \      DPRINTF(("%.*sADD_NEW(%d,%d)\n", rlevel*2-2, SP, (x), (y))); \
374      } \      } \
# Line 359  for the current character, one for the f Line 379  for the current character, one for the f
379      { \      { \
380      next_new_state->offset = (x); \      next_new_state->offset = (x); \
381      next_new_state->count  = (y); \      next_new_state->count  = (y); \
     next_new_state->ims    = ims; \  
382      next_new_state->data   = (z); \      next_new_state->data   = (z); \
383      next_new_state++; \      next_new_state++; \
384      DPRINTF(("%.*sADD_NEW_DATA(%d,%d,%d)\n", rlevel*2-2, SP, (x), (y), (z))); \      DPRINTF(("%.*sADD_NEW_DATA(%d,%d,%d) line %d\n", rlevel*2-2, SP, \
385          (x), (y), (z), __LINE__)); \
386      } \      } \
387    else return PCRE_ERROR_DFA_WSSIZE    else return PCRE_ERROR_DFA_WSSIZE
388    
# Line 371  for the current character, one for the f Line 391  for the current character, one for the f
391  static int  static int
392  internal_dfa_exec(  internal_dfa_exec(
393    dfa_match_data *md,    dfa_match_data *md,
394    const uschar *this_start_code,    const pcre_uchar *this_start_code,
395    const uschar *current_subject,    const pcre_uchar *current_subject,
396    int start_offset,    int start_offset,
397    int *offsets,    int *offsets,
398    int offsetcount,    int offsetcount,
399    int *workspace,    int *workspace,
400    int wscount,    int wscount,
401    int ims,    int  rlevel)
   int  rlevel,  
   int  recursing)  
402  {  {
403  stateblock *active_states, *new_states, *temp_states;  stateblock *active_states, *new_states, *temp_states;
404  stateblock *next_active_state, *next_new_state;  stateblock *next_active_state, *next_new_state;
405    
406  const uschar *ctypes, *lcc, *fcc;  const pcre_uint8 *ctypes, *lcc, *fcc;
407  const uschar *ptr;  const pcre_uchar *ptr;
408  const uschar *end_code, *first_op;  const pcre_uchar *end_code, *first_op;
409    
410    dfa_recursion_info new_recursive;
411    
412  int active_count, new_count, match_count;  int active_count, new_count, match_count;
413    
414  /* Some fields in the md block are frequently referenced, so we load them into  /* Some fields in the md block are frequently referenced, so we load them into
415  independent variables in the hope that this will perform better. */  independent variables in the hope that this will perform better. */
416    
417  const uschar *start_subject = md->start_subject;  const pcre_uchar *start_subject = md->start_subject;
418  const uschar *end_subject = md->end_subject;  const pcre_uchar *end_subject = md->end_subject;
419  const uschar *start_code = md->start_code;  const pcre_uchar *start_code = md->start_code;
420    
421  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
422  BOOL utf8 = (md->poptions & PCRE_UTF8) != 0;  BOOL utf = (md->poptions & PCRE_UTF8) != 0;
423  #else  #else
424  BOOL utf8 = FALSE;  BOOL utf = FALSE;
425  #endif  #endif
426    
427    BOOL reset_could_continue = FALSE;
428    
429  rlevel++;  rlevel++;
430  offsetcount &= (-2);  offsetcount &= (-2);
431    
# Line 412  wscount = (wscount - (wscount % (INTS_PE Line 434  wscount = (wscount - (wscount % (INTS_PE
434            (2 * INTS_PER_STATEBLOCK);            (2 * INTS_PER_STATEBLOCK);
435    
436  DPRINTF(("\n%.*s---------------------\n"  DPRINTF(("\n%.*s---------------------\n"
437    "%.*sCall to internal_dfa_exec f=%d r=%d\n",    "%.*sCall to internal_dfa_exec f=%d\n",
438    rlevel*2-2, SP, rlevel*2-2, SP, rlevel, recursing));    rlevel*2-2, SP, rlevel*2-2, SP, rlevel));
439    
440  ctypes = md->tables + ctypes_offset;  ctypes = md->tables + ctypes_offset;
441  lcc = md->tables + lcc_offset;  lcc = md->tables + lcc_offset;
# Line 426  next_new_state = new_states = active_sta Line 448  next_new_state = new_states = active_sta
448  new_count = 0;  new_count = 0;
449    
450  first_op = this_start_code + 1 + LINK_SIZE +  first_op = this_start_code + 1 + LINK_SIZE +
451    ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA)? 2:0);    ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA ||
452        *this_start_code == OP_CBRAPOS || *this_start_code == OP_SCBRAPOS)
453        ? IMM2_SIZE:0);
454    
455  /* The first thing in any (sub) pattern is a bracket of some sort. Push all  /* The first thing in any (sub) pattern is a bracket of some sort. Push all
456  the alternative states onto the list, and find out where the end is. This  the alternative states onto the list, and find out where the end is. This
# Line 454  if (*first_op == OP_REVERSE) Line 478  if (*first_op == OP_REVERSE)
478    /* If we can't go back the amount required for the longest lookbehind    /* If we can't go back the amount required for the longest lookbehind
479    pattern, go back as far as we can; some alternatives may still be viable. */    pattern, go back as far as we can; some alternatives may still be viable. */
480    
481  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
482    /* In character mode we have to step back character by character */    /* In character mode we have to step back character by character */
483    
484    if (utf8)    if (utf)
485      {      {
486      for (gone_back = 0; gone_back < max_back; gone_back++)      for (gone_back = 0; gone_back < max_back; gone_back++)
487        {        {
488        if (current_subject <= start_subject) break;        if (current_subject <= start_subject) break;
489        current_subject--;        current_subject--;
490        while (current_subject > start_subject &&        ACROSSCHAR(current_subject > start_subject, *current_subject, current_subject--);
              (*current_subject & 0xc0) == 0x80)  
         current_subject--;  
491        }        }
492      }      }
493    else    else
# Line 525  else Line 547  else
547    else    else
548      {      {
549      int length = 1 + LINK_SIZE +      int length = 1 + LINK_SIZE +
550        ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA)? 2:0);        ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA ||
551            *this_start_code == OP_CBRAPOS || *this_start_code == OP_SCBRAPOS)
552            ? IMM2_SIZE:0);
553      do      do
554        {        {
555        ADD_NEW((int)(end_code - start_code + length), 0);        ADD_NEW((int)(end_code - start_code + length), 0);
# Line 538  else Line 562  else
562    
563  workspace[0] = 0;    /* Bit indicating which vector is current */  workspace[0] = 0;    /* Bit indicating which vector is current */
564    
565  DPRINTF(("%.*sEnd state = %d\n", rlevel*2-2, SP, end_code - start_code));  DPRINTF(("%.*sEnd state = %d\n", rlevel*2-2, SP, (int)(end_code - start_code)));
566    
567  /* Loop for scanning the subject */  /* Loop for scanning the subject */
568    
# Line 549  for (;;) Line 573  for (;;)
573    int clen, dlen;    int clen, dlen;
574    unsigned int c, d;    unsigned int c, d;
575    int forced_fail = 0;    int forced_fail = 0;
576    BOOL could_continue = FALSE;    BOOL partial_newline = FALSE;
577      BOOL could_continue = reset_could_continue;
578      reset_could_continue = FALSE;
579    
580    /* Make the new state list into the active state list and empty the    /* Make the new state list into the active state list and empty the
581    new state list. */    new state list. */
# Line 565  for (;;) Line 591  for (;;)
591    
592  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
593    printf("%.*sNext character: rest of subject = \"", rlevel*2-2, SP);    printf("%.*sNext character: rest of subject = \"", rlevel*2-2, SP);
594    pchars((uschar *)ptr, strlen((char *)ptr), stdout);    pchars(ptr, STRLEN_UC(ptr), stdout);
595    printf("\"\n");    printf("\"\n");
596    
597    printf("%.*sActive states: ", rlevel*2-2, SP);    printf("%.*sActive states: ", rlevel*2-2, SP);
# Line 585  for (;;) Line 611  for (;;)
611    
612    if (ptr < end_subject)    if (ptr < end_subject)
613      {      {
614      clen = 1;        /* Number of bytes in the character */      clen = 1;        /* Number of data items in the character */
615  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
616      if (utf8) { GETCHARLEN(c, ptr, clen); } else      if (utf) { GETCHARLEN(c, ptr, clen); } else
617  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
618      c = *ptr;      c = *ptr;
619      }      }
620    else    else
# Line 605  for (;;) Line 631  for (;;)
631    for (i = 0; i < active_count; i++)    for (i = 0; i < active_count; i++)
632      {      {
633      stateblock *current_state = active_states + i;      stateblock *current_state = active_states + i;
634      const uschar *code;      BOOL caseless = FALSE;
635        const pcre_uchar *code;
636      int state_offset = current_state->offset;      int state_offset = current_state->offset;
637      int count, codevalue, rrc;      int count, codevalue, rrc;
638    
# Line 616  for (;;) Line 643  for (;;)
643          else printf("0x%02x\n", c);          else printf("0x%02x\n", c);
644  #endif  #endif
645    
     /* This variable is referred to implicity in the ADD_xxx macros. */  
   
     ims = current_state->ims;  
   
646      /* A negative offset is a special case meaning "hold off going to this      /* A negative offset is a special case meaning "hold off going to this
647      (negated) state until the number of characters in the data field have      (negated) state until the number of characters in the data field have
648      been skipped". */      been skipped". If the could_continue flag was passed over from a previous
649        state, arrange for it to passed on. */
650    
651      if (state_offset < 0)      if (state_offset < 0)
652        {        {
# Line 631  for (;;) Line 655  for (;;)
655          DPRINTF(("%.*sSkipping this character\n", rlevel*2-2, SP));          DPRINTF(("%.*sSkipping this character\n", rlevel*2-2, SP));
656          ADD_NEW_DATA(state_offset, current_state->count,          ADD_NEW_DATA(state_offset, current_state->count,
657            current_state->data - 1);            current_state->data - 1);
658            if (could_continue) reset_could_continue = TRUE;
659          continue;          continue;
660          }          }
661        else        else
# Line 670  for (;;) Line 695  for (;;)
695      permitted.      permitted.
696    
697      We also use this mechanism for opcodes such as OP_TYPEPLUS that take an      We also use this mechanism for opcodes such as OP_TYPEPLUS that take an
698      argument that is not a data character - but is always one byte long. We      argument that is not a data character - but is always one byte long because
699      have to take special action to deal with  \P, \p, \H, \h, \V, \v and \X in      the values are small. We have to take special action to deal with  \P, \p,
700      this case. To keep the other cases fast, convert these ones to new opcodes.      \H, \h, \V, \v and \X in this case. To keep the other cases fast, convert
701      */      these ones to new opcodes. */
702    
703      if (coptable[codevalue] > 0)      if (coptable[codevalue] > 0)
704        {        {
705        dlen = 1;        dlen = 1;
706  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
707        if (utf8) { GETCHARLEN(d, (code + coptable[codevalue]), dlen); } else        if (utf) { GETCHARLEN(d, (code + coptable[codevalue]), dlen); } else
708  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
709        d = code[coptable[codevalue]];        d = code[coptable[codevalue]];
710        if (codevalue >= OP_TYPESTAR)        if (codevalue >= OP_TYPESTAR)
711          {          {
# Line 725  for (;;) Line 750  for (;;)
750    
751  /* ========================================================================== */  /* ========================================================================== */
752        /* Reached a closing bracket. If not at the end of the pattern, carry        /* Reached a closing bracket. If not at the end of the pattern, carry
753        on with the next opcode. Otherwise, unless we have an empty string and        on with the next opcode. For repeating opcodes, also add the repeat
754          state. Note that KETRPOS will always be encountered at the end of the
755          subpattern, because the possessive subpattern repeats are always handled
756          using recursive calls. Thus, it never adds any new states.
757    
758          At the end of the (sub)pattern, unless we have an empty string and
759        PCRE_NOTEMPTY is set, or PCRE_NOTEMPTY_ATSTART is set and we are at the        PCRE_NOTEMPTY is set, or PCRE_NOTEMPTY_ATSTART is set and we are at the
760        start of the subject, save the match data, shifting up all previous        start of the subject, save the match data, shifting up all previous
761        matches so we always have the longest first. */        matches so we always have the longest first. */
# Line 733  for (;;) Line 763  for (;;)
763        case OP_KET:        case OP_KET:
764        case OP_KETRMIN:        case OP_KETRMIN:
765        case OP_KETRMAX:        case OP_KETRMAX:
766          case OP_KETRPOS:
767        if (code != end_code)        if (code != end_code)
768          {          {
769          ADD_ACTIVE(state_offset + 1 + LINK_SIZE, 0);          ADD_ACTIVE(state_offset + 1 + LINK_SIZE, 0);
# Line 749  for (;;) Line 780  for (;;)
780                  current_subject > start_subject + md->start_offset)))                  current_subject > start_subject + md->start_offset)))
781            {            {
782            if (match_count < 0) match_count = (offsetcount >= 2)? 1 : 0;            if (match_count < 0) match_count = (offsetcount >= 2)? 1 : 0;
783              else if (match_count > 0 && ++match_count * 2 >= offsetcount)              else if (match_count > 0 && ++match_count * 2 > offsetcount)
784                match_count = 0;                match_count = 0;
785            count = ((match_count == 0)? offsetcount : match_count * 2) - 2;            count = ((match_count == 0)? offsetcount : match_count * 2) - 2;
786            if (count > 0) memmove(offsets + 2, offsets, count * sizeof(int));            if (count > 0) memmove(offsets + 2, offsets, count * sizeof(int));
# Line 758  for (;;) Line 789  for (;;)
789              offsets[0] = (int)(current_subject - start_subject);              offsets[0] = (int)(current_subject - start_subject);
790              offsets[1] = (int)(ptr - start_subject);              offsets[1] = (int)(ptr - start_subject);
791              DPRINTF(("%.*sSet matched string = \"%.*s\"\n", rlevel*2-2, SP,              DPRINTF(("%.*sSet matched string = \"%.*s\"\n", rlevel*2-2, SP,
792                offsets[1] - offsets[0], current_subject));                offsets[1] - offsets[0], (char *)current_subject));
793              }              }
794            if ((md->moptions & PCRE_DFA_SHORTEST) != 0)            if ((md->moptions & PCRE_DFA_SHORTEST) != 0)
795              {              {
# Line 795  for (;;) Line 826  for (;;)
826        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
827        case OP_CBRA:        case OP_CBRA:
828        case OP_SCBRA:        case OP_SCBRA:
829        ADD_ACTIVE((int)(code - start_code + 3 + LINK_SIZE),  0);        ADD_ACTIVE((int)(code - start_code + 1 + LINK_SIZE + IMM2_SIZE),  0);
830        code += GET(code, 1);        code += GET(code, 1);
831        while (*code == OP_ALT)        while (*code == OP_ALT)
832          {          {
# Line 822  for (;;) Line 853  for (;;)
853    
854        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
855        case OP_CIRC:        case OP_CIRC:
856        if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||        if (ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0)
           ((ims & PCRE_MULTILINE) != 0 &&  
             ptr != end_subject &&  
             WAS_NEWLINE(ptr)))  
857          { ADD_ACTIVE(state_offset + 1, 0); }          { ADD_ACTIVE(state_offset + 1, 0); }
858        break;        break;
859    
860        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
861        case OP_EOD:        case OP_CIRCM:
862        if (ptr >= end_subject) { ADD_ACTIVE(state_offset + 1, 0); }        if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||
863              (ptr != end_subject && WAS_NEWLINE(ptr)))
864            { ADD_ACTIVE(state_offset + 1, 0); }
865        break;        break;
866    
867        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
868        case OP_OPT:        case OP_EOD:
869        ims = code[1];        if (ptr >= end_subject)
870        ADD_ACTIVE(state_offset + 2, 0);          {
871            if ((md->moptions & PCRE_PARTIAL_HARD) != 0)
872              could_continue = TRUE;
873            else { ADD_ACTIVE(state_offset + 1, 0); }
874            }
875        break;        break;
876    
877        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
# Line 860  for (;;) Line 894  for (;;)
894        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
895        case OP_ANY:        case OP_ANY:
896        if (clen > 0 && !IS_NEWLINE(ptr))        if (clen > 0 && !IS_NEWLINE(ptr))
897          { ADD_NEW(state_offset + 1, 0); }          {
898            if (ptr + 1 >= md->end_subject &&
899                (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
900                NLBLOCK->nltype == NLTYPE_FIXED &&
901                NLBLOCK->nllen == 2 &&
902                c == NLBLOCK->nl[0])
903              {
904              could_continue = partial_newline = TRUE;
905              }
906            else
907              {
908              ADD_NEW(state_offset + 1, 0);
909              }
910            }
911        break;        break;
912    
913        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
# Line 871  for (;;) Line 918  for (;;)
918    
919        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
920        case OP_EODN:        case OP_EODN:
921        if (clen == 0 || (IS_NEWLINE(ptr) && ptr == end_subject - md->nllen))        if (clen == 0 && (md->moptions & PCRE_PARTIAL_HARD) != 0)
922            could_continue = TRUE;
923          else if (clen == 0 || (IS_NEWLINE(ptr) && ptr == end_subject - md->nllen))
924          { ADD_ACTIVE(state_offset + 1, 0); }          { ADD_ACTIVE(state_offset + 1, 0); }
925        break;        break;
926    
# Line 879  for (;;) Line 928  for (;;)
928        case OP_DOLL:        case OP_DOLL:
929        if ((md->moptions & PCRE_NOTEOL) == 0)        if ((md->moptions & PCRE_NOTEOL) == 0)
930          {          {
931          if (clen == 0 ||          if (clen == 0 && (md->moptions & PCRE_PARTIAL_HARD) != 0)
932              could_continue = TRUE;
933            else if (clen == 0 ||
934              ((md->poptions & PCRE_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr) &&              ((md->poptions & PCRE_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr) &&
935                 ((ims & PCRE_MULTILINE) != 0 || ptr == end_subject - md->nllen)                 (ptr == end_subject - md->nllen)
936              ))              ))
937            { ADD_ACTIVE(state_offset + 1, 0); }            { ADD_ACTIVE(state_offset + 1, 0); }
938            else if (ptr + 1 >= md->end_subject &&
939                     (md->moptions & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) != 0 &&
940                     NLBLOCK->nltype == NLTYPE_FIXED &&
941                     NLBLOCK->nllen == 2 &&
942                     c == NLBLOCK->nl[0])
943              {
944              if ((md->moptions & PCRE_PARTIAL_HARD) != 0)
945                {
946                reset_could_continue = TRUE;
947                ADD_NEW_DATA(-(state_offset + 1), 0, 1);
948                }
949              else could_continue = partial_newline = TRUE;
950              }
951            }
952          break;
953    
954          /*-----------------------------------------------------------------*/
955          case OP_DOLLM:
956          if ((md->moptions & PCRE_NOTEOL) == 0)
957            {
958            if (clen == 0 && (md->moptions & PCRE_PARTIAL_HARD) != 0)
959              could_continue = TRUE;
960            else if (clen == 0 ||
961                ((md->poptions & PCRE_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr)))
962              { ADD_ACTIVE(state_offset + 1, 0); }
963            else if (ptr + 1 >= md->end_subject &&
964                     (md->moptions & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) != 0 &&
965                     NLBLOCK->nltype == NLTYPE_FIXED &&
966                     NLBLOCK->nllen == 2 &&
967                     c == NLBLOCK->nl[0])
968              {
969              if ((md->moptions & PCRE_PARTIAL_HARD) != 0)
970                {
971                reset_could_continue = TRUE;
972                ADD_NEW_DATA(-(state_offset + 1), 0, 1);
973                }
974              else could_continue = partial_newline = TRUE;
975              }
976          }          }
977        else if ((ims & PCRE_MULTILINE) != 0 && IS_NEWLINE(ptr))        else if (IS_NEWLINE(ptr))
978          { ADD_ACTIVE(state_offset + 1, 0); }          { ADD_ACTIVE(state_offset + 1, 0); }
979        break;        break;
980    
# Line 916  for (;;) Line 1005  for (;;)
1005    
1006          if (ptr > start_subject)          if (ptr > start_subject)
1007            {            {
1008            const uschar *temp = ptr - 1;            const pcre_uchar *temp = ptr - 1;
1009            if (temp < md->start_used_ptr) md->start_used_ptr = temp;            if (temp < md->start_used_ptr) md->start_used_ptr = temp;
1010  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1011            if (utf8) BACKCHAR(temp);            if (utf) { BACKCHAR(temp); }
1012  #endif  #endif
1013            GETCHARTEST(d, temp);            GETCHARTEST(d, temp);
1014  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 984  for (;;) Line 1073  for (;;)
1073            break;            break;
1074    
1075            case PT_GC:            case PT_GC:
1076            OK = _pcre_ucp_gentype[prop->chartype] == code[2];            OK = PRIV(ucp_gentype)[prop->chartype] == code[2];
1077            break;            break;
1078    
1079            case PT_PC:            case PT_PC:
# Line 998  for (;;) Line 1087  for (;;)
1087            /* These are specials for combination cases. */            /* These are specials for combination cases. */
1088    
1089            case PT_ALNUM:            case PT_ALNUM:
1090            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1091                 _pcre_ucp_gentype[prop->chartype] == ucp_N;                 PRIV(ucp_gentype)[prop->chartype] == ucp_N;
1092            break;            break;
1093    
1094            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
1095            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1096                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;
1097            break;            break;
1098    
1099            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
1100            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1101                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
1102                 c == CHAR_FF || c == CHAR_CR;                 c == CHAR_FF || c == CHAR_CR;
1103            break;            break;
1104    
1105            case PT_WORD:            case PT_WORD:
1106            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1107                 _pcre_ucp_gentype[prop->chartype] == ucp_N ||                 PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
1108                 c == CHAR_UNDERSCORE;                 c == CHAR_UNDERSCORE;
1109            break;            break;
1110    
# Line 1046  for (;;) Line 1135  for (;;)
1135        if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }        if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
1136        if (clen > 0)        if (clen > 0)
1137          {          {
1138          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if (d == OP_ANY && ptr + 1 >= md->end_subject &&
1139                (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
1140                NLBLOCK->nltype == NLTYPE_FIXED &&
1141                NLBLOCK->nllen == 2 &&
1142                c == NLBLOCK->nl[0])
1143              {
1144              could_continue = partial_newline = TRUE;
1145              }
1146            else if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1147              (c < 256 &&              (c < 256 &&
1148                (d != OP_ANY || !IS_NEWLINE(ptr)) &&                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
1149                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
# Line 1069  for (;;) Line 1166  for (;;)
1166        ADD_ACTIVE(state_offset + 2, 0);        ADD_ACTIVE(state_offset + 2, 0);
1167        if (clen > 0)        if (clen > 0)
1168          {          {
1169          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if (d == OP_ANY && ptr + 1 >= md->end_subject &&
1170                (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
1171                NLBLOCK->nltype == NLTYPE_FIXED &&
1172                NLBLOCK->nllen == 2 &&
1173                c == NLBLOCK->nl[0])
1174              {
1175              could_continue = partial_newline = TRUE;
1176              }
1177            else if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1178              (c < 256 &&              (c < 256 &&
1179                (d != OP_ANY || !IS_NEWLINE(ptr)) &&                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
1180                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
# Line 1091  for (;;) Line 1196  for (;;)
1196        ADD_ACTIVE(state_offset + 2, 0);        ADD_ACTIVE(state_offset + 2, 0);
1197        if (clen > 0)        if (clen > 0)
1198          {          {
1199          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if (d == OP_ANY && ptr + 1 >= md->end_subject &&
1200                (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
1201                NLBLOCK->nltype == NLTYPE_FIXED &&
1202                NLBLOCK->nllen == 2 &&
1203                c == NLBLOCK->nl[0])
1204              {
1205              could_continue = partial_newline = TRUE;
1206              }
1207            else if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1208              (c < 256 &&              (c < 256 &&
1209                (d != OP_ANY || !IS_NEWLINE(ptr)) &&                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
1210                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
# Line 1111  for (;;) Line 1224  for (;;)
1224        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1225        if (clen > 0)        if (clen > 0)
1226          {          {
1227          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if (d == OP_ANY && ptr + 1 >= md->end_subject &&
1228                (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
1229                NLBLOCK->nltype == NLTYPE_FIXED &&
1230                NLBLOCK->nllen == 2 &&
1231                c == NLBLOCK->nl[0])
1232              {
1233              could_continue = partial_newline = TRUE;
1234              }
1235            else if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1236              (c < 256 &&              (c < 256 &&
1237                (d != OP_ANY || !IS_NEWLINE(ptr)) &&                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
1238                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1239            {            {
1240            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
1241              { ADD_NEW(state_offset + 4, 0); }              { ADD_NEW(state_offset + 1 + IMM2_SIZE + 1, 0); }
1242            else            else
1243              { ADD_NEW(state_offset, count); }              { ADD_NEW(state_offset, count); }
1244            }            }
# Line 1128  for (;;) Line 1249  for (;;)
1249        case OP_TYPEUPTO:        case OP_TYPEUPTO:
1250        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
1251        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
1252        ADD_ACTIVE(state_offset + 4, 0);        ADD_ACTIVE(state_offset + 2 + IMM2_SIZE, 0);
1253        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1254        if (clen > 0)        if (clen > 0)
1255          {          {
1256          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if (d == OP_ANY && ptr + 1 >= md->end_subject &&
1257                (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
1258                NLBLOCK->nltype == NLTYPE_FIXED &&
1259                NLBLOCK->nllen == 2 &&
1260                c == NLBLOCK->nl[0])
1261              {
1262              could_continue = partial_newline = TRUE;
1263              }
1264            else if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1265              (c < 256 &&              (c < 256 &&
1266                (d != OP_ANY || !IS_NEWLINE(ptr)) &&                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
1267                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
# Line 1143  for (;;) Line 1272  for (;;)
1272              next_active_state--;              next_active_state--;
1273              }              }
1274            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
1275              { ADD_NEW(state_offset + 4, 0); }              { ADD_NEW(state_offset + 2 + IMM2_SIZE, 0); }
1276            else            else
1277              { ADD_NEW(state_offset, count); }              { ADD_NEW(state_offset, count); }
1278            }            }
# Line 1178  for (;;) Line 1307  for (;;)
1307            break;            break;
1308    
1309            case PT_GC:            case PT_GC:
1310            OK = _pcre_ucp_gentype[prop->chartype] == code[3];            OK = PRIV(ucp_gentype)[prop->chartype] == code[3];
1311            break;            break;
1312    
1313            case PT_PC:            case PT_PC:
# Line 1192  for (;;) Line 1321  for (;;)
1321            /* These are specials for combination cases. */            /* These are specials for combination cases. */
1322    
1323            case PT_ALNUM:            case PT_ALNUM:
1324            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1325                 _pcre_ucp_gentype[prop->chartype] == ucp_N;                 PRIV(ucp_gentype)[prop->chartype] == ucp_N;
1326            break;            break;
1327    
1328            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
1329            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1330                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;
1331            break;            break;
1332    
1333            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
1334            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1335                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
1336                 c == CHAR_FF || c == CHAR_CR;                 c == CHAR_FF || c == CHAR_CR;
1337            break;            break;
1338    
1339            case PT_WORD:            case PT_WORD:
1340            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1341                 _pcre_ucp_gentype[prop->chartype] == ucp_N ||                 PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
1342                 c == CHAR_UNDERSCORE;                 c == CHAR_UNDERSCORE;
1343            break;            break;
1344    
# Line 1239  for (;;) Line 1368  for (;;)
1368        case OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS:        case OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS:
1369        count = current_state->count;  /* Already matched */        count = current_state->count;  /* Already matched */
1370        if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }        if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
1371        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)        if (clen > 0)
1372          {          {
1373          const uschar *nptr = ptr + clen;          int lgb, rgb;
1374            const pcre_uchar *nptr = ptr + clen;
1375          int ncount = 0;          int ncount = 0;
1376          if (count > 0 && codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS)          if (count > 0 && codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS)
1377            {            {
1378            active_count--;           /* Remove non-match possibility */            active_count--;           /* Remove non-match possibility */
1379            next_active_state--;            next_active_state--;
1380            }            }
1381            lgb = UCD_GRAPHBREAK(c);
1382          while (nptr < end_subject)          while (nptr < end_subject)
1383            {            {
1384            int nd;            dlen = 1;
1385            int ndlen = 1;            if (!utf) d = *nptr; else { GETCHARLEN(d, nptr, dlen); }
1386            GETCHARLEN(nd, nptr, ndlen);            rgb = UCD_GRAPHBREAK(d);
1387            if (UCD_CATEGORY(nd) != ucp_M) break;            if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
1388            ncount++;            ncount++;
1389            nptr += ndlen;            lgb = rgb;
1390              nptr += dlen;
1391            }            }
1392          count++;          count++;
1393          ADD_NEW_DATA(-state_offset, count, ncount);          ADD_NEW_DATA(-state_offset, count, ncount);
# Line 1274  for (;;) Line 1406  for (;;)
1406          int ncount = 0;          int ncount = 0;
1407          switch (c)          switch (c)
1408            {            {
1409            case 0x000b:            case CHAR_VT:
1410            case 0x000c:            case CHAR_FF:
1411            case 0x0085:            case CHAR_NEL:
1412    #ifndef EBCDIC
1413            case 0x2028:            case 0x2028:
1414            case 0x2029:            case 0x2029:
1415    #endif  /* Not EBCDIC */
1416            if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;            if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1417            goto ANYNL01;            goto ANYNL01;
1418    
1419            case 0x000d:            case CHAR_CR:
1420            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == CHAR_LF) ncount = 1;
1421            /* Fall through */            /* Fall through */
1422    
1423            ANYNL01:            ANYNL01:
1424            case 0x000a:            case CHAR_LF:
1425            if (count > 0 && codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSPLUS)            if (count > 0 && codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSPLUS)
1426              {              {
1427              active_count--;           /* Remove non-match possibility */              active_count--;           /* Remove non-match possibility */
# Line 1314  for (;;) Line 1448  for (;;)
1448          BOOL OK;          BOOL OK;
1449          switch (c)          switch (c)
1450            {            {
1451            case 0x000a:            VSPACE_CASES:
           case 0x000b:  
           case 0x000c:  
           case 0x000d:  
           case 0x0085:  
           case 0x2028:  
           case 0x2029:  
1452            OK = TRUE;            OK = TRUE;
1453            break;            break;
1454    
# Line 1353  for (;;) Line 1481  for (;;)
1481          BOOL OK;          BOOL OK;
1482          switch (c)          switch (c)
1483            {            {
1484            case 0x09:      /* HT */            HSPACE_CASES:
           case 0x20:      /* SPACE */  
           case 0xa0:      /* NBSP */  
           case 0x1680:    /* OGHAM SPACE MARK */  
           case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */  
           case 0x2000:    /* EN QUAD */  
           case 0x2001:    /* EM QUAD */  
           case 0x2002:    /* EN SPACE */  
           case 0x2003:    /* EM SPACE */  
           case 0x2004:    /* THREE-PER-EM SPACE */  
           case 0x2005:    /* FOUR-PER-EM SPACE */  
           case 0x2006:    /* SIX-PER-EM SPACE */  
           case 0x2007:    /* FIGURE SPACE */  
           case 0x2008:    /* PUNCTUATION SPACE */  
           case 0x2009:    /* THIN SPACE */  
           case 0x200A:    /* HAIR SPACE */  
           case 0x202f:    /* NARROW NO-BREAK SPACE */  
           case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */  
           case 0x3000:    /* IDEOGRAPHIC SPACE */  
1485            OK = TRUE;            OK = TRUE;
1486            break;            break;
1487    
# Line 1425  for (;;) Line 1535  for (;;)
1535            break;            break;
1536    
1537            case PT_GC:            case PT_GC:
1538            OK = _pcre_ucp_gentype[prop->chartype] == code[3];            OK = PRIV(ucp_gentype)[prop->chartype] == code[3];
1539            break;            break;
1540    
1541            case PT_PC:            case PT_PC:
# Line 1439  for (;;) Line 1549  for (;;)
1549            /* These are specials for combination cases. */            /* These are specials for combination cases. */
1550    
1551            case PT_ALNUM:            case PT_ALNUM:
1552            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1553                 _pcre_ucp_gentype[prop->chartype] == ucp_N;                 PRIV(ucp_gentype)[prop->chartype] == ucp_N;
1554            break;            break;
1555    
1556            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
1557            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1558                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;
1559            break;            break;
1560    
1561            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
1562            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1563                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
1564                 c == CHAR_FF || c == CHAR_CR;                 c == CHAR_FF || c == CHAR_CR;
1565            break;            break;
1566    
1567            case PT_WORD:            case PT_WORD:
1568            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1569                 _pcre_ucp_gentype[prop->chartype] == ucp_N ||                 PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
1570                 c == CHAR_UNDERSCORE;                 c == CHAR_UNDERSCORE;
1571            break;            break;
1572    
# Line 1495  for (;;) Line 1605  for (;;)
1605        QS2:        QS2:
1606    
1607        ADD_ACTIVE(state_offset + 2, 0);        ADD_ACTIVE(state_offset + 2, 0);
1608        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)        if (clen > 0)
1609          {          {
1610          const uschar *nptr = ptr + clen;          int lgb, rgb;
1611            const pcre_uchar *nptr = ptr + clen;
1612          int ncount = 0;          int ncount = 0;
1613          if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSSTAR ||          if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSSTAR ||
1614              codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSQUERY)              codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSQUERY)
# Line 1505  for (;;) Line 1616  for (;;)
1616            active_count--;           /* Remove non-match possibility */            active_count--;           /* Remove non-match possibility */
1617            next_active_state--;            next_active_state--;
1618            }            }
1619            lgb = UCD_GRAPHBREAK(c);
1620          while (nptr < end_subject)          while (nptr < end_subject)
1621            {            {
1622            int nd;            dlen = 1;
1623            int ndlen = 1;            if (!utf) d = *nptr; else { GETCHARLEN(d, nptr, dlen); }
1624            GETCHARLEN(nd, nptr, ndlen);            rgb = UCD_GRAPHBREAK(d);
1625            if (UCD_CATEGORY(nd) != ucp_M) break;            if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
1626            ncount++;            ncount++;
1627            nptr += ndlen;            lgb = rgb;
1628              nptr += dlen;
1629            }            }
1630          ADD_NEW_DATA(-(state_offset + count), 0, ncount);          ADD_NEW_DATA(-(state_offset + count), 0, ncount);
1631          }          }
# Line 1538  for (;;) Line 1651  for (;;)
1651          int ncount = 0;          int ncount = 0;
1652          switch (c)          switch (c)
1653            {            {
1654            case 0x000b:            case CHAR_VT:
1655            case 0x000c:            case CHAR_FF:
1656            case 0x0085:            case CHAR_NEL:
1657    #ifndef EBCDIC
1658            case 0x2028:            case 0x2028:
1659            case 0x2029:            case 0x2029:
1660    #endif  /* Not EBCDIC */
1661            if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;            if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1662            goto ANYNL02;            goto ANYNL02;
1663    
1664            case 0x000d:            case CHAR_CR:
1665            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == CHAR_LF) ncount = 1;
1666            /* Fall through */            /* Fall through */
1667    
1668            ANYNL02:            ANYNL02:
1669            case 0x000a:            case CHAR_LF:
1670            if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSSTAR ||            if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSSTAR ||
1671                codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSQUERY)                codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSQUERY)
1672              {              {
# Line 1586  for (;;) Line 1701  for (;;)
1701          BOOL OK;          BOOL OK;
1702          switch (c)          switch (c)
1703            {            {
1704            case 0x000a:            VSPACE_CASES:
           case 0x000b:  
           case 0x000c:  
           case 0x000d:  
           case 0x0085:  
           case 0x2028:  
           case 0x2029:  
1705            OK = TRUE;            OK = TRUE;
1706            break;            break;
1707    
# Line 1632  for (;;) Line 1741  for (;;)
1741          BOOL OK;          BOOL OK;
1742          switch (c)          switch (c)
1743            {            {
1744            case 0x09:      /* HT */            HSPACE_CASES:
           case 0x20:      /* SPACE */  
           case 0xa0:      /* NBSP */  
           case 0x1680:    /* OGHAM SPACE MARK */  
           case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */  
           case 0x2000:    /* EN QUAD */  
           case 0x2001:    /* EM QUAD */  
           case 0x2002:    /* EN SPACE */  
           case 0x2003:    /* EM SPACE */  
           case 0x2004:    /* THREE-PER-EM SPACE */  
           case 0x2005:    /* FOUR-PER-EM SPACE */  
           case 0x2006:    /* SIX-PER-EM SPACE */  
           case 0x2007:    /* FIGURE SPACE */  
           case 0x2008:    /* PUNCTUATION SPACE */  
           case 0x2009:    /* THIN SPACE */  
           case 0x200A:    /* HAIR SPACE */  
           case 0x202f:    /* NARROW NO-BREAK SPACE */  
           case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */  
           case 0x3000:    /* IDEOGRAPHIC SPACE */  
1745            OK = TRUE;            OK = TRUE;
1746            break;            break;
1747    
# Line 1679  for (;;) Line 1770  for (;;)
1770        case OP_PROP_EXTRA + OP_TYPEMINUPTO:        case OP_PROP_EXTRA + OP_TYPEMINUPTO:
1771        case OP_PROP_EXTRA + OP_TYPEPOSUPTO:        case OP_PROP_EXTRA + OP_TYPEPOSUPTO:
1772        if (codevalue != OP_PROP_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_PROP_EXTRA + OP_TYPEEXACT)
1773          { ADD_ACTIVE(state_offset + 6, 0); }          { ADD_ACTIVE(state_offset + 1 + IMM2_SIZE + 3, 0); }
1774        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1775        if (clen > 0)        if (clen > 0)
1776          {          {
1777          BOOL OK;          BOOL OK;
1778          const ucd_record * prop = GET_UCD(c);          const ucd_record * prop = GET_UCD(c);
1779          switch(code[4])          switch(code[1 + IMM2_SIZE + 1])
1780            {            {
1781            case PT_ANY:            case PT_ANY:
1782            OK = TRUE;            OK = TRUE;
# Line 1697  for (;;) Line 1788  for (;;)
1788            break;            break;
1789    
1790            case PT_GC:            case PT_GC:
1791            OK = _pcre_ucp_gentype[prop->chartype] == code[5];            OK = PRIV(ucp_gentype)[prop->chartype] == code[1 + IMM2_SIZE + 2];
1792            break;            break;
1793    
1794            case PT_PC:            case PT_PC:
1795            OK = prop->chartype == code[5];            OK = prop->chartype == code[1 + IMM2_SIZE + 2];
1796            break;            break;
1797    
1798            case PT_SC:            case PT_SC:
1799            OK = prop->script == code[5];            OK = prop->script == code[1 + IMM2_SIZE + 2];
1800            break;            break;
1801    
1802            /* These are specials for combination cases. */            /* These are specials for combination cases. */
1803    
1804            case PT_ALNUM:            case PT_ALNUM:
1805            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1806                 _pcre_ucp_gentype[prop->chartype] == ucp_N;                 PRIV(ucp_gentype)[prop->chartype] == ucp_N;
1807            break;            break;
1808    
1809            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
1810            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1811                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;
1812            break;            break;
1813    
1814            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
1815            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1816                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
1817                 c == CHAR_FF || c == CHAR_CR;                 c == CHAR_FF || c == CHAR_CR;
1818            break;            break;
1819    
1820            case PT_WORD:            case PT_WORD:
1821            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1822                 _pcre_ucp_gentype[prop->chartype] == ucp_N ||                 PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
1823                 c == CHAR_UNDERSCORE;                 c == CHAR_UNDERSCORE;
1824            break;            break;
1825    
# Line 1747  for (;;) Line 1838  for (;;)
1838              next_active_state--;              next_active_state--;
1839              }              }
1840            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
1841              { ADD_NEW(state_offset + 6, 0); }              { ADD_NEW(state_offset + 1 + IMM2_SIZE + 3, 0); }
1842            else            else
1843              { ADD_NEW(state_offset, count); }              { ADD_NEW(state_offset, count); }
1844            }            }
# Line 1760  for (;;) Line 1851  for (;;)
1851        case OP_EXTUNI_EXTRA + OP_TYPEMINUPTO:        case OP_EXTUNI_EXTRA + OP_TYPEMINUPTO:
1852        case OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO:        case OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO:
1853        if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)
1854          { ADD_ACTIVE(state_offset + 4, 0); }          { ADD_ACTIVE(state_offset + 2 + IMM2_SIZE, 0); }
1855        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1856        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)        if (clen > 0)
1857          {          {
1858          const uschar *nptr = ptr + clen;          int lgb, rgb;
1859            const pcre_uchar *nptr = ptr + clen;
1860          int ncount = 0;          int ncount = 0;
1861          if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO)          if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO)
1862            {            {
1863            active_count--;           /* Remove non-match possibility */            active_count--;           /* Remove non-match possibility */
1864            next_active_state--;            next_active_state--;
1865            }            }
1866            lgb = UCD_GRAPHBREAK(c);
1867          while (nptr < end_subject)          while (nptr < end_subject)
1868            {            {
1869            int nd;            dlen = 1;
1870            int ndlen = 1;            if (!utf) d = *nptr; else { GETCHARLEN(d, nptr, dlen); }
1871            GETCHARLEN(nd, nptr, ndlen);            rgb = UCD_GRAPHBREAK(d);
1872            if (UCD_CATEGORY(nd) != ucp_M) break;            if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
1873            ncount++;            ncount++;
1874            nptr += ndlen;            lgb = rgb;
1875              nptr += dlen;
1876            }            }
1877            if (nptr >= end_subject && (md->moptions & PCRE_PARTIAL_HARD) != 0)
1878                reset_could_continue = TRUE;
1879          if (++count >= GET2(code, 1))          if (++count >= GET2(code, 1))
1880            { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }            { ADD_NEW_DATA(-(state_offset + 2 + IMM2_SIZE), 0, ncount); }
1881          else          else
1882            { ADD_NEW_DATA(-state_offset, count, ncount); }            { ADD_NEW_DATA(-state_offset, count, ncount); }
1883          }          }
# Line 1794  for (;;) Line 1890  for (;;)
1890        case OP_ANYNL_EXTRA + OP_TYPEMINUPTO:        case OP_ANYNL_EXTRA + OP_TYPEMINUPTO:
1891        case OP_ANYNL_EXTRA + OP_TYPEPOSUPTO:        case OP_ANYNL_EXTRA + OP_TYPEPOSUPTO:
1892        if (codevalue != OP_ANYNL_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_ANYNL_EXTRA + OP_TYPEEXACT)
1893          { ADD_ACTIVE(state_offset + 4, 0); }          { ADD_ACTIVE(state_offset + 2 + IMM2_SIZE, 0); }
1894        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1895        if (clen > 0)        if (clen > 0)
1896          {          {
1897          int ncount = 0;          int ncount = 0;
1898          switch (c)          switch (c)
1899            {            {
1900            case 0x000b:            case CHAR_VT:
1901            case 0x000c:            case CHAR_FF:
1902            case 0x0085:            case CHAR_NEL:
1903    #ifndef EBCDIC
1904            case 0x2028:            case 0x2028:
1905            case 0x2029:            case 0x2029:
1906    #endif  /* Not EBCDIC */
1907            if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;            if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1908            goto ANYNL03;            goto ANYNL03;
1909    
1910            case 0x000d:            case CHAR_CR:
1911            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == CHAR_LF) ncount = 1;
1912            /* Fall through */            /* Fall through */
1913    
1914            ANYNL03:            ANYNL03:
1915            case 0x000a:            case CHAR_LF:
1916            if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSUPTO)            if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSUPTO)
1917              {              {
1918              active_count--;           /* Remove non-match possibility */              active_count--;           /* Remove non-match possibility */
1919              next_active_state--;              next_active_state--;
1920              }              }
1921            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
1922              { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }              { ADD_NEW_DATA(-(state_offset + 2 + IMM2_SIZE), 0, ncount); }
1923            else            else
1924              { ADD_NEW_DATA(-state_offset, count, ncount); }              { ADD_NEW_DATA(-state_offset, count, ncount); }
1925            break;            break;
# Line 1838  for (;;) Line 1936  for (;;)
1936        case OP_VSPACE_EXTRA + OP_TYPEMINUPTO:        case OP_VSPACE_EXTRA + OP_TYPEMINUPTO:
1937        case OP_VSPACE_EXTRA + OP_TYPEPOSUPTO:        case OP_VSPACE_EXTRA + OP_TYPEPOSUPTO:
1938        if (codevalue != OP_VSPACE_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_VSPACE_EXTRA + OP_TYPEEXACT)
1939          { ADD_ACTIVE(state_offset + 4, 0); }          { ADD_ACTIVE(state_offset + 2 + IMM2_SIZE, 0); }
1940        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1941        if (clen > 0)        if (clen > 0)
1942          {          {
1943          BOOL OK;          BOOL OK;
1944          switch (c)          switch (c)
1945            {            {
1946            case 0x000a:            VSPACE_CASES:
           case 0x000b:  
           case 0x000c:  
           case 0x000d:  
           case 0x0085:  
           case 0x2028:  
           case 0x2029:  
1947            OK = TRUE;            OK = TRUE;
1948            break;            break;
1949    
# Line 1867  for (;;) Line 1959  for (;;)
1959              next_active_state--;              next_active_state--;
1960              }              }
1961            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
1962              { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }              { ADD_NEW_DATA(-(state_offset + 2 + IMM2_SIZE), 0, 0); }
1963            else            else
1964              { ADD_NEW_DATA(-state_offset, count, 0); }              { ADD_NEW_DATA(-state_offset, count, 0); }
1965            }            }
# Line 1880  for (;;) Line 1972  for (;;)
1972        case OP_HSPACE_EXTRA + OP_TYPEMINUPTO:        case OP_HSPACE_EXTRA + OP_TYPEMINUPTO:
1973        case OP_HSPACE_EXTRA + OP_TYPEPOSUPTO:        case OP_HSPACE_EXTRA + OP_TYPEPOSUPTO:
1974        if (codevalue != OP_HSPACE_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_HSPACE_EXTRA + OP_TYPEEXACT)
1975          { ADD_ACTIVE(state_offset + 4, 0); }          { ADD_ACTIVE(state_offset + 2 + IMM2_SIZE, 0); }
1976        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1977        if (clen > 0)        if (clen > 0)
1978          {          {
1979          BOOL OK;          BOOL OK;
1980          switch (c)          switch (c)
1981            {            {
1982            case 0x09:      /* HT */            HSPACE_CASES:
           case 0x20:      /* SPACE */  
           case 0xa0:      /* NBSP */  
           case 0x1680:    /* OGHAM SPACE MARK */  
           case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */  
           case 0x2000:    /* EN QUAD */  
           case 0x2001:    /* EM QUAD */  
           case 0x2002:    /* EN SPACE */  
           case 0x2003:    /* EM SPACE */  
           case 0x2004:    /* THREE-PER-EM SPACE */  
           case 0x2005:    /* FOUR-PER-EM SPACE */  
           case 0x2006:    /* SIX-PER-EM SPACE */  
           case 0x2007:    /* FIGURE SPACE */  
           case 0x2008:    /* PUNCTUATION SPACE */  
           case 0x2009:    /* THIN SPACE */  
           case 0x200A:    /* HAIR SPACE */  
           case 0x202f:    /* NARROW NO-BREAK SPACE */  
           case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */  
           case 0x3000:    /* IDEOGRAPHIC SPACE */  
1983            OK = TRUE;            OK = TRUE;
1984            break;            break;
1985    
# Line 1922  for (;;) Line 1996  for (;;)
1996              next_active_state--;              next_active_state--;
1997              }              }
1998            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
1999              { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }              { ADD_NEW_DATA(-(state_offset + 2 + IMM2_SIZE), 0, 0); }
2000            else            else
2001              { ADD_NEW_DATA(-state_offset, count, 0); }              { ADD_NEW_DATA(-state_offset, count, 0); }
2002            }            }
# Line 1941  for (;;) Line 2015  for (;;)
2015        break;        break;
2016    
2017        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2018        case OP_CHARNC:        case OP_CHARI:
2019        if (clen == 0) break;        if (clen == 0) break;
2020    
2021  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2022        if (utf8)        if (utf)
2023          {          {
2024          if (c == d) { ADD_NEW(state_offset + dlen + 1, 0); } else          if (c == d) { ADD_NEW(state_offset + dlen + 1, 0); } else
2025            {            {
2026            unsigned int othercase;            unsigned int othercase;
2027            if (c < 128) othercase = fcc[c]; else            if (c < 128)
2028                othercase = fcc[c];
2029            /* If we have Unicode property support, we can use it to test the            else
2030            other case of the character. */              /* If we have Unicode property support, we can use it to test the
2031                other case of the character. */
2032  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2033            othercase = UCD_OTHERCASE(c);              othercase = UCD_OTHERCASE(c);
2034  #else  #else
2035            othercase = NOTACHAR;              othercase = NOTACHAR;
2036  #endif  #endif
2037    
2038            if (d == othercase) { ADD_NEW(state_offset + dlen + 1, 0); }            if (d == othercase) { ADD_NEW(state_offset + dlen + 1, 0); }
2039            }            }
2040          }          }
2041        else        else
2042  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2043          /* Not UTF mode */
       /* Non-UTF-8 mode */  
2044          {          {
2045          if (lcc[c] == lcc[d]) { ADD_NEW(state_offset + 2, 0); }          if (TABLE_GET(c, lcc, c) == TABLE_GET(d, lcc, d))
2046              { ADD_NEW(state_offset + 2, 0); }
2047          }          }
2048        break;        break;
2049    
# Line 1981  for (;;) Line 2055  for (;;)
2055        to wait for them to pass before continuing. */        to wait for them to pass before continuing. */
2056    
2057        case OP_EXTUNI:        case OP_EXTUNI:
2058        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)        if (clen > 0)
2059          {          {
2060          const uschar *nptr = ptr + clen;          int lgb, rgb;
2061            const pcre_uchar *nptr = ptr + clen;
2062          int ncount = 0;          int ncount = 0;
2063            lgb = UCD_GRAPHBREAK(c);
2064          while (nptr < end_subject)          while (nptr < end_subject)
2065            {            {
2066            int nclen = 1;            dlen = 1;
2067            GETCHARLEN(c, nptr, nclen);            if (!utf) d = *nptr; else { GETCHARLEN(d, nptr, dlen); }
2068            if (UCD_CATEGORY(c) != ucp_M) break;            rgb = UCD_GRAPHBREAK(d);
2069              if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
2070            ncount++;            ncount++;
2071            nptr += nclen;            lgb = rgb;
2072              nptr += dlen;
2073            }            }
2074            if (nptr >= end_subject && (md->moptions & PCRE_PARTIAL_HARD) != 0)
2075                reset_could_continue = TRUE;
2076          ADD_NEW_DATA(-(state_offset + 1), 0, ncount);          ADD_NEW_DATA(-(state_offset + 1), 0, ncount);
2077          }          }
2078        break;        break;
# Line 2006  for (;;) Line 2086  for (;;)
2086        case OP_ANYNL:        case OP_ANYNL:
2087        if (clen > 0) switch(c)        if (clen > 0) switch(c)
2088          {          {
2089          case 0x000b:          case CHAR_VT:
2090          case 0x000c:          case CHAR_FF:
2091          case 0x0085:          case CHAR_NEL:
2092    #ifndef EBCDIC
2093          case 0x2028:          case 0x2028:
2094          case 0x2029:          case 0x2029:
2095    #endif  /* Not EBCDIC */
2096          if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;          if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
2097    
2098          case 0x000a:          case CHAR_LF:
2099          ADD_NEW(state_offset + 1, 0);          ADD_NEW(state_offset + 1, 0);
2100          break;          break;
2101    
2102          case 0x000d:          case CHAR_CR:
2103          if (ptr + 1 < end_subject && ptr[1] == 0x0a)          if (ptr + 1 >= end_subject)
2104              {
2105              ADD_NEW(state_offset + 1, 0);
2106              if ((md->moptions & PCRE_PARTIAL_HARD) != 0)
2107                reset_could_continue = TRUE;
2108              }
2109            else if (ptr[1] == CHAR_LF)
2110            {            {
2111            ADD_NEW_DATA(-(state_offset + 1), 0, 1);            ADD_NEW_DATA(-(state_offset + 1), 0, 1);
2112            }            }
# Line 2034  for (;;) Line 2122  for (;;)
2122        case OP_NOT_VSPACE:        case OP_NOT_VSPACE:
2123        if (clen > 0) switch(c)        if (clen > 0) switch(c)
2124          {          {
2125          case 0x000a:          VSPACE_CASES:
         case 0x000b:  
         case 0x000c:  
         case 0x000d:  
         case 0x0085:  
         case 0x2028:  
         case 0x2029:  
2126          break;          break;
2127    
2128          default:          default:
# Line 2053  for (;;) Line 2135  for (;;)
2135        case OP_VSPACE:        case OP_VSPACE:
2136        if (clen > 0) switch(c)        if (clen > 0) switch(c)
2137          {          {
2138          case 0x000a:          VSPACE_CASES:
         case 0x000b:  
         case 0x000c:  
         case 0x000d:  
         case 0x0085:  
         case 0x2028:  
         case 0x2029:  
2139          ADD_NEW(state_offset + 1, 0);          ADD_NEW(state_offset + 1, 0);
2140          break;          break;
2141    
2142          default: break;          default:
2143            break;
2144          }          }
2145        break;        break;
2146    
# Line 2071  for (;;) Line 2148  for (;;)
2148        case OP_NOT_HSPACE:        case OP_NOT_HSPACE:
2149        if (clen > 0) switch(c)        if (clen > 0) switch(c)
2150          {          {
2151          case 0x09:      /* HT */          HSPACE_CASES:
         case 0x20:      /* SPACE */  
         case 0xa0:      /* NBSP */  
         case 0x1680:    /* OGHAM SPACE MARK */  
         case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */  
         case 0x2000:    /* EN QUAD */  
         case 0x2001:    /* EM QUAD */  
         case 0x2002:    /* EN SPACE */  
         case 0x2003:    /* EM SPACE */  
         case 0x2004:    /* THREE-PER-EM SPACE */  
         case 0x2005:    /* FOUR-PER-EM SPACE */  
         case 0x2006:    /* SIX-PER-EM SPACE */  
         case 0x2007:    /* FIGURE SPACE */  
         case 0x2008:    /* PUNCTUATION SPACE */  
         case 0x2009:    /* THIN SPACE */  
         case 0x200A:    /* HAIR SPACE */  
         case 0x202f:    /* NARROW NO-BREAK SPACE */  
         case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */  
         case 0x3000:    /* IDEOGRAPHIC SPACE */  
2152          break;          break;
2153    
2154          default:          default:
# Line 2102  for (;;) Line 2161  for (;;)
2161        case OP_HSPACE:        case OP_HSPACE:
2162        if (clen > 0) switch(c)        if (clen > 0) switch(c)
2163          {          {
2164          case 0x09:      /* HT */          HSPACE_CASES:
         case 0x20:      /* SPACE */  
         case 0xa0:      /* NBSP */  
         case 0x1680:    /* OGHAM SPACE MARK */  
         case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */  
         case 0x2000:    /* EN QUAD */  
         case 0x2001:    /* EM QUAD */  
         case 0x2002:    /* EN SPACE */  
         case 0x2003:    /* EM SPACE */  
         case 0x2004:    /* THREE-PER-EM SPACE */  
         case 0x2005:    /* FOUR-PER-EM SPACE */  
         case 0x2006:    /* SIX-PER-EM SPACE */  
         case 0x2007:    /* FIGURE SPACE */  
         case 0x2008:    /* PUNCTUATION SPACE */  
         case 0x2009:    /* THIN SPACE */  
         case 0x200A:    /* HAIR SPACE */  
         case 0x202f:    /* NARROW NO-BREAK SPACE */  
         case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */  
         case 0x3000:    /* IDEOGRAPHIC SPACE */  
2165          ADD_NEW(state_offset + 1, 0);          ADD_NEW(state_offset + 1, 0);
2166          break;          break;
2167    
2168            default:
2169            break;
2170          }          }
2171        break;        break;
2172    
2173        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2174        /* Match a negated single character. This is only used for one-byte        /* Match a negated single character casefully. */
       characters, that is, we know that d < 256. The character we are  
       checking (c) can be multibyte. */  
2175    
2176        case OP_NOT:        case OP_NOT:
2177          if (clen > 0 && c != d) { ADD_NEW(state_offset + dlen + 1, 0); }
2178          break;
2179    
2180          /*-----------------------------------------------------------------*/
2181          /* Match a negated single character caselessly. */
2182    
2183          case OP_NOTI:
2184        if (clen > 0)        if (clen > 0)
2185          {          {
2186          unsigned int otherd = ((ims & PCRE_CASELESS) != 0)? fcc[d] : d;          unsigned int otherd;
2187          if (c != d && c != otherd) { ADD_NEW(state_offset + dlen + 1, 0); }  #ifdef SUPPORT_UTF
2188            if (utf && d >= 128)
2189              {
2190    #ifdef SUPPORT_UCP
2191              otherd = UCD_OTHERCASE(d);
2192    #endif  /* SUPPORT_UCP */
2193              }
2194            else
2195    #endif  /* SUPPORT_UTF */
2196            otherd = TABLE_GET(d, fcc, d);
2197            if (c != d && c != otherd)
2198              { ADD_NEW(state_offset + dlen + 1, 0); }
2199          }          }
2200        break;        break;
2201    
2202        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2203          case OP_PLUSI:
2204          case OP_MINPLUSI:
2205          case OP_POSPLUSI:
2206          case OP_NOTPLUSI:
2207          case OP_NOTMINPLUSI:
2208          case OP_NOTPOSPLUSI:
2209          caseless = TRUE;
2210          codevalue -= OP_STARI - OP_STAR;
2211    
2212          /* Fall through */
2213        case OP_PLUS:        case OP_PLUS:
2214        case OP_MINPLUS:        case OP_MINPLUS:
2215        case OP_POSPLUS:        case OP_POSPLUS:
# Line 2151  for (;;) Line 2221  for (;;)
2221        if (clen > 0)        if (clen > 0)
2222          {          {
2223          unsigned int otherd = NOTACHAR;          unsigned int otherd = NOTACHAR;
2224          if ((ims & PCRE_CASELESS) != 0)          if (caseless)
2225            {            {
2226  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2227            if (utf8 && d >= 128)            if (utf && d >= 128)
2228              {              {
2229  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2230              otherd = UCD_OTHERCASE(d);              otherd = UCD_OTHERCASE(d);
2231  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2232              }              }
2233            else            else
2234  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2235            otherd = fcc[d];            otherd = TABLE_GET(d, fcc, d);
2236            }            }
2237          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
2238            {            {
# Line 2179  for (;;) Line 2249  for (;;)
2249        break;        break;
2250    
2251        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2252          case OP_QUERYI:
2253          case OP_MINQUERYI:
2254          case OP_POSQUERYI:
2255          case OP_NOTQUERYI:
2256          case OP_NOTMINQUERYI:
2257          case OP_NOTPOSQUERYI:
2258          caseless = TRUE;
2259          codevalue -= OP_STARI - OP_STAR;
2260          /* Fall through */
2261        case OP_QUERY:        case OP_QUERY:
2262        case OP_MINQUERY:        case OP_MINQUERY:
2263        case OP_POSQUERY:        case OP_POSQUERY:
# Line 2189  for (;;) Line 2268  for (;;)
2268        if (clen > 0)        if (clen > 0)
2269          {          {
2270          unsigned int otherd = NOTACHAR;          unsigned int otherd = NOTACHAR;
2271          if ((ims & PCRE_CASELESS) != 0)          if (caseless)
2272            {            {
2273  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2274            if (utf8 && d >= 128)            if (utf && d >= 128)
2275              {              {
2276  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2277              otherd = UCD_OTHERCASE(d);              otherd = UCD_OTHERCASE(d);
2278  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2279              }              }
2280            else            else
2281  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2282            otherd = fcc[d];            otherd = TABLE_GET(d, fcc, d);
2283            }            }
2284          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
2285            {            {
# Line 2215  for (;;) Line 2294  for (;;)
2294        break;        break;
2295    
2296        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2297          case OP_STARI:
2298          case OP_MINSTARI:
2299          case OP_POSSTARI:
2300          case OP_NOTSTARI:
2301          case OP_NOTMINSTARI:
2302          case OP_NOTPOSSTARI:
2303          caseless = TRUE;
2304          codevalue -= OP_STARI - OP_STAR;
2305          /* Fall through */
2306        case OP_STAR:        case OP_STAR:
2307        case OP_MINSTAR:        case OP_MINSTAR:
2308        case OP_POSSTAR:        case OP_POSSTAR:
# Line 2225  for (;;) Line 2313  for (;;)
2313        if (clen > 0)        if (clen > 0)
2314          {          {
2315          unsigned int otherd = NOTACHAR;          unsigned int otherd = NOTACHAR;
2316          if ((ims & PCRE_CASELESS) != 0)          if (caseless)
2317            {            {
2318  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2319            if (utf8 && d >= 128)            if (utf && d >= 128)
2320              {              {
2321  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2322              otherd = UCD_OTHERCASE(d);              otherd = UCD_OTHERCASE(d);
2323  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2324              }              }
2325            else            else
2326  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2327            otherd = fcc[d];            otherd = TABLE_GET(d, fcc, d);
2328            }            }
2329          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
2330            {            {
# Line 2251  for (;;) Line 2339  for (;;)
2339        break;        break;
2340    
2341        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2342          case OP_EXACTI:
2343          case OP_NOTEXACTI:
2344          caseless = TRUE;
2345          codevalue -= OP_STARI - OP_STAR;
2346          /* Fall through */
2347        case OP_EXACT:        case OP_EXACT:
2348        case OP_NOTEXACT:        case OP_NOTEXACT:
2349        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
2350        if (clen > 0)        if (clen > 0)
2351          {          {
2352          unsigned int otherd = NOTACHAR;          unsigned int otherd = NOTACHAR;
2353          if ((ims & PCRE_CASELESS) != 0)          if (caseless)
2354            {            {
2355  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2356            if (utf8 && d >= 128)            if (utf && d >= 128)
2357              {              {
2358  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2359              otherd = UCD_OTHERCASE(d);              otherd = UCD_OTHERCASE(d);
2360  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2361              }              }
2362            else            else
2363  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2364            otherd = fcc[d];            otherd = TABLE_GET(d, fcc, d);
2365            }            }
2366          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
2367            {            {
2368            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
2369              { ADD_NEW(state_offset + dlen + 3, 0); }              { ADD_NEW(state_offset + dlen + 1 + IMM2_SIZE, 0); }
2370            else            else
2371              { ADD_NEW(state_offset, count); }              { ADD_NEW(state_offset, count); }
2372            }            }
# Line 2281  for (;;) Line 2374  for (;;)
2374        break;        break;
2375    
2376        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2377          case OP_UPTOI:
2378          case OP_MINUPTOI:
2379          case OP_POSUPTOI:
2380          case OP_NOTUPTOI:
2381          case OP_NOTMINUPTOI:
2382          case OP_NOTPOSUPTOI:
2383          caseless = TRUE;
2384          codevalue -= OP_STARI - OP_STAR;
2385          /* Fall through */
2386        case OP_UPTO:        case OP_UPTO:
2387        case OP_MINUPTO:        case OP_MINUPTO:
2388        case OP_POSUPTO:        case OP_POSUPTO:
2389        case OP_NOTUPTO:        case OP_NOTUPTO:
2390        case OP_NOTMINUPTO:        case OP_NOTMINUPTO:
2391        case OP_NOTPOSUPTO:        case OP_NOTPOSUPTO:
2392        ADD_ACTIVE(state_offset + dlen + 3, 0);        ADD_ACTIVE(state_offset + dlen + 1 + IMM2_SIZE, 0);
2393        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
2394        if (clen > 0)        if (clen > 0)
2395          {          {
2396          unsigned int otherd = NOTACHAR;          unsigned int otherd = NOTACHAR;
2397          if ((ims & PCRE_CASELESS) != 0)          if (caseless)
2398            {            {
2399  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2400            if (utf8 && d >= 128)            if (utf && d >= 128)
2401              {              {
2402  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2403              otherd = UCD_OTHERCASE(d);              otherd = UCD_OTHERCASE(d);
2404  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2405              }              }
2406            else            else
2407  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2408            otherd = fcc[d];            otherd = TABLE_GET(d, fcc, d);
2409            }            }
2410          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
2411            {            {
# Line 2313  for (;;) Line 2415  for (;;)
2415              next_active_state--;              next_active_state--;
2416              }              }
2417            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
2418              { ADD_NEW(state_offset + dlen + 3, 0); }              { ADD_NEW(state_offset + dlen + 1 + IMM2_SIZE, 0); }
2419            else            else
2420              { ADD_NEW(state_offset, count); }              { ADD_NEW(state_offset, count); }
2421            }            }
# Line 2330  for (;;) Line 2432  for (;;)
2432          {          {
2433          BOOL isinclass = FALSE;          BOOL isinclass = FALSE;
2434          int next_state_offset;          int next_state_offset;
2435          const uschar *ecode;          const pcre_uchar *ecode;
2436    
2437          /* For a simple class, there is always just a 32-byte table, and we          /* For a simple class, there is always just a 32-byte table, and we
2438          can set isinclass from it. */          can set isinclass from it. */
2439    
2440          if (codevalue != OP_XCLASS)          if (codevalue != OP_XCLASS)
2441            {            {
2442            ecode = code + 33;            ecode = code + 1 + (32 / sizeof(pcre_uchar));
2443            if (clen > 0)            if (clen > 0)
2444              {              {
2445              isinclass = (c > 255)? (codevalue == OP_NCLASS) :              isinclass = (c > 255)? (codevalue == OP_NCLASS) :
2446                ((code[1 + c/8] & (1 << (c&7))) != 0);                ((((pcre_uint8 *)(code + 1))[c/8] & (1 << (c&7))) != 0);
2447              }              }
2448            }            }
2449    
# Line 2352  for (;;) Line 2454  for (;;)
2454          else          else
2455           {           {
2456           ecode = code + GET(code, 1);           ecode = code + GET(code, 1);
2457           if (clen > 0) isinclass = _pcre_xclass(c, code + 1 + LINK_SIZE);           if (clen > 0) isinclass = PRIV(xclass)(c, code + 1 + LINK_SIZE, utf);
2458           }           }
2459    
2460          /* At this point, isinclass is set for all kinds of class, and ecode          /* At this point, isinclass is set for all kinds of class, and ecode
# Line 2386  for (;;) Line 2488  for (;;)
2488            case OP_CRMINRANGE:            case OP_CRMINRANGE:
2489            count = current_state->count;  /* Already matched */            count = current_state->count;  /* Already matched */
2490            if (count >= GET2(ecode, 1))            if (count >= GET2(ecode, 1))
2491              { ADD_ACTIVE(next_state_offset + 5, 0); }              { ADD_ACTIVE(next_state_offset + 1 + 2 * IMM2_SIZE, 0); }
2492            if (isinclass)            if (isinclass)
2493              {              {
2494              int max = GET2(ecode, 3);              int max = GET2(ecode, 1 + IMM2_SIZE);
2495              if (++count >= max && max != 0)   /* Max 0 => no limit */              if (++count >= max && max != 0)   /* Max 0 => no limit */
2496                { ADD_NEW(next_state_offset + 5, 0); }                { ADD_NEW(next_state_offset + 1 + 2 * IMM2_SIZE, 0); }
2497              else              else
2498                { ADD_NEW(state_offset, count); }                { ADD_NEW(state_offset, count); }
2499              }              }
# Line 2422  for (;;) Line 2524  for (;;)
2524          int rc;          int rc;
2525          int local_offsets[2];          int local_offsets[2];
2526          int local_workspace[1000];          int local_workspace[1000];
2527          const uschar *endasscode = code + GET(code, 1);          const pcre_uchar *endasscode = code + GET(code, 1);
2528    
2529          while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);          while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);
2530    
# Line 2435  for (;;) Line 2537  for (;;)
2537            sizeof(local_offsets)/sizeof(int),    /* size of same */            sizeof(local_offsets)/sizeof(int),    /* size of same */
2538            local_workspace,                      /* workspace vector */            local_workspace,                      /* workspace vector */
2539            sizeof(local_workspace)/sizeof(int),  /* size of same */            sizeof(local_workspace)/sizeof(int),  /* size of same */
2540            ims,                                  /* the current ims flags */            rlevel);                              /* function recursion level */
           rlevel,                               /* function recursion level */  
           recursing);                           /* pass on regex recursion */  
2541    
2542          if (rc == PCRE_ERROR_DFA_UITEM) return rc;          if (rc == PCRE_ERROR_DFA_UITEM) return rc;
2543          if ((rc >= 0) == (codevalue == OP_ASSERT || codevalue == OP_ASSERTBACK))          if ((rc >= 0) == (codevalue == OP_ASSERT || codevalue == OP_ASSERTBACK))
# Line 2461  for (;;) Line 2561  for (;;)
2561          if (code[LINK_SIZE+1] == OP_CALLOUT)          if (code[LINK_SIZE+1] == OP_CALLOUT)
2562            {            {
2563            rrc = 0;            rrc = 0;
2564            if (pcre_callout != NULL)            if (PUBL(callout) != NULL)
2565              {              {
2566              pcre_callout_block cb;              PUBL(callout_block) cb;
2567              cb.version          = 1;   /* Version 1 of the callout block */              cb.version          = 1;   /* Version 1 of the callout block */
2568              cb.callout_number   = code[LINK_SIZE+2];              cb.callout_number   = code[LINK_SIZE+2];
2569              cb.offset_vector    = offsets;              cb.offset_vector    = offsets;
2570    #ifdef COMPILE_PCRE8
2571              cb.subject          = (PCRE_SPTR)start_subject;              cb.subject          = (PCRE_SPTR)start_subject;
2572    #else
2573                cb.subject          = (PCRE_SPTR16)start_subject;
2574    #endif
2575              cb.subject_length   = (int)(end_subject - start_subject);              cb.subject_length   = (int)(end_subject - start_subject);
2576              cb.start_match      = (int)(current_subject - start_subject);              cb.start_match      = (int)(current_subject - start_subject);
2577              cb.current_position = (int)(ptr - start_subject);              cb.current_position = (int)(ptr - start_subject);
# Line 2476  for (;;) Line 2580  for (;;)
2580              cb.capture_top      = 1;              cb.capture_top      = 1;
2581              cb.capture_last     = -1;              cb.capture_last     = -1;
2582              cb.callout_data     = md->callout_data;              cb.callout_data     = md->callout_data;
2583              if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */              cb.mark             = NULL;   /* No (*MARK) support */
2584                if ((rrc = (*PUBL(callout))(&cb)) < 0) return rrc;   /* Abandon */
2585              }              }
2586            if (rrc > 0) break;                      /* Fail this thread */            if (rrc > 0) break;                      /* Fail this thread */
2587            code += _pcre_OP_lengths[OP_CALLOUT];    /* Skip callout data */            code += PRIV(OP_lengths)[OP_CALLOUT];    /* Skip callout data */
2588            }            }
2589    
2590          condcode = code[LINK_SIZE+1];          condcode = code[LINK_SIZE+1];
# Line 2500  for (;;) Line 2605  for (;;)
2605    
2606          else if (condcode == OP_RREF || condcode == OP_NRREF)          else if (condcode == OP_RREF || condcode == OP_NRREF)
2607            {            {
2608            int value = GET2(code, LINK_SIZE+2);            int value = GET2(code, LINK_SIZE + 2);
2609            if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;            if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;
2610            if (recursing > 0)            if (md->recursive != NULL)
2611              { ADD_ACTIVE(state_offset + LINK_SIZE + 4, 0); }              { ADD_ACTIVE(state_offset + LINK_SIZE + 2 + IMM2_SIZE, 0); }
2612            else { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }            else { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
2613            }            }
2614    
# Line 2512  for (;;) Line 2617  for (;;)
2617          else          else
2618            {            {
2619            int rc;            int rc;
2620            const uschar *asscode = code + LINK_SIZE + 1;            const pcre_uchar *asscode = code + LINK_SIZE + 1;
2621            const uschar *endasscode = asscode + GET(asscode, 1);            const pcre_uchar *endasscode = asscode + GET(asscode, 1);
2622    
2623            while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);            while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);
2624    
# Line 2526  for (;;) Line 2631  for (;;)
2631              sizeof(local_offsets)/sizeof(int),    /* size of same */              sizeof(local_offsets)/sizeof(int),    /* size of same */
2632              local_workspace,                      /* workspace vector */              local_workspace,                      /* workspace vector */
2633              sizeof(local_workspace)/sizeof(int),  /* size of same */              sizeof(local_workspace)/sizeof(int),  /* size of same */
2634              ims,                                  /* the current ims flags */              rlevel);                              /* function recursion level */
             rlevel,                               /* function recursion level */  
             recursing);                           /* pass on regex recursion */  
2635    
2636            if (rc == PCRE_ERROR_DFA_UITEM) return rc;            if (rc == PCRE_ERROR_DFA_UITEM) return rc;
2637            if ((rc >= 0) ==            if ((rc >= 0) ==
# Line 2543  for (;;) Line 2646  for (;;)
2646        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2647        case OP_RECURSE:        case OP_RECURSE:
2648          {          {
2649            dfa_recursion_info *ri;
2650          int local_offsets[1000];          int local_offsets[1000];
2651          int local_workspace[1000];          int local_workspace[1000];
2652            const pcre_uchar *callpat = start_code + GET(code, 1);
2653            int recno = (callpat == md->start_code)? 0 :
2654              GET2(callpat, 1 + LINK_SIZE);
2655          int rc;          int rc;
2656    
2657          DPRINTF(("%.*sStarting regex recursion %d\n", rlevel*2-2, SP,          DPRINTF(("%.*sStarting regex recursion\n", rlevel*2-2, SP));
2658            recursing + 1));  
2659            /* Check for repeating a recursion without advancing the subject
2660            pointer. This should catch convoluted mutual recursions. (Some simple
2661            cases are caught at compile time.) */
2662    
2663            for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
2664              if (recno == ri->group_num && ptr == ri->subject_position)
2665                return PCRE_ERROR_RECURSELOOP;
2666    
2667            /* Remember this recursion and where we started it so as to
2668            catch infinite loops. */
2669    
2670            new_recursive.group_num = recno;
2671            new_recursive.subject_position = ptr;
2672            new_recursive.prevrec = md->recursive;
2673            md->recursive = &new_recursive;
2674    
2675          rc = internal_dfa_exec(          rc = internal_dfa_exec(
2676            md,                                   /* fixed match data */            md,                                   /* fixed match data */
2677            start_code + GET(code, 1),            /* this subexpression's code */            callpat,                              /* this subexpression's code */
2678            ptr,                                  /* where we currently are */            ptr,                                  /* where we currently are */
2679            (int)(ptr - start_subject),           /* start offset */            (int)(ptr - start_subject),           /* start offset */
2680            local_offsets,                        /* offset vector */            local_offsets,                        /* offset vector */
2681            sizeof(local_offsets)/sizeof(int),    /* size of same */            sizeof(local_offsets)/sizeof(int),    /* size of same */
2682            local_workspace,                      /* workspace vector */            local_workspace,                      /* workspace vector */
2683            sizeof(local_workspace)/sizeof(int),  /* size of same */            sizeof(local_workspace)/sizeof(int),  /* size of same */
2684            ims,                                  /* the current ims flags */            rlevel);                              /* function recursion level */
2685            rlevel,                               /* function recursion level */  
2686            recursing + 1);                       /* regex recurse level */          md->recursive = new_recursive.prevrec;  /* Done this recursion */
2687    
2688          DPRINTF(("%.*sReturn from regex recursion %d: rc=%d\n", rlevel*2-2, SP,          DPRINTF(("%.*sReturn from regex recursion: rc=%d\n", rlevel*2-2, SP,
2689            recursing + 1, rc));            rc));
2690    
2691          /* Ran out of internal offsets */          /* Ran out of internal offsets */
2692    
# Line 2578  for (;;) Line 2700  for (;;)
2700            {            {
2701            for (rc = rc*2 - 2; rc >= 0; rc -= 2)            for (rc = rc*2 - 2; rc >= 0; rc -= 2)
2702              {              {
             const uschar *p = start_subject + local_offsets[rc];  
             const uschar *pp = start_subject + local_offsets[rc+1];  
2703              int charcount = local_offsets[rc+1] - local_offsets[rc];              int charcount = local_offsets[rc+1] - local_offsets[rc];
2704              while (p < pp) if ((*p++ & 0xc0) == 0x80) charcount--;  #ifdef SUPPORT_UTF
2705                if (utf)
2706                  {
2707                  const pcre_uchar *p = start_subject + local_offsets[rc];
2708                  const pcre_uchar *pp = start_subject + local_offsets[rc+1];
2709                  while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--;
2710                  }
2711    #endif
2712              if (charcount > 0)              if (charcount > 0)
2713                {                {
2714                ADD_NEW_DATA(-(state_offset + LINK_SIZE + 1), 0, (charcount - 1));                ADD_NEW_DATA(-(state_offset + LINK_SIZE + 1), 0, (charcount - 1));
# Line 2597  for (;;) Line 2724  for (;;)
2724        break;        break;
2725    
2726        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2727          case OP_BRAPOS:
2728          case OP_SBRAPOS:
2729          case OP_CBRAPOS:
2730          case OP_SCBRAPOS:
2731          case OP_BRAPOSZERO:
2732            {
2733            int charcount, matched_count;
2734            const pcre_uchar *local_ptr = ptr;
2735            BOOL allow_zero;
2736    
2737            if (codevalue == OP_BRAPOSZERO)
2738              {
2739              allow_zero = TRUE;
2740              codevalue = *(++code);  /* Codevalue will be one of above BRAs */
2741              }
2742            else allow_zero = FALSE;
2743    
2744            /* Loop to match the subpattern as many times as possible as if it were
2745            a complete pattern. */
2746    
2747            for (matched_count = 0;; matched_count++)
2748              {
2749              int local_offsets[2];
2750              int local_workspace[1000];
2751    
2752              int rc = internal_dfa_exec(
2753                md,                                   /* fixed match data */
2754                code,                                 /* this subexpression's code */
2755                local_ptr,                            /* where we currently are */
2756                (int)(ptr - start_subject),           /* start offset */
2757                local_offsets,                        /* offset vector */
2758                sizeof(local_offsets)/sizeof(int),    /* size of same */
2759                local_workspace,                      /* workspace vector */
2760                sizeof(local_workspace)/sizeof(int),  /* size of same */
2761                rlevel);                              /* function recursion level */
2762    
2763              /* Failed to match */
2764    
2765              if (rc < 0)
2766                {
2767                if (rc != PCRE_ERROR_NOMATCH) return rc;
2768                break;
2769                }
2770    
2771              /* Matched: break the loop if zero characters matched. */
2772    
2773              charcount = local_offsets[1] - local_offsets[0];
2774              if (charcount == 0) break;
2775              local_ptr += charcount;    /* Advance temporary position ptr */
2776              }
2777    
2778            /* At this point we have matched the subpattern matched_count
2779            times, and local_ptr is pointing to the character after the end of the
2780            last match. */
2781    
2782            if (matched_count > 0 || allow_zero)
2783              {
2784              const pcre_uchar *end_subpattern = code;
2785              int next_state_offset;
2786    
2787              do { end_subpattern += GET(end_subpattern, 1); }
2788                while (*end_subpattern == OP_ALT);
2789              next_state_offset =
2790                (int)(end_subpattern - start_code + LINK_SIZE + 1);
2791    
2792              /* Optimization: if there are no more active states, and there
2793              are no new states yet set up, then skip over the subject string
2794              right here, to save looping. Otherwise, set up the new state to swing
2795              into action when the end of the matched substring is reached. */
2796    
2797              if (i + 1 >= active_count && new_count == 0)
2798                {
2799                ptr = local_ptr;
2800                clen = 0;
2801                ADD_NEW(next_state_offset, 0);
2802                }
2803              else
2804                {
2805                const pcre_uchar *p = ptr;
2806                const pcre_uchar *pp = local_ptr;
2807                charcount = (int)(pp - p);
2808    #ifdef SUPPORT_UTF
2809                if (utf) while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--;
2810    #endif
2811                ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1));
2812                }
2813              }
2814            }
2815          break;
2816    
2817          /*-----------------------------------------------------------------*/
2818        case OP_ONCE:        case OP_ONCE:
2819          case OP_ONCE_NC:
2820          {          {
2821          int local_offsets[2];          int local_offsets[2];
2822          int local_workspace[1000];          int local_workspace[1000];
# Line 2611  for (;;) Line 2830  for (;;)
2830            sizeof(local_offsets)/sizeof(int),    /* size of same */            sizeof(local_offsets)/sizeof(int),    /* size of same */
2831            local_workspace,                      /* workspace vector */            local_workspace,                      /* workspace vector */
2832            sizeof(local_workspace)/sizeof(int),  /* size of same */            sizeof(local_workspace)/sizeof(int),  /* size of same */
2833            ims,                                  /* the current ims flags */            rlevel);                              /* function recursion level */
           rlevel,                               /* function recursion level */  
           recursing);                           /* pass on regex recursion */  
2834    
2835          if (rc >= 0)          if (rc >= 0)
2836            {            {
2837            const uschar *end_subpattern = code;            const pcre_uchar *end_subpattern = code;
2838            int charcount = local_offsets[1] - local_offsets[0];            int charcount = local_offsets[1] - local_offsets[0];
2839            int next_state_offset, repeat_state_offset;            int next_state_offset, repeat_state_offset;
2840    
# Line 2647  for (;;) Line 2864  for (;;)
2864            /* Optimization: if there are no more active states, and there            /* Optimization: if there are no more active states, and there
2865            are no new states yet set up, then skip over the subject string            are no new states yet set up, then skip over the subject string
2866            right here, to save looping. Otherwise, set up the new state to swing            right here, to save looping. Otherwise, set up the new state to swing
2867            into action when the end of the substring is reached. */            into action when the end of the matched substring is reached. */
2868    
2869            else if (i + 1 >= active_count && new_count == 0)            else if (i + 1 >= active_count && new_count == 0)
2870              {              {
# Line 2670  for (;;) Line 2887  for (;;)
2887              }              }
2888            else            else
2889              {              {
2890              const uschar *p = start_subject + local_offsets[0];  #ifdef SUPPORT_UTF
2891              const uschar *pp = start_subject + local_offsets[1];              if (utf)
2892              while (p < pp) if ((*p++ & 0xc0) == 0x80) charcount--;                {
2893                  const pcre_uchar *p = start_subject + local_offsets[0];
2894                  const pcre_uchar *pp = start_subject + local_offsets[1];
2895                  while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--;
2896                  }
2897    #endif
2898              ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1));              ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1));
2899              if (repeat_state_offset >= 0)              if (repeat_state_offset >= 0)
2900                { ADD_NEW_DATA(-repeat_state_offset, 0, (charcount - 1)); }                { ADD_NEW_DATA(-repeat_state_offset, 0, (charcount - 1)); }
2901              }              }
   
2902            }            }
2903          else if (rc != PCRE_ERROR_NOMATCH) return rc;          else if (rc != PCRE_ERROR_NOMATCH) return rc;
2904          }          }
# Line 2689  for (;;) Line 2910  for (;;)
2910    
2911        case OP_CALLOUT:        case OP_CALLOUT:
2912        rrc = 0;        rrc = 0;
2913        if (pcre_callout != NULL)        if (PUBL(callout) != NULL)
2914          {          {
2915          pcre_callout_block cb;          PUBL(callout_block) cb;
2916          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 1;   /* Version 1 of the callout block */
2917          cb.callout_number   = code[1];          cb.callout_number   = code[1];
2918          cb.offset_vector    = offsets;          cb.offset_vector    = offsets;
2919    #ifdef COMPILE_PCRE8
2920          cb.subject          = (PCRE_SPTR)start_subject;          cb.subject          = (PCRE_SPTR)start_subject;
2921    #else
2922            cb.subject          = (PCRE_SPTR16)start_subject;
2923    #endif
2924          cb.subject_length   = (int)(end_subject - start_subject);          cb.subject_length   = (int)(end_subject - start_subject);
2925          cb.start_match      = (int)(current_subject - start_subject);          cb.start_match      = (int)(current_subject - start_subject);
2926          cb.current_position = (int)(ptr - start_subject);          cb.current_position = (int)(ptr - start_subject);
# Line 2704  for (;;) Line 2929  for (;;)
2929          cb.capture_top      = 1;          cb.capture_top      = 1;
2930          cb.capture_last     = -1;          cb.capture_last     = -1;
2931          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
2932          if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */          cb.mark             = NULL;   /* No (*MARK) support */
2933            if ((rrc = (*PUBL(callout))(&cb)) < 0) return rrc;   /* Abandon */
2934          }          }
2935        if (rrc == 0)        if (rrc == 0)
2936          { ADD_ACTIVE(state_offset + _pcre_OP_lengths[OP_CALLOUT], 0); }          { ADD_ACTIVE(state_offset + PRIV(OP_lengths)[OP_CALLOUT], 0); }
2937        break;        break;
2938    
2939    
# Line 2736  for (;;) Line 2962  for (;;)
2962    if (new_count <= 0)    if (new_count <= 0)
2963      {      {
2964      if (rlevel == 1 &&                               /* Top level, and */      if (rlevel == 1 &&                               /* Top level, and */
2965          could_continue &&                            /* Some could go on */          could_continue &&                            /* Some could go on, and */
2966          forced_fail != workspace[1] &&               /* Not all forced fail & */          forced_fail != workspace[1] &&               /* Not all forced fail & */
2967          (                                            /* either... */          (                                            /* either... */
2968          (md->moptions & PCRE_PARTIAL_HARD) != 0      /* Hard partial */          (md->moptions & PCRE_PARTIAL_HARD) != 0      /* Hard partial */
# Line 2744  for (;;) Line 2970  for (;;)
2970          ((md->moptions & PCRE_PARTIAL_SOFT) != 0 &&  /* Soft partial and */          ((md->moptions & PCRE_PARTIAL_SOFT) != 0 &&  /* Soft partial and */
2971           match_count < 0)                            /* no matches */           match_count < 0)                            /* no matches */
2972          ) &&                                         /* And... */          ) &&                                         /* And... */
2973          ptr >= end_subject &&                     /* Reached end of subject */          (
2974          ptr > current_subject)                    /* Matched non-empty string */          partial_newline ||                           /* Either partial NL */
2975              (                                          /* or ... */
2976              ptr >= end_subject &&                /* End of subject and */
2977              ptr > md->start_used_ptr)            /* Inspected non-empty string */
2978              )
2979            )
2980        {        {
2981        if (offsetcount >= 2)        if (offsetcount >= 2)
2982          {          {
# Line 2804  Returns:          > 0 => number of match Line 3035  Returns:          > 0 => number of match
3035                   < -1 => some kind of unexpected problem                   < -1 => some kind of unexpected problem
3036  */  */
3037    
3038    #ifdef COMPILE_PCRE8
3039  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
3040  pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,  pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,
3041    const char *subject, int length, int start_offset, int options, int *offsets,    const char *subject, int length, int start_offset, int options, int *offsets,
3042    int offsetcount, int *workspace, int wscount)    int offsetcount, int *workspace, int wscount)
3043    #else
3044    PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
3045    pcre16_dfa_exec(const pcre16 *argument_re, const pcre16_extra *extra_data,
3046      PCRE_SPTR16 subject, int length, int start_offset, int options, int *offsets,
3047      int offsetcount, int *workspace, int wscount)
3048    #endif
3049  {  {
3050  real_pcre *re = (real_pcre *)argument_re;  REAL_PCRE *re = (REAL_PCRE *)argument_re;
3051  dfa_match_data match_block;  dfa_match_data match_block;
3052  dfa_match_data *md = &match_block;  dfa_match_data *md = &match_block;
3053  BOOL utf8, anchored, startline, firstline;  BOOL utf, anchored, startline, firstline;
3054  const uschar *current_subject, *end_subject, *lcc;  const pcre_uchar *current_subject, *end_subject;
   
 pcre_study_data internal_study;  
3055  const pcre_study_data *study = NULL;  const pcre_study_data *study = NULL;
 real_pcre internal_re;  
3056    
3057  const uschar *req_byte_ptr;  const pcre_uchar *req_char_ptr;
3058  const uschar *start_bits = NULL;  const pcre_uint8 *start_bits = NULL;
3059  BOOL first_byte_caseless = FALSE;  BOOL has_first_char = FALSE;
3060  BOOL req_byte_caseless = FALSE;  BOOL has_req_char = FALSE;
3061  int first_byte = -1;  pcre_uchar first_char = 0;
3062  int req_byte = -1;  pcre_uchar first_char2 = 0;
3063  int req_byte2 = -1;  pcre_uchar req_char = 0;
3064    pcre_uchar req_char2 = 0;
3065  int newline;  int newline;
3066    
3067  /* Plausibility checks */  /* Plausibility checks */
# Line 2835  if (re == NULL || subject == NULL || wor Line 3071  if (re == NULL || subject == NULL || wor
3071     (offsets == NULL && offsetcount > 0)) return PCRE_ERROR_NULL;     (offsets == NULL && offsetcount > 0)) return PCRE_ERROR_NULL;
3072  if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;  if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;
3073  if (wscount < 20) return PCRE_ERROR_DFA_WSSIZE;  if (wscount < 20) return PCRE_ERROR_DFA_WSSIZE;
3074    if (start_offset < 0 || start_offset > length) return PCRE_ERROR_BADOFFSET;
3075    
3076  /* We need to find the pointer to any study data before we test for byte  /* Check that the first field in the block is the magic number. If it is not,
3077  flipping, so we scan the extra_data block first. This may set two fields in the  return with PCRE_ERROR_BADMAGIC. However, if the magic number is equal to
3078  match block, so we must initialize them beforehand. However, the other fields  REVERSED_MAGIC_NUMBER we return with PCRE_ERROR_BADENDIANNESS, which
3079  in the match block must not be set until after the byte flipping. */  means that the pattern is likely compiled with different endianness. */
3080    
3081    if (re->magic_number != MAGIC_NUMBER)
3082      return re->magic_number == REVERSED_MAGIC_NUMBER?
3083        PCRE_ERROR_BADENDIANNESS:PCRE_ERROR_BADMAGIC;
3084    if ((re->flags & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
3085    
3086    /* If restarting after a partial match, do some sanity checks on the contents
3087    of the workspace. */
3088    
3089    if ((options & PCRE_DFA_RESTART) != 0)
3090      {
3091      if ((workspace[0] & (-2)) != 0 || workspace[1] < 1 ||
3092        workspace[1] > (wscount - 2)/INTS_PER_STATEBLOCK)
3093          return PCRE_ERROR_DFA_BADRESTART;
3094      }
3095    
3096    /* Set up study, callout, and table data */
3097    
3098  md->tables = re->tables;  md->tables = re->tables;
3099  md->callout_data = NULL;  md->callout_data = NULL;
# Line 2858  if (extra_data != NULL) Line 3112  if (extra_data != NULL)
3112      md->tables = extra_data->tables;      md->tables = extra_data->tables;
3113    }    }
3114    
 /* Check that the first field in the block is the magic number. If it is not,  
 test for a regex that was compiled on a host of opposite endianness. If this is  
 the case, flipped values are put in internal_re and internal_study if there was  
 study data too. */  
   
 if (re->magic_number != MAGIC_NUMBER)  
   {  
   re = _pcre_try_flipped(re, &internal_re, study, &internal_study);  
   if (re == NULL) return PCRE_ERROR_BADMAGIC;  
   if (study != NULL) study = &internal_study;  
   }  
   
3115  /* Set some local values */  /* Set some local values */
3116    
3117  current_subject = (const unsigned char *)subject + start_offset;  current_subject = (const pcre_uchar *)subject + start_offset;
3118  end_subject = (const unsigned char *)subject + length;  end_subject = (const pcre_uchar *)subject + length;
3119  req_byte_ptr = current_subject - 1;  req_char_ptr = current_subject - 1;
3120    
3121  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3122  utf8 = (re->options & PCRE_UTF8) != 0;  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
3123    utf = (re->options & PCRE_UTF8) != 0;
3124  #else  #else
3125  utf8 = FALSE;  utf = FALSE;
3126  #endif  #endif
3127    
3128  anchored = (options & (PCRE_ANCHORED|PCRE_DFA_RESTART)) != 0 ||  anchored = (options & (PCRE_ANCHORED|PCRE_DFA_RESTART)) != 0 ||
# Line 2887  anchored = (options & (PCRE_ANCHORED|PCR Line 3130  anchored = (options & (PCRE_ANCHORED|PCR
3130    
3131  /* The remaining fixed data for passing around. */  /* The remaining fixed data for passing around. */
3132    
3133  md->start_code = (const uschar *)argument_re +  md->start_code = (const pcre_uchar *)argument_re +
3134      re->name_table_offset + re->name_count * re->name_entry_size;      re->name_table_offset + re->name_count * re->name_entry_size;
3135  md->start_subject = (const unsigned char *)subject;  md->start_subject = (const pcre_uchar *)subject;
3136  md->end_subject = end_subject;  md->end_subject = end_subject;
3137  md->start_offset = start_offset;  md->start_offset = start_offset;
3138  md->moptions = options;  md->moptions = options;
# Line 2950  else Line 3193  else
3193  /* Check a UTF-8 string if required. Unfortunately there's no way of passing  /* Check a UTF-8 string if required. Unfortunately there's no way of passing
3194  back the character offset. */  back the character offset. */
3195    
3196  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3197  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)  if (utf && (options & PCRE_NO_UTF8_CHECK) == 0)
3198    {    {
3199    if (_pcre_valid_utf8((uschar *)subject, length) >= 0)    int erroroffset;
3200      return PCRE_ERROR_BADUTF8;    int errorcode = PRIV(valid_utf)((pcre_uchar *)subject, length, &erroroffset);
3201    if (start_offset > 0 && start_offset < length)    if (errorcode != 0)
3202      {      {
3203      int tb = ((uschar *)subject)[start_offset];      if (offsetcount >= 2)
     if (tb > 127)  
3204        {        {
3205        tb &= 0xc0;        offsets[0] = erroroffset;
3206        if (tb != 0 && tb != 0xc0) return PCRE_ERROR_BADUTF8_OFFSET;        offsets[1] = errorcode;
3207        }        }
3208        return (errorcode <= PCRE_UTF8_ERR5 && (options & PCRE_PARTIAL_HARD) != 0)?
3209          PCRE_ERROR_SHORTUTF8 : PCRE_ERROR_BADUTF8;
3210      }      }
3211      if (start_offset > 0 && start_offset < length &&
3212            NOT_FIRSTCHAR(((PCRE_PUCHAR)subject)[start_offset]))
3213        return PCRE_ERROR_BADUTF8_OFFSET;
3214    }    }
3215  #endif  #endif
3216    
# Line 2971  if (utf8 && (options & PCRE_NO_UTF8_CHEC Line 3218  if (utf8 && (options & PCRE_NO_UTF8_CHEC
3218  is a feature that makes it possible to save compiled regex and re-use them  is a feature that makes it possible to save compiled regex and re-use them
3219  in other programs later. */  in other programs later. */
3220    
3221  if (md->tables == NULL) md->tables = _pcre_default_tables;  if (md->tables == NULL) md->tables = PRIV(default_tables);
3222    
3223  /* The lower casing table and the "must be at the start of a line" flag are  /* The "must be at the start of a line" flags are used in a loop when finding
3224  used in a loop when finding where to start. */  where to start. */
3225    
 lcc = md->tables + lcc_offset;  
3226  startline = (re->flags & PCRE_STARTLINE) != 0;  startline = (re->flags & PCRE_STARTLINE) != 0;
3227  firstline = (re->options & PCRE_FIRSTLINE) != 0;  firstline = (re->options & PCRE_FIRSTLINE) != 0;
3228    
# Line 2990  if (!anchored) Line 3236  if (!anchored)
3236    {    {
3237    if ((re->flags & PCRE_FIRSTSET) != 0)    if ((re->flags & PCRE_FIRSTSET) != 0)
3238      {      {
3239      first_byte = re->first_byte & 255;      has_first_char = TRUE;
3240      if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)      first_char = first_char2 = (pcre_uchar)(re->first_char);
3241        first_byte = lcc[first_byte];      if ((re->flags & PCRE_FCH_CASELESS) != 0)
3242          {
3243          first_char2 = TABLE_GET(first_char, md->tables + fcc_offset, first_char);
3244    #if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
3245          if (utf && first_char > 127)
3246            first_char2 = UCD_OTHERCASE(first_char);
3247    #endif
3248          }
3249      }      }
3250    else    else
3251      {      {
# Line 3007  character" set. */ Line 3260  character" set. */
3260    
3261  if ((re->flags & PCRE_REQCHSET) != 0)  if ((re->flags & PCRE_REQCHSET) != 0)
3262    {    {
3263    req_byte = re->req_byte & 255;    has_req_char = TRUE;
3264    req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;    req_char = req_char2 = (pcre_uchar)(re->req_char);
3265    req_byte2 = (md->tables + fcc_offset)[req_byte];  /* case flipped */    if ((re->flags & PCRE_RCH_CASELESS) != 0)
3266        {
3267        req_char2 = TABLE_GET(req_char, md->tables + fcc_offset, req_char);
3268    #if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
3269        if (utf && req_char > 127)
3270          req_char2 = UCD_OTHERCASE(req_char);
3271    #endif
3272        }
3273    }    }
3274    
3275  /* Call the main matching function, looping for a non-anchored regex after a  /* Call the main matching function, looping for a non-anchored regex after a
# Line 3022  for (;;) Line 3282  for (;;)
3282    
3283    if ((options & PCRE_DFA_RESTART) == 0)    if ((options & PCRE_DFA_RESTART) == 0)
3284      {      {
3285      const uschar *save_end_subject = end_subject;      const pcre_uchar *save_end_subject = end_subject;
3286    
3287      /* If firstline is TRUE, the start of the match is constrained to the first      /* If firstline is TRUE, the start of the match is constrained to the first
3288      line of a multiline string. Implement this by temporarily adjusting      line of a multiline string. Implement this by temporarily adjusting
# Line 3031  for (;;) Line 3291  for (;;)
3291    
3292      if (firstline)      if (firstline)
3293        {        {
3294        USPTR t = current_subject;        PCRE_PUCHAR t = current_subject;
3295  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3296        if (utf8)        if (utf)
3297          {          {
3298          while (t < md->end_subject && !IS_NEWLINE(t))          while (t < md->end_subject && !IS_NEWLINE(t))
3299            {            {
3300            t++;            t++;
3301            while (t < end_subject && (*t & 0xc0) == 0x80) t++;            ACROSSCHAR(t < end_subject, *t, t++);
3302            }            }
3303          }          }
3304        else        else
# Line 3049  for (;;) Line 3309  for (;;)
3309    
3310      /* There are some optimizations that avoid running the match if a known      /* There are some optimizations that avoid running the match if a known
3311      starting point is not found. However, there is an option that disables      starting point is not found. However, there is an option that disables
3312      these, for testing and for ensuring that all callouts do actually occur. */      these, for testing and for ensuring that all callouts do actually occur.
3313        The option can be set in the regex by (*NO_START_OPT) or passed in
3314        match-time options. */
3315    
3316      if ((options & PCRE_NO_START_OPTIMIZE) == 0)      if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0)
3317        {        {
3318        /* Advance to a known first byte. */        /* Advance to a known first char. */
3319    
3320        if (first_byte >= 0)        if (has_first_char)
3321          {          {
3322          if (first_byte_caseless)          if (first_char != first_char2)
3323            while (current_subject < end_subject &&            while (current_subject < end_subject &&
3324                   lcc[*current_subject] != first_byte)                *current_subject != first_char && *current_subject != first_char2)
3325              current_subject++;              current_subject++;
3326          else          else
3327            while (current_subject < end_subject &&            while (current_subject < end_subject &&
3328                   *current_subject != first_byte)                   *current_subject != first_char)
3329              current_subject++;              current_subject++;
3330          }          }
3331    
# Line 3073  for (;;) Line 3335  for (;;)
3335          {          {
3336          if (current_subject > md->start_subject + start_offset)          if (current_subject > md->start_subject + start_offset)
3337            {            {
3338  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3339            if (utf8)            if (utf)
3340              {              {
3341              while (current_subject < end_subject &&              while (current_subject < end_subject &&
3342                     !WAS_NEWLINE(current_subject))                     !WAS_NEWLINE(current_subject))
3343                {                {
3344                current_subject++;                current_subject++;
3345                while(current_subject < end_subject &&                ACROSSCHAR(current_subject < end_subject, *current_subject,
3346                      (*current_subject & 0xc0) == 0x80)                  current_subject++);
                 current_subject++;  
3347                }                }
3348              }              }
3349            else            else
# Line 3109  for (;;) Line 3370  for (;;)
3370          while (current_subject < end_subject)          while (current_subject < end_subject)
3371            {            {
3372            register unsigned int c = *current_subject;            register unsigned int c = *current_subject;
3373            if ((start_bits[c/8] & (1 << (c&7))) == 0) current_subject++;  #ifndef COMPILE_PCRE8
3374              else break;            if (c > 255) c = 255;
3375    #endif
3376              if ((start_bits[c/8] & (1 << (c&7))) == 0)
3377                {
3378                current_subject++;
3379    #if defined SUPPORT_UTF && defined COMPILE_PCRE8
3380                /* In non 8-bit mode, the iteration will stop for
3381                characters > 255 at the beginning or not stop at all. */
3382                if (utf)
3383                  ACROSSCHAR(current_subject < end_subject, *current_subject,
3384                    current_subject++);
3385    #endif
3386                }
3387              else break;
3388            }            }
3389          }          }
3390        }        }
# Line 3123  for (;;) Line 3397  for (;;)
3397      disabling is explicitly requested (and of course, by the test above, this      disabling is explicitly requested (and of course, by the test above, this
3398      code is not obeyed when restarting after a partial match). */      code is not obeyed when restarting after a partial match). */
3399    
3400      if ((options & PCRE_NO_START_OPTIMIZE) == 0 &&      if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0 &&
3401          (options & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) == 0)          (options & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) == 0)
3402        {        {
3403        /* If the pattern was studied, a minimum subject length may be set. This        /* If the pattern was studied, a minimum subject length may be set. This
# Line 3135  for (;;) Line 3409  for (;;)
3409            (pcre_uint32)(end_subject - current_subject) < study->minlength)            (pcre_uint32)(end_subject - current_subject) < study->minlength)
3410          return PCRE_ERROR_NOMATCH;          return PCRE_ERROR_NOMATCH;
3411    
3412        /* If req_byte is set, we know that that character must appear in the        /* If req_char is set, we know that that character must appear in the
3413        subject for the match to succeed. If the first character is set, req_byte        subject for the match to succeed. If the first character is set, req_char
3414        must be later in the subject; otherwise the test starts at the match        must be later in the subject; otherwise the test starts at the match
3415        point. This optimization can save a huge amount of work in patterns with        point. This optimization can save a huge amount of work in patterns with
3416        nested unlimited repeats that aren't going to match. Writing separate        nested unlimited repeats that aren't going to match. Writing separate
# Line 3148  for (;;) Line 3422  for (;;)
3422        patterns. This showed up when somebody was matching /^C/ on a 32-megabyte        patterns. This showed up when somebody was matching /^C/ on a 32-megabyte
3423        string... so we don't do this when the string is sufficiently long. */        string... so we don't do this when the string is sufficiently long. */
3424    
3425        if (req_byte >= 0 && end_subject - current_subject < REQ_BYTE_MAX)        if (has_req_char && end_subject - current_subject < REQ_BYTE_MAX)
3426          {          {
3427          register const uschar *p = current_subject + ((first_byte >= 0)? 1 : 0);          register PCRE_PUCHAR p = current_subject + (has_first_char? 1:0);
3428    
3429          /* We don't need to repeat the search if we haven't yet reached the          /* We don't need to repeat the search if we haven't yet reached the
3430          place we found it at last time. */          place we found it at last time. */
3431    
3432          if (p > req_byte_ptr)          if (p > req_char_ptr)
3433            {            {
3434            if (req_byte_caseless)            if (req_char != req_char2)
3435              {              {
3436              while (p < end_subject)              while (p < end_subject)
3437                {                {
3438                register int pp = *p++;                register int pp = *p++;
3439                if (pp == req_byte || pp == req_byte2) { p--; break; }                if (pp == req_char || pp == req_char2) { p--; break; }
3440                }                }
3441              }              }
3442            else            else
3443              {              {
3444              while (p < end_subject)              while (p < end_subject)
3445                {                {
3446                if (*p++ == req_byte) { p--; break; }                if (*p++ == req_char) { p--; break; }
3447                }                }
3448              }              }
3449    
# Line 3182  for (;;) Line 3456  for (;;)
3456            found it, so that we don't search again next time round the loop if            found it, so that we don't search again next time round the loop if
3457            the start hasn't passed this character yet. */            the start hasn't passed this character yet. */
3458    
3459            req_byte_ptr = p;            req_char_ptr = p;
3460            }            }
3461          }          }
3462        }        }
# Line 3191  for (;;) Line 3465  for (;;)
3465    /* OK, now we can do the business */    /* OK, now we can do the business */
3466    
3467    md->start_used_ptr = current_subject;    md->start_used_ptr = current_subject;
3468      md->recursive = NULL;
3469    
3470    rc = internal_dfa_exec(    rc = internal_dfa_exec(
3471      md,                                /* fixed match data */      md,                                /* fixed match data */
# Line 3201  for (;;) Line 3476  for (;;)
3476      offsetcount,                       /* size of same */      offsetcount,                       /* size of same */
3477      workspace,                         /* workspace vector */      workspace,                         /* workspace vector */
3478      wscount,                           /* size of same */      wscount,                           /* size of same */
3479      re->options & (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL), /* ims flags */      0);                                /* function recurse level */
     0,                                 /* function recurse level */  
     0);                                /* regex recurse level */  
3480    
3481    /* Anything other than "no match" means we are done, always; otherwise, carry    /* Anything other than "no match" means we are done, always; otherwise, carry
3482    on only if not anchored. */    on only if not anchored. */
# Line 3215  for (;;) Line 3488  for (;;)
3488    
3489    if (firstline && IS_NEWLINE(current_subject)) break;    if (firstline && IS_NEWLINE(current_subject)) break;
3490    current_subject++;    current_subject++;
3491    if (utf8)  #ifdef SUPPORT_UTF
3492      if (utf)
3493      {      {
3494      while (current_subject < end_subject && (*current_subject & 0xc0) == 0x80)      ACROSSCHAR(current_subject < end_subject, *current_subject,
3495        current_subject++;        current_subject++);
3496      }      }
3497    #endif
3498    if (current_subject > end_subject) break;    if (current_subject > end_subject) break;
3499    
3500    /* If we have just passed a CR and we are now at a LF, and the pattern does    /* If we have just passed a CR and we are now at a LF, and the pattern does

Legend:
Removed from v.535  
changed lines
  Added in v.1041

  ViewVC Help
Powered by ViewVC 1.1.5