diff options
| -rw-r--r-- | lib/utf8.t | 12 | ||||
| -rw-r--r-- | universal.c | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/utf8.t b/lib/utf8.t index ae81ccdc46..b13bb5377d 100644 --- a/lib/utf8.t +++ b/lib/utf8.t @@ -427,6 +427,18 @@ SKIP: { } { + # Make sure utf8::decode respects copy-on-write [perl #91834]. + # Hash keys are the easiest way to test this. + my $name = "\x{c3}\x{b3}"; + my ($k1) = keys %{ { $name=>undef } }; + my $k2 = $name; + utf8::decode($k1); + utf8::decode($k2); + my $h = { $k1 => 1, $k2 => 2 }; + is join('', keys $h), $k2, 'utf8::decode respects copy-on-write'; +} + +{ my $a = "456\xb6"; utf8::upgrade($a); diff --git a/universal.c b/universal.c index 145d860bc6..a8113d0e6c 100644 --- a/universal.c +++ b/universal.c @@ -695,7 +695,9 @@ XS(XS_utf8_decode) croak_xs_usage(cv, "sv"); else { SV * const sv = ST(0); - const bool RETVAL = sv_utf8_decode(sv); + bool RETVAL; + if (SvIsCOW(sv)) sv_force_normal(sv); + RETVAL = sv_utf8_decode(sv); ST(0) = boolSV(RETVAL); sv_2mortal(ST(0)); } |