summaryrefslogtreecommitdiff
path: root/regexec.c
diff options
context:
space:
mode:
authorYves Orton <demerphq@gmail.com>2005-07-08 19:07:26 +0200
committerDave Mitchell <davem@fdisolutions.com>2005-07-10 13:53:49 +0000
commit108bb1ada68a74e70f8cfe3683513fea5b30f778 (patch)
treea180ae91346713259b42e6936af809c175f8f2d3 /regexec.c
parentfe4f188cfb649411f4ddac27f781a35304aab7d6 (diff)
downloadperl-108bb1ada68a74e70f8cfe3683513fea5b30f778.tar.gz
Re: [perl #36207] UTF8/Latin 1/i regexp "Malformed character" warning
Message-ID: <9b18b3110507080807f16d1eb@mail.gmail.com> Fix trie codepath of mixed utf8/latin1 pattern matches p4raw-id: //depot/perl@25106
Diffstat (limited to 'regexec.c')
-rw-r--r--regexec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/regexec.c b/regexec.c
index f302259fcc..802ed18b2f 100644
--- a/regexec.c
+++ b/regexec.c
@@ -2612,7 +2612,7 @@ S_regmatch(pTHX_ regnode *prog)
if ( base ) {
- if ( do_utf8 || UTF ) {
+ if ( do_utf8 ) {
if ( foldlen>0 ) {
uvc = utf8n_to_uvuni( uscan, UTF8_MAXLEN, &len, uniflags );
foldlen -= len;
@@ -2678,7 +2678,7 @@ S_regmatch(pTHX_ regnode *prog)
if ( base ) {
- if ( do_utf8 || UTF ) {
+ if ( do_utf8 ) {
uvc = utf8n_to_uvuni( (U8*)uc, UTF8_MAXLEN, &len, uniflags );
} else {
uvc = (U32)*uc;