From 6e372418d9475ff9e639bc950bcaaa08893b54ff Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 14 Nov 2013 22:19:04 +0500 Subject: [PATCH] fix seg in new media code --- src/switch_core_media.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index b03b90aae8..7acc08cc88 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -1824,7 +1824,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_get_offered_pt(switch_core_ses switch_assert(session); - if (!(smh = session->media_handle)) { + if (!(smh = session->media_handle) || !mimp) { return SWITCH_STATUS_FALSE; } @@ -3347,7 +3347,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s if (!switch_true(mirror) && switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND && (!switch_channel_test_flag(session->channel, CF_REINVITE) || switch_media_handle_test_media_flag(smh, SCMF_RENEG_ON_REINVITE))) { - switch_core_media_get_offered_pt(session, mimp, &a_engine->cur_payload_map->recv_pt); + switch_core_media_get_offered_pt(session, matches[0].imp, &a_engine->cur_payload_map->recv_pt); } switch_snprintf(tmp, sizeof(tmp), "%d", a_engine->cur_payload_map->recv_pt); @@ -3558,7 +3558,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s pmap->recv_pt = (switch_payload_t)map->rm_pt; - if (!switch_true(mirror) && switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) { + if (j == 0 && (!switch_true(mirror) && switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND)) { switch_core_media_get_offered_pt(session, mimp, &pmap->recv_pt); } }