X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_sys.c;h=4b9b0963d7fdeee37f06e7cb4b9c2b759b90cd8c;hb=158e3910f3d0bce487277fa0db25247b664ed87c;hp=a333b1053a5047090b7676da2d5db1f9e594e6df;hpb=c88828dcbffbb4012ad6dc9e62721d09fc8ce3ed;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp_sys.c b/pp_sys.c
index a333b10..4b9b096 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -1842,9 +1842,6 @@ PP(pp_send)
 	    /* See the note at doio.c:do_print about filesize limits. --jhi */
 	    retval = PerlLIO_write(PerlIO_fileno(IoIFP(io)),
 				   buffer, length);
-	    if (DO_UTF8(bufsv))
-	        retval = utf8_length((U8*)SvPVX(bufsv),
-				     (U8*)SvPVX(bufsv) + retval);
 	}
     }
 #ifdef HAS_SOCKET
@@ -1866,6 +1863,8 @@ PP(pp_send)
     if (retval < 0)
 	goto say_undef;
     SP = ORIGMARK;
+    if (DO_UTF8(bufsv))
+        retval = utf8_length((U8*)buffer, (U8*)buffer + retval);
 #if Size_t_size > IVSIZE
     PUSHn(retval);
 #else
@@ -3924,8 +3923,11 @@ PP(pp_fork)
 	RETSETUNDEF;
     if (!childpid) {
 	/*SUPPRESS 560*/
-	if ((tmpgv = gv_fetchpv("$", TRUE, SVt_PV)))
+	if ((tmpgv = gv_fetchpv("$", TRUE, SVt_PV))) {
+            SvREADONLY_off(GvSV(tmpgv));
 	    sv_setiv(GvSV(tmpgv), (IV)PerlProc_getpid());
+            SvREADONLY_on(GvSV(tmpgv));
+        }
 	hv_clear(PL_pidstatus);	/* no kids, so don't wait for 'em */
     }
     PUSHi(childpid);