diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-20 17:04:48 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-20 17:04:48 +0000 |
commit | 0af122e8553e6039752e77a740064599dd15b2c9 (patch) | |
tree | c6b06309ac39425d77243d3361db1e4a82fc41ce /channels/chan_iax2.c | |
parent | c9cb49832d9e490bf8ade928a69ff941d1c526be (diff) |
Merged revisions 183560 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r183560 | russell | 2009-03-20 12:00:58 -0500 (Fri, 20 Mar 2009) | 10 lines
Merged revisions 183559 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r183559 | russell | 2009-03-20 11:53:25 -0500 (Fri, 20 Mar 2009) | 2 lines
Fix a crash in IAX2 registration handling found during load testing with dvossel.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@183562 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
-rw-r--r-- | channels/chan_iax2.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 56330d8f4..a7e09edbd 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -6467,15 +6467,20 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies * ast_devstate_changed(AST_DEVICE_UNKNOWN, "IAX2/%s", p->name); /* Activate notification */ return_unref: - ast_string_field_set(iaxs[callno], peer, peer); - /* Choose lowest expiry number */ - if (expire && (expire < iaxs[callno]->expiry)) - iaxs[callno]->expiry = expire; + if (iaxs[callno]) { + ast_string_field_set(iaxs[callno], peer, peer); + + /* Choose lowest expiry number */ + if (expire && (expire < iaxs[callno]->expiry)) { + iaxs[callno]->expiry = expire; + } + } res = 0; - if (p) + if (p) { peer_unref(p); + } return res; } |