From: BJ Weschke Date: Fri, 21 Jul 2006 19:10:58 +0000 (+0000) Subject: This corrects the crash condition present in #7575, but I'm not really sure if it... X-Git-Tag: 1.4.0-beta1~540 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2611e36c308ee685220cf3aa4ebbeeffa6cb9aa;p=thirdparty%2Fasterisk.git 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 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1c10221572..751fd4130f 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;