From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 20 Mar 2009 17:08:12 +0000 (+0000)
Subject: Merged revisions 183560 via svnmerge from
X-Git-Tag: 1.6.1.0-rc4~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b4c0390a6cada4e667810096c14386831a4a9e5;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@183563 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index df1edbb7cd..a1fd1b9d0e 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -6522,15 +6522,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;
 }