diff options
| author | BJ Weschke <bweschke@btwtech.com> | 2006-07-21 19:10:58 +0000 |
|---|---|---|
| committer | BJ Weschke <bweschke@btwtech.com> | 2006-07-21 19:10:58 +0000 |
| commit | f2611e36c308ee685220cf3aa4ebbeeffa6cb9aa (patch) | |
| tree | 332a43411b48e29746aa286bf274255c8472cf08 /channels | |
| parent | ca9ba719b6f4ef598bc3dc71bdee05d11d0c7687 (diff) | |
This corrects the crash condition present in #7575, but I'm not really sure if it's the "right" fix. Please review and make any adjustments you see necessary.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1c1022157..751fd4130 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -11239,11 +11239,10 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru build_route(p, req, 1); } - if (p->owner && (p->owner->_state == AST_STATE_UP)) { /* if this is a re-invite */ - struct ast_channel *bridgepeer = NULL; + struct ast_channel *bridgepeer = NULL; + if (p->owner && (p->owner->_state == AST_STATE_UP) && (bridgepeer = ast_bridged_channel(p->owner))) { /* if this is a re-invite */ struct sip_pvt *bridgepvt = NULL; - bridgepeer = ast_bridged_channel(p->owner); if (!bridgepeer->tech) { ast_log(LOG_WARNING, "Ooooh.. no tech! That's REALLY bad\n"); break; |