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

Diff of /code/trunk/pcre_study.c

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

revision 689 by ph10, Fri Sep 9 10:34:57 2011 UTC revision 1364 by ph10, Sat Oct 5 15:45:11 2013 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2010 University of Cambridge             Copyright (c) 1997-2012 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 66  string of that length that matches. In U Line 66  string of that length that matches. In U
66  rather than bytes.  rather than bytes.
67    
68  Arguments:  Arguments:
69    code        pointer to start of group (the bracket)    re              compiled pattern block
70    startcode   pointer to start of the whole pattern    code            pointer to start of group (the bracket)
71    options     the compiling options    startcode       pointer to start of the whole pattern's code
72    had_accept  pointer to flag for (*ACCEPT) encountered    options         the compiling options
73    int         RECURSE depth    int             RECURSE depth
74    
75  Returns:   the minimum length  Returns:   the minimum length
76             -1 if \C was encountered             -1 if \C in UTF-8 mode or (*ACCEPT) was encountered
77             -2 internal error (missing capturing bracket)             -2 internal error (missing capturing bracket)
78             -3 internal error (opcode not listed)             -3 internal error (opcode not listed)
79  */  */
80    
81  static int  static int
82  find_minlength(const uschar *code, const uschar *startcode, int options,  find_minlength(const REAL_PCRE *re, const pcre_uchar *code,
83    BOOL *had_accept_ptr, int recurse_depth)    const pcre_uchar *startcode, int options, int recurse_depth)
84  {  {
85  int length = -1;  int length = -1;
86  BOOL utf8 = (options & PCRE_UTF8) != 0;  /* PCRE_UTF16 has the same value as PCRE_UTF8. */
87    BOOL utf = (options & PCRE_UTF8) != 0;
88  BOOL had_recurse = FALSE;  BOOL had_recurse = FALSE;
89  register int branchlength = 0;  register int branchlength = 0;
90  register uschar *cc = (uschar *)code + 1 + LINK_SIZE;  register pcre_uchar *cc = (pcre_uchar *)code + 1 + LINK_SIZE;
91    
92  if (*code == OP_CBRA || *code == OP_SCBRA ||  if (*code == OP_CBRA || *code == OP_SCBRA ||
93      *code == OP_CBRAPOS || *code == OP_SCBRAPOS) cc += 2;      *code == OP_CBRAPOS || *code == OP_SCBRAPOS) cc += IMM2_SIZE;
94    
95  /* Scan along the opcodes for this branch. If we get to the end of the  /* Scan along the opcodes for this branch. If we get to the end of the
96  branch, check the length against that of the other branches. */  branch, check the length against that of the other branches. */
# Line 97  branch, check the length against that of Line 98  branch, check the length against that of
98  for (;;)  for (;;)
99    {    {
100    int d, min;    int d, min;
101    uschar *cs, *ce;    pcre_uchar *cs, *ce;
102    register int op = *cc;    register pcre_uchar op = *cc;
103    
104    switch (op)    switch (op)
105      {      {
# Line 128  for (;;) Line 129  for (;;)
129      case OP_BRAPOS:      case OP_BRAPOS:
130      case OP_SBRAPOS:      case OP_SBRAPOS:
131      case OP_ONCE:      case OP_ONCE:
132      d = find_minlength(cc, startcode, options, had_accept_ptr, recurse_depth);      case OP_ONCE_NC:
133        d = find_minlength(re, cc, startcode, options, recurse_depth);
134      if (d < 0) return d;      if (d < 0) return d;
135      branchlength += d;      branchlength += d;
     if (*had_accept_ptr) return branchlength;  
136      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
137      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
138      break;      break;
139    
140      /* Reached end of a branch; if it's a ket it is the end of a nested      /* ACCEPT makes things far too complicated; we have to give up. */
     call. If it's ALT it is an alternation in a nested call. If it is END it's  
     the end of the outer call. All can be handled by the same code. If it is  
     ACCEPT, it is essentially the same as END, but we set a flag so that  
     counting stops. */  
141    
142      case OP_ACCEPT:      case OP_ACCEPT:
143      case OP_ASSERT_ACCEPT:      case OP_ASSERT_ACCEPT:
144      *had_accept_ptr = TRUE;      return -1;
145      /* Fall through */  
146        /* Reached end of a branch; if it's a ket it is the end of a nested
147        call. If it's ALT it is an alternation in a nested call. If it is END it's
148        the end of the outer call. All can be handled by the same code. If an
149        ACCEPT was previously encountered, use the length that was in force at that
150        time, and pass back the shortest ACCEPT length. */
151    
152      case OP_ALT:      case OP_ALT:
153      case OP_KET:      case OP_KET:
154      case OP_KETRMAX:      case OP_KETRMAX:
# Line 188  for (;;) Line 191  for (;;)
191      case OP_DOLLM:      case OP_DOLLM:
192      case OP_NOT_WORD_BOUNDARY:      case OP_NOT_WORD_BOUNDARY:
193      case OP_WORD_BOUNDARY:      case OP_WORD_BOUNDARY:
194      cc += _pcre_OP_lengths[*cc];      cc += PRIV(OP_lengths)[*cc];
195      break;      break;
196    
197      /* Skip over a subpattern that has a {0} or {0,x} quantifier */      /* Skip over a subpattern that has a {0} or {0,x} quantifier */
# Line 197  for (;;) Line 200  for (;;)
200      case OP_BRAMINZERO:      case OP_BRAMINZERO:
201      case OP_BRAPOSZERO:      case OP_BRAPOSZERO:
202      case OP_SKIPZERO:      case OP_SKIPZERO:
203      cc += _pcre_OP_lengths[*cc];      cc += PRIV(OP_lengths)[*cc];
204      do cc += GET(cc, 1); while (*cc == OP_ALT);      do cc += GET(cc, 1); while (*cc == OP_ALT);
205      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
206      break;      break;
# Line 222  for (;;) Line 225  for (;;)
225      case OP_NOTPOSPLUSI:      case OP_NOTPOSPLUSI:
226      branchlength++;      branchlength++;
227      cc += 2;      cc += 2;
228  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
229      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
230  #endif  #endif
231      break;      break;
232    
# Line 242  for (;;) Line 245  for (;;)
245      case OP_NOTEXACT:      case OP_NOTEXACT:
246      case OP_NOTEXACTI:      case OP_NOTEXACTI:
247      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
248      cc += 4;      cc += 2 + IMM2_SIZE;
249  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
250      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
251  #endif  #endif
252      break;      break;
253    
254      case OP_TYPEEXACT:      case OP_TYPEEXACT:
255      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
256      cc += (cc[3] == OP_PROP || cc[3] == OP_NOTPROP)? 6 : 4;      cc += 2 + IMM2_SIZE + ((cc[1 + IMM2_SIZE] == OP_PROP
257          || cc[1 + IMM2_SIZE] == OP_NOTPROP)? 2 : 0);
258      break;      break;
259    
260      /* Handle single-char non-literal matchers */      /* Handle single-char non-literal matchers */
# Line 285  for (;;) Line 289  for (;;)
289      cc++;      cc++;
290      break;      break;
291    
292      /* The single-byte matcher means we can't proceed in UTF-8 mode */      /* The single-byte matcher means we can't proceed in UTF-8 mode. (In
293        non-UTF-8 mode \C will actually be turned into OP_ALLANY, so won't ever
294        appear, but leave the code, just in case.) */
295    
296      case OP_ANYBYTE:      case OP_ANYBYTE:
297  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
298      if (utf8) return -1;      if (utf) return -1;
299  #endif  #endif
300      branchlength++;      branchlength++;
301      cc++;      cc++;
# Line 305  for (;;) Line 311  for (;;)
311      case OP_TYPEPOSSTAR:      case OP_TYPEPOSSTAR:
312      case OP_TYPEPOSQUERY:      case OP_TYPEPOSQUERY:
313      if (cc[1] == OP_PROP || cc[1] == OP_NOTPROP) cc += 2;      if (cc[1] == OP_PROP || cc[1] == OP_NOTPROP) cc += 2;
314      cc += _pcre_OP_lengths[op];      cc += PRIV(OP_lengths)[op];
315      break;      break;
316    
317      case OP_TYPEUPTO:      case OP_TYPEUPTO:
318      case OP_TYPEMINUPTO:      case OP_TYPEMINUPTO:
319      case OP_TYPEPOSUPTO:      case OP_TYPEPOSUPTO:
320      if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;      if (cc[1 + IMM2_SIZE] == OP_PROP
321      cc += _pcre_OP_lengths[op];        || cc[1 + IMM2_SIZE] == OP_NOTPROP) cc += 2;
322        cc += PRIV(OP_lengths)[op];
323      break;      break;
324    
325      /* Check a class for variable quantification */      /* Check a class for variable quantification */
326    
 #ifdef SUPPORT_UTF8  
     case OP_XCLASS:  
     cc += GET(cc, 1) - 33;  
     /* Fall through */  
 #endif  
   
327      case OP_CLASS:      case OP_CLASS:
328      case OP_NCLASS:      case OP_NCLASS:
329      cc += 33;  #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
330        case OP_XCLASS:
331        /* The original code caused an unsigned overflow in 64 bit systems,
332        so now we use a conditional statement. */
333        if (op == OP_XCLASS)
334          cc += GET(cc, 1);
335        else
336          cc += PRIV(OP_lengths)[OP_CLASS];
337    #else
338        cc += PRIV(OP_lengths)[OP_CLASS];
339    #endif
340    
341      switch (*cc)      switch (*cc)
342        {        {
# Line 344  for (;;) Line 355  for (;;)
355        case OP_CRRANGE:        case OP_CRRANGE:
356        case OP_CRMINRANGE:        case OP_CRMINRANGE:
357        branchlength += GET2(cc,1);        branchlength += GET2(cc,1);
358        cc += 5;        cc += 1 + 2 * IMM2_SIZE;
359        break;        break;
360    
361        default:        default:
# Line 364  for (;;) Line 375  for (;;)
375      If PCRE_JAVASCRIPT_COMPAT is set, a backreference to an unset bracket      If PCRE_JAVASCRIPT_COMPAT is set, a backreference to an unset bracket
376      matches an empty string (by default it causes a matching failure), so in      matches an empty string (by default it causes a matching failure), so in
377      that case we must set the minimum length to zero. */      that case we must set the minimum length to zero. */
378    
379        case OP_DNREF:     /* Duplicate named pattern back reference */
380        case OP_DNREFI:
381        if ((options & PCRE_JAVASCRIPT_COMPAT) == 0)
382          {
383          int count = GET2(cc, 1+IMM2_SIZE);
384          pcre_uchar *slot = (pcre_uchar *)re +
385            re->name_table_offset + GET2(cc, 1) * re->name_entry_size;
386          d = INT_MAX;
387          while (count-- > 0)
388            {
389            ce = cs = (pcre_uchar *)PRIV(find_bracket)(startcode, utf, GET2(slot, 0));
390            if (cs == NULL) return -2;
391            do ce += GET(ce, 1); while (*ce == OP_ALT);
392            if (cc > cs && cc < ce)
393              {
394              d = 0;
395              had_recurse = TRUE;
396              break;
397              }
398            else
399              {
400              int dd = find_minlength(re, cs, startcode, options, recurse_depth);
401              if (dd < d) d = dd;
402              }
403            slot += re->name_entry_size;
404            }
405          }
406        else d = 0;
407        cc += 1 + 2*IMM2_SIZE;
408        goto REPEAT_BACK_REFERENCE;
409    
410      case OP_REF:      case OP_REF:      /* Single back reference */
411      case OP_REFI:      case OP_REFI:
412      if ((options & PCRE_JAVASCRIPT_COMPAT) == 0)      if ((options & PCRE_JAVASCRIPT_COMPAT) == 0)
413        {        {
414        ce = cs = (uschar *)_pcre_find_bracket(startcode, utf8, GET2(cc, 1));        ce = cs = (pcre_uchar *)PRIV(find_bracket)(startcode, utf, GET2(cc, 1));
415        if (cs == NULL) return -2;        if (cs == NULL) return -2;
416        do ce += GET(ce, 1); while (*ce == OP_ALT);        do ce += GET(ce, 1); while (*ce == OP_ALT);
417        if (cc > cs && cc < ce)        if (cc > cs && cc < ce)
# Line 379  for (;;) Line 421  for (;;)
421          }          }
422        else        else
423          {          {
424          d = find_minlength(cs, startcode, options, had_accept_ptr,          d = find_minlength(re, cs, startcode, options, recurse_depth);
           recurse_depth);  
         *had_accept_ptr = FALSE;  
425          }          }
426        }        }
427      else d = 0;      else d = 0;
428      cc += 3;      cc += 1 + IMM2_SIZE;
429    
430      /* Handle repeated back references */      /* Handle repeated back references */
431    
432        REPEAT_BACK_REFERENCE:
433      switch (*cc)      switch (*cc)
434        {        {
435        case OP_CRSTAR:        case OP_CRSTAR:
# Line 408  for (;;) Line 449  for (;;)
449        case OP_CRRANGE:        case OP_CRRANGE:
450        case OP_CRMINRANGE:        case OP_CRMINRANGE:
451        min = GET2(cc, 1);        min = GET2(cc, 1);
452        cc += 5;        cc += 1 + 2 * IMM2_SIZE;
453        break;        break;
454    
455        default:        default:
# Line 423  for (;;) Line 464  for (;;)
464      caught by a recursion depth count. */      caught by a recursion depth count. */
465    
466      case OP_RECURSE:      case OP_RECURSE:
467      cs = ce = (uschar *)startcode + GET(cc, 1);      cs = ce = (pcre_uchar *)startcode + GET(cc, 1);
     if (cs == NULL) return -2;  
468      do ce += GET(ce, 1); while (*ce == OP_ALT);      do ce += GET(ce, 1); while (*ce == OP_ALT);
469      if ((cc > cs && cc < ce) || recurse_depth > 10)      if ((cc > cs && cc < ce) || recurse_depth > 10)
470        had_recurse = TRUE;        had_recurse = TRUE;
471      else      else
472        {        {
473        branchlength += find_minlength(cs, startcode, options, had_accept_ptr,        branchlength += find_minlength(re, cs, startcode, options,
474          recurse_depth + 1);          recurse_depth + 1);
       *had_accept_ptr = FALSE;  
475        }        }
476      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
477      break;      break;
# Line 484  for (;;) Line 523  for (;;)
523      case OP_NOTPOSQUERY:      case OP_NOTPOSQUERY:
524      case OP_NOTPOSQUERYI:      case OP_NOTPOSQUERYI:
525    
526      cc += _pcre_OP_lengths[op];      cc += PRIV(OP_lengths)[op];
527  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
528      if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
529  #endif  #endif
530      break;      break;
531    
# Line 495  for (;;) Line 534  for (;;)
534      case OP_MARK:      case OP_MARK:
535      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
536      case OP_SKIP_ARG:      case OP_SKIP_ARG:
     cc += _pcre_OP_lengths[op] + cc[1];  
     break;  
   
537      case OP_THEN_ARG:      case OP_THEN_ARG:
538      cc += _pcre_OP_lengths[op] + cc[1+LINK_SIZE];      cc += PRIV(OP_lengths)[op] + cc[1];
539      break;      break;
540    
541      /* The remaining opcodes are just skipped over. */      /* The remaining opcodes are just skipped over. */
# Line 511  for (;;) Line 547  for (;;)
547      case OP_SET_SOM:      case OP_SET_SOM:
548      case OP_SKIP:      case OP_SKIP:
549      case OP_THEN:      case OP_THEN:
550      cc += _pcre_OP_lengths[op];      cc += PRIV(OP_lengths)[op];
551      break;      break;
552    
553      /* This should not occur: we list all opcodes explicitly so that when      /* This should not occur: we list all opcodes explicitly so that when
# Line 540  Arguments: Line 576  Arguments:
576    p             points to the character    p             points to the character
577    caseless      the caseless flag    caseless      the caseless flag
578    cd            the block with char table pointers    cd            the block with char table pointers
579    utf8          TRUE for UTF-8 mode    utf           TRUE for UTF-8 / UTF-16 / UTF-32 mode
580    
581  Returns:        pointer after the character  Returns:        pointer after the character
582  */  */
583    
584  static const uschar *  static const pcre_uchar *
585  set_table_bit(uschar *start_bits, const uschar *p, BOOL caseless,  set_table_bit(pcre_uint8 *start_bits, const pcre_uchar *p, BOOL caseless,
586    compile_data *cd, BOOL utf8)    compile_data *cd, BOOL utf)
587  {  {
588  unsigned int c = *p;  pcre_uint32 c = *p;
589    
590    #ifdef COMPILE_PCRE8
591  SET_BIT(c);  SET_BIT(c);
592    
593  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
594  if (utf8 && c > 127)  if (utf && c > 127)
595    {    {
596    GETCHARINC(c, p);    GETCHARINC(c, p);
597  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
598    if (caseless)    if (caseless)
599      {      {
600      uschar buff[8];      pcre_uchar buff[6];
601      c = UCD_OTHERCASE(c);      c = UCD_OTHERCASE(c);
602      (void)_pcre_ord2utf8(c, buff);      (void)PRIV(ord2utf)(c, buff);
603      SET_BIT(buff[0]);      SET_BIT(buff[0]);
604      }      }
605  #endif  #endif  /* Not SUPPORT_UCP */
606    return p;    return p;
607    }    }
608  #endif  #else   /* Not SUPPORT_UTF */
609    (void)(utf);   /* Stops warning for unused parameter */
610    #endif  /* SUPPORT_UTF */
611    
612  /* Not UTF-8 mode, or character is less than 127. */  /* Not UTF-8 mode, or character is less than 127. */
613    
614  if (caseless && (cd->ctypes[c] & ctype_letter) != 0) SET_BIT(cd->fcc[c]);  if (caseless && (cd->ctypes[c] & ctype_letter) != 0) SET_BIT(cd->fcc[c]);
615  return p + 1;  return p + 1;
616    #endif  /* COMPILE_PCRE8 */
617    
618    #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
619    if (c > 0xff)
620      {
621      c = 0xff;
622      caseless = FALSE;
623      }
624    SET_BIT(c);
625    
626    #ifdef SUPPORT_UTF
627    if (utf && c > 127)
628      {
629      GETCHARINC(c, p);
630    #ifdef SUPPORT_UCP
631      if (caseless)
632        {
633        c = UCD_OTHERCASE(c);
634        if (c > 0xff)
635          c = 0xff;
636        SET_BIT(c);
637        }
638    #endif  /* SUPPORT_UCP */
639      return p;
640      }
641    #else   /* Not SUPPORT_UTF */
642    (void)(utf);   /* Stops warning for unused parameter */
643    #endif  /* SUPPORT_UTF */
644    
645    if (caseless && (cd->ctypes[c] & ctype_letter) != 0) SET_BIT(cd->fcc[c]);
646    return p + 1;
647    #endif
648  }  }
649    
650    
# Line 599  Returns:         nothing Line 670  Returns:         nothing
670  */  */
671    
672  static void  static void
673  set_type_bits(uschar *start_bits, int cbit_type, int table_limit,  set_type_bits(pcre_uint8 *start_bits, int cbit_type, unsigned int table_limit,
674    compile_data *cd)    compile_data *cd)
675  {  {
676  register int c;  register pcre_uint32 c;
677  for (c = 0; c < table_limit; c++) start_bits[c] |= cd->cbits[c+cbit_type];  for (c = 0; c < table_limit; c++) start_bits[c] |= cd->cbits[c+cbit_type];
678    #if defined SUPPORT_UTF && defined COMPILE_PCRE8
679  if (table_limit == 32) return;  if (table_limit == 32) return;
680  for (c = 128; c < 256; c++)  for (c = 128; c < 256; c++)
681    {    {
682    if ((cd->cbits[c/8] & (1 << (c&7))) != 0)    if ((cd->cbits[c/8] & (1 << (c&7))) != 0)
683      {      {
684      uschar buff[8];      pcre_uchar buff[6];
685      (void)_pcre_ord2utf8(c, buff);      (void)PRIV(ord2utf)(c, buff);
686      SET_BIT(buff[0]);      SET_BIT(buff[0]);
687      }      }
688    }    }
689    #endif
690  }  }
691    
692    
# Line 639  Returns:         nothing Line 712  Returns:         nothing
712  */  */
713    
714  static void  static void
715  set_nottype_bits(uschar *start_bits, int cbit_type, int table_limit,  set_nottype_bits(pcre_uint8 *start_bits, int cbit_type, unsigned int table_limit,
716    compile_data *cd)    compile_data *cd)
717  {  {
718  register int c;  register pcre_uint32 c;
719  for (c = 0; c < table_limit; c++) start_bits[c] |= ~cd->cbits[c+cbit_type];  for (c = 0; c < table_limit; c++) start_bits[c] |= ~cd->cbits[c+cbit_type];
720    #if defined SUPPORT_UTF && defined COMPILE_PCRE8
721  if (table_limit != 32) for (c = 24; c < 32; c++) start_bits[c] = 0xff;  if (table_limit != 32) for (c = 24; c < 32; c++) start_bits[c] = 0xff;
722    #endif
723  }  }
724    
725    
# Line 664  function fails unless the result is SSB_ Line 739  function fails unless the result is SSB_
739  Arguments:  Arguments:
740    code         points to an expression    code         points to an expression
741    start_bits   points to a 32-byte table, initialized to 0    start_bits   points to a 32-byte table, initialized to 0
742    utf8         TRUE if in UTF-8 mode    utf          TRUE if in UTF-8 / UTF-16 / UTF-32 mode
743    cd           the block with char table pointers    cd           the block with char table pointers
744    
745  Returns:       SSB_FAIL     => Failed to find any starting bytes  Returns:       SSB_FAIL     => Failed to find any starting bytes
# Line 674  Returns:       SSB_FAIL     => Failed to Line 749  Returns:       SSB_FAIL     => Failed to
749  */  */
750    
751  static int  static int
752  set_start_bits(const uschar *code, uschar *start_bits, BOOL utf8,  set_start_bits(const pcre_uchar *code, pcre_uint8 *start_bits, BOOL utf,
753    compile_data *cd)    compile_data *cd)
754  {  {
755  register int c;  register pcre_uint32 c;
756  int yield = SSB_DONE;  int yield = SSB_DONE;
757  int table_limit = utf8? 16:32;  #if defined SUPPORT_UTF && defined COMPILE_PCRE8
758    int table_limit = utf? 16:32;
759    #else
760    int table_limit = 32;
761    #endif
762    
763  #if 0  #if 0
764  /* ========================================================================= */  /* ========================================================================= */
# Line 701  volatile int dummy; Line 780  volatile int dummy;
780  do  do
781    {    {
782    BOOL try_next = TRUE;    BOOL try_next = TRUE;
783    const uschar *tcode = code + 1 + LINK_SIZE;    const pcre_uchar *tcode = code + 1 + LINK_SIZE;
784    
785    if (*code == OP_CBRA || *code == OP_SCBRA ||    if (*code == OP_CBRA || *code == OP_SCBRA ||
786        *code == OP_CBRAPOS || *code == OP_SCBRAPOS) tcode += 2;        *code == OP_CBRAPOS || *code == OP_SCBRAPOS) tcode += IMM2_SIZE;
787    
788    while (try_next)    /* Loop for items in this branch */    while (try_next)    /* Loop for items in this branch */
789      {      {
# Line 780  do Line 859  do
859        case OP_RECURSE:        case OP_RECURSE:
860        case OP_REF:        case OP_REF:
861        case OP_REFI:        case OP_REFI:
862          case OP_DNREF:
863          case OP_DNREFI:
864        case OP_REVERSE:        case OP_REVERSE:
865        case OP_RREF:        case OP_RREF:
866        case OP_SCOND:        case OP_SCOND:
# Line 790  do Line 871  do
871        case OP_SOM:        case OP_SOM:
872        case OP_THEN:        case OP_THEN:
873        case OP_THEN_ARG:        case OP_THEN_ARG:
874    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
875        case OP_XCLASS:        case OP_XCLASS:
876    #endif
877        return SSB_FAIL;        return SSB_FAIL;
878    
879        /* We can ignore word boundary tests. */        /* We can ignore word boundary tests. */
# Line 814  do Line 897  do
897        case OP_CBRAPOS:        case OP_CBRAPOS:
898        case OP_SCBRAPOS:        case OP_SCBRAPOS:
899        case OP_ONCE:        case OP_ONCE:
900          case OP_ONCE_NC:
901        case OP_ASSERT:        case OP_ASSERT:
902        rc = set_start_bits(tcode, start_bits, utf8, cd);        rc = set_start_bits(tcode, start_bits, utf, cd);
903        if (rc == SSB_FAIL || rc == SSB_UNKNOWN) return rc;        if (rc == SSB_FAIL || rc == SSB_UNKNOWN) return rc;
904        if (rc == SSB_DONE) try_next = FALSE; else        if (rc == SSB_DONE) try_next = FALSE; else
905          {          {
# Line 862  do Line 946  do
946        case OP_BRAZERO:        case OP_BRAZERO:
947        case OP_BRAMINZERO:        case OP_BRAMINZERO:
948        case OP_BRAPOSZERO:        case OP_BRAPOSZERO:
949        rc = set_start_bits(++tcode, start_bits, utf8, cd);        rc = set_start_bits(++tcode, start_bits, utf, cd);
950        if (rc == SSB_FAIL || rc == SSB_UNKNOWN) return rc;        if (rc == SSB_FAIL || rc == SSB_UNKNOWN) return rc;
951  /* =========================================================================  /* =========================================================================
952        See the comment at the head of this function concerning the next line,        See the comment at the head of this function concerning the next line,
# Line 889  do Line 973  do
973        case OP_QUERY:        case OP_QUERY:
974        case OP_MINQUERY:        case OP_MINQUERY:
975        case OP_POSQUERY:        case OP_POSQUERY:
976        tcode = set_table_bit(start_bits, tcode + 1, FALSE, cd, utf8);        tcode = set_table_bit(start_bits, tcode + 1, FALSE, cd, utf);
977        break;        break;
978    
979        case OP_STARI:        case OP_STARI:
# Line 898  do Line 982  do
982        case OP_QUERYI:        case OP_QUERYI:
983        case OP_MINQUERYI:        case OP_MINQUERYI:
984        case OP_POSQUERYI:        case OP_POSQUERYI:
985        tcode = set_table_bit(start_bits, tcode + 1, TRUE, cd, utf8);        tcode = set_table_bit(start_bits, tcode + 1, TRUE, cd, utf);
986        break;        break;
987    
988        /* Single-char upto sets the bit and tries the next */        /* Single-char upto sets the bit and tries the next */
# Line 906  do Line 990  do
990        case OP_UPTO:        case OP_UPTO:
991        case OP_MINUPTO:        case OP_MINUPTO:
992        case OP_POSUPTO:        case OP_POSUPTO:
993        tcode = set_table_bit(start_bits, tcode + 3, FALSE, cd, utf8);        tcode = set_table_bit(start_bits, tcode + 1 + IMM2_SIZE, FALSE, cd, utf);
994        break;        break;
995    
996        case OP_UPTOI:        case OP_UPTOI:
997        case OP_MINUPTOI:        case OP_MINUPTOI:
998        case OP_POSUPTOI:        case OP_POSUPTOI:
999        tcode = set_table_bit(start_bits, tcode + 3, TRUE, cd, utf8);        tcode = set_table_bit(start_bits, tcode + 1 + IMM2_SIZE, TRUE, cd, utf);
1000        break;        break;
1001    
1002        /* At least one single char sets the bit and stops */        /* At least one single char sets the bit and stops */
1003    
1004        case OP_EXACT:        case OP_EXACT:
1005        tcode += 2;        tcode += IMM2_SIZE;
1006        /* Fall through */        /* Fall through */
1007        case OP_CHAR:        case OP_CHAR:
1008        case OP_PLUS:        case OP_PLUS:
1009        case OP_MINPLUS:        case OP_MINPLUS:
1010        case OP_POSPLUS:        case OP_POSPLUS:
1011        (void)set_table_bit(start_bits, tcode + 1, FALSE, cd, utf8);        (void)set_table_bit(start_bits, tcode + 1, FALSE, cd, utf);
1012        try_next = FALSE;        try_next = FALSE;
1013        break;        break;
1014    
1015        case OP_EXACTI:        case OP_EXACTI:
1016        tcode += 2;        tcode += IMM2_SIZE;
1017        /* Fall through */        /* Fall through */
1018        case OP_CHARI:        case OP_CHARI:
1019        case OP_PLUSI:        case OP_PLUSI:
1020        case OP_MINPLUSI:        case OP_MINPLUSI:
1021        case OP_POSPLUSI:        case OP_POSPLUSI:
1022        (void)set_table_bit(start_bits, tcode + 1, TRUE, cd, utf8);        (void)set_table_bit(start_bits, tcode + 1, TRUE, cd, utf);
1023        try_next = FALSE;        try_next = FALSE;
1024        break;        break;
1025    
# Line 946  do Line 1030  do
1030        identical. */        identical. */
1031    
1032        case OP_HSPACE:        case OP_HSPACE:
1033        SET_BIT(0x09);        SET_BIT(CHAR_HT);
1034        SET_BIT(0x20);        SET_BIT(CHAR_SPACE);
1035        if (utf8)  #ifdef SUPPORT_UTF
1036          if (utf)
1037          {          {
1038    #ifdef COMPILE_PCRE8
1039          SET_BIT(0xC2);  /* For U+00A0 */          SET_BIT(0xC2);  /* For U+00A0 */
1040          SET_BIT(0xE1);  /* For U+1680, U+180E */          SET_BIT(0xE1);  /* For U+1680, U+180E */
1041          SET_BIT(0xE2);  /* For U+2000 - U+200A, U+202F, U+205F */          SET_BIT(0xE2);  /* For U+2000 - U+200A, U+202F, U+205F */
1042          SET_BIT(0xE3);  /* For U+3000 */          SET_BIT(0xE3);  /* For U+3000 */
1043    #elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1044            SET_BIT(0xA0);
1045            SET_BIT(0xFF);  /* For characters > 255 */
1046    #endif  /* COMPILE_PCRE[8|16|32] */
1047            }
1048          else
1049    #endif /* SUPPORT_UTF */
1050            {
1051    #ifndef EBCDIC
1052            SET_BIT(0xA0);
1053    #endif  /* Not EBCDIC */
1054    #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1055            SET_BIT(0xFF);  /* For characters > 255 */
1056    #endif  /* COMPILE_PCRE[16|32] */
1057          }          }
       else SET_BIT(0xA0);  
1058        try_next = FALSE;        try_next = FALSE;
1059        break;        break;
1060    
1061        case OP_ANYNL:        case OP_ANYNL:
1062        case OP_VSPACE:        case OP_VSPACE:
1063        SET_BIT(0x0A);        SET_BIT(CHAR_LF);
1064        SET_BIT(0x0B);        SET_BIT(CHAR_VT);
1065        SET_BIT(0x0C);        SET_BIT(CHAR_FF);
1066        SET_BIT(0x0D);        SET_BIT(CHAR_CR);
1067        if (utf8)  #ifdef SUPPORT_UTF
1068          if (utf)
1069          {          {
1070    #ifdef COMPILE_PCRE8
1071          SET_BIT(0xC2);  /* For U+0085 */          SET_BIT(0xC2);  /* For U+0085 */
1072          SET_BIT(0xE2);  /* For U+2028, U+2029 */          SET_BIT(0xE2);  /* For U+2028, U+2029 */
1073    #elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1074            SET_BIT(CHAR_NEL);
1075            SET_BIT(0xFF);  /* For characters > 255 */
1076    #endif  /* COMPILE_PCRE[8|16|32] */
1077            }
1078          else
1079    #endif /* SUPPORT_UTF */
1080            {
1081            SET_BIT(CHAR_NEL);
1082    #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1083            SET_BIT(0xFF);  /* For characters > 255 */
1084    #endif
1085          }          }
       else SET_BIT(0x85);  
1086        try_next = FALSE;        try_next = FALSE;
1087        break;        break;
1088    
# Line 990  do Line 1102  do
1102        break;        break;
1103    
1104        /* The cbit_space table has vertical tab as whitespace; we have to        /* The cbit_space table has vertical tab as whitespace; we have to
1105        ensure it is set as not whitespace. */        ensure it is set as not whitespace. Luckily, the code value is the same
1106          (0x0b) in ASCII and EBCDIC, so we can just adjust the appropriate bit. */
1107    
1108        case OP_NOT_WHITESPACE:        case OP_NOT_WHITESPACE:
1109        set_nottype_bits(start_bits, cbit_space, table_limit, cd);        set_nottype_bits(start_bits, cbit_space, table_limit, cd);
# Line 998  do Line 1111  do
1111        try_next = FALSE;        try_next = FALSE;
1112        break;        break;
1113    
1114        /* The cbit_space table has vertical tab as whitespace; we have to        /* The cbit_space table has vertical tab as whitespace; we have to not
1115        not set it from the table. */        set it from the table. Luckily, the code value is the same (0x0b) in
1116          ASCII and EBCDIC, so we can just adjust the appropriate bit. */
1117    
1118        case OP_WHITESPACE:        case OP_WHITESPACE:
1119        c = start_bits[1];    /* Save in case it was already set */        c = start_bits[1];    /* Save in case it was already set */
# Line 1028  do Line 1142  do
1142        break;        break;
1143    
1144        case OP_TYPEEXACT:        case OP_TYPEEXACT:
1145        tcode += 3;        tcode += 1 + IMM2_SIZE;
1146        break;        break;
1147    
1148        /* Zero or more repeats of character types set the bits and then        /* Zero or more repeats of character types set the bits and then
# Line 1037  do Line 1151  do
1151        case OP_TYPEUPTO:        case OP_TYPEUPTO:
1152        case OP_TYPEMINUPTO:        case OP_TYPEMINUPTO:
1153        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
1154        tcode += 2;               /* Fall through */        tcode += IMM2_SIZE;  /* Fall through */
1155    
1156        case OP_TYPESTAR:        case OP_TYPESTAR:
1157        case OP_TYPEMINSTAR:        case OP_TYPEMINSTAR:
# Line 1053  do Line 1167  do
1167          return SSB_FAIL;          return SSB_FAIL;
1168    
1169          case OP_HSPACE:          case OP_HSPACE:
1170          SET_BIT(0x09);          SET_BIT(CHAR_HT);
1171          SET_BIT(0x20);          SET_BIT(CHAR_SPACE);
1172          if (utf8)  #ifdef SUPPORT_UTF
1173            if (utf)
1174            {            {
1175    #ifdef COMPILE_PCRE8
1176            SET_BIT(0xC2);  /* For U+00A0 */            SET_BIT(0xC2);  /* For U+00A0 */
1177            SET_BIT(0xE1);  /* For U+1680, U+180E */            SET_BIT(0xE1);  /* For U+1680, U+180E */
1178            SET_BIT(0xE2);  /* For U+2000 - U+200A, U+202F, U+205F */            SET_BIT(0xE2);  /* For U+2000 - U+200A, U+202F, U+205F */
1179            SET_BIT(0xE3);  /* For U+3000 */            SET_BIT(0xE3);  /* For U+3000 */
1180    #elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1181              SET_BIT(0xA0);
1182              SET_BIT(0xFF);  /* For characters > 255 */
1183    #endif  /* COMPILE_PCRE[8|16|32] */
1184            }            }
1185          else SET_BIT(0xA0);          else
1186    #endif /* SUPPORT_UTF */
1187    #ifndef EBCDIC
1188              SET_BIT(0xA0);
1189    #endif  /* Not EBCDIC */
1190          break;          break;
1191    
1192          case OP_ANYNL:          case OP_ANYNL:
1193          case OP_VSPACE:          case OP_VSPACE:
1194          SET_BIT(0x0A);          SET_BIT(CHAR_LF);
1195          SET_BIT(0x0B);          SET_BIT(CHAR_VT);
1196          SET_BIT(0x0C);          SET_BIT(CHAR_FF);
1197          SET_BIT(0x0D);          SET_BIT(CHAR_CR);
1198          if (utf8)  #ifdef SUPPORT_UTF
1199            if (utf)
1200            {            {
1201    #ifdef COMPILE_PCRE8
1202            SET_BIT(0xC2);  /* For U+0085 */            SET_BIT(0xC2);  /* For U+0085 */
1203            SET_BIT(0xE2);  /* For U+2028, U+2029 */            SET_BIT(0xE2);  /* For U+2028, U+2029 */
1204    #elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1205              SET_BIT(CHAR_NEL);
1206              SET_BIT(0xFF);  /* For characters > 255 */
1207    #endif  /* COMPILE_PCRE16 */
1208            }            }
1209          else SET_BIT(0x85);          else
1210    #endif /* SUPPORT_UTF */
1211              SET_BIT(CHAR_NEL);
1212          break;          break;
1213    
1214          case OP_NOT_DIGIT:          case OP_NOT_DIGIT:
# Line 1087  do Line 1219  do
1219          set_type_bits(start_bits, cbit_digit, table_limit, cd);          set_type_bits(start_bits, cbit_digit, table_limit, cd);
1220          break;          break;
1221    
1222          /* The cbit_space table has vertical tab as whitespace; we have to          /* The cbit_space table has vertical tab as whitespace; we no longer
1223          ensure it gets set as not whitespace. */          have to play fancy tricks because Perl added VT to its whitespace at
1224            release 5.18. PCRE added it at release 8.34. */
1225    
1226          case OP_NOT_WHITESPACE:          case OP_NOT_WHITESPACE:
1227          set_nottype_bits(start_bits, cbit_space, table_limit, cd);          set_nottype_bits(start_bits, cbit_space, table_limit, cd);
         start_bits[1] |= 0x08;  
1228          break;          break;
1229    
         /* The cbit_space table has vertical tab as whitespace; we have to  
         avoid setting it. */  
   
1230          case OP_WHITESPACE:          case OP_WHITESPACE:
         c = start_bits[1];    /* Save in case it was already set */  
1231          set_type_bits(start_bits, cbit_space, table_limit, cd);          set_type_bits(start_bits, cbit_space, table_limit, cd);
         start_bits[1] = (start_bits[1] & ~0x08) | c;  
1232          break;          break;
1233    
1234          case OP_NOT_WORDCHAR:          case OP_NOT_WORDCHAR:
# Line 1123  do Line 1250  do
1250        character with a value > 255. */        character with a value > 255. */
1251    
1252        case OP_NCLASS:        case OP_NCLASS:
1253  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && defined COMPILE_PCRE8
1254        if (utf8)        if (utf)
1255          {          {
1256          start_bits[24] |= 0xf0;              /* Bits for 0xc4 - 0xc8 */          start_bits[24] |= 0xf0;              /* Bits for 0xc4 - 0xc8 */
1257          memset(start_bits+25, 0xff, 7);      /* Bits for 0xc9 - 0xff */          memset(start_bits+25, 0xff, 7);      /* Bits for 0xc9 - 0xff */
1258          }          }
1259  #endif  #endif
1260    #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1261          SET_BIT(0xFF);                         /* For characters > 255 */
1262    #endif
1263        /* Fall through */        /* Fall through */
1264    
1265        case OP_CLASS:        case OP_CLASS:
1266          {          {
1267            pcre_uint8 *map;
1268          tcode++;          tcode++;
1269            map = (pcre_uint8 *)tcode;
1270    
1271          /* In UTF-8 mode, the bits in a bit map correspond to character          /* In UTF-8 mode, the bits in a bit map correspond to character
1272          values, not to byte values. However, the bit map we are constructing is          values, not to byte values. However, the bit map we are constructing is
# Line 1142  do Line 1274  do
1274          value is > 127. In fact, there are only two possible starting bytes for          value is > 127. In fact, there are only two possible starting bytes for
1275          characters in the range 128 - 255. */          characters in the range 128 - 255. */
1276    
1277  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF && defined COMPILE_PCRE8
1278          if (utf8)          if (utf)
1279            {            {
1280            for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];            for (c = 0; c < 16; c++) start_bits[c] |= map[c];
1281            for (c = 128; c < 256; c++)            for (c = 128; c < 256; c++)
1282              {              {
1283              if ((tcode[c/8] && (1 << (c&7))) != 0)              if ((map[c/8] && (1 << (c&7))) != 0)
1284                {                {
1285                int d = (c >> 6) | 0xc0;            /* Set bit for this starter */                int d = (c >> 6) | 0xc0;            /* Set bit for this starter */
1286                start_bits[d/8] |= (1 << (d&7));    /* and then skip on to the */                start_bits[d/8] |= (1 << (d&7));    /* and then skip on to the */
# Line 1156  do Line 1288  do
1288                }                }
1289              }              }
1290            }            }
   
         /* In non-UTF-8 mode, the two bit maps are completely compatible. */  
   
1291          else          else
1292  #endif  #endif
1293            {            {
1294            for (c = 0; c < 32; c++) start_bits[c] |= tcode[c];            /* In non-UTF-8 mode, the two bit maps are completely compatible. */
1295              for (c = 0; c < 32; c++) start_bits[c] |= map[c];
1296            }            }
1297    
1298          /* Advance past the bit map, and act on what follows. For a zero          /* Advance past the bit map, and act on what follows. For a zero
1299          minimum repeat, continue; otherwise stop processing. */          minimum repeat, continue; otherwise stop processing. */
1300    
1301          tcode += 32;          tcode += 32 / sizeof(pcre_uchar);
1302          switch (*tcode)          switch (*tcode)
1303            {            {
1304            case OP_CRSTAR:            case OP_CRSTAR:
# Line 1180  do Line 1310  do
1310    
1311            case OP_CRRANGE:            case OP_CRRANGE:
1312            case OP_CRMINRANGE:            case OP_CRMINRANGE:
1313            if (((tcode[1] << 8) + tcode[2]) == 0) tcode += 5;            if (GET2(tcode, 1) == 0) tcode += 1 + 2 * IMM2_SIZE;
1314              else try_next = FALSE;              else try_next = FALSE;
1315            break;            break;
1316    
# Line 1209  return yield; Line 1339  return yield;
1339  *************************************************/  *************************************************/
1340    
1341  /* This function is handed a compiled expression that it must study to produce  /* This function is handed a compiled expression that it must study to produce
1342  information that will speed up the matching. It returns a pcre_extra block  information that will speed up the matching. It returns a pcre[16]_extra block
1343  which then gets handed back to pcre_exec().  which then gets handed back to pcre_exec().
1344    
1345  Arguments:  Arguments:
# Line 1218  Arguments: Line 1348  Arguments:
1348    errorptr  points to where to place error messages;    errorptr  points to where to place error messages;
1349              set NULL unless error              set NULL unless error
1350    
1351  Returns:    pointer to a pcre_extra block, with study_data filled in and the  Returns:    pointer to a pcre[16]_extra block, with study_data filled in and
1352                appropriate flags set;                the appropriate flags set;
1353              NULL on error or if no optimization possible              NULL on error or if no optimization possible
1354  */  */
1355    
1356    #if defined COMPILE_PCRE8
1357  PCRE_EXP_DEFN pcre_extra * PCRE_CALL_CONVENTION  PCRE_EXP_DEFN pcre_extra * PCRE_CALL_CONVENTION
1358  pcre_study(const pcre *external_re, int options, const char **errorptr)  pcre_study(const pcre *external_re, int options, const char **errorptr)
1359    #elif defined COMPILE_PCRE16
1360    PCRE_EXP_DEFN pcre16_extra * PCRE_CALL_CONVENTION
1361    pcre16_study(const pcre16 *external_re, int options, const char **errorptr)
1362    #elif defined COMPILE_PCRE32
1363    PCRE_EXP_DEFN pcre32_extra * PCRE_CALL_CONVENTION
1364    pcre32_study(const pcre32 *external_re, int options, const char **errorptr)
1365    #endif
1366  {  {
1367  int min;  int min;
1368  BOOL bits_set = FALSE;  BOOL bits_set = FALSE;
1369  BOOL had_accept = FALSE;  pcre_uint8 start_bits[32];
1370  uschar start_bits[32];  PUBL(extra) *extra = NULL;
 pcre_extra *extra = NULL;  
1371  pcre_study_data *study;  pcre_study_data *study;
1372  const uschar *tables;  const pcre_uint8 *tables;
1373  uschar *code;  pcre_uchar *code;
1374  compile_data compile_block;  compile_data compile_block;
1375  const real_pcre *re = (const real_pcre *)external_re;  const REAL_PCRE *re = (const REAL_PCRE *)external_re;
1376    
1377    
1378  *errorptr = NULL;  *errorptr = NULL;
1379    
# Line 1245  if (re == NULL || re->magic_number != MA Line 1383  if (re == NULL || re->magic_number != MA
1383    return NULL;    return NULL;
1384    }    }
1385    
1386    if ((re->flags & PCRE_MODE) == 0)
1387      {
1388    #if defined COMPILE_PCRE8
1389      *errorptr = "argument not compiled in 8 bit mode";
1390    #elif defined COMPILE_PCRE16
1391      *errorptr = "argument not compiled in 16 bit mode";
1392    #elif defined COMPILE_PCRE32
1393      *errorptr = "argument not compiled in 32 bit mode";
1394    #endif
1395      return NULL;
1396      }
1397    
1398  if ((options & ~PUBLIC_STUDY_OPTIONS) != 0)  if ((options & ~PUBLIC_STUDY_OPTIONS) != 0)
1399    {    {
1400    *errorptr = "unknown or incorrect option bit(s) set";    *errorptr = "unknown or incorrect option bit(s) set";
1401    return NULL;    return NULL;
1402    }    }
1403    
1404  code = (uschar *)re + re->name_table_offset +  code = (pcre_uchar *)re + re->name_table_offset +
1405    (re->name_count * re->name_entry_size);    (re->name_count * re->name_entry_size);
1406    
1407  /* For an anchored pattern, or an unanchored pattern that has a first char, or  /* For an anchored pattern, or an unanchored pattern that has a first char, or
# Line 1266  if ((re->options & PCRE_ANCHORED) == 0 & Line 1416  if ((re->options & PCRE_ANCHORED) == 0 &
1416    /* Set the character tables in the block that is passed around */    /* Set the character tables in the block that is passed around */
1417    
1418    tables = re->tables;    tables = re->tables;
1419    
1420    #if defined COMPILE_PCRE8
1421    if (tables == NULL)    if (tables == NULL)
1422      (void)pcre_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,      (void)pcre_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
1423      (void *)(&tables));      (void *)(&tables));
1424    #elif defined COMPILE_PCRE16
1425      if (tables == NULL)
1426        (void)pcre16_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
1427        (void *)(&tables));
1428    #elif defined COMPILE_PCRE32
1429      if (tables == NULL)
1430        (void)pcre32_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
1431        (void *)(&tables));
1432    #endif
1433    
1434    compile_block.lcc = tables + lcc_offset;    compile_block.lcc = tables + lcc_offset;
1435    compile_block.fcc = tables + fcc_offset;    compile_block.fcc = tables + fcc_offset;
# Line 1277  if ((re->options & PCRE_ANCHORED) == 0 & Line 1438  if ((re->options & PCRE_ANCHORED) == 0 &
1438    
1439    /* See if we can find a fixed set of initial characters for the pattern. */    /* See if we can find a fixed set of initial characters for the pattern. */
1440    
1441    memset(start_bits, 0, 32 * sizeof(uschar));    memset(start_bits, 0, 32 * sizeof(pcre_uint8));
1442    rc = set_start_bits(code, start_bits, (re->options & PCRE_UTF8) != 0,    rc = set_start_bits(code, start_bits, (re->options & PCRE_UTF8) != 0,
1443      &compile_block);      &compile_block);
1444    bits_set = rc == SSB_DONE;    bits_set = rc == SSB_DONE;
1445    if (rc == SSB_UNKNOWN)    if (rc == SSB_UNKNOWN)
1446      {      {
1447      *errorptr = "internal error: opcode not recognized";      *errorptr = "internal error: opcode not recognized";
1448      return NULL;      return NULL;
1449      }      }
1450    }    }
1451    
1452  /* Find the minimum length of subject string. */  /* Find the minimum length of subject string. */
1453    
1454  switch(min = find_minlength(code, code, re->options, &had_accept, 0))  switch(min = find_minlength(re, code, code, re->options, 0))
1455    {    {
1456    case -2: *errorptr = "internal error: missing capturing bracket"; return NULL;    case -2: *errorptr = "internal error: missing capturing bracket"; return NULL;
1457    case -3: *errorptr = "internal error: opcode not recognized"; return NULL;    case -3: *errorptr = "internal error: opcode not recognized"; return NULL;
# Line 1298  switch(min = find_minlength(code, code, Line 1459  switch(min = find_minlength(code, code,
1459    }    }
1460    
1461  /* If a set of starting bytes has been identified, or if the minimum length is  /* If a set of starting bytes has been identified, or if the minimum length is
1462  greater than zero, or if JIT optimization has been requested, get a pcre_extra  greater than zero, or if JIT optimization has been requested, or if
1463  block and a pcre_study_data block. The study data is put in the latter, which  PCRE_STUDY_EXTRA_NEEDED is set, get a pcre[16]_extra block and a
1464  is pointed to by the former, which may also get additional data set later by  pcre_study_data block. The study data is put in the latter, which is pointed to
1465  the calling program. At the moment, the size of pcre_study_data is fixed. We  by the former, which may also get additional data set later by the calling
1466  nevertheless save it in a field for returning via the pcre_fullinfo() function  program. At the moment, the size of pcre_study_data is fixed. We nevertheless
1467  so that if it becomes variable in the future, we don't have to change that  save it in a field for returning via the pcre_fullinfo() function so that if it
1468  code. */  becomes variable in the future, we don't have to change that code. */
1469    
1470  if (bits_set || min > 0  if (bits_set || min > 0 || (options & (
1471  #ifdef SUPPORT_JIT  #ifdef SUPPORT_JIT
1472      || (options & PCRE_STUDY_JIT_COMPILE) != 0      PCRE_STUDY_JIT_COMPILE | PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE |
1473        PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE |
1474  #endif  #endif
1475    )      PCRE_STUDY_EXTRA_NEEDED)) != 0)
1476    {    {
1477    extra = (pcre_extra *)(pcre_malloc)    extra = (PUBL(extra) *)(PUBL(malloc))
1478      (sizeof(pcre_extra) + sizeof(pcre_study_data));      (sizeof(PUBL(extra)) + sizeof(pcre_study_data));
1479    if (extra == NULL)    if (extra == NULL)
1480      {      {
1481      *errorptr = "failed to get memory";      *errorptr = "failed to get memory";
1482      return NULL;      return NULL;
1483      }      }
1484    
1485    study = (pcre_study_data *)((char *)extra + sizeof(pcre_extra));    study = (pcre_study_data *)((char *)extra + sizeof(PUBL(extra)));
1486    extra->flags = PCRE_EXTRA_STUDY_DATA;    extra->flags = PCRE_EXTRA_STUDY_DATA;
1487    extra->study_data = study;    extra->study_data = study;
1488    
1489    study->size = sizeof(pcre_study_data);    study->size = sizeof(pcre_study_data);
1490    study->flags = 0;    study->flags = 0;
1491    
1492      /* Set the start bits always, to avoid unset memory errors if the
1493      study data is written to a file, but set the flag only if any of the bits
1494      are set, to save time looking when none are. */
1495    
1496    if (bits_set)    if (bits_set)
1497      {      {
1498      study->flags |= PCRE_STUDY_MAPPED;      study->flags |= PCRE_STUDY_MAPPED;
1499      memcpy(study->start_bits, start_bits, sizeof(start_bits));      memcpy(study->start_bits, start_bits, sizeof(start_bits));
1500      }      }
1501      else memset(study->start_bits, 0, 32 * sizeof(pcre_uint8));
1502    /* Always set the minlength value in the block, because the JIT compiler  
1503    makes use of it. However, don't set the bit unless the length is greater than  #ifdef PCRE_DEBUG
1504    zero - the interpretive pcre_exec() and pcre_dfa_exec() needn't waste time    if (bits_set)
1505    checking this case. */      {
1506        pcre_uint8 *ptr = start_bits;
1507    study->minlength = min;      int i;
1508    if (min > 0) study->flags |= PCRE_STUDY_MINLEN;  
1509        printf("Start bits:\n");
1510        for (i = 0; i < 32; i++)
1511          printf("%3d: %02x%s", i * 8, *ptr++, ((i + 1) & 0x7) != 0? " " : "\n");
1512        }
1513    #endif
1514    
1515      /* Always set the minlength value in the block, because the JIT compiler
1516      makes use of it. However, don't set the bit unless the length is greater than
1517      zero - the interpretive pcre_exec() and pcre_dfa_exec() needn't waste time
1518      checking the zero case. */
1519    
1520      if (min > 0)
1521        {
1522        study->flags |= PCRE_STUDY_MINLEN;
1523        study->minlength = min;
1524        }
1525      else study->minlength = 0;
1526    
1527    /* If JIT support was compiled and requested, attempt the JIT compilation.    /* If JIT support was compiled and requested, attempt the JIT compilation.
1528    If no starting bytes were found, and the minimum length is zero, and JIT    If no starting bytes were found, and the minimum length is zero, and JIT
1529    compilation fails, abandon the extra block and return NULL. */    compilation fails, abandon the extra block and return NULL, unless
1530      PCRE_STUDY_EXTRA_NEEDED is set. */
1531    
1532  #ifdef SUPPORT_JIT  #ifdef SUPPORT_JIT
1533    extra->executable_jit = NULL;    extra->executable_jit = NULL;
1534    if ((options & PCRE_STUDY_JIT_COMPILE) != 0) _pcre_jit_compile(re, extra);    if ((options & PCRE_STUDY_JIT_COMPILE) != 0)
1535    if (study->flags == 0 && (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) == 0)      PRIV(jit_compile)(re, extra, JIT_COMPILE);
1536      if ((options & PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE) != 0)
1537        PRIV(jit_compile)(re, extra, JIT_PARTIAL_SOFT_COMPILE);
1538      if ((options & PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE) != 0)
1539        PRIV(jit_compile)(re, extra, JIT_PARTIAL_HARD_COMPILE);
1540    
1541      if (study->flags == 0 && (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) == 0 &&
1542          (options & PCRE_STUDY_EXTRA_NEEDED) == 0)
1543      {      {
1544    #if defined COMPILE_PCRE8
1545      pcre_free_study(extra);      pcre_free_study(extra);
1546    #elif defined COMPILE_PCRE16
1547        pcre16_free_study(extra);
1548    #elif defined COMPILE_PCRE32
1549        pcre32_free_study(extra);
1550    #endif
1551      extra = NULL;      extra = NULL;
1552      }      }
1553  #endif  #endif
1554    }    }
1555    
# Line 1366  return extra; Line 1563  return extra;
1563    
1564  /* This function frees the memory that was obtained by pcre_study().  /* This function frees the memory that was obtained by pcre_study().
1565    
1566  Argument:   a pointer to the pcre_extra block  Argument:   a pointer to the pcre[16]_extra block
1567  Returns:    nothing  Returns:    nothing
1568  */  */
1569    
1570    #if defined COMPILE_PCRE8
1571  PCRE_EXP_DEFN void  PCRE_EXP_DEFN void
1572  pcre_free_study(pcre_extra *extra)  pcre_free_study(pcre_extra *extra)
1573    #elif defined COMPILE_PCRE16
1574    PCRE_EXP_DEFN void
1575    pcre16_free_study(pcre16_extra *extra)
1576    #elif defined COMPILE_PCRE32
1577    PCRE_EXP_DEFN void
1578    pcre32_free_study(pcre32_extra *extra)
1579    #endif
1580  {  {
1581    if (extra == NULL)
1582      return;
1583  #ifdef SUPPORT_JIT  #ifdef SUPPORT_JIT
1584  if ((extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 &&  if ((extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 &&
1585       extra->executable_jit != NULL)       extra->executable_jit != NULL)
1586    _pcre_jit_free(extra->executable_jit);    PRIV(jit_free)(extra->executable_jit);
1587  #endif  #endif
1588  pcre_free(extra);  PUBL(free)(extra);
1589  }  }
1590    
1591  /* End of pcre_study.c */  /* End of pcre_study.c */

Legend:
Removed from v.689  
changed lines
  Added in v.1364

  ViewVC Help
Powered by ViewVC 1.1.5