# Diff of /code/trunk/pcre_dfa_exec.c

revision 637 by ph10, Sun Jul 24 17:44:12 2011 UTC revision 925 by ph10, Wed Feb 22 14:24:56 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-2011 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 113  small value. Non-zero values in the tabl Line 113  small value. Non-zero values in the tabl
113  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
114  modified, the three tables that follow must also be modified. */  modified, the three tables that follow must also be modified. */
115
116  static const uschar coptable[] = {  static const pcre_uint8 coptable[] = {
117    0,                             /* End                                    */    0,                             /* End                                    */
118    0, 0, 0, 0, 0,                 /* \A, \G, \K, \B, \b                     */    0, 0, 0, 0, 0,                 /* \A, \G, \K, \B, \b                     */
119    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 128  static const uschar coptable[] = { Line 128  static const uschar coptable[] = {
128    1,                             /* noti                                   */    1,                             /* noti                                   */
129    /* Positive single-char repeats                                          */    /* Positive single-char repeats                                          */
130    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */
131    3, 3, 3,                       /* upto, minupto, exact                   */    1+IMM2_SIZE, 1+IMM2_SIZE,      /* upto, minupto                          */
132    1, 1, 1, 3,                    /* *+, ++, ?+, upto+                      */    1+IMM2_SIZE,                   /* exact                                  */
133      1, 1, 1, 1+IMM2_SIZE,          /* *+, ++, ?+, upto+                      */
134    1, 1, 1, 1, 1, 1,              /* *I, *?I, +I, +?I, ?I, ??I              */    1, 1, 1, 1, 1, 1,              /* *I, *?I, +I, +?I, ?I, ??I              */
135    3, 3, 3,                       /* upto I, minupto I, exact I             */    1+IMM2_SIZE, 1+IMM2_SIZE,      /* upto I, minupto I                      */
136    1, 1, 1, 3,                    /* *+I, ++I, ?+I, upto+I                  */    1+IMM2_SIZE,                   /* exact I                                */
137      1, 1, 1, 1+IMM2_SIZE,          /* *+I, ++I, ?+I, upto+I                  */
138    /* Negative single-char repeats - only for chars < 256                   */    /* Negative single-char repeats - only for chars < 256                   */
139    1, 1, 1, 1, 1, 1,              /* NOT *, *?, +, +?, ?, ??                */    1, 1, 1, 1, 1, 1,              /* NOT *, *?, +, +?, ?, ??                */
140    3, 3, 3,                       /* NOT upto, minupto, exact               */    1+IMM2_SIZE, 1+IMM2_SIZE,      /* NOT upto, minupto                      */
141    1, 1, 1, 3,                    /* NOT *+, ++, ?+, upto+                  */    1+IMM2_SIZE,                   /* NOT exact                              */
142      1, 1, 1, 1+IMM2_SIZE,          /* NOT *+, ++, ?+, upto+                  */
143    1, 1, 1, 1, 1, 1,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */    1, 1, 1, 1, 1, 1,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */
144    3, 3, 3,                       /* NOT upto I, minupto I, exact I         */    1+IMM2_SIZE, 1+IMM2_SIZE,      /* NOT upto I, minupto I                  */
145    1, 1, 1, 3,                    /* NOT *+I, ++I, ?+I, upto+I              */    1+IMM2_SIZE,                   /* NOT exact I                            */
146      1, 1, 1, 1+IMM2_SIZE,          /* NOT *+I, ++I, ?+I, upto+I              */
147    /* Positive type repeats                                                 */    /* Positive type repeats                                                 */
148    1, 1, 1, 1, 1, 1,              /* Type *, *?, +, +?, ?, ??               */    1, 1, 1, 1, 1, 1,              /* Type *, *?, +, +?, ?, ??               */
149    3, 3, 3,                       /* Type upto, minupto, exact              */    1+IMM2_SIZE, 1+IMM2_SIZE,      /* Type upto, minupto                     */
150    1, 1, 1, 3,                    /* Type *+, ++, ?+, upto+                 */    1+IMM2_SIZE,                   /* Type exact                             */
151      1, 1, 1, 1+IMM2_SIZE,          /* Type *+, ++, ?+, upto+                 */
152    /* Character class & ref repeats                                         */    /* Character class & ref repeats                                         */
153    0, 0, 0, 0, 0, 0,              /* *, *?, +, +?, ?, ??                    */    0, 0, 0, 0, 0, 0,              /* *, *?, +, +?, ?, ??                    */
154    0, 0,                          /* CRRANGE, CRMINRANGE                    */    0, 0,                          /* CRRANGE, CRMINRANGE                    */
# Line 164  static const uschar coptable[] = { Line 169  static const uschar coptable[] = {
169    0,                             /* Assert not                             */    0,                             /* Assert not                             */
170    0,                             /* Assert behind                          */    0,                             /* Assert behind                          */
171    0,                             /* Assert behind not                      */    0,                             /* Assert behind not                      */
172    0, 0, 0, 0, 0, 0,              /* ONCE, BRA, BRAPOS, CBRA, CBRAPOS, COND */    0, 0,                          /* ONCE, ONCE_NC                          */
173      0, 0, 0, 0, 0,                 /* BRA, BRAPOS, CBRA, CBRAPOS, COND       */
174    0, 0, 0, 0, 0,                 /* SBRA, SBRAPOS, SCBRA, SCBRAPOS, SCOND  */    0, 0, 0, 0, 0,                 /* SBRA, SBRAPOS, SCBRA, SCBRAPOS, SCOND  */
175    0, 0,                          /* CREF, NCREF                            */    0, 0,                          /* CREF, NCREF                            */
176    0, 0,                          /* RREF, NRREF                            */    0, 0,                          /* RREF, NRREF                            */
# Line 181  remember the fact that a character could Line 187  remember the fact that a character could
187  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
188  two tables that follow must also be modified. */  two tables that follow must also be modified. */
189
190  static const uschar poptable[] = {  static const pcre_uint8 poptable[] = {
191    0,                             /* End                                    */    0,                             /* End                                    */
192    0, 0, 0, 1, 1,                 /* \A, \G, \K, \B, \b                     */    0, 0, 0, 1, 1,                 /* \A, \G, \K, \B, \b                     */
193    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 232  static const uschar poptable[] = { Line 238  static const uschar poptable[] = {
238    0,                             /* Assert not                             */    0,                             /* Assert not                             */
239    0,                             /* Assert behind                          */    0,                             /* Assert behind                          */
240    0,                             /* Assert behind not                      */    0,                             /* Assert behind not                      */
241    0, 0, 0, 0, 0, 0,              /* ONCE, BRA, BRAPOS, CBRA, CBRAPOS, COND */    0, 0,                          /* ONCE, ONCE_NC                          */
242      0, 0, 0, 0, 0,                 /* BRA, BRAPOS, CBRA, CBRAPOS, COND       */
243    0, 0, 0, 0, 0,                 /* SBRA, SBRAPOS, SCBRA, SCBRAPOS, SCOND  */    0, 0, 0, 0, 0,                 /* SBRA, SBRAPOS, SCBRA, SCBRAPOS, SCOND  */
244    0, 0,                          /* CREF, NCREF                            */    0, 0,                          /* CREF, NCREF                            */
245    0, 0,                          /* RREF, NRREF                            */    0, 0,                          /* RREF, NRREF                            */
# Line 247  static const uschar poptable[] = { Line 254  static const uschar poptable[] = {
254  /* 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,
255  and \w */  and \w */
256
257  static const uschar toptable1[] = {  static const pcre_uint8 toptable1[] = {
258    0, 0, 0, 0, 0, 0,    0, 0, 0, 0, 0, 0,
259    ctype_digit, ctype_digit,    ctype_digit, ctype_digit,
260    ctype_space, ctype_space,    ctype_space, ctype_space,
# Line 255  static const uschar toptable1[] = { Line 262  static const uschar toptable1[] = {
262    0, 0                            /* OP_ANY, OP_ALLANY */    0, 0                            /* OP_ANY, OP_ALLANY */
263  };  };
264
265  static const uschar toptable2[] = {  static const pcre_uint8 toptable2[] = {
266    0, 0, 0, 0, 0, 0,    0, 0, 0, 0, 0, 0,
267    ctype_digit, 0,    ctype_digit, 0,
268    ctype_space, 0,    ctype_space, 0,
# Line 294  Returns:       nothing Line 301  Returns:       nothing
301  */  */
302
303  static void  static void
304  pchars(unsigned char *p, int length, FILE *f)  pchars(const pcre_uchar *p, int length, FILE *f)
305  {  {
306  int c;  int c;
307  while (length-- > 0)  while (length-- > 0)
# Line 328  Arguments: Line 335  Arguments:
335    workspace         vector of workspace    workspace         vector of workspace
336    wscount           size of same    wscount           size of same
337    rlevel            function call recursion level    rlevel            function call recursion level
recursing         regex recursive call level
338
339  Returns:            > 0 => number of match offset pairs placed in offsets  Returns:            > 0 => number of match offset pairs placed in offsets
340                      = 0 => offsets overflowed; longest matches are present                      = 0 => offsets overflowed; longest matches are present
# Line 385  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  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 425  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 440  new_count = 0; Line 449  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 ||    ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA ||
452      *this_start_code == OP_CBRAPOS || *this_start_code == OP_SCBRAPOS)? 2:0);      *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 468  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 540  else Line 548  else
548      {      {
549      int length = 1 + LINK_SIZE +      int length = 1 + LINK_SIZE +
550        ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA ||        ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA ||
551          *this_start_code == OP_CBRAPOS || *this_start_code == OP_SCBRAPOS)?          *this_start_code == OP_CBRAPOS || *this_start_code == OP_SCBRAPOS)
552          2:0);          ? 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 554  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 565  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. */
582
# Line 581  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 602  for (;;) Line 612  for (;;)
612    if (ptr < end_subject)    if (ptr < end_subject)
613      {      {
614      clen = 1;        /* Number of bytes in the character */      clen = 1;        /* Number of bytes 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 621  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      BOOL caseless = FALSE;      BOOL caseless = FALSE;
635      const uschar *code;      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 635  for (;;) Line 645  for (;;)
645
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 644  for (;;) Line 655  for (;;)
655          DPRINTF(("%.*sSkipping this character\n", rlevel*2-2, SP));          DPRINTF(("%.*sSkipping this character\n", rlevel*2-2, SP));
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 683  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 738  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. For repeating opcodes, also add the repeat        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        state. Note that KETRPOS will always be encountered at the end of the
755        subpattern, because the possessive subpattern repeats are always handled        subpattern, because the possessive subpattern repeats are always handled
756        using recursive calls. Thus, it never adds any new states.        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        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
# Line 751  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:        case OP_KETRPOS:
767        if (code != end_code)        if (code != end_code)
768          {          {
# Line 768  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 814  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 882  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 910  for (;;) Line 935  for (;;)
935                 (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;        break;
953
# Line 922  for (;;) Line 960  for (;;)
960          else if (clen == 0 ||          else if (clen == 0 ||
961              ((md->poptions & PCRE_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr)))              ((md->poptions & PCRE_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr)))
962            { ADD_ACTIVE(state_offset + 1, 0); }            { 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 (IS_NEWLINE(ptr))        else if (IS_NEWLINE(ptr))
978          { ADD_ACTIVE(state_offset + 1, 0); }          { ADD_ACTIVE(state_offset + 1, 0); }
# Line 954  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 1022  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 1036  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 1084  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 1107  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 1129  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 1149  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 1166  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 1181  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 1216  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 1230  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 1279  for (;;) Line 1370  for (;;)
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 && UCD_CATEGORY(c) != ucp_M)
1372          {          {
1373          const uschar *nptr = ptr + clen;          const pcre_uchar *nptr = ptr + clen;
1374          int ncount = 0;          int ncount = 0;
1375          if (count > 0 && codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS)          if (count > 0 && codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS)
1376            {            {
# Line 1463  for (;;) Line 1554  for (;;)
1554            break;            break;
1555
1556            case PT_GC:            case PT_GC:
1557            OK = _pcre_ucp_gentype[prop->chartype] == code[3];            OK = PRIV(ucp_gentype)[prop->chartype] == code[3];
1558            break;            break;
1559
1560            case PT_PC:            case PT_PC:
# Line 1477  for (;;) Line 1568  for (;;)
1568            /* These are specials for combination cases. */            /* These are specials for combination cases. */
1569
1570            case PT_ALNUM:            case PT_ALNUM:
1571            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1572                 _pcre_ucp_gentype[prop->chartype] == ucp_N;                 PRIV(ucp_gentype)[prop->chartype] == ucp_N;
1573            break;            break;
1574
1575            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
1576            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1577                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;
1578            break;            break;
1579
1580            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
1581            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1582                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
1583                 c == CHAR_FF || c == CHAR_CR;                 c == CHAR_FF || c == CHAR_CR;
1584            break;            break;
1585
1586            case PT_WORD:            case PT_WORD:
1587            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1588                 _pcre_ucp_gentype[prop->chartype] == ucp_N ||                 PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
1589                 c == CHAR_UNDERSCORE;                 c == CHAR_UNDERSCORE;
1590            break;            break;
1591
# Line 1535  for (;;) Line 1626  for (;;)
1626        ADD_ACTIVE(state_offset + 2, 0);        ADD_ACTIVE(state_offset + 2, 0);
1627        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1628          {          {
1629          const uschar *nptr = ptr + clen;          const pcre_uchar *nptr = ptr + clen;
1630          int ncount = 0;          int ncount = 0;
1631          if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSSTAR ||          if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSSTAR ||
1632              codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSQUERY)              codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSQUERY)
# Line 1717  for (;;) Line 1808  for (;;)
1808        case OP_PROP_EXTRA + OP_TYPEMINUPTO:        case OP_PROP_EXTRA + OP_TYPEMINUPTO:
1809        case OP_PROP_EXTRA + OP_TYPEPOSUPTO:        case OP_PROP_EXTRA + OP_TYPEPOSUPTO:
1810        if (codevalue != OP_PROP_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_PROP_EXTRA + OP_TYPEEXACT)
1811          { ADD_ACTIVE(state_offset + 6, 0); }          { ADD_ACTIVE(state_offset + 1 + IMM2_SIZE + 3, 0); }
1812        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1813        if (clen > 0)        if (clen > 0)
1814          {          {
1815          BOOL OK;          BOOL OK;
1816          const ucd_record * prop = GET_UCD(c);          const ucd_record * prop = GET_UCD(c);
1817          switch(code[4])          switch(code[1 + IMM2_SIZE + 1])
1818            {            {
1819            case PT_ANY:            case PT_ANY:
1820            OK = TRUE;            OK = TRUE;
# Line 1735  for (;;) Line 1826  for (;;)
1826            break;            break;
1827
1828            case PT_GC:            case PT_GC:
1829            OK = _pcre_ucp_gentype[prop->chartype] == code[5];            OK = PRIV(ucp_gentype)[prop->chartype] == code[1 + IMM2_SIZE + 2];
1830            break;            break;
1831
1832            case PT_PC:            case PT_PC:
1833            OK = prop->chartype == code[5];            OK = prop->chartype == code[1 + IMM2_SIZE + 2];
1834            break;            break;
1835
1836            case PT_SC:            case PT_SC:
1837            OK = prop->script == code[5];            OK = prop->script == code[1 + IMM2_SIZE + 2];
1838            break;            break;
1839
1840            /* These are specials for combination cases. */            /* These are specials for combination cases. */
1841
1842            case PT_ALNUM:            case PT_ALNUM:
1843            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1844                 _pcre_ucp_gentype[prop->chartype] == ucp_N;                 PRIV(ucp_gentype)[prop->chartype] == ucp_N;
1845            break;            break;
1846
1847            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
1848            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1849                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;
1850            break;            break;
1851
1852            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
1853            OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
1854                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
1855                 c == CHAR_FF || c == CHAR_CR;                 c == CHAR_FF || c == CHAR_CR;
1856            break;            break;
1857
1858            case PT_WORD:            case PT_WORD:
1859            OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||            OK = PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
1860                 _pcre_ucp_gentype[prop->chartype] == ucp_N ||                 PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
1861                 c == CHAR_UNDERSCORE;                 c == CHAR_UNDERSCORE;
1862            break;            break;
1863
# Line 1785  for (;;) Line 1876  for (;;)
1876              next_active_state--;              next_active_state--;
1877              }              }
1878            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
1879              { ADD_NEW(state_offset + 6, 0); }              { ADD_NEW(state_offset + 1 + IMM2_SIZE + 3, 0); }
1880            else            else
1881              { ADD_NEW(state_offset, count); }              { ADD_NEW(state_offset, count); }
1882            }            }
# Line 1798  for (;;) Line 1889  for (;;)
1889        case OP_EXTUNI_EXTRA + OP_TYPEMINUPTO:        case OP_EXTUNI_EXTRA + OP_TYPEMINUPTO:
1890        case OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO:        case OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO:
1891        if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)
1892          { ADD_ACTIVE(state_offset + 4, 0); }          { ADD_ACTIVE(state_offset + 2 + IMM2_SIZE, 0); }
1893        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1894        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1895          {          {
1896          const uschar *nptr = ptr + clen;          const pcre_uchar *nptr = ptr + clen;
1897          int ncount = 0;          int ncount = 0;
1898          if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO)          if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO)
1899            {            {
# Line 1818  for (;;) Line 1909  for (;;)
1909            ncount++;            ncount++;
1910            nptr += ndlen;            nptr += ndlen;
1911            }            }
1912            if (nptr >= end_subject && (md->moptions & PCRE_PARTIAL_HARD) != 0)
1913                reset_could_continue = TRUE;
1914          if (++count >= GET2(code, 1))          if (++count >= GET2(code, 1))
1915            { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }            { ADD_NEW_DATA(-(state_offset + 2 + IMM2_SIZE), 0, ncount); }
1916          else          else
1917            { ADD_NEW_DATA(-state_offset, count, ncount); }            { ADD_NEW_DATA(-state_offset, count, ncount); }
1918          }          }
# Line 1832  for (;;) Line 1925  for (;;)
1925        case OP_ANYNL_EXTRA + OP_TYPEMINUPTO:        case OP_ANYNL_EXTRA + OP_TYPEMINUPTO:
1926        case OP_ANYNL_EXTRA + OP_TYPEPOSUPTO:        case OP_ANYNL_EXTRA + OP_TYPEPOSUPTO:
1927        if (codevalue != OP_ANYNL_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_ANYNL_EXTRA + OP_TYPEEXACT)
1928          { ADD_ACTIVE(state_offset + 4, 0); }          { ADD_ACTIVE(state_offset + 2 + IMM2_SIZE, 0); }
1929        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1930        if (clen > 0)        if (clen > 0)
1931          {          {
# Line 1859  for (;;) Line 1952  for (;;)
1952              next_active_state--;              next_active_state--;
1953              }              }
1954            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
1955              { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }              { ADD_NEW_DATA(-(state_offset + 2 + IMM2_SIZE), 0, ncount); }
1956            else            else
1957              { ADD_NEW_DATA(-state_offset, count, ncount); }              { ADD_NEW_DATA(-state_offset, count, ncount); }
1958            break;            break;
# Line 1876  for (;;) Line 1969  for (;;)
1969        case OP_VSPACE_EXTRA + OP_TYPEMINUPTO:        case OP_VSPACE_EXTRA + OP_TYPEMINUPTO:
1970        case OP_VSPACE_EXTRA + OP_TYPEPOSUPTO:        case OP_VSPACE_EXTRA + OP_TYPEPOSUPTO:
1971        if (codevalue != OP_VSPACE_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_VSPACE_EXTRA + OP_TYPEEXACT)
1972          { ADD_ACTIVE(state_offset + 4, 0); }          { ADD_ACTIVE(state_offset + 2 + IMM2_SIZE, 0); }
1973        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1974        if (clen > 0)        if (clen > 0)
1975          {          {
# Line 1905  for (;;) Line 1998  for (;;)
1998              next_active_state--;              next_active_state--;
1999              }              }
2000            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
2001              { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }              { ADD_NEW_DATA(-(state_offset + 2 + IMM2_SIZE), 0, 0); }
2002            else            else
2003              { ADD_NEW_DATA(-state_offset, count, 0); }              { ADD_NEW_DATA(-state_offset, count, 0); }
2004            }            }
# Line 1918  for (;;) Line 2011  for (;;)
2011        case OP_HSPACE_EXTRA + OP_TYPEMINUPTO:        case OP_HSPACE_EXTRA + OP_TYPEMINUPTO:
2012        case OP_HSPACE_EXTRA + OP_TYPEPOSUPTO:        case OP_HSPACE_EXTRA + OP_TYPEPOSUPTO:
2013        if (codevalue != OP_HSPACE_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_HSPACE_EXTRA + OP_TYPEEXACT)
2014          { ADD_ACTIVE(state_offset + 4, 0); }          { ADD_ACTIVE(state_offset + 2 + IMM2_SIZE, 0); }
2015        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
2016        if (clen > 0)        if (clen > 0)
2017          {          {
# Line 1960  for (;;) Line 2053  for (;;)
2053              next_active_state--;              next_active_state--;
2054              }              }
2055            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
2056              { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }              { ADD_NEW_DATA(-(state_offset + 2 + IMM2_SIZE), 0, 0); }
2057            else            else
2058              { ADD_NEW_DATA(-state_offset, count, 0); }              { ADD_NEW_DATA(-state_offset, count, 0); }
2059            }            }
# Line 1982  for (;;) Line 2075  for (;;)
2075        case OP_CHARI:        case OP_CHARI:
2076        if (clen == 0) break;        if (clen == 0) break;
2077
2078  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2079        if (utf8)        if (utf)
2080          {          {
2081          if (c == d) { ADD_NEW(state_offset + dlen + 1, 0); } else          if (c == d) { ADD_NEW(state_offset + dlen + 1, 0); } else
2082            {            {
2083            unsigned int othercase;            unsigned int othercase;
2084            if (c < 128) othercase = fcc[c]; else            if (c < 128)
2085                othercase = fcc[c];
2086            /* If we have Unicode property support, we can use it to test the            else
2087            other case of the character. */              /* If we have Unicode property support, we can use it to test the
2088                other case of the character. */
2089  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2090            othercase = UCD_OTHERCASE(c);              othercase = UCD_OTHERCASE(c);
2091  #else  #else
2092            othercase = NOTACHAR;              othercase = NOTACHAR;
2093  #endif  #endif
2094
2095            if (d == othercase) { ADD_NEW(state_offset + dlen + 1, 0); }            if (d == othercase) { ADD_NEW(state_offset + dlen + 1, 0); }
2096            }            }
2097          }          }
2098        else        else
2099  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2100          /* Not UTF mode */
/* Non-UTF-8 mode */
2101          {          {
2102          if (lcc[c] == lcc[d]) { ADD_NEW(state_offset + 2, 0); }          if (TABLE_GET(c, lcc, c) == TABLE_GET(d, lcc, d))
2103              { ADD_NEW(state_offset + 2, 0); }
2104          }          }
2105        break;        break;
2106
# Line 2021  for (;;) Line 2114  for (;;)
2114        case OP_EXTUNI:        case OP_EXTUNI:
2115        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
2116          {          {
2117          const uschar *nptr = ptr + clen;          const pcre_uchar *nptr = ptr + clen;
2118          int ncount = 0;          int ncount = 0;
2119          while (nptr < end_subject)          while (nptr < end_subject)
2120            {            {
# Line 2031  for (;;) Line 2124  for (;;)
2124            ncount++;            ncount++;
2125            nptr += nclen;            nptr += nclen;
2126            }            }
2127            if (nptr >= end_subject && (md->moptions & PCRE_PARTIAL_HARD) != 0)
2128                reset_could_continue = TRUE;
2129          ADD_NEW_DATA(-(state_offset + 1), 0, ncount);          ADD_NEW_DATA(-(state_offset + 1), 0, ncount);
2130          }          }
2131        break;        break;
# Line 2056  for (;;) Line 2151  for (;;)
2151          break;          break;
2152
2153          case 0x000d:          case 0x000d:
2154          if (ptr + 1 < end_subject && ptr[1] == 0x0a)          if (ptr + 1 >= end_subject)
2155              {
2156              ADD_NEW(state_offset + 1, 0);
2157              if ((md->moptions & PCRE_PARTIAL_HARD) != 0)
2158                reset_could_continue = TRUE;
2159              }
2160            else if (ptr[1] == 0x0a)
2161            {            {
2162            ADD_NEW_DATA(-(state_offset + 1), 0, 1);            ADD_NEW_DATA(-(state_offset + 1), 0, 1);
2163            }            }
2164          else          else
2165            {            {
2166            ADD_NEW(state_offset + 1, 0);            ADD_NEW(state_offset + 1, 0);
2167            }            }
2168          break;          break;
2169          }          }
2170        break;        break;
# Line 2165  for (;;) Line 2266  for (;;)
2266        break;        break;
2267
2268        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2269        /* Match a negated single character casefully. This is only used for        /* Match a negated single character casefully. */
one-byte characters, that is, we know that d < 256. The character we are
checking (c) can be multibyte. */
2270
2271        case OP_NOT:        case OP_NOT:
2272        if (clen > 0 && c != d) { ADD_NEW(state_offset + dlen + 1, 0); }        if (clen > 0 && c != d) { ADD_NEW(state_offset + dlen + 1, 0); }
2273        break;        break;
2274
2275        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2276        /* Match a negated single character caselessly. This is only used for        /* Match a negated single character caselessly. */
one-byte characters, that is, we know that d < 256. The character we are
checking (c) can be multibyte. */
2277
2278        case OP_NOTI:        case OP_NOTI:
2279        if (clen > 0 && c != d && c != fcc[d])        if (clen > 0)
2280          { ADD_NEW(state_offset + dlen + 1, 0); }          {
2281            unsigned int otherd;
2282    #ifdef SUPPORT_UTF
2283            if (utf && d >= 128)
2284              {
2285    #ifdef SUPPORT_UCP
2286              otherd = UCD_OTHERCASE(d);
2287    #endif  /* SUPPORT_UCP */
2288              }
2289            else
2290    #endif  /* SUPPORT_UTF */
2291            otherd = TABLE_GET(d, fcc, d);
2292            if (c != d && c != otherd)
2293              { ADD_NEW(state_offset + dlen + 1, 0); }
2294            }
2295        break;        break;
2296
2297        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
# Line 2192  for (;;) Line 2303  for (;;)
2303        case OP_NOTPOSPLUSI:        case OP_NOTPOSPLUSI:
2304        caseless = TRUE;        caseless = TRUE;
2305        codevalue -= OP_STARI - OP_STAR;        codevalue -= OP_STARI - OP_STAR;
2306
2307        /* Fall through */        /* Fall through */
2308        case OP_PLUS:        case OP_PLUS:
2309        case OP_MINPLUS:        case OP_MINPLUS:
# Line 2207  for (;;) Line 2318  for (;;)
2318          unsigned int otherd = NOTACHAR;          unsigned int otherd = NOTACHAR;
2319          if (caseless)          if (caseless)
2320            {            {
2321  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2322            if (utf8 && d >= 128)            if (utf && d >= 128)
2323              {              {
2324  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2325              otherd = UCD_OTHERCASE(d);              otherd = UCD_OTHERCASE(d);
2326  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2327              }              }
2328            else            else
2329  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2330            otherd = fcc[d];            otherd = TABLE_GET(d, fcc, d);
2331            }            }
2332          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
2333            {            {
# Line 2254  for (;;) Line 2365  for (;;)
2365          unsigned int otherd = NOTACHAR;          unsigned int otherd = NOTACHAR;
2366          if (caseless)          if (caseless)
2367            {            {
2368  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2369            if (utf8 && d >= 128)            if (utf && d >= 128)
2370              {              {
2371  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2372              otherd = UCD_OTHERCASE(d);              otherd = UCD_OTHERCASE(d);
2373  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2374              }              }
2375            else            else
2376  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2377            otherd = fcc[d];            otherd = TABLE_GET(d, fcc, d);
2378            }            }
2379          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
2380            {            {
# Line 2299  for (;;) Line 2410  for (;;)
2410          unsigned int otherd = NOTACHAR;          unsigned int otherd = NOTACHAR;
2411          if (caseless)          if (caseless)
2412            {            {
2413  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2414            if (utf8 && d >= 128)            if (utf && d >= 128)
2415              {              {
2416  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2417              otherd = UCD_OTHERCASE(d);              otherd = UCD_OTHERCASE(d);
2418  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2419              }              }
2420            else            else
2421  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2422            otherd = fcc[d];            otherd = TABLE_GET(d, fcc, d);
2423            }            }
2424          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
2425            {            {
# Line 2336  for (;;) Line 2447  for (;;)
2447          unsigned int otherd = NOTACHAR;          unsigned int otherd = NOTACHAR;
2448          if (caseless)          if (caseless)
2449            {            {
2450  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2451            if (utf8 && d >= 128)            if (utf && d >= 128)
2452              {              {
2453  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2454              otherd = UCD_OTHERCASE(d);              otherd = UCD_OTHERCASE(d);
2455  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2456              }              }
2457            else            else
2458  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2459            otherd = fcc[d];            otherd = TABLE_GET(d, fcc, d);
2460            }            }
2461          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
2462            {            {
2463            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
2464              { ADD_NEW(state_offset + dlen + 3, 0); }              { ADD_NEW(state_offset + dlen + 1 + IMM2_SIZE, 0); }
2465            else            else
2466              { ADD_NEW(state_offset, count); }              { ADD_NEW(state_offset, count); }
2467            }            }
# Line 2373  for (;;) Line 2484  for (;;)
2484        case OP_NOTUPTO:        case OP_NOTUPTO:
2485        case OP_NOTMINUPTO:        case OP_NOTMINUPTO:
2486        case OP_NOTPOSUPTO:        case OP_NOTPOSUPTO:
2487        ADD_ACTIVE(state_offset + dlen + 3, 0);        ADD_ACTIVE(state_offset + dlen + 1 + IMM2_SIZE, 0);
2488        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
2489        if (clen > 0)        if (clen > 0)
2490          {          {
2491          unsigned int otherd = NOTACHAR;          unsigned int otherd = NOTACHAR;
2492          if (caseless)          if (caseless)
2493            {            {
2494  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2495            if (utf8 && d >= 128)            if (utf && d >= 128)
2496              {              {
2497  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2498              otherd = UCD_OTHERCASE(d);              otherd = UCD_OTHERCASE(d);
2499  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2500              }              }
2501            else            else
2502  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
2503            otherd = fcc[d];            otherd = TABLE_GET(d, fcc, d);
2504            }            }
2505          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))          if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
2506            {            {
# Line 2399  for (;;) Line 2510  for (;;)
2510              next_active_state--;              next_active_state--;
2511              }              }
2512            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
2513              { ADD_NEW(state_offset + dlen + 3, 0); }              { ADD_NEW(state_offset + dlen + 1 + IMM2_SIZE, 0); }
2514            else            else
2515              { ADD_NEW(state_offset, count); }              { ADD_NEW(state_offset, count); }
2516            }            }
# Line 2416  for (;;) Line 2527  for (;;)
2527          {          {
2528          BOOL isinclass = FALSE;          BOOL isinclass = FALSE;
2529          int next_state_offset;          int next_state_offset;
2530          const uschar *ecode;          const pcre_uchar *ecode;
2531
2532          /* 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
2533          can set isinclass from it. */          can set isinclass from it. */
2534
2535          if (codevalue != OP_XCLASS)          if (codevalue != OP_XCLASS)
2536            {            {
2537            ecode = code + 33;            ecode = code + 1 + (32 / sizeof(pcre_uchar));
2538            if (clen > 0)            if (clen > 0)
2539              {              {
2540              isinclass = (c > 255)? (codevalue == OP_NCLASS) :              isinclass = (c > 255)? (codevalue == OP_NCLASS) :
2541                ((code[1 + c/8] & (1 << (c&7))) != 0);                ((((pcre_uint8 *)(code + 1))[c/8] & (1 << (c&7))) != 0);
2542              }              }
2543            }            }
2544
# Line 2438  for (;;) Line 2549  for (;;)
2549          else          else
2550           {           {
2551           ecode = code + GET(code, 1);           ecode = code + GET(code, 1);
2552           if (clen > 0) isinclass = _pcre_xclass(c, code + 1 + LINK_SIZE);           if (clen > 0) isinclass = PRIV(xclass)(c, code + 1 + LINK_SIZE, utf);
2553           }           }
2554
2555          /* 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 2472  for (;;) Line 2583  for (;;)
2583            case OP_CRMINRANGE:            case OP_CRMINRANGE:
2584            count = current_state->count;  /* Already matched */            count = current_state->count;  /* Already matched */
2585            if (count >= GET2(ecode, 1))            if (count >= GET2(ecode, 1))
2586              { ADD_ACTIVE(next_state_offset + 5, 0); }              { ADD_ACTIVE(next_state_offset + 1 + 2 * IMM2_SIZE, 0); }
2587            if (isinclass)            if (isinclass)
2588              {              {
2589              int max = GET2(ecode, 3);              int max = GET2(ecode, 1 + IMM2_SIZE);
2590              if (++count >= max && max != 0)   /* Max 0 => no limit */              if (++count >= max && max != 0)   /* Max 0 => no limit */
2591                { ADD_NEW(next_state_offset + 5, 0); }                { ADD_NEW(next_state_offset + 1 + 2 * IMM2_SIZE, 0); }
2592              else              else
2593                { ADD_NEW(state_offset, count); }                { ADD_NEW(state_offset, count); }
2594              }              }
# Line 2508  for (;;) Line 2619  for (;;)
2619          int rc;          int rc;
2620          int local_offsets[2];          int local_offsets[2];
2621          int local_workspace[1000];          int local_workspace[1000];
2622          const uschar *endasscode = code + GET(code, 1);          const pcre_uchar *endasscode = code + GET(code, 1);
2623
2624          while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);          while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);
2625
# Line 2521  for (;;) Line 2632  for (;;)
2632            sizeof(local_offsets)/sizeof(int),    /* size of same */            sizeof(local_offsets)/sizeof(int),    /* size of same */
2633            local_workspace,                      /* workspace vector */            local_workspace,                      /* workspace vector */
2634            sizeof(local_workspace)/sizeof(int),  /* size of same */            sizeof(local_workspace)/sizeof(int),  /* size of same */
2635            rlevel,                               /* function recursion level */            rlevel);                              /* function recursion level */
recursing);                           /* pass on regex recursion */
2636
2637          if (rc == PCRE_ERROR_DFA_UITEM) return rc;          if (rc == PCRE_ERROR_DFA_UITEM) return rc;
2638          if ((rc >= 0) == (codevalue == OP_ASSERT || codevalue == OP_ASSERTBACK))          if ((rc >= 0) == (codevalue == OP_ASSERT || codevalue == OP_ASSERTBACK))
# Line 2546  for (;;) Line 2656  for (;;)
2656          if (code[LINK_SIZE+1] == OP_CALLOUT)          if (code[LINK_SIZE+1] == OP_CALLOUT)
2657            {            {
2658            rrc = 0;            rrc = 0;
2659            if (pcre_callout != NULL)            if (PUBL(callout) != NULL)
2660              {              {
2661              pcre_callout_block cb;              PUBL(callout_block) cb;
2662              cb.version          = 1;   /* Version 1 of the callout block */              cb.version          = 1;   /* Version 1 of the callout block */
2663              cb.callout_number   = code[LINK_SIZE+2];              cb.callout_number   = code[LINK_SIZE+2];
2664              cb.offset_vector    = offsets;              cb.offset_vector    = offsets;
2665    #ifdef COMPILE_PCRE8
2666              cb.subject          = (PCRE_SPTR)start_subject;              cb.subject          = (PCRE_SPTR)start_subject;
2667    #else
2668                cb.subject          = (PCRE_SPTR16)start_subject;
2669    #endif
2670              cb.subject_length   = (int)(end_subject - start_subject);              cb.subject_length   = (int)(end_subject - start_subject);
2671              cb.start_match      = (int)(current_subject - start_subject);              cb.start_match      = (int)(current_subject - start_subject);
2672              cb.current_position = (int)(ptr - start_subject);              cb.current_position = (int)(ptr - start_subject);
# Line 2561  for (;;) Line 2675  for (;;)
2675              cb.capture_top      = 1;              cb.capture_top      = 1;
2676              cb.capture_last     = -1;              cb.capture_last     = -1;
2677              cb.callout_data     = md->callout_data;              cb.callout_data     = md->callout_data;
2678              if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */              cb.mark             = NULL;   /* No (*MARK) support */
2679                if ((rrc = (*PUBL(callout))(&cb)) < 0) return rrc;   /* Abandon */
2680              }              }
2681            if (rrc > 0) break;                      /* Fail this thread */            if (rrc > 0) break;                      /* Fail this thread */
2682            code += _pcre_OP_lengths[OP_CALLOUT];    /* Skip callout data */            code += PRIV(OP_lengths)[OP_CALLOUT];    /* Skip callout data */
2683            }            }
2684
2685          condcode = code[LINK_SIZE+1];          condcode = code[LINK_SIZE+1];
# Line 2585  for (;;) Line 2700  for (;;)
2700
2701          else if (condcode == OP_RREF || condcode == OP_NRREF)          else if (condcode == OP_RREF || condcode == OP_NRREF)
2702            {            {
2703            int value = GET2(code, LINK_SIZE+2);            int value = GET2(code, LINK_SIZE + 2);
2704            if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;            if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;
2705            if (recursing > 0)            if (md->recursive != NULL)
2706              { ADD_ACTIVE(state_offset + LINK_SIZE + 4, 0); }              { ADD_ACTIVE(state_offset + LINK_SIZE + 2 + IMM2_SIZE, 0); }
2707            else { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }            else { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
2708            }            }
2709
# Line 2597  for (;;) Line 2712  for (;;)
2712          else          else
2713            {            {
2714            int rc;            int rc;
2715            const uschar *asscode = code + LINK_SIZE + 1;            const pcre_uchar *asscode = code + LINK_SIZE + 1;
2716            const uschar *endasscode = asscode + GET(asscode, 1);            const pcre_uchar *endasscode = asscode + GET(asscode, 1);
2717
2718            while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);            while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);
2719
# Line 2611  for (;;) Line 2726  for (;;)
2726              sizeof(local_offsets)/sizeof(int),    /* size of same */              sizeof(local_offsets)/sizeof(int),    /* size of same */
2727              local_workspace,                      /* workspace vector */              local_workspace,                      /* workspace vector */
2728              sizeof(local_workspace)/sizeof(int),  /* size of same */              sizeof(local_workspace)/sizeof(int),  /* size of same */
2729              rlevel,                               /* function recursion level */              rlevel);                              /* function recursion level */
recursing);                           /* pass on regex recursion */
2730
2731            if (rc == PCRE_ERROR_DFA_UITEM) return rc;            if (rc == PCRE_ERROR_DFA_UITEM) return rc;
2732            if ((rc >= 0) ==            if ((rc >= 0) ==
# Line 2627  for (;;) Line 2741  for (;;)
2741        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2742        case OP_RECURSE:        case OP_RECURSE:
2743          {          {
2744            dfa_recursion_info *ri;
2745          int local_offsets[1000];          int local_offsets[1000];
2746          int local_workspace[1000];          int local_workspace[1000];
2747            const pcre_uchar *callpat = start_code + GET(code, 1);
2748            int recno = (callpat == md->start_code)? 0 :
2749              GET2(callpat, 1 + LINK_SIZE);
2750          int rc;          int rc;
2751
2752          DPRINTF(("%.*sStarting regex recursion %d\n", rlevel*2-2, SP,          DPRINTF(("%.*sStarting regex recursion\n", rlevel*2-2, SP));
2753            recursing + 1));
2754            /* Check for repeating a recursion without advancing the subject
2755            pointer. This should catch convoluted mutual recursions. (Some simple
2756            cases are caught at compile time.) */
2757
2758            for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
2759              if (recno == ri->group_num && ptr == ri->subject_position)
2760                return PCRE_ERROR_RECURSELOOP;
2761
2762            /* Remember this recursion and where we started it so as to
2763            catch infinite loops. */
2764
2765            new_recursive.group_num = recno;
2766            new_recursive.subject_position = ptr;
2767            new_recursive.prevrec = md->recursive;
2768            md->recursive = &new_recursive;
2769
2770          rc = internal_dfa_exec(          rc = internal_dfa_exec(
2771            md,                                   /* fixed match data */            md,                                   /* fixed match data */
2772            start_code + GET(code, 1),            /* this subexpression's code */            callpat,                              /* this subexpression's code */
2773            ptr,                                  /* where we currently are */            ptr,                                  /* where we currently are */
2774            (int)(ptr - start_subject),           /* start offset */            (int)(ptr - start_subject),           /* start offset */
2775            local_offsets,                        /* offset vector */            local_offsets,                        /* offset vector */
2776            sizeof(local_offsets)/sizeof(int),    /* size of same */            sizeof(local_offsets)/sizeof(int),    /* size of same */
2777            local_workspace,                      /* workspace vector */            local_workspace,                      /* workspace vector */
2778            sizeof(local_workspace)/sizeof(int),  /* size of same */            sizeof(local_workspace)/sizeof(int),  /* size of same */
2779            rlevel,                               /* function recursion level */            rlevel);                              /* function recursion level */
2780            recursing + 1);                       /* regex recurse level */
2781            md->recursive = new_recursive.prevrec;  /* Done this recursion */
2782
2783          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,
2784            recursing + 1, rc));            rc));
2785
2786          /* Ran out of internal offsets */          /* Ran out of internal offsets */
2787
# Line 2661  for (;;) Line 2795  for (;;)
2795            {            {
2796            for (rc = rc*2 - 2; rc >= 0; rc -= 2)            for (rc = rc*2 - 2; rc >= 0; rc -= 2)
2797              {              {
const uschar *p = start_subject + local_offsets[rc];
const uschar *pp = start_subject + local_offsets[rc+1];
2798              int charcount = local_offsets[rc+1] - local_offsets[rc];              int charcount = local_offsets[rc+1] - local_offsets[rc];
2799              while (p < pp) if ((*p++ & 0xc0) == 0x80) charcount--;  #ifdef SUPPORT_UTF
2800                const pcre_uchar *p = start_subject + local_offsets[rc];
2801                const pcre_uchar *pp = start_subject + local_offsets[rc+1];
2802                while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--;
2803    #endif
2804              if (charcount > 0)              if (charcount > 0)
2805                {                {
2806                ADD_NEW_DATA(-(state_offset + LINK_SIZE + 1), 0, (charcount - 1));                ADD_NEW_DATA(-(state_offset + LINK_SIZE + 1), 0, (charcount - 1));
# Line 2684  for (;;) Line 2820  for (;;)
2820        case OP_SBRAPOS:        case OP_SBRAPOS:
2821        case OP_CBRAPOS:        case OP_CBRAPOS:
2822        case OP_SCBRAPOS:        case OP_SCBRAPOS:
2823        case OP_BRAPOSZERO:        case OP_BRAPOSZERO:
2824          {          {
2825          int charcount, matched_count;          int charcount, matched_count;
2826          const uschar *local_ptr = ptr;          const pcre_uchar *local_ptr = ptr;
2827          BOOL allow_zero;          BOOL allow_zero;
2828
2829          if (codevalue == OP_BRAPOSZERO)          if (codevalue == OP_BRAPOSZERO)
2830            {            {
2831            allow_zero = TRUE;            allow_zero = TRUE;
2832            codevalue = *(++code);  /* Codevalue will be one of above BRAs */            codevalue = *(++code);  /* Codevalue will be one of above BRAs */
2833            }            }
2834          else allow_zero = FALSE;          else allow_zero = FALSE;
2835
2836          /* Loop to match the subpattern as many times as possible as if it were          /* Loop to match the subpattern as many times as possible as if it were
2837          a complete pattern. */          a complete pattern. */
2838
2839          for (matched_count = 0;; matched_count++)          for (matched_count = 0;; matched_count++)
2840            {            {
2841            int local_offsets[2];            int local_offsets[2];
2842            int local_workspace[1000];            int local_workspace[1000];
2843
2844            int rc = internal_dfa_exec(            int rc = internal_dfa_exec(
2845              md,                                   /* fixed match data */              md,                                   /* fixed match data */
2846              code,                                 /* this subexpression's code */              code,                                 /* this subexpression's code */
# Line 2714  for (;;) Line 2850  for (;;)
2850              sizeof(local_offsets)/sizeof(int),    /* size of same */              sizeof(local_offsets)/sizeof(int),    /* size of same */
2851              local_workspace,                      /* workspace vector */              local_workspace,                      /* workspace vector */
2852              sizeof(local_workspace)/sizeof(int),  /* size of same */              sizeof(local_workspace)/sizeof(int),  /* size of same */
2853              rlevel,                               /* function recursion level */              rlevel);                              /* function recursion level */
2854              recursing);                           /* pass on regex recursion */

2855            /* Failed to match */            /* Failed to match */
2856
2857            if (rc < 0)            if (rc < 0)
2858              {              {
2859              if (rc != PCRE_ERROR_NOMATCH) return rc;              if (rc != PCRE_ERROR_NOMATCH) return rc;
2860              break;              break;
2861              }              }
2862
2863            /* Matched: break the loop if zero characters matched. */            /* Matched: break the loop if zero characters matched. */
2864
2865            charcount = local_offsets[1] - local_offsets[0];            charcount = local_offsets[1] - local_offsets[0];
2866            if (charcount == 0) break;            if (charcount == 0) break;
2867            local_ptr += charcount;    /* Advance temporary position ptr */            local_ptr += charcount;    /* Advance temporary position ptr */
2868            }            }
2869
2870          /* At this point we have matched the subpattern matched_count          /* At this point we have matched the subpattern matched_count
2871          times, and local_ptr is pointing to the character after the end of the          times, and local_ptr is pointing to the character after the end of the
2872          last match. */          last match. */
2873
2874          if (matched_count > 0 || allow_zero)          if (matched_count > 0 || allow_zero)
2875            {            {
2876            const uschar *end_subpattern = code;            const pcre_uchar *end_subpattern = code;
2877            int next_state_offset;            int next_state_offset;
2878
2879            do { end_subpattern += GET(end_subpattern, 1); }            do { end_subpattern += GET(end_subpattern, 1); }
2880              while (*end_subpattern == OP_ALT);              while (*end_subpattern == OP_ALT);
2881            next_state_offset =            next_state_offset =
# Line 2759  for (;;) Line 2894  for (;;)
2894              }              }
2895            else            else
2896              {              {
2897              const uschar *p = ptr;              const pcre_uchar *p = ptr;
2898              const uschar *pp = local_ptr;              const pcre_uchar *pp = local_ptr;
2899              charcount = pp - p;              charcount = (int)(pp - p);
2900              while (p < pp) if ((*p++ & 0xc0) == 0x80) charcount--;  #ifdef SUPPORT_UTF
2901                while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--;
2902    #endif
2903              ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1));              ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1));
2904              }              }
2905            }            }
2906          }          }
2907        break;        break;
2908
2909        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
2910        case OP_ONCE:        case OP_ONCE:
2911          case OP_ONCE_NC:
2912          {          {
2913          int local_offsets[2];          int local_offsets[2];
2914          int local_workspace[1000];          int local_workspace[1000];
# Line 2784  for (;;) Line 2922  for (;;)
2922            sizeof(local_offsets)/sizeof(int),    /* size of same */            sizeof(local_offsets)/sizeof(int),    /* size of same */
2923            local_workspace,                      /* workspace vector */            local_workspace,                      /* workspace vector */
2924            sizeof(local_workspace)/sizeof(int),  /* size of same */            sizeof(local_workspace)/sizeof(int),  /* size of same */
2925            rlevel,                               /* function recursion level */            rlevel);                              /* function recursion level */
recursing);                           /* pass on regex recursion */
2926
2927          if (rc >= 0)          if (rc >= 0)
2928            {            {
2929            const uschar *end_subpattern = code;            const pcre_uchar *end_subpattern = code;
2930            int charcount = local_offsets[1] - local_offsets[0];            int charcount = local_offsets[1] - local_offsets[0];
2931            int next_state_offset, repeat_state_offset;            int next_state_offset, repeat_state_offset;
2932
# Line 2842  for (;;) Line 2979  for (;;)
2979              }              }
2980            else            else
2981              {              {
2982              const uschar *p = start_subject + local_offsets[0];  #ifdef SUPPORT_UTF
2983              const uschar *pp = start_subject + local_offsets[1];              const pcre_uchar *p = start_subject + local_offsets[0];
2984              while (p < pp) if ((*p++ & 0xc0) == 0x80) charcount--;              const pcre_uchar *pp = start_subject + local_offsets[1];
2985                while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--;
2986    #endif
2987              ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1));              ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1));
2988              if (repeat_state_offset >= 0)              if (repeat_state_offset >= 0)
2989                { ADD_NEW_DATA(-repeat_state_offset, 0, (charcount - 1)); }                { ADD_NEW_DATA(-repeat_state_offset, 0, (charcount - 1)); }
# Line 2860  for (;;) Line 2999  for (;;)
2999
3000        case OP_CALLOUT:        case OP_CALLOUT:
3001        rrc = 0;        rrc = 0;
3002        if (pcre_callout != NULL)        if (PUBL(callout) != NULL)
3003          {          {
3004          pcre_callout_block cb;          PUBL(callout_block) cb;
3005          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 1;   /* Version 1 of the callout block */
3006          cb.callout_number   = code[1];          cb.callout_number   = code[1];
3007          cb.offset_vector    = offsets;          cb.offset_vector    = offsets;
3008    #ifdef COMPILE_PCRE8
3009          cb.subject          = (PCRE_SPTR)start_subject;          cb.subject          = (PCRE_SPTR)start_subject;
3010    #else
3011            cb.subject          = (PCRE_SPTR16)start_subject;
3012    #endif
3013          cb.subject_length   = (int)(end_subject - start_subject);          cb.subject_length   = (int)(end_subject - start_subject);
3014          cb.start_match      = (int)(current_subject - start_subject);          cb.start_match      = (int)(current_subject - start_subject);
3015          cb.current_position = (int)(ptr - start_subject);          cb.current_position = (int)(ptr - start_subject);
# Line 2875  for (;;) Line 3018  for (;;)
3018          cb.capture_top      = 1;          cb.capture_top      = 1;
3019          cb.capture_last     = -1;          cb.capture_last     = -1;
3020          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
3021          if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */          cb.mark             = NULL;   /* No (*MARK) support */
3022            if ((rrc = (*PUBL(callout))(&cb)) < 0) return rrc;   /* Abandon */
3023          }          }
3024        if (rrc == 0)        if (rrc == 0)
3025          { ADD_ACTIVE(state_offset + _pcre_OP_lengths[OP_CALLOUT], 0); }          { ADD_ACTIVE(state_offset + PRIV(OP_lengths)[OP_CALLOUT], 0); }
3026        break;        break;
3027
3028
# Line 2903  for (;;) Line 3047  for (;;)
3047
3048    The "could_continue" variable is true if a state could have continued but    The "could_continue" variable is true if a state could have continued but
3049    for the fact that the end of the subject was reached. */    for the fact that the end of the subject was reached. */
3050
3051    if (new_count <= 0)    if (new_count <= 0)
3052      {      {
3053      if (rlevel == 1 &&                               /* Top level, and */      if (rlevel == 1 &&                               /* Top level, and */
3054          could_continue &&                            /* Some could go on */          could_continue &&                            /* Some could go on, and */
3055          forced_fail != workspace[1] &&               /* Not all forced fail & */          forced_fail != workspace[1] &&               /* Not all forced fail & */
3056          (                                            /* either... */          (                                            /* either... */
3057          (md->moptions & PCRE_PARTIAL_HARD) != 0      /* Hard partial */          (md->moptions & PCRE_PARTIAL_HARD) != 0      /* Hard partial */
# Line 2915  for (;;) Line 3059  for (;;)
3059          ((md->moptions & PCRE_PARTIAL_SOFT) != 0 &&  /* Soft partial and */          ((md->moptions & PCRE_PARTIAL_SOFT) != 0 &&  /* Soft partial and */
3060           match_count < 0)                            /* no matches */           match_count < 0)                            /* no matches */
3061          ) &&                                         /* And... */          ) &&                                         /* And... */
3062          ptr >= end_subject &&                  /* Reached end of subject */          (
3063          ptr > md->start_used_ptr)              /* Inspected non-empty string */          partial_newline ||                           /* Either partial NL */
3064              (                                          /* or ... */
3065              ptr >= end_subject &&                /* End of subject and */
3066              ptr > md->start_used_ptr)            /* Inspected non-empty string */
3067              )
3068            )
3069        {        {
3070        if (offsetcount >= 2)        if (offsetcount >= 2)
3071          {          {
# Line 2975  Returns:          > 0 => number of match Line 3124  Returns:          > 0 => number of match
3124                   < -1 => some kind of unexpected problem                   < -1 => some kind of unexpected problem
3125  */  */
3126
3127    #ifdef COMPILE_PCRE8
3128  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
3129  pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,  pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,
3130    const char *subject, int length, int start_offset, int options, int *offsets,    const char *subject, int length, int start_offset, int options, int *offsets,
3131    int offsetcount, int *workspace, int wscount)    int offsetcount, int *workspace, int wscount)
3132    #else
3133    PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
3134    pcre16_dfa_exec(const pcre16 *argument_re, const pcre16_extra *extra_data,
3135      PCRE_SPTR16 subject, int length, int start_offset, int options, int *offsets,
3136      int offsetcount, int *workspace, int wscount)
3137    #endif
3138  {  {
3139  real_pcre *re = (real_pcre *)argument_re;  REAL_PCRE *re = (REAL_PCRE *)argument_re;
3140  dfa_match_data match_block;  dfa_match_data match_block;
3141  dfa_match_data *md = &match_block;  dfa_match_data *md = &match_block;
3142  BOOL utf8, anchored, startline, firstline;  BOOL utf, anchored, startline, firstline;
3143  const uschar *current_subject, *end_subject, *lcc;  const pcre_uchar *current_subject, *end_subject;

pcre_study_data internal_study;
3144  const pcre_study_data *study = NULL;  const pcre_study_data *study = NULL;
real_pcre internal_re;
3145
3146  const uschar *req_byte_ptr;  const pcre_uchar *req_char_ptr;
3147  const uschar *start_bits = NULL;  const pcre_uint8 *start_bits = NULL;
3148  BOOL first_byte_caseless = FALSE;  BOOL has_first_char = FALSE;
3149  BOOL req_byte_caseless = FALSE;  BOOL has_req_char = FALSE;
3150  int first_byte = -1;  pcre_uchar first_char = 0;
3151  int req_byte = -1;  pcre_uchar first_char2 = 0;
3152  int req_byte2 = -1;  pcre_uchar req_char = 0;
3153    pcre_uchar req_char2 = 0;
3154  int newline;  int newline;
3155
3156  /* Plausibility checks */  /* Plausibility checks */
# Line 3028  if (extra_data != NULL) Line 3182  if (extra_data != NULL)
3182      md->callout_data = extra_data->callout_data;      md->callout_data = extra_data->callout_data;
3183    if ((flags & PCRE_EXTRA_TABLES) != 0)    if ((flags & PCRE_EXTRA_TABLES) != 0)
3184      md->tables = extra_data->tables;      md->tables = extra_data->tables;
3185      ((pcre_extra *)extra_data)->flags &= ~PCRE_EXTRA_USED_JIT;  /* No JIT support here */
3186    }    }
3187
3188  /* Check that the first field in the block is the magic number. If it is not,  /* Check that the first field in the block is the magic number. If it is not,
3189  test for a regex that was compiled on a host of opposite endianness. If this is  return with PCRE_ERROR_BADMAGIC. However, if the magic number is equal to
3190  the case, flipped values are put in internal_re and internal_study if there was  REVERSED_MAGIC_NUMBER we return with PCRE_ERROR_BADENDIANNESS, which
3191  study data too. */  means that the pattern is likely compiled with different endianness. */
3192
3193  if (re->magic_number != MAGIC_NUMBER)  if (re->magic_number != MAGIC_NUMBER)
3194    {    return re->magic_number == REVERSED_MAGIC_NUMBER?
3195    re = _pcre_try_flipped(re, &internal_re, study, &internal_study);      PCRE_ERROR_BADENDIANNESS:PCRE_ERROR_BADMAGIC;
3196    if (re == NULL) return PCRE_ERROR_BADMAGIC;  if ((re->flags & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
if (study != NULL) study = &internal_study;
}
3197
3198  /* Set some local values */  /* Set some local values */
3199
3200  current_subject = (const unsigned char *)subject + start_offset;  current_subject = (const pcre_uchar *)subject + start_offset;
3201  end_subject = (const unsigned char *)subject + length;  end_subject = (const pcre_uchar *)subject + length;
3202  req_byte_ptr = current_subject - 1;  req_char_ptr = current_subject - 1;
3203
3204  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3205  utf8 = (re->options & PCRE_UTF8) != 0;  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
3206    utf = (re->options & PCRE_UTF8) != 0;
3207  #else  #else
3208  utf8 = FALSE;  utf = FALSE;
3209  #endif  #endif
3210
3211  anchored = (options & (PCRE_ANCHORED|PCRE_DFA_RESTART)) != 0 ||  anchored = (options & (PCRE_ANCHORED|PCRE_DFA_RESTART)) != 0 ||
# Line 3059  anchored = (options & (PCRE_ANCHORED|PCR Line 3213  anchored = (options & (PCRE_ANCHORED|PCR
3213
3214  /* The remaining fixed data for passing around. */  /* The remaining fixed data for passing around. */
3215
3216  md->start_code = (const uschar *)argument_re +  md->start_code = (const pcre_uchar *)argument_re +
3217      re->name_table_offset + re->name_count * re->name_entry_size;      re->name_table_offset + re->name_count * re->name_entry_size;
3218  md->start_subject = (const unsigned char *)subject;  md->start_subject = (const pcre_uchar *)subject;
3219  md->end_subject = end_subject;  md->end_subject = end_subject;
3220  md->start_offset = start_offset;  md->start_offset = start_offset;
3221  md->moptions = options;  md->moptions = options;
# Line 3122  else Line 3276  else
3276  /* 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
3277  back the character offset. */  back the character offset. */
3278
3279  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3280  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)  if (utf && (options & PCRE_NO_UTF8_CHECK) == 0)
3281    {    {
3282    int erroroffset;    int erroroffset;
3283    int errorcode = _pcre_valid_utf8((uschar *)subject, length, &erroroffset);    int errorcode = PRIV(valid_utf)((pcre_uchar *)subject, length, &erroroffset);
3284    if (errorcode != 0)    if (errorcode != 0)
3285      {      {
3286      if (offsetcount >= 2)      if (offsetcount >= 2)
3287        {        {
3288        offsets[0] = erroroffset;        offsets[0] = erroroffset;
3289        offsets[1] = errorcode;        offsets[1] = errorcode;
3290        }        }
3291      return (errorcode <= PCRE_UTF8_ERR5 && (options & PCRE_PARTIAL_HARD) != 0)?      return (errorcode <= PCRE_UTF8_ERR5 && (options & PCRE_PARTIAL_HARD) != 0)?
3292        PCRE_ERROR_SHORTUTF8 : PCRE_ERROR_BADUTF8;        PCRE_ERROR_SHORTUTF8 : PCRE_ERROR_BADUTF8;
3293      }      }
3294    if (start_offset > 0 && start_offset < length &&    if (start_offset > 0 && start_offset < length &&
3295          (((USPTR)subject)[start_offset] & 0xc0) == 0x80)          NOT_FIRSTCHAR(((PCRE_PUCHAR)subject)[start_offset]))
3297    }    }
3298  #endif  #endif
# Line 3147  if (utf8 && (options & PCRE_NO_UTF8_CHEC Line 3301  if (utf8 && (options & PCRE_NO_UTF8_CHEC
3301  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
3302  in other programs later. */  in other programs later. */
3303
3304  if (md->tables == NULL) md->tables = _pcre_default_tables;  if (md->tables == NULL) md->tables = PRIV(default_tables);
3305
3306  /* 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
3307  used in a loop when finding where to start. */  where to start. */
3308
lcc = md->tables + lcc_offset;
3309  startline = (re->flags & PCRE_STARTLINE) != 0;  startline = (re->flags & PCRE_STARTLINE) != 0;
3310  firstline = (re->options & PCRE_FIRSTLINE) != 0;  firstline = (re->options & PCRE_FIRSTLINE) != 0;
3311
# Line 3166  if (!anchored) Line 3319  if (!anchored)
3319    {    {
3320    if ((re->flags & PCRE_FIRSTSET) != 0)    if ((re->flags & PCRE_FIRSTSET) != 0)
3321      {      {
3322      first_byte = re->first_byte & 255;      has_first_char = TRUE;
3323      if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)      first_char = first_char2 = (pcre_uchar)(re->first_char);
3324        first_byte = lcc[first_byte];      if ((re->flags & PCRE_FCH_CASELESS) != 0)
3325          {
3326          first_char2 = TABLE_GET(first_char, md->tables + fcc_offset, first_char);
3327    #if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
3328          if (utf && first_char > 127)
3329            first_char2 = UCD_OTHERCASE(first_char);
3330    #endif
3331          }
3332      }      }
3333    else    else
3334      {      {
# Line 3183  character" set. */ Line 3343  character" set. */
3343
3344  if ((re->flags & PCRE_REQCHSET) != 0)  if ((re->flags & PCRE_REQCHSET) != 0)
3345    {    {
3346    req_byte = re->req_byte & 255;    has_req_char = TRUE;
3347    req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;    req_char = req_char2 = (pcre_uchar)(re->req_char);
3348    req_byte2 = (md->tables + fcc_offset)[req_byte];  /* case flipped */    if ((re->flags & PCRE_RCH_CASELESS) != 0)
3349        {
3350        req_char2 = TABLE_GET(req_char, md->tables + fcc_offset, req_char);
3351    #if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
3352        if (utf && req_char > 127)
3353          req_char2 = UCD_OTHERCASE(req_char);
3354    #endif
3355        }
3356    }    }
3357
3358  /* 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 3198  for (;;) Line 3365  for (;;)
3365
3366    if ((options & PCRE_DFA_RESTART) == 0)    if ((options & PCRE_DFA_RESTART) == 0)
3367      {      {
3368      const uschar *save_end_subject = end_subject;      const pcre_uchar *save_end_subject = end_subject;
3369
3370      /* 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
3371      line of a multiline string. Implement this by temporarily adjusting      line of a multiline string. Implement this by temporarily adjusting
# Line 3207  for (;;) Line 3374  for (;;)
3374
3375      if (firstline)      if (firstline)
3376        {        {
3377        USPTR t = current_subject;        PCRE_PUCHAR t = current_subject;
3378  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3379        if (utf8)        if (utf)
3380          {          {
3381          while (t < md->end_subject && !IS_NEWLINE(t))          while (t < md->end_subject && !IS_NEWLINE(t))
3382            {            {
3383            t++;            t++;
3384            while (t < end_subject && (*t & 0xc0) == 0x80) t++;            ACROSSCHAR(t < end_subject, *t, t++);
3385            }            }
3386          }          }
3387        else        else
# Line 3231  for (;;) Line 3398  for (;;)
3398
3399      if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0)      if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0)
3400        {        {
3401        /* Advance to a known first byte. */        /* Advance to a known first char. */
3402
3403        if (first_byte >= 0)        if (has_first_char)
3404          {          {
3405          if (first_byte_caseless)          if (first_char != first_char2)
3406            while (current_subject < end_subject &&            while (current_subject < end_subject &&
3407                   lcc[*current_subject] != first_byte)                *current_subject != first_char && *current_subject != first_char2)
3408              current_subject++;              current_subject++;
3409          else          else
3410            while (current_subject < end_subject &&            while (current_subject < end_subject &&
3411                   *current_subject != first_byte)                   *current_subject != first_char)
3412              current_subject++;              current_subject++;
3413          }          }
3414
# Line 3251  for (;;) Line 3418  for (;;)
3418          {          {
3419          if (current_subject > md->start_subject + start_offset)          if (current_subject > md->start_subject + start_offset)
3420            {            {
3421  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3422            if (utf8)            if (utf)
3423              {              {
3424              while (current_subject < end_subject &&              while (current_subject < end_subject &&
3425                     !WAS_NEWLINE(current_subject))                     !WAS_NEWLINE(current_subject))
3426                {                {
3427                current_subject++;                current_subject++;
3428                while(current_subject < end_subject &&                ACROSSCHAR(current_subject < end_subject, *current_subject,
3429                      (*current_subject & 0xc0) == 0x80)                  current_subject++);
current_subject++;
3430                }                }
3431              }              }
3432            else            else
# Line 3287  for (;;) Line 3453  for (;;)
3453          while (current_subject < end_subject)          while (current_subject < end_subject)
3454            {            {
3455            register unsigned int c = *current_subject;            register unsigned int c = *current_subject;
3456    #ifndef COMPILE_PCRE8
3457              if (c > 255) c = 255;
3458    #endif
3459            if ((start_bits[c/8] & (1 << (c&7))) == 0)            if ((start_bits[c/8] & (1 << (c&7))) == 0)
3460              {              {
3461              current_subject++;              current_subject++;
3462  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && defined COMPILE_PCRE8
3463              if (utf8)              /* In non 8-bit mode, the iteration will stop for
3464                while(current_subject < end_subject &&              characters > 255 at the beginning or not stop at all. */
3465                      (*current_subject & 0xc0) == 0x80) current_subject++;              if (utf)
3466                  ACROSSCHAR(current_subject < end_subject, *current_subject,
3467                    current_subject++);
3468  #endif  #endif
3469              }              }
3470            else break;            else break;
# Line 3309  for (;;) Line 3480  for (;;)
3480      disabling is explicitly requested (and of course, by the test above, this      disabling is explicitly requested (and of course, by the test above, this
3481      code is not obeyed when restarting after a partial match). */      code is not obeyed when restarting after a partial match). */
3482
3483      if ((options & PCRE_NO_START_OPTIMIZE) == 0 &&      if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0 &&
3484          (options & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) == 0)          (options & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) == 0)
3485        {        {
3486        /* 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 3321  for (;;) Line 3492  for (;;)
3492            (pcre_uint32)(end_subject - current_subject) < study->minlength)            (pcre_uint32)(end_subject - current_subject) < study->minlength)
3493          return PCRE_ERROR_NOMATCH;          return PCRE_ERROR_NOMATCH;
3494
3495        /* 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
3496        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
3497        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
3498        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
3499        nested unlimited repeats that aren't going to match. Writing separate        nested unlimited repeats that aren't going to match. Writing separate
# Line 3334  for (;;) Line 3505  for (;;)
3505        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
3506        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. */
3507
3508        if (req_byte >= 0 && end_subject - current_subject < REQ_BYTE_MAX)        if (has_req_char && end_subject - current_subject < REQ_BYTE_MAX)
3509          {          {
3510          register const uschar *p = current_subject + ((first_byte >= 0)? 1 : 0);          register PCRE_PUCHAR p = current_subject + (has_first_char? 1:0);
3511
3512          /* 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
3513          place we found it at last time. */          place we found it at last time. */
3514
3515          if (p > req_byte_ptr)          if (p > req_char_ptr)
3516            {            {
3517            if (req_byte_caseless)            if (req_char != req_char2)
3518              {              {
3519              while (p < end_subject)              while (p < end_subject)
3520                {                {
3521                register int pp = *p++;                register int pp = *p++;
3522                if (pp == req_byte || pp == req_byte2) { p--; break; }                if (pp == req_char || pp == req_char2) { p--; break; }
3523                }                }
3524              }              }
3525            else            else
3526              {              {
3527              while (p < end_subject)              while (p < end_subject)
3528                {                {
3529                if (*p++ == req_byte) { p--; break; }                if (*p++ == req_char) { p--; break; }
3530                }                }
3531              }              }
3532
# Line 3368  for (;;) Line 3539  for (;;)
3539            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
3540            the start hasn't passed this character yet. */            the start hasn't passed this character yet. */
3541
3542            req_byte_ptr = p;            req_char_ptr = p;
3543            }            }
3544          }          }
3545        }        }
# Line 3377  for (;;) Line 3548  for (;;)
3548    /* OK, now we can do the business */    /* OK, now we can do the business */
3549
3550    md->start_used_ptr = current_subject;    md->start_used_ptr = current_subject;
3551      md->recursive = NULL;
3552
3553    rc = internal_dfa_exec(    rc = internal_dfa_exec(
3554      md,                                /* fixed match data */      md,                                /* fixed match data */
# Line 3387  for (;;) Line 3559  for (;;)
3559      offsetcount,                       /* size of same */      offsetcount,                       /* size of same */
3560      workspace,                         /* workspace vector */      workspace,                         /* workspace vector */
3561      wscount,                           /* size of same */      wscount,                           /* size of same */
3562      0,                                 /* function recurse level */      0);                                /* function recurse level */
0);                                /* regex recurse level */
3563
3564    /* Anything other than "no match" means we are done, always; otherwise, carry    /* Anything other than "no match" means we are done, always; otherwise, carry
3565    on only if not anchored. */    on only if not anchored. */
# Line 3400  for (;;) Line 3571  for (;;)
3571
3572    if (firstline && IS_NEWLINE(current_subject)) break;    if (firstline && IS_NEWLINE(current_subject)) break;
3573    current_subject++;    current_subject++;
3574    if (utf8)  #ifdef SUPPORT_UTF
3575      if (utf)
3576      {      {
3577      while (current_subject < end_subject && (*current_subject & 0xc0) == 0x80)      ACROSSCHAR(current_subject < end_subject, *current_subject,
3578        current_subject++;        current_subject++);
3579      }      }
3580    #endif
3581    if (current_subject > end_subject) break;    if (current_subject > end_subject) break;
3582
3583    /* 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.637 changed lines Added in v.925