diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-12 01:52:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-15 13:31:00 +0200 |
| commit | e587a428d75d58e2e5a592efd7bff44e1d9294ee (patch) | |
| tree | cd306836335aa87a4777464bf189724f63e6caff /libavformat/rtpproto.c | |
| parent | 8c1dc1f6ed119c2bffc937efc5f591cfaf0d35b3 (diff) | |
| download | ffmpeg-e587a428d75d58e2e5a592efd7bff44e1d9294ee.tar.gz | |
avformat/rtpproto: fix strict aliasing violations with sockaddr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpproto.c')
| -rw-r--r-- | libavformat/rtpproto.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index a8cbd97708..62f77da289 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -130,23 +130,26 @@ static int compare_addr(const struct sockaddr_storage *a, static int get_port(const struct sockaddr_storage *ss) { + sockaddr_union ssu = (sockaddr_union){.storage = *ss}; if (ss->ss_family == AF_INET) - return ntohs(((const struct sockaddr_in *)ss)->sin_port); + return ntohs(ssu.in.sin_port); #if HAVE_STRUCT_SOCKADDR_IN6 if (ss->ss_family == AF_INET6) - return ntohs(((const struct sockaddr_in6 *)ss)->sin6_port); + return ntohs(ssu.in6.sin6_port); #endif return 0; } static void set_port(struct sockaddr_storage *ss, int port) { + sockaddr_union ssu = (sockaddr_union){.storage = *ss}; if (ss->ss_family == AF_INET) - ((struct sockaddr_in *)ss)->sin_port = htons(port); + ssu.in.sin_port = htons(port); #if HAVE_STRUCT_SOCKADDR_IN6 else if (ss->ss_family == AF_INET6) - ((struct sockaddr_in6 *)ss)->sin6_port = htons(port); + ssu.in6.sin6_port = htons(port); #endif + *ss = ssu.storage; } static int rtp_check_source_lists(RTPContext *s, struct sockaddr_storage *source_addr_ptr) |