diff --git a/perl-5.26.0-perl-131263-clear-the-UTF8-flag-on-a-glob-if-it-isn-.patch b/perl-5.26.0-perl-131263-clear-the-UTF8-flag-on-a-glob-if-it-isn-.patch new file mode 100644 index 0000000..0ba657a --- /dev/null +++ b/perl-5.26.0-perl-131263-clear-the-UTF8-flag-on-a-glob-if-it-isn-.patch @@ -0,0 +1,72 @@ +From 7b3e03bd309fcc48a135123a60678ae2596b1c38 Mon Sep 17 00:00:00 2001 +From: Tony Cook +Date: Wed, 7 Jun 2017 15:00:26 +1000 +Subject: [PATCH] clear the UTF8 flag on a glob if it isn't UTF8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Ported to 5.26.0: + +commit 1097da16b21fe0a2257dba9937e55c0cca18f7e1 +Author: Tony Cook +Date: Wed Jun 7 15:00:26 2017 +1000 + + [perl #131263] clear the UTF8 flag on a glob if it isn't UTF8 + + Previously sv_2pv_flags() would set the UTF8 flag on a glob if it + had a UTF8 name, but wouldn't clear tha flag if it didn't. + + This meant a name change, eg. if assigned another glob, from a UTF8 + name to a non-UTF8 name would leave the flag set. + +Signed-off-by: Petr Písař +--- + sv.c | 2 ++ + t/op/gv.t | 10 +++++++++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/sv.c b/sv.c +index 9f3e28e..ae3dc95 100644 +--- a/sv.c ++++ b/sv.c +@@ -3179,6 +3179,8 @@ Perl_sv_2pv_flags(pTHX_ SV *const sv, STRLEN *const lp, const I32 flags) + assert(SvPOK(buffer)); + if (SvUTF8(buffer)) + SvUTF8_on(sv); ++ else ++ SvUTF8_off(sv); + if (lp) + *lp = SvCUR(buffer); + return SvPVX(buffer); +diff --git a/t/op/gv.t b/t/op/gv.t +index 4fe6b00..670ccf6 100644 +--- a/t/op/gv.t ++++ b/t/op/gv.t +@@ -12,7 +12,7 @@ BEGIN { + + use warnings; + +-plan(tests => 280); ++plan(tests => 282); + + # type coercion on assignment + $foo = 'foo'; +@@ -1170,6 +1170,14 @@ SKIP: { + is ($? & 127, 0,"[perl #128597] No crash when gp_free calls ckWARN_d"); + } + ++{ ++ # [perl #131263] ++ *sym = "\N{U+0080}"; ++ ok(*sym eq "*main::\N{U+0080}", "utf8 flag properly set"); ++ *sym = "\xC3\x80"; ++ ok(*sym eq "*main::\xC3\x80", "utf8 flag properly cleared"); ++} ++ + # test gv_try_downgrade() + # If a GV can be stored in a stash in a compact, non-GV form, then + # whenever ops are freed which reference the GV, an attempt is made to +-- +2.9.4 + diff --git a/perl.spec b/perl.spec index 81f135d..8158046 100644 --- a/perl.spec +++ b/perl.spec @@ -154,6 +154,10 @@ Patch33: perl-5.27.0-Fix-131190-UTF8-code-improperly-casting-negative-int Patch34: perl-5.27.0-perl-131221-improve-duplication-of-via-handles.patch Patch35: perl-5.27.0-perl-131221-sv_dup-sv_dup_inc-are-only-available-und.patch +# Fix glob UTF-8 flag on a glob reassignment, RT#131263, +# in upstream after 5.27.0 +Patch36: perl-5.26.0-perl-131263-clear-the-UTF8-flag-on-a-glob-if-it-isn-.patch + # Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048 Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch @@ -2807,6 +2811,7 @@ Perl extension for Version Objects %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch200 -p1 %patch201 -p1 @@ -2831,6 +2836,7 @@ perl -x patchlevel.h \ 'Fedora Patch32: Fix a crash when calling a subroutine from a stash (RT#131085)' \ 'Fedora Patch33: Fix an improper cast of a negative integer to an unsigned 8-bit type (RT#131190)' \ 'Fedora Patch34: Fix cloning :via handles on thread creation (RT#131221)' \ + 'Fedora Patch36: Fix glob UTF-8 flag on a glob reassignment (RT#131263)' \ 'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \ 'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \ %{nil} @@ -5118,6 +5124,7 @@ popd - Fix a crash when calling a subroutine from a stash (RT#131085) - Fix an improper cast of a negative integer to an unsigned 8-bit type (RT#131190) - Fix cloning :via handles on thread creation (RT#131221) +- Fix glob UTF-8 flag on a glob reassignment (RT#131263) * Tue Jun 06 2017 Jitka Plesnikova - 4:5.26.0-393 - Stop providing old perl(MODULE_COMPAT_5.24.*)