X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_sys.c;h=200ed94831b32e50a74a4db8aeeab07383a1b799;hb=db28185901bfe308f53f975f7d61e927a5f806b5;hp=a7e89a70c3a340c84f0673a36cee35cd3ca479e5;hpb=b5ac89c3e91fc5e73ab09acd099240e5aaa213a5;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp_sys.c b/pp_sys.c
index a7e89a7..200ed94 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -173,6 +173,8 @@ static char zero_but_true[ZBTLEN + 1] = "0 but true";
 #  define FD_CLOEXEC 1		/* NeXT needs this */
 #endif
 
+#include "reentr.h"
+
 #undef PERL_EFF_ACCESS_R_OK	/* EFFective uid/gid ACCESS R_OK */
 #undef PERL_EFF_ACCESS_W_OK
 #undef PERL_EFF_ACCESS_X_OK
@@ -825,10 +827,12 @@ PP(pp_tie)
     if (sv_isobject(sv)) {
 	sv_unmagic(varsv, how);
 	/* Croak if a self-tie on an aggregate is attempted. */
-	if (varsv == SvRV(sv) && how == PERL_MAGIC_tied)
+	if (varsv == SvRV(sv) &&
+	    (SvTYPE(varsv) == SVt_PVAV ||
+	     SvTYPE(varsv) == SVt_PVHV))
 	    Perl_croak(aTHX_
 		       "Self-ties of arrays and hashes are not supported");
-	sv_magic(varsv, sv, how, Nullch, 0);
+	sv_magic(varsv, (SvRV(sv) == varsv ? Nullsv : sv), how, Nullch, 0);
     }
     LEAVE;
     SP = PL_stack_base + markoff;
@@ -2180,9 +2184,6 @@ PP(pp_ioctl)
 #else
 	retval = fcntl(PerlIO_fileno(IoIFP(io)), func, s);
 #endif
-#else
-	DIE(aTHX_ "fcntl is not implemented");
-#endif
 
     if (SvPOK(argsv)) {
 	if (s[SvCUR(argsv)] != 17)
@@ -2201,6 +2202,10 @@ PP(pp_ioctl)
 	PUSHp(zero_but_true, ZBTLEN);
     }
     RETURN;
+
+#else
+    DIE(aTHX_ "fcntl is not implemented");
+#endif
 }
 
 PP(pp_flock)