diff options
| author |   afresh1 <afresh1@openbsd.org> | 2015-04-25 19:14:36 +0000 |
|---|---|---|
| committer | afresh1 <afresh1@openbsd.org> | 2015-04-25 19:14:36 +0000 |
| commit | e9260a2109384575f8cd9fa929a31d4eb3290b65 (patch) | |
| tree | 9096b19bb2e9d2cf7a3bfb6d70385e971df2781a /gnu/usr.bin/perl/regexec.c | |
| parent | Import perl-5.20.2 (diff) | |
| download | wireguard-openbsd-e9260a2109384575f8cd9fa929a31d4eb3290b65.tar.xz wireguard-openbsd-e9260a2109384575f8cd9fa929a31d4eb3290b65.zip | |
Fix merge issues, remove excess files - match perl-5.20.2 dist
Diffstat (limited to 'gnu/usr.bin/perl/regexec.c')
| -rw-r--r-- | gnu/usr.bin/perl/regexec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/perl/regexec.c b/gnu/usr.bin/perl/regexec.c index 362390bd66a..5edac3f4f04 100644 --- a/gnu/usr.bin/perl/regexec.c +++ b/gnu/usr.bin/perl/regexec.c @@ -707,6 +707,7 @@ Perl_re_intuit_start(pTHX_ goto fail; } + RX_MATCH_UTF8_set(rx,utf8_target); reginfo->is_utf8_target = cBOOL(utf8_target); reginfo->info_aux = NULL; reginfo->strbeg = strbeg; @@ -2585,6 +2586,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, } RX_MATCH_TAINTED_off(rx); + RX_MATCH_UTF8_set(rx, utf8_target); reginfo->prog = rx; /* Yes, sorry that this is confusing. */ reginfo->intuit = 0; @@ -3105,8 +3107,6 @@ got_it: if (RXp_PAREN_NAMES(prog)) (void)hv_iterinit(RXp_PAREN_NAMES(prog)); - RX_MATCH_UTF8_set(rx, utf8_target); - /* make sure $`, $&, $', and $digit will work later */ if ( !(flags & REXEC_NOT_FIRST) ) S_reg_set_capture_string(aTHX_ rx, |