kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_rtp_asterisk: Eliminate "type-punned pointer" build warning.

Browse Source 
Removes "res_rtp_asterisk.c:706: warning: dereferencing type-punned pointer
will break strict-aliasing rules" warning from the build on 32-bit platforms.

The problem is that 'size' was referenced aliased to both (pj_size_t *) and
(pj_ssize_t *). Now just make a copy of size that is the right type so there
isn't any pointer aliasing happening.

It also adds comments and asserts regarding what looks like an inappropriate
use of pj_sock_sendto, but is actually totally fine.

(closes issue ASTERISK-20368)
Reported by: Shaun Ruffell
Tested by: Michael L. Young
Patches:
  0001-res_rtp_asterisk-Eliminate-type-punned-pointer-build.patch uploaded by Shaun Ruffell (license 5417)
    slightly modified by David M. Lee.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@372777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David M. Lee
2012-09-10 19:19:50 +00:00
parent f1a70f36b6
commit 95563e7890
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/res_rtp_asterisk.c
View File

@@ -700,14 +700,19 @@ static pj_status_t ast_rtp_on_ice_tx_pkt(pj_ice_sess *ice, unsigned comp_id, uns
{ {
struct ast_rtp *rtp = ice->user_data; struct ast_rtp *rtp = ice->user_data;
pj_status_t status = PJ_EINVALIDOP; pj_status_t status = PJ_EINVALIDOP;
pj_ssize_t _size = (pj_ssize_t)size;
if (transport_id == TRANSPORT_SOCKET_RTP) { if (transport_id == TRANSPORT_SOCKET_RTP) {
/* Traffic is destined to go right out the RTP socket we already have */ /* Traffic is destined to go right out the RTP socket we already have */
status = pj_sock_sendto(rtp->s, pkt, (pj_ssize_t*)&size, 0, dst_addr, dst_addr_len); status = pj_sock_sendto(rtp->s, pkt, &_size, 0, dst_addr, dst_addr_len);
/* sendto on a connectionless socket should send all the data, or none at all */
ast_assert(_size == size || status != PJ_SUCCESS);
} else if (transport_id == TRANSPORT_SOCKET_RTCP) { } else if (transport_id == TRANSPORT_SOCKET_RTCP) {
/* Traffic is destined to go right out the RTCP socket we already have */ /* Traffic is destined to go right out the RTCP socket we already have */
if (rtp->rtcp) { if (rtp->rtcp) {
status = pj_sock_sendto(rtp->rtcp->s, pkt, (pj_ssize_t*)&size, 0, dst_addr, dst_addr_len); status = pj_sock_sendto(rtp->rtcp->s, pkt, &_size, 0, dst_addr, dst_addr_len);
/* sendto on a connectionless socket should send all the data, or none at all */
ast_assert(_size == size || status != PJ_SUCCESS);
} else { } else {
status = PJ_SUCCESS; status = PJ_SUCCESS;
} }