diff options
| author | hailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2009-09-05 01:10:23 +0000 |
|---|---|---|
| committer | hailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2009-09-05 01:10:23 +0000 |
| commit | 27027bb343909122893e418ee9e18070c1940c44 (patch) | |
| tree | 56c158a7149518df27a85d36b36ca41a66e44ef1 /serprog.c | |
| parent | ce954937c29af574d639f8f702bfc0192c88d36b (diff) | |
| download | flashrom-27027bb343909122893e418ee9e18070c1940c44.tar.gz | |
Fix strict aliasing in serprog.
Initialize the sockaddr,sockaddr_in union directly instead of running
memset later.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@715 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'serprog.c')
| -rw-r--r-- | serprog.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -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"); } |