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

res_pjsip_sdp_rtp.c: Don't alter global addr variable.

Browse Source 
* create_rtp(): Fix unexpected alteration of global address_rtp if a
transport is bound to an address.

* create_rtp(): Fix use of uninitialized memory if the endpoint RTP media
address is invalid or the transport has an invalid address.

ASTERISK-26851

Change-Id: Icde42e65164a88913cb5c2601b285eebcff397b7
This commit is contained in:
Richard Mudgett
2017-04-03 15:38:06 -05:00
parent 68bde0f07d
commit 6906765381
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/res_pjsip_sdp_rtp.c
View File

@@ -198,8 +198,16 @@ static int create_rtp(struct ast_sip_session *session, struct ast_sip_session_me
struct ast_sockaddr *media_address = &address_rtp; struct ast_sockaddr *media_address = &address_rtp;
if (session->endpoint->media.bind_rtp_to_media_address && !ast_strlen_zero(session->endpoint->media.address)) { if (session->endpoint->media.bind_rtp_to_media_address && !ast_strlen_zero(session->endpoint->media.address)) {
ast_sockaddr_parse(&temp_media_address, session->endpoint->media.address, 0); if (ast_sockaddr_parse(&temp_media_address, session->endpoint->media.address, 0)) {
media_address = &temp_media_address; ast_debug(1, "Endpoint %s: Binding RTP media to %s\n",
ast_sorcery_object_get_id(session->endpoint),
session->endpoint->media.address);
media_address = &temp_media_address;
} else {
ast_debug(1, "Endpoint %s: RTP media address invalid: %s\n",
ast_sorcery_object_get_id(session->endpoint),
session->endpoint->media.address);
}
} else { } else {
struct ast_sip_transport *transport = struct ast_sip_transport *transport =
ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport",
@@ -209,9 +217,14 @@ static int create_rtp(struct ast_sip_session *session, struct ast_sip_session_me
char hoststr[PJ_INET6_ADDRSTRLEN]; char hoststr[PJ_INET6_ADDRSTRLEN];
pj_sockaddr_print(&transport->state->host, hoststr, sizeof(hoststr), 0); pj_sockaddr_print(&transport->state->host, hoststr, sizeof(hoststr), 0);
ast_debug(1, "Transport: %s bound to host: %s, using this for media.\n", if (ast_sockaddr_parse(&temp_media_address, hoststr, 0)) {
session->endpoint->transport, hoststr); ast_debug(1, "Transport %s bound to %s: Using it for RTP media.\n",
ast_sockaddr_parse(media_address, hoststr, 0); session->endpoint->transport, hoststr);
media_address = &temp_media_address;
} else {
ast_debug(1, "Transport %s bound to %s: Invalid for RTP media.\n",
session->endpoint->transport, hoststr);
}
} }
ao2_cleanup(transport); ao2_cleanup(transport);
} }