]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix a crash in IAX2 registration handling found during load testing with dvossel.
authorRussell Bryant <russell@russellbryant.com>
Fri, 20 Mar 2009 16:53:25 +0000 (16:53 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 20 Mar 2009 16:53:25 +0000 (16:53 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@183559 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

index df72a5e4a6cc9a694c70eca9dd08de8da06ec7a6..71056e61896d72ca40acaf24bc5b4a53ae65f4cf 100644 (file)
@@ -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;
 }