1 files changed, 16 insertions, 1 deletions
diff --git a/mg.c b/mg.c
index b1a036ef7b..3355df1b4b 100644
--- a/mg.c
+++ b/mg.c
@@ -1269,9 +1269,24 @@ int
 Perl_magic_setenv(pTHX_ SV *sv, MAGIC *mg)
 {
     STRLEN len = 0, klen;
-    const char * const key = MgPV_const(mg,klen);
+
+    const char *key;
     const char *s = "";
 
+    SV *keysv = MgSV(mg);
+
+    if (keysv == NULL) {
+        key = mg->mg_ptr;
+        klen = mg->mg_len;
+    }
+    else {
+        if (!sv_utf8_downgrade(keysv, /* fail_ok */ TRUE)) {
+            Perl_ck_warner_d(aTHX_ packWARN(WARN_UTF8), "Wide character in %s", "setenv key (encoding to utf8)");
+        }
+
+        key = SvPV_const(keysv,klen);
+    }
+
     PERL_ARGS_ASSERT_MAGIC_SETENV;
 
     SvGETMAGIC(sv);