From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Fri, 15 Jun 2001 11:08:13 +0000 (+0000)
Subject: Check that HVs with HvNAME() != NULL are really stashes before
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5f438a9a23e13957a6f27a6c29850d4dce382023;p=p5sagit%2Fp5-mst-13.2.git

Check that HVs with HvNAME() != NULL are really stashes before
treating them as such. Also be more defensive on the GvCV.
Win32 fork and dprof now working again.

p4raw-id: //depot/perlio@10597
---

diff --git a/sv.c b/sv.c
index 6b6e063..4352fd4 100644
--- a/sv.c
+++ b/sv.c
@@ -8159,6 +8159,9 @@ Perl_sv_dup(pTHX_ SV *sstr)
 	}
 	HvPMROOT((HV*)dstr)	= HvPMROOT((HV*)sstr);		/* XXX */
 	HvNAME((HV*)dstr)	= SAVEPV(HvNAME((HV*)sstr));
+        /* If HvNAME() is set hv _may_ be a stash 
+           - record it for possible callback 
+         */
 	if(HvNAME((HV*)dstr))
 	    av_push(PL_clone_callbacks, dstr);
 	break;
@@ -9307,21 +9310,26 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags,
         PL_ptr_table = NULL;
     }
     
+    /* For the (possible) stashes identified above 
+         - check that they are stashes
+         - if they are see if the ->CLONE method is defined
+         - if it is call it 
+     */
     while(av_len(PL_clone_callbacks) != -1) {
         HV* stash = (HV*) av_shift(PL_clone_callbacks);
-        CV* cloner = (CV*) gv_fetchmethod_autoload(stash,"CLONE",0);
-        if(cloner) {
-            dSP;
-            cloner = GvCV(cloner);
-            ENTER;
-            SAVETMPS;
-            PUSHMARK(SP);
-            XPUSHs(newSVpv(HvNAME(stash),0));
-            PUTBACK;
-            call_sv((SV*)cloner, G_DISCARD);
-            FREETMPS;
-            LEAVE;
-            
+        if (gv_stashpv(HvNAME(stash),0)) {
+            GV* cloner = gv_fetchmethod_autoload(stash,"CLONE",0);
+            if (cloner && GvCV(cloner)) {
+                dSP;
+                ENTER;
+                SAVETMPS;
+                PUSHMARK(SP);
+                XPUSHs(newSVpv(HvNAME(stash),0));
+                PUTBACK;
+                call_sv((SV*)GvCV(cloner), G_DISCARD);
+                FREETMPS;
+                LEAVE;
+            }
         }
     }