Make ‘SIG handler not defined’ UTF8- and null-safe

1 files changed, 11 insertions, 5 deletions

diff --git a/mg.c b/mg.c
index 01fa6b4091..4ed7c7a3ba 100644
--- a/mg.c
+++ b/mg.c
@@ -3124,11 +3124,17 @@ Perl_sighandler(int sig)
     }
 
     if (!cv || !CvROOT(cv)) {
-	Perl_ck_warner(aTHX_ packWARN(WARN_SIGNAL), "SIG%s handler \"%s\" not defined.\n",
-		       PL_sig_name[sig], (gv ? GvENAME(gv)
-					  : ((cv && CvGV(cv))
-					     ? GvENAME(CvGV(cv))
-					     : "__ANON__")));
+	const HEK * const hek = gv
+			   ? GvENAME_HEK(gv)
+			   : cv && CvGV(cv) ? GvENAME_HEK(CvGV(cv)) : NULL;
+	if (hek)
+	    Perl_ck_warner(aTHX_ packWARN(WARN_SIGNAL),
+				"SIG%s handler \"%"HEKf"\" not defined.\n",
+			         PL_sig_name[sig], hek);
+	     /* diag_listed_as: SIG%s handler "%s" not defined */
+	else Perl_ck_warner(aTHX_ packWARN(WARN_SIGNAL),
+			   "SIG%s handler \"__ANON__\" not defined.\n",
+			    PL_sig_name[sig]);
 	goto cleanup;
     }