openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

Fix strict aliasing in serprog

Browse Source 
Initialize the sockaddr,sockaddr_in union directly instead of running
memset later.

Corresponding to flashrom svn r715.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
This commit is contained in:
Carl-Daniel Hailfinger 2009-09-05 01:10:23 +00:00
parent 95e892b9d3
commit 6d1256082c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
serprog.c
View File

@ -105,7 +105,7 @@ static int sp_opensocket(char *ip, unsigned int port)
{
int flag = 1;
struct hostent *hostPtr = NULL;
struct sockaddr_in sp;
union { struct sockaddr_in si; struct sockaddr s; } sp = {};
int sock;
printf_debug(MSGHEADER "IP %s port %d\n", ip, port);
sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
@ -117,11 +117,10 @@ static int sp_opensocket(char *ip, unsigned int port)
if (NULL == hostPtr)
sp_die("Error: cannot resolve");
}
memset(&sp, 0, sizeof(sp));
sp.sin_family = AF_INET;
sp.sin_port = htons(port);
(void)memcpy(&sp.sin_addr, hostPtr->h_addr, hostPtr->h_length);
if (connect(sock, (struct sockaddr *)&sp, sizeof(sp)) < 0) {
sp.si.sin_family = AF_INET;
sp.si.sin_port = htons(port);
(void)memcpy(&sp.si.sin_addr, hostPtr->h_addr, hostPtr->h_length);
if (connect(sock, &sp.s, sizeof(sp.si)) < 0) {
close(sock);
sp_die("Error: serprog cannot connect");
}