In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/3d860744f242683742ba97ad753bc8a1ee061dac?hp=d95e4a00df6c58639bedd71055b14b95a1cad924>
- Log -----------------------------------------------------------------
commit 3d860744f242683742ba97ad753bc8a1ee061dac
Author: Yves Orton <demer...@gmail.com>
Date: Wed Mar 9 20:03:21 2016 +0100
use inequality when checking "tail" in trie compilation
It is possible that a node inside an alternation points out
and past the end of the alternation, using equality on tail
means we don't notice. Its not clear that this is actually
required, but it has been an issue in other contexts so lets
just always use inequalities for this purpose.
M regcomp.c
commit 944e05e3d149b21eef2ceb8d255da390afb267a2
Author: Yves Orton <demer...@gmail.com>
Date: Wed Mar 9 20:00:53 2016 +0100
Fix Perl #126206: handle NOTHING regops and EXACTFU_SS regops in
make_trie() properly
... and avoid dereffing non-EXACT nodes unnecessarily at the same
time. This fixes https://rt.perl.org/Ticket/Display.html?id=126206
M regcomp.c
-----------------------------------------------------------------------
Summary of changes:
regcomp.c | 58 ++++++++++++++++++++++++++++------------------------------
1 file changed, 28 insertions(+), 30 deletions(-)
diff --git a/regcomp.c b/regcomp.c
index facfb81..ffee749 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -2505,8 +2505,8 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode
*startbranch,
for ( cur = first ; cur < last ; cur = regnext( cur ) ) {
regnode *noper = NEXTOPER( cur );
- const U8 *uc = (U8*)STRING( noper );
- const U8 *e = uc + STR_LEN( noper );
+ const U8 *uc;
+ const U8 *e;
int foldlen = 0;
U32 wordlen = 0; /* required init */
STRLEN minchars = 0;
@@ -2516,17 +2516,19 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode
*startbranch,
if (OP(noper) == NOTHING) {
regnode *noper_next= regnext(noper);
- if (noper_next != tail && OP(noper_next) == flags) {
- noper = noper_next;
- uc= (U8*)STRING(noper);
- e= uc + STR_LEN(noper);
- trie->minlen= STR_LEN(noper);
- } else {
- trie->minlen= 0;
- continue;
- }
+ if (noper_next < tail)
+ noper= noper_next;
+ }
+
+ if ( noper < tail && ( OP(noper) == flags || ( flags == EXACTFU &&
OP(noper) == EXACTFU_SS ) ) ) {
+ uc= (U8*)STRING(noper);
+ e= uc + STR_LEN(noper);
+ } else {
+ trie->minlen= 0;
+ continue;
}
+
if ( set_bit ) { /* bitmap only alloced when !(UTF&&Folding) */
TRIE_BITMAP_SET(trie,*uc); /* store the raw first byte
regardless of encoding */
@@ -2732,22 +2734,20 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode
*startbranch,
for ( cur = first ; cur < last ; cur = regnext( cur ) ) {
regnode *noper = NEXTOPER( cur );
- U8 *uc = (U8*)STRING( noper );
- const U8 *e = uc + STR_LEN( noper );
U32 state = 1; /* required init */
U16 charid = 0; /* sanity init */
U32 wordlen = 0; /* required init */
if (OP(noper) == NOTHING) {
regnode *noper_next= regnext(noper);
- if (noper_next != tail && OP(noper_next) == flags) {
- noper = noper_next;
- uc= (U8*)STRING(noper);
- e= uc + STR_LEN(noper);
- }
+ if (noper_next < tail)
+ noper= noper_next;
}
- if (OP(noper) != NOTHING) {
+ if ( noper < tail && ( OP(noper) == flags || ( flags == EXACTFU &&
OP(noper) == EXACTFU_SS ) ) ) {
+ const U8 *uc= (U8*)STRING(noper);
+ const U8 *e= uc + STR_LEN(noper);
+
for ( ; uc < e ; uc += len ) {
TRIE_READ_CHAR;
@@ -2951,8 +2951,6 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode
*startbranch,
for ( cur = first ; cur < last ; cur = regnext( cur ) ) {
regnode *noper = NEXTOPER( cur );
- const U8 *uc = (U8*)STRING( noper );
- const U8 *e = uc + STR_LEN( noper );
U32 state = 1; /* required init */
@@ -2963,14 +2961,14 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode
*startbranch,
if (OP(noper) == NOTHING) {
regnode *noper_next= regnext(noper);
- if (noper_next != tail && OP(noper_next) == flags) {
- noper = noper_next;
- uc= (U8*)STRING(noper);
- e= uc + STR_LEN(noper);
- }
+ if (noper_next < tail)
+ noper= noper_next;
}
- if ( OP(noper) != NOTHING ) {
+ if ( noper < tail && ( OP(noper) == flags || ( flags == EXACTFU &&
OP(noper) == EXACTFU_SS ) ) ) {
+ const U8 *uc= (U8*)STRING(noper);
+ const U8 *e= uc + STR_LEN(noper);
+
for ( ; uc < e ; uc += len ) {
TRIE_READ_CHAR;
@@ -4513,7 +4511,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode
**scanp,
|| ( trietype == noper_trietype )
)
#ifdef NOJUMPTRIE
- && noper_next == tail
+ && noper_next >= tail
#endif
&& count < U16_MAX)
{
@@ -4573,7 +4571,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode
**scanp,
}
if ( noper_trietype
#ifdef NOJUMPTRIE
- && noper_next == tail
+ && noper_next >= tail
#endif
){
/* noper is triable, so we can start a new
@@ -4618,7 +4616,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode
**scanp,
depth==0 ) {
flags |= SCF_TRIE_RESTUDY;
if ( startbranch == first
- && scan == tail )
+ && scan >= tail )
{
RExC_seen
&=~REG_TOP_LEVEL_BRANCHES_SEEN;
}
--
Perl5 Master Repository
