[perl #91850] utf8::decode: croak for ro scalars

Perl · Jan 6, 2012 · 492ebab · 492ebab
1 parent 1b3a617
commit 492ebab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/utf8.t b/lib/utf8.t
@@ -438,6 +438,17 @@ SKIP: {
     is join('', keys $h), $k2, 'utf8::decode respects copy-on-write';
 }
 
+{
+    # Make sure utf8::decode does not modify read-only scalars
+    # [perl #91850].
+
+    my $name = "\x{c3}\x{b3}";
+    Internals::SvREADONLY($name, 1);
+    eval { utf8::decode($name) };
+    like $@, qr/^Modification of a read-only/,
+	'utf8::decode respects readonliness';
+}
+
 {
     my $a = "456\xb6";
     utf8::upgrade($a);

diff --git a/universal.c b/universal.c
@@ -812,7 +812,7 @@ XS(XS_utf8_decode)
     else {
 	SV * const sv = ST(0);
 	bool RETVAL;
-	if (SvIsCOW(sv)) sv_force_normal(sv);
+	if (SvREADONLY(sv)) sv_force_normal(sv);
 	RETVAL = sv_utf8_decode(sv);
 	ST(0) = boolSV(RETVAL);
     }