3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-27 07:31:03 +08:00
Code Issues Projects Releases Wiki Activity

Problem: testutil build broken with gcc 4.4 on CentOS 6

Browse Source 
Solution: do not alias sockaddr_un, but take a copy

tests/testutil.cpp: In function 'fd_t bind_socket_resolve_port(const char*, const char*, char*, int, int)':
tests/testutil.cpp:468: error: dereferencing pointer 'un_addr' does break strict-aliasing rules
This commit is contained in:
Luca Boccassi 2020-04-28 00:06:04 +01:00
parent 882cb6fdfb
commit a909e7296d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/testutil.cpp
View File

@ -408,10 +408,10 @@ fd_t connect_socket (const char *endpoint_, const int af_, const int protocol_)
freeaddrinfo (in); freeaddrinfo (in);
} else { } else {
#if defined(ZMQ_HAVE_IPC) #if defined(ZMQ_HAVE_IPC)
struct sockaddr_un *un_addr = (struct sockaddr_un *) &addr; // Cannot cast addr as gcc 4.4 will fail with strict aliasing errors
(*(struct sockaddr_un *) &addr).sun_family = AF_UNIX;
strcpy ((*(struct sockaddr_un *) &addr).sun_path, endpoint_);
addr_len = sizeof (struct sockaddr_un); addr_len = sizeof (struct sockaddr_un);
un_addr->sun_family = AF_UNIX;
strcpy (un_addr->sun_path, endpoint_);
#else #else
return retired_fd; return retired_fd;
#endif #endif
@ -463,9 +463,9 @@ fd_t bind_socket_resolve_port (const char *address_,
freeaddrinfo (in); freeaddrinfo (in);
} else { } else {
#if defined(ZMQ_HAVE_IPC) #if defined(ZMQ_HAVE_IPC)
struct sockaddr_un *un_addr = (struct sockaddr_un *) &addr; // Cannot cast addr as gcc 4.4 will fail with strict aliasing errors
(*(struct sockaddr_un *) &addr).sun_family = AF_UNIX;
addr_len = sizeof (struct sockaddr_un); addr_len = sizeof (struct sockaddr_un);
un_addr->sun_family = AF_UNIX;
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
char buffer[MAX_PATH] = ""; char buffer[MAX_PATH] = "";
@ -484,7 +484,7 @@ fd_t bind_socket_resolve_port (const char *address_,
close (fd); close (fd);
#endif #endif
#endif #endif
strcpy (un_addr->sun_path, buffer); strcpy ((*(struct sockaddr_un *) &addr).sun_path, buffer);
memcpy (my_endpoint_, "ipc://", 7); memcpy (my_endpoint_, "ipc://", 7);
strcat (my_endpoint_, buffer); strcat (my_endpoint_, buffer);
@ -506,8 +506,8 @@ fd_t bind_socket_resolve_port (const char *address_,
sprintf (my_endpoint_, "%s://%s:%u", sprintf (my_endpoint_, "%s://%s:%u",
protocol_ == IPPROTO_TCP ? "tcp" : "udp", address_, protocol_ == IPPROTO_TCP ? "tcp" : "udp", address_,
af_ == AF_INET af_ == AF_INET
? ntohs (((struct sockaddr_in *) &addr)->sin_port) ? ntohs ((*(struct sockaddr_in *) &addr).sin_port)
: ntohs (((struct sockaddr_in6 *) &addr)->sin6_port)); : ntohs ((*(struct sockaddr_in6 *) &addr).sin6_port));
} }
return s_pre; return s_pre;