aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-20 16:53:25 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-20 16:53:25 +0000
commit74456ce1876d0cf236d931dbaf58d920f81f5b9b (patch)
tree6ad58715825d6e41eaa4ec76f98082510c1fb6ab /channels
parent304116c2f63b4f40fa08e5b37931a9600f4ffcc3 (diff)
Fix a crash in IAX2 registration handling found during load testing with dvossel.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@183559 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_iax2.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index df72a5e4a..71056e618 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5819,15 +5819,20 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
ast_device_state_changed("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;
}