From f4d0347d027c9040d55cb6f88a86babefde17ece Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 20 Mar 2009 17:00:58 +0000
Subject: [PATCH] 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/trunk@183560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_iax2.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index bda25b2371..b2559a02f4 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -6682,15 +6682,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;
}
--
GitLab