Fix refcounts for lock/magic_mutexfree. Make OP_LOCK auto-ref

its argument using ck_rfun as OP_DEFINED. Make pp_lock return
a ref to its argument for AV, HV, CV.

p4raw-id: //depot/perl@170

1 files changed, 8 insertions, 1 deletions

diff --git a/pp.c b/pp.c
index d002a1f0c5..649506fa89 100644
--- a/pp.c
+++ b/pp.c
@@ -4266,8 +4266,9 @@ void *svv;
 PP(pp_lock)
 {
     dSP;
-#ifdef USE_THREADS
     dTOPss;
+    SV *retsv = sv;
+#ifdef USE_THREADS
     MAGIC *mg;
     
     if (SvROK(sv))
@@ -4284,8 +4285,14 @@ PP(pp_lock)
 	DEBUG_L(PerlIO_printf(PerlIO_stderr(), "0x%lx: pp_lock lock 0x%lx\n",
 			      (unsigned long)thr, (unsigned long)sv);)
 	MUTEX_UNLOCK(MgMUTEXP(mg));
+	SvREFCNT_inc(sv);	/* keep alive until magic_mutexfree */
 	save_destructor(unlock_condpair, sv);
     }
 #endif /* USE_THREADS */
+    if (SvTYPE(retsv) == SVt_PVAV || SvTYPE(retsv) == SVt_PVHV
+	|| SvTYPE(retsv) == SVt_PVCV) {
+	retsv = refto(retsv);
+    }
+    SETs(retsv);
     RETURN;
 }