Don’t put malformed UTF8 in $AUTOLOAD

1 files changed, 4 insertions, 1 deletions

diff --git a/gv.c b/gv.c
index 24f4912a89..684f279737 100644
--- a/gv.c
+++ b/gv.c
@@ -1204,7 +1204,10 @@ Perl_gv_autoload_pvn(pTHX_ HV *stash, const char *name, STRLEN len, U32 flags)
     sv_catpvs(varsv, "::");
     /* Ensure SvSETMAGIC() is called if necessary. In particular, to clear
        tainting if $FOO::AUTOLOAD was previously tainted, but is not now.  */
-    sv_catpvn_mg(varsv, name, len);
+    sv_catpvn_flags(
+	varsv, name, len,
+	SV_GMAGIC|SV_SMAGIC|(is_utf8 ? SV_CATUTF8 : SV_CATBYTES)
+    );
     if (is_utf8)
         SvUTF8_on(varsv);
     return gv;