From: Sara Golemon <pollita@php.net>
Date: Sat, 21 Feb 2004 19:37:37 +0000 (+0000)
Subject: Avoid use of memcpy(), reply on struct in_addr to be right sized instead
X-Git-Tag: RELEASE_0_2_0~238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c23305e184412a68e5ed8e502b58fec01f52349b;p=php

Avoid use of memcpy(), reply on struct in_addr to be right sized instead
---

diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 8ec5a540a8..37b6520c1b 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -117,7 +117,7 @@ static char**		ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char *path TSRM
 
 /* IP and port conversion box */
 union ipbox {
-	unsigned long	l[2];
+	struct in_addr	ia[2];
 	unsigned short	s[4];
 	unsigned char	c[8];
 };
@@ -775,8 +775,7 @@ ftp_pasv(ftpbuf_t *ftp, int pasv)
 	}
 	sin = (struct sockaddr_in *) sa;
 	sin->sin_family = AF_INET;
-	/* Deal with differing integer sizes */
-	memcpy(&(sin->sin_addr.s_addr), &(ipbox.c[0]), 4);
+	sin->sin_addr = ipbox.ia[0];
 	sin->sin_port = ipbox.s[2];
 
 	ftp->pasv = 2;
@@ -1481,7 +1480,7 @@ ftp_getdata(ftpbuf_t *ftp TSRMLS_DC)
 #endif
 
 	/* send the PORT */
-	memcpy(&(ipbox.c[0]), &(((struct sockaddr_in*) sa)->sin_addr.s_addr), 4);
+	ipbox.ia[0] = ((struct sockaddr_in*) sa)->sin_addr;
 	ipbox.s[2] = ((struct sockaddr_in*) &addr)->sin_port;
 	sprintf(arg, "%u,%u,%u,%u,%u,%u", ipbox.c[0], ipbox.c[1], ipbox.c[2], ipbox.c[3], ipbox.c[4], ipbox.c[5]);