summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorBen Ford <bford@digium.com>2017-09-15 09:43:21 -0500
committerBenjamin Keith Ford <bford@digium.com>2017-09-20 12:14:45 -0500
commite666051d790bb2a9d1e9ff6bb11bd69db6e0efba (patch)
treefbaff373e27c9c3d2d739a5d6e2fc4eec514b026 /main
parent8830cc05415c0d18ea1a10a43173fb20f79d8f8c (diff)
res_pjsip_session: Check for removed stream state.
When a sip session is refreshed, the stream topology is looped through, checking each stream for compatible formats. This would cause a crash if the stream state was AST_STREAM_STATE_REMOVED, since the formats would never be set for this stream, causing a NULL value to be returned from ast_stream_get_formats. This commit adds a check for streams with removed states. Also removed a stray semicolon. Change-Id: Ic86f8b65a4a26a60885b28b8b1a0b22e1b471d42
Diffstat (limited to 'main')
-rw-r--r--main/bridge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/bridge.c b/main/bridge.c
index ab12ecf64..5d9c0c1f7 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -1741,7 +1741,7 @@ int ast_bridge_join(struct ast_bridge *bridge,
ao2_ref(bridge_channel, -1);
-join_exit:;
+join_exit:
ast_bridge_run_after_callback(chan);
bridge_channel_impart_signal(chan);
if (!(ast_channel_softhangup_internal_flag(chan) & AST_SOFTHANGUP_ASYNCGOTO)