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

Diff of /code/trunk/pcre_exec.c

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

revision 1100 by chpe, Tue Oct 16 15:56:26 2012 UTC revision 1248 by ph10, Wed Feb 13 17:36:38 2013 UTC
# Line 56  possible. There are also some static sup Line 56  possible. There are also some static sup
56  #undef min  #undef min
57  #undef max  #undef max
58    
59    /* The md->capture_last field uses the lower 16 bits for the last captured
60    substring (which can never be greater than 65535) and a bit in the top half
61    to mean "capture vector overflowed". This odd way of doing things was
62    implemented when it was realized that preserving and restoring the overflow bit
63    whenever the last capture number was saved/restored made for a neater
64    interface, and doing it this way saved on (a) another variable, which would
65    have increased the stack frame size (a big NO-NO in PCRE) and (b) another
66    separate set of save/restore instructions. The following defines are used in
67    implementing this. */
68    
69    #define CAPLMASK    0x0000ffff    /* The bits used for last_capture */
70    #define OVFLMASK    0xffff0000    /* The bits used for the overflow flag */
71    #define OVFLBIT     0x00010000    /* The bit that is set for overflow */
72    
73  /* Values for setting in md->match_function_type to indicate two special types  /* Values for setting in md->match_function_type to indicate two special types
74  of call to match(). We do it this way to save on using another stack variable,  of call to match(). We do it this way to save on using another stack variable,
75  as stack usage is to be discouraged. */  as stack usage is to be discouraged. */
# Line 149  match_ref(int offset, register PCRE_PUCH Line 163  match_ref(int offset, register PCRE_PUCH
163  {  {
164  PCRE_PUCHAR eptr_start = eptr;  PCRE_PUCHAR eptr_start = eptr;
165  register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];  register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
166    #ifdef SUPPORT_UTF
167  BOOL utf = md->utf;  BOOL utf = md->utf;
168    #endif
169    
170  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
171  if (eptr >= md->end_subject)  if (eptr >= md->end_subject)
# Line 197  if (caseless) Line 213  if (caseless)
213        GETCHARINC(c, eptr);        GETCHARINC(c, eptr);
214        GETCHARINC(d, p);        GETCHARINC(d, p);
215        ur = GET_UCD(d);        ur = GET_UCD(d);
216        if (c != d && c != d + ur->other_case)        if (c != d && c != d + ur->other_case)
217          {          {
218          const pcre_uint32 *pp = PRIV(ucd_caseless_sets) + ur->caseset;          const pcre_uint32 *pp = PRIV(ucd_caseless_sets) + ur->caseset;
219          for (;;)          for (;;)
220            {            {
221            if (c < *pp) return -1;            if (c < *pp) return -1;
# Line 292  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM Line 308  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
308         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
309         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
310         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
311         RM61,  RM62, RM63, RM64, RM65, RM66 };         RM61,  RM62, RM63, RM64, RM65, RM66, RM67 };
312    
313  /* These versions of the macros use the stack, as normal. There are debugging  /* These versions of the macros use the stack, as normal. There are debugging
314  versions and production versions. Note that the "rw" argument of RMATCH isn't  versions and production versions. Note that the "rw" argument of RMATCH isn't
# Line 401  typedef struct heapframe { Line 417  typedef struct heapframe {
417    
418  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
419    int Xprop_type;    int Xprop_type;
420    int Xprop_value;    unsigned int Xprop_value;
421    int Xprop_fail_result;    int Xprop_fail_result;
422    int Xoclength;    int Xoclength;
423    pcre_uchar Xocchars[6];    pcre_uchar Xocchars[6];
# Line 414  typedef struct heapframe { Line 430  typedef struct heapframe {
430    int Xlength;    int Xlength;
431    int Xmax;    int Xmax;
432    int Xmin;    int Xmin;
433    int Xnumber;    unsigned int Xnumber;
434    int Xoffset;    int Xoffset;
435    int Xop;    unsigned int Xop;
436    int Xsave_capture_last;    pcre_int32 Xsave_capture_last;
437    int Xsave_offset1, Xsave_offset2, Xsave_offset3;    int Xsave_offset1, Xsave_offset2, Xsave_offset3;
438    int Xstacksave[REC_STACK_SAVE_MAX];    int Xstacksave[REC_STACK_SAVE_MAX];
439    
# Line 619  BOOL prev_is_word; Line 635  BOOL prev_is_word;
635    
636  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
637  int prop_type;  int prop_type;
638  int prop_value;  unsigned int prop_value;
639  int prop_fail_result;  int prop_fail_result;
640  int oclength;  int oclength;
641  pcre_uchar occhars[6];  pcre_uchar occhars[6];
# Line 630  int ctype; Line 646  int ctype;
646  int length;  int length;
647  int max;  int max;
648  int min;  int min;
649  int number;  unsigned int number;
650  int offset;  int offset;
651  pcre_uchar op;  unsigned int op;
652  int save_capture_last;  pcre_int32 save_capture_last;
653  int save_offset1, save_offset2, save_offset3;  int save_offset1, save_offset2, save_offset3;
654  int stacksave[REC_STACK_SAVE_MAX];  int stacksave[REC_STACK_SAVE_MAX];
655    
# Line 1064  for (;;) Line 1080  for (;;)
1080        /* In all other cases, we have to make another call to match(). */        /* In all other cases, we have to make another call to match(). */
1081    
1082        save_mark = md->mark;        save_mark = md->mark;
1083          save_capture_last = md->capture_last;
1084        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
1085          RM2);          RM2);
1086    
# Line 1095  for (;;) Line 1112  for (;;)
1112        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1113        md->mark = save_mark;        md->mark = save_mark;
1114        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1115          md->capture_last = save_capture_last;
1116        }        }
1117    
1118      RRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
# Line 1216  for (;;) Line 1234  for (;;)
1234      POSSESSIVE_NON_CAPTURE:      POSSESSIVE_NON_CAPTURE:
1235      matched_once = FALSE;      matched_once = FALSE;
1236      code_offset = (int)(ecode - md->start_code);      code_offset = (int)(ecode - md->start_code);
1237        save_capture_last = md->capture_last;
1238    
1239      for (;;)      for (;;)
1240        {        {
# Line 1245  for (;;) Line 1264  for (;;)
1264        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1265        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1266        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1267          md->capture_last = save_capture_last;
1268        }        }
1269    
1270      if (matched_once || allow_zero)      if (matched_once || allow_zero)
# Line 1289  for (;;) Line 1309  for (;;)
1309          cb.pattern_position = GET(ecode, LINK_SIZE + 3);          cb.pattern_position = GET(ecode, LINK_SIZE + 3);
1310          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);
1311          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1312          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last & CAPLMASK;
1313            /* Internal change requires this for API compatibility. */
1314            if (cb.capture_last == 0) cb.capture_last = -1;
1315          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1316          cb.mark             = md->nomatch_mark;          cb.mark             = md->nomatch_mark;
1317          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
# Line 1311  for (;;) Line 1333  for (;;)
1333          }          }
1334        else        else
1335          {          {
1336          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/          unsigned int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
1337          condition = (recno == RREF_ANY || recno == md->recursive->group_num);          condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1338    
1339          /* If the test is for recursion into a specific subpattern, and it is          /* If the test is for recursion into a specific subpattern, and it is
# Line 1383  for (;;) Line 1405  for (;;)
1405    
1406        if (!condition && condcode == OP_NCREF)        if (!condition && condcode == OP_NCREF)
1407          {          {
1408          int refno = offset >> 1;          unsigned int refno = offset >> 1;
1409          pcre_uchar *slotA = md->name_table;          pcre_uchar *slotA = md->name_table;
1410    
1411          for (i = 0; i < md->name_count; i++)          for (i = 0; i < md->name_count; i++)
# Line 1511  for (;;) Line 1533  for (;;)
1533      to close any currently open capturing brackets. */      to close any currently open capturing brackets. */
1534    
1535      case OP_CLOSE:      case OP_CLOSE:
1536      number = GET2(ecode, 1);      number = GET2(ecode, 1);   /* Must be less than 65536 */
1537      offset = number << 1;      offset = number << 1;
1538    
1539  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 1519  for (;;) Line 1541  for (;;)
1541        printf("\n");        printf("\n");
1542  #endif  #endif
1543    
1544      md->capture_last = number;      md->capture_last = (md->capture_last & OVFLMASK) | number;
1545      if (offset >= md->offset_max) md->offset_overflow = TRUE; else      if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
1546        {        {
1547        md->offset_vector[offset] =        md->offset_vector[offset] =
1548          md->offset_vector[md->offset_end - number];          md->offset_vector[md->offset_end - number];
# Line 1714  for (;;) Line 1736  for (;;)
1736        cb.pattern_position = GET(ecode, 2);        cb.pattern_position = GET(ecode, 2);
1737        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
1738        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1739        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last & CAPLMASK;
1740          /* Internal change requires this for API compatibility. */
1741          if (cb.capture_last == 0) cb.capture_last = -1;
1742        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1743        cb.mark             = md->nomatch_mark;        cb.mark             = md->nomatch_mark;
1744        if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);        if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
# Line 1743  for (;;) Line 1767  for (;;)
1767      case OP_RECURSE:      case OP_RECURSE:
1768        {        {
1769        recursion_info *ri;        recursion_info *ri;
1770        int recno;        unsigned int recno;
1771    
1772        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1773        recno = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
# Line 1760  for (;;) Line 1784  for (;;)
1784        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1785    
1786        new_recursive.group_num = recno;        new_recursive.group_num = recno;
1787          new_recursive.saved_capture_last = md->capture_last;
1788        new_recursive.subject_position = eptr;        new_recursive.subject_position = eptr;
1789        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1790        md->recursive = &new_recursive;        md->recursive = &new_recursive;
# Line 1783  for (;;) Line 1808  for (;;)
1808              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1809    
1810        /* OK, now we can do the recursion. After processing each alternative,        /* OK, now we can do the recursion. After processing each alternative,
1811        restore the offset data. If there were nested recursions, md->recursive        restore the offset data and the last captured value. If there were nested
1812        might be changed, so reset it before looping. */        recursions, md->recursive might be changed, so reset it before looping.
1813          */
1814    
1815        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1816        cbegroup = (*callpat >= OP_SBRA);        cbegroup = (*callpat >= OP_SBRA);
# Line 1795  for (;;) Line 1821  for (;;)
1821            md, eptrb, RM6);            md, eptrb, RM6);
1822          memcpy(md->offset_vector, new_recursive.offset_save,          memcpy(md->offset_vector, new_recursive.offset_save,
1823              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1824            md->capture_last = new_recursive.saved_capture_last;
1825          md->recursive = new_recursive.prevrec;          md->recursive = new_recursive.prevrec;
1826          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1827            {            {
# Line 1945  for (;;) Line 1972  for (;;)
1972    
1973        /* Deal with capturing */        /* Deal with capturing */
1974    
1975        md->capture_last = number;        md->capture_last = (md->capture_last & OVFLMASK) | number;
1976        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
1977          {          {
1978          /* If offset is greater than offset_top, it means that we are          /* If offset is greater than offset_top, it means that we are
1979          "skipping" a capturing group, and that group's offsets must be marked          "skipping" a capturing group, and that group's offsets must be marked
# Line 2530  for (;;) Line 2557  for (;;)
2557        }        }
2558      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2559        {        {
2560        const pcre_uint32 *cp;        const pcre_uint32 *cp;
2561        const ucd_record *prop = GET_UCD(c);        const ucd_record *prop = GET_UCD(c);
2562    
2563        switch(ecode[1])        switch(ecode[1])
# Line 2592  for (;;) Line 2619  for (;;)
2619          break;          break;
2620    
2621          case PT_CLIST:          case PT_CLIST:
2622          cp = PRIV(ucd_caseless_sets) + prop->caseset;          cp = PRIV(ucd_caseless_sets) + ecode[2];
2623          for (;;)          for (;;)
2624            {            {
2625            if (c < *cp)            if (c < *cp)
# Line 3310  for (;;) Line 3337  for (;;)
3337        if (length > 1)        if (length > 1)
3338          {          {
3339  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3340          unsigned int othercase;          pcre_uint32 othercase;
3341          if (op >= OP_STARI &&     /* Caseless */          if (op >= OP_STARI &&     /* Caseless */
3342              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3343            oclength = PRIV(ord2utf)(othercase, occhars);            oclength = PRIV(ord2utf)(othercase, occhars);
# Line 3437  for (;;) Line 3464  for (;;)
3464    
3465        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3466          {          {
3467          pcre_uchar cc;          pcre_uint32 cc;                 /* Faster than pcre_uchar */
   
3468          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3469            {            {
3470            SCHECK_PARTIAL();            SCHECK_PARTIAL();
# Line 3453  for (;;) Line 3479  for (;;)
3479          {          {
3480          for (fi = min;; fi++)          for (fi = min;; fi++)
3481            {            {
3482            pcre_uchar cc;            pcre_uint32 cc;               /* Faster than pcre_uchar */
   
3483            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3484            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3485            if (fi >= max) RRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
# Line 3474  for (;;) Line 3499  for (;;)
3499          pp = eptr;          pp = eptr;
3500          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3501            {            {
3502            pcre_uchar cc;            pcre_uint32 cc;               /* Faster than pcre_uchar */
   
3503            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3504              {              {
3505              SCHECK_PARTIAL();              SCHECK_PARTIAL();
# Line 3746  for (;;) Line 3770  for (;;)
3770  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
3771          if (utf)          if (utf)
3772            {            {
3773            register unsigned int d;            register pcre_uint32 d;
3774            for (fi = min;; fi++)            for (fi = min;; fi++)
3775              {              {
3776              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
# Line 3791  for (;;) Line 3815  for (;;)
3815  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
3816          if (utf)          if (utf)
3817            {            {
3818            register unsigned int d;            register pcre_uint32 d;
3819            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3820              {              {
3821              int len = 1;              int len = 1;
# Line 3848  for (;;) Line 3872  for (;;)
3872  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
3873        if (utf)        if (utf)
3874          {          {
3875          register unsigned int d;          register pcre_uint32 d;
3876          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3877            {            {
3878            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 3882  for (;;) Line 3906  for (;;)
3906  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
3907          if (utf)          if (utf)
3908            {            {
3909            register unsigned int d;            register pcre_uint32 d;
3910            for (fi = min;; fi++)            for (fi = min;; fi++)
3911              {              {
3912              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
# Line 3926  for (;;) Line 3950  for (;;)
3950  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
3951          if (utf)          if (utf)
3952            {            {
3953            register unsigned int d;            register pcre_uint32 d;
3954            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3955              {              {
3956              int len = 1;              int len = 1;
# Line 4201  for (;;) Line 4225  for (;;)
4225                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4226              }              }
4227            break;            break;
4228    
4229            case PT_CLIST:            case PT_CLIST:
4230            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
4231              {              {
4232              const pcre_uint32 *cp;              const pcre_uint32 *cp;
4233              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4234                {                {
# Line 4212  for (;;) Line 4236  for (;;)
4236                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4237                }                }
4238              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4239              cp = PRIV(ucd_caseless_sets) + UCD_CASESET(c);              cp = PRIV(ucd_caseless_sets) + prop_value;
4240              for (;;)              for (;;)
4241                {                {
4242                if (c < *cp)                if (c < *cp)
4243                  { if (prop_fail_result) break; else { RRETURN(MATCH_NOMATCH); } }                  { if (prop_fail_result) break; else { RRETURN(MATCH_NOMATCH); } }
4244                if (c == *cp++)                if (c == *cp++)
4245                  { if (prop_fail_result) { RRETURN(MATCH_NOMATCH); } else break; }                  { if (prop_fail_result) { RRETURN(MATCH_NOMATCH); } else break; }
4246                }                }
4247              }              }
4248            break;            break;
4249    
4250            /* This should not occur */            /* This should not occur */
4251    
4252            default:            default:
# Line 4952  for (;;) Line 4976  for (;;)
4976    
4977            case PT_CLIST:            case PT_CLIST:
4978            for (fi = min;; fi++)            for (fi = min;; fi++)
4979              {              {
4980              const pcre_uint32 *cp;              const pcre_uint32 *cp;
4981              RMATCH(eptr, ecode, offset_top, md, eptrb, RM62);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM67);
4982              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4983              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
4984              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4963  for (;;) Line 4987  for (;;)
4987                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4988                }                }
4989              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4990              cp = PRIV(ucd_caseless_sets) + UCD_CASESET(c);              cp = PRIV(ucd_caseless_sets) + prop_value;
4991              for (;;)              for (;;)
4992                {                {
4993                if (c < *cp)                if (c < *cp)
# Line 5443  for (;;) Line 5467  for (;;)
5467              eptr+= len;              eptr+= len;
5468              }              }
5469            break;            break;
5470    
5471            case PT_CLIST:            case PT_CLIST:
5472            for (i = min; i < max; i++)            for (i = min; i < max; i++)
5473              {              {
# Line 5455  for (;;) Line 5479  for (;;)
5479                break;                break;
5480                }                }
5481              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5482              cp = PRIV(ucd_caseless_sets) + UCD_CASESET(c);              cp = PRIV(ucd_caseless_sets) + prop_value;
5483              for (;;)              for (;;)
5484                {                {
5485                if (c < *cp)                if (c < *cp)
5486                  { if (prop_fail_result) break; else goto GOT_MAX; }                  { if (prop_fail_result) break; else goto GOT_MAX; }
5487                if (c == *cp++)                if (c == *cp++)
5488                  { if (prop_fail_result) goto GOT_MAX; else break; }                  { if (prop_fail_result) goto GOT_MAX; else break; }
5489                }                }
5490              eptr += len;              eptr += len;
5491              }              }
5492            GOT_MAX:            GOT_MAX:
5493            break;            break;
5494    
5495            default:            default:
# Line 6109  switch (frame->Xwhere) Line 6133  switch (frame->Xwhere)
6133    LBL(32) LBL(34) LBL(42) LBL(46)    LBL(32) LBL(34) LBL(42) LBL(46)
6134  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
6135    LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)    LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)
6136    LBL(59) LBL(60) LBL(61) LBL(62)    LBL(59) LBL(60) LBL(61) LBL(62) LBL(67)
6137  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
6138  #endif  /* SUPPORT_UTF */  #endif  /* SUPPORT_UTF */
6139    default:    default:
6140    DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));    DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));
   
 printf("+++jump error in pcre match: label %d non-existent\n", frame->Xwhere);  
   
6141    return PCRE_ERROR_INTERNAL;    return PCRE_ERROR_INTERNAL;
6142    }    }
6143  #undef LBL  #undef LBL
# Line 6296  if ((options & ~PUBLIC_EXEC_OPTIONS) != Line 6317  if ((options & ~PUBLIC_EXEC_OPTIONS) !=
6317  if (re == NULL || subject == NULL || (offsets == NULL && offsetcount > 0))  if (re == NULL || subject == NULL || (offsets == NULL && offsetcount > 0))
6318    return PCRE_ERROR_NULL;    return PCRE_ERROR_NULL;
6319  if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;  if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;
6320    if (length < 0) return PCRE_ERROR_BADLENGTH;
6321  if (start_offset < 0 || start_offset > length) return PCRE_ERROR_BADOFFSET;  if (start_offset < 0 || start_offset > length) return PCRE_ERROR_BADOFFSET;
6322    
6323  /* 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,
# Line 6362  if (extra_data != NULL Line 6384  if (extra_data != NULL
6384      && (extra_data->flags & (PCRE_EXTRA_EXECUTABLE_JIT |      && (extra_data->flags & (PCRE_EXTRA_EXECUTABLE_JIT |
6385                               PCRE_EXTRA_TABLES)) == PCRE_EXTRA_EXECUTABLE_JIT                               PCRE_EXTRA_TABLES)) == PCRE_EXTRA_EXECUTABLE_JIT
6386      && extra_data->executable_jit != NULL      && extra_data->executable_jit != NULL
6387      && (options & ~(PCRE_NO_UTF8_CHECK | PCRE_NOTBOL | PCRE_NOTEOL |      && (options & ~PUBLIC_JIT_EXEC_OPTIONS) == 0)
                     PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART |  
                     PCRE_PARTIAL_SOFT | PCRE_PARTIAL_HARD)) == 0)  
6388    {    {
6389    rc = PRIV(jit_exec)(re, extra_data, (const pcre_uchar *)subject, length,    rc = PRIV(jit_exec)(extra_data, (const pcre_uchar *)subject, length,
6390         start_offset, options, offsets, offsetcount);         start_offset, options, offsets, offsetcount);
6391    
6392    /* PCRE_ERROR_NULL means that the selected normal or partial matching    /* PCRE_ERROR_NULL means that the selected normal or partial matching
6393    mode is not compiled. In this case we simply fallback to interpreter. */    mode is not compiled. In this case we simply fallback to interpreter. */
6394    
6395    if (rc != PCRE_ERROR_NULL) return rc;    if (rc != PCRE_ERROR_JIT_BADOPTION) return rc;
6396    }    }
6397  #endif  #endif
6398    
# Line 6544  if (re->top_backref > 0 && re->top_backr Line 6564  if (re->top_backref > 0 && re->top_backr
6564    DPRINTF(("Got memory to hold back references\n"));    DPRINTF(("Got memory to hold back references\n"));
6565    }    }
6566  else md->offset_vector = offsets;  else md->offset_vector = offsets;
   
6567  md->offset_end = ocount;  md->offset_end = ocount;
6568  md->offset_max = (2*ocount)/3;  md->offset_max = (2*ocount)/3;
6569  md->offset_overflow = FALSE;  md->capture_last = 0;
 md->capture_last = -1;  
6570    
6571  /* Reset the working variable associated with each extraction. These should  /* Reset the working variable associated with each extraction. These should
6572  never be used unless previously set, but they get saved and restored, and so we  never be used unless previously set, but they get saved and restored, and so we
# Line 6945  if (rc == MATCH_MATCH || rc == MATCH_ACC Line 6963  if (rc == MATCH_MATCH || rc == MATCH_ACC
6963          (arg_offset_max - 2) * sizeof(int));          (arg_offset_max - 2) * sizeof(int));
6964        DPRINTF(("Copied offsets from temporary memory\n"));        DPRINTF(("Copied offsets from temporary memory\n"));
6965        }        }
6966      if (md->end_offset_top > arg_offset_max) md->offset_overflow = TRUE;      if (md->end_offset_top > arg_offset_max) md->capture_last |= OVFLBIT;
6967      DPRINTF(("Freeing temporary memory\n"));      DPRINTF(("Freeing temporary memory\n"));
6968      (PUBL(free))(md->offset_vector);      (PUBL(free))(md->offset_vector);
6969      }      }
# Line 6953  if (rc == MATCH_MATCH || rc == MATCH_ACC Line 6971  if (rc == MATCH_MATCH || rc == MATCH_ACC
6971    /* Set the return code to the number of captured strings, or 0 if there were    /* Set the return code to the number of captured strings, or 0 if there were
6972    too many to fit into the vector. */    too many to fit into the vector. */
6973    
6974    rc = (md->offset_overflow && md->end_offset_top >= arg_offset_max)?    rc = ((md->capture_last & OVFLBIT) != 0 &&
6975             md->end_offset_top >= arg_offset_max)?
6976      0 : md->end_offset_top/2;      0 : md->end_offset_top/2;
6977    
6978    /* If there is space in the offset vector, set any unused pairs at the end of    /* If there is space in the offset vector, set any unused pairs at the end of

Legend:
Removed from v.1100  
changed lines
  Added in v.1248

  ViewVC Help
Powered by ViewVC 1.1.5