diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-01-09 07:22:42 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-01-09 07:22:42 -0600 |
| commit | 38b4189643140a78d1873dcd13f7f076ba1ea3ee (patch) | |
| tree | c0caa6056946e734def10e9b7b8c47644814caba /channels | |
| parent | e54c8aec343b43745ab9d241f6c5336fdb2a29a3 (diff) | |
| parent | b576b58d74e2ec85bdd4ea62912261896beee976 (diff) | |
Merge changes from topic 'ASTERISK-26672'
* changes:
res_rtp_asterisk.c: Fix uninitialized memory crash.
chan_rtp.c: Fix uninitialized memory crash.
res_rtp_asterisk.c: Initialize ourip passed to ast_find_ourip().
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_rtp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/channels/chan_rtp.c b/channels/chan_rtp.c index 1c824fecc..6eec91e22 100644 --- a/channels/chan_rtp.c +++ b/channels/chan_rtp.c @@ -314,7 +314,12 @@ static struct ast_channel *unicast_rtp_request(const char *type, struct ast_form engine_name = S_COR(ast_test_flag(&opts, OPT_RTP_ENGINE), opt_args[OPT_ARG_RTP_ENGINE], "asterisk"); - ast_ouraddrfor(&address, &local_address); + ast_sockaddr_copy(&local_address, &address); + if (ast_ouraddrfor(&address, &local_address)) { + ast_log(LOG_ERROR, "Could not get our address for sending media to '%s'\n", + args.destination); + goto failure; + } instance = ast_rtp_instance_new(engine_name, NULL, &local_address, NULL); if (!instance) { ast_log(LOG_ERROR, |