-
Notifications
You must be signed in to change notification settings - Fork 561
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Assertion fails in multi-char regex match #11333
Comments
From @khwilliamsonThis is a bug report for perl from khw@karl.(none), % perl -E '"s\N{U+DF}" =~ /\x{00DF}/i' To occur, it has to be /i matching, have a char that has a multi-char Flags: Site configuration information for perl 5.14.0: Configured by khw at Fri May 13 07:08:22 MDT 2011. Summary of my perl5 (revision 5 version 14 subversion 0) configuration: Locally applied patches: @INC for perl 5.14.0: /home/khw/fastbleadperl/lib/site_perl/5.14.0/i686-linux-thread-multi-64int-ld Environment for perl 5.14.0: PATH=/home/khw/bin:/home/khw/print/bin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/usr/games:/home/khw/cxoffice/bin |
From @khwilliamsonSee attached patch |
From @khwilliamson0001-Assertion-fails-in-multi-char-regex-match.patchFrom 9d6ceae4ca52cbe80bba8e1819ccb48779d5797b Mon Sep 17 00:00:00 2001
From: Karl Williamson <public@khwilliamson.com>
Date: Fri, 13 May 2011 08:35:23 -0600
Subject: [PATCH] Assertion fails in multi-char regex match
In '"s\N{U+DF}" =~ /\x{00DF}/i, the LHS folds to 'sss', the RHS to 'ss'.
The bug occurs when the RHS tries to match the first two es's, but that
splits the LHS \xDF character, which Perl doesn't know how to handle,
and the assertion got triggered. (This is similar to [perl #72998].)
The solution adopted here is to disallow a partial character match,
as #72998 did as well.
---
regexec.c | 10 ++++++----
t/re/pat_advanced.t | 4 ++++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/regexec.c b/regexec.c
index 391fc16..fd90ad7 100644
--- a/regexec.c
+++ b/regexec.c
@@ -6726,9 +6726,12 @@ S_reginclass(pTHX_ const regexp * const prog, register const regnode * const n,
STRLEN len;
const char * const s = SvPV_const(sv, len);
- if (len <= total_foldlen && memEQ(s,
- (char*)folded,
- len))
+ if (len <= total_foldlen
+ && memEQ(s, (char*)folded, len)
+
+ /* If 0, means matched a partial char. See
+ * [perl #90536] */
+ && map_fold_len_back[len])
{
/* Advance the target string ptr to account for
@@ -6737,7 +6740,6 @@ S_reginclass(pTHX_ const regexp * const prog, register const regnode * const n,
* length. */
if (lenp) {
*lenp = map_fold_len_back[len];
- assert(*lenp != 0); /* Otherwise will loop */
}
match = TRUE;
break;
diff --git a/t/re/pat_advanced.t b/t/re/pat_advanced.t
index 6d7624d..2a510d1 100644
--- a/t/re/pat_advanced.t
+++ b/t/re/pat_advanced.t
@@ -2108,6 +2108,10 @@ EOP
like("\x{00DF}", qr/[\x{1E9E}_]*/i, "\"\\x{00DF}\" =~ /[\\x{1E9E}_]*/i was looping");
}
+ { # Bug #90536, caused failed assertion
+ unlike("s\N{U+DF}", qr/^\x{00DF}/i, "\"s\\N{U+DF}\", qr/^\\x{00DF}/i");
+ }
+
# !!! NOTE that tests that aren't at all likely to crash perl should go
# a ways above, above these last ones.
--
1.7.1
|
From @cpansproutI see this has been applied as f912626. |
@cpansprout - Status changed from 'new' to 'resolved' |
Migrated from rt.perl.org#90536 (status was 'resolved')
Searchable as RT90536$
The text was updated successfully, but these errors were encountered: