X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_sys.c;h=e2c4111bdeb2e2c727b1aadf1e676fc7102d3d57;hb=e42c74e1bbeb8832945ac76bd2905217353ae440;hp=dc070f81b99502aacda87e488ebeb57064812606;hpb=a00b5bd33cb12556305f4526d4870e67e2ca9517;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp_sys.c b/pp_sys.c
index dc070f8..e2c4111 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -1561,6 +1561,10 @@ PP(pp_sysread)
 			  (struct sockaddr *)namebuf, &bufsize);
 	if (count < 0)
 	    RETPUSHUNDEF;
+#ifdef EPOC
+        /* Bogus return without padding */
+	bufsize = sizeof (struct sockaddr_in);
+#endif
 	SvCUR_set(bufsv, count);
 	*SvEND(bufsv) = '\0';
 	(void)SvPOK_only(bufsv);
@@ -2192,6 +2196,9 @@ PP(pp_socket)
 	RETPUSHUNDEF;
     }
 
+    if (IoIFP(io))
+	do_close(gv, FALSE);
+
     TAINT_PROPER("socket");
     fd = PerlSock_socket(domain, type, protocol);
     if (fd < 0)
@@ -2250,6 +2257,11 @@ PP(pp_sockpair)
 	RETPUSHUNDEF;
     }
 
+    if (IoIFP(io1))
+	do_close(gv1, FALSE);
+    if (IoIFP(io2))
+	do_close(gv2, FALSE);
+
     TAINT_PROPER("socketpair");
     if (PerlSock_socketpair(domain, type, protocol, fd) < 0)
 	RETPUSHUNDEF;