[perl #117941] reset crashes when current stash is freed

2 files changed, 6 insertions, 2 deletions

diff --git a/sv.c b/sv.c
index bcc9a228aa..c45d4b1a0f 100644
--- a/sv.c
+++ b/sv.c
@@ -8982,7 +8982,7 @@ Perl_sv_resetpvn(pTHX_ const char *s, STRLEN len, HV * const stash)
     char todo[PERL_UCHAR_MAX+1];
     const char *send;
 
-    if (!stash)
+    if (!stash || SvTYPE(stash) != SVt_PVHV)
 	return;
 
     if (!s) {		/* reset ?? searches */
diff --git a/t/op/reset.t b/t/op/reset.t
index 291bc393ad..5c3b1622b0 100644
--- a/t/op/reset.t
+++ b/t/op/reset.t
@@ -7,7 +7,7 @@ BEGIN {
 }
 use strict;
 
-plan tests => 30;
+plan tests => 31;
 
 package aiieee;
 
@@ -120,6 +120,10 @@ fresh_perl_is( # it crashes more reliably with a smaller script
   "ok\n", {},
   "no crash if package is effectively renamed before op is freed");
 
+sub _117941 { package _117941; reset }
+delete $::{"_117941::"};
+_117941();
+pass("no crash when current package is freed");
 
 undef $/;
 my $prog = <DATA>;