diff options
author | Ben Ford <bford@digium.com> | 2017-09-15 09:43:21 -0500 |
---|---|---|
committer | Ben Ford <bford@digium.com> | 2017-09-20 12:14:15 -0500 |
commit | 90b68dd54b57cc83c5fe773a012a485c12fff27b (patch) | |
tree | 919b0645798f905c816113b1c1d96d2cfa93c8d4 /main/bridge.c | |
parent | e5fdee036e8bdc1926d67cb3eeb0b2d6fd8fb7c3 (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/bridge.c')
-rw-r--r-- | main/bridge.c | 2 |
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) |