From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 25 Jan 2006 19:16:14 +0000 (+0000)
Subject: Merged revisions 8677 via svnmerge from
X-Git-Tag: 1.4.0-beta1~2787
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1a2631101c2e2c37e4506a2d1ea0d7dcf7571b4;p=thirdparty%2Fasterisk.git

Merged revisions 8677 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r8677 | russell | 2006-01-25 14:14:43 -0500 (Wed, 25 Jan 2006) | 3 lines

don't call ast_update_realtime with uninitialized variables if we get a
registration with an expirey of 0 seconds (issue #6173)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0d5c4df8d9..845769dfe0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1596,16 +1596,15 @@ static void realtime_update_peer(const char *peername, struct sockaddr_in *sin,
 {
 	char port[10];
 	char ipaddr[20];
-	char regseconds[20] = "0";
+	char regseconds[20];
+	time_t nowtime;
+	
+	time(&nowtime);
+	nowtime += expirey;
+	snprintf(regseconds, sizeof(regseconds), "%d", (int)nowtime);	/* Expiration time */
+	ast_inet_ntoa(ipaddr, sizeof(ipaddr), sin->sin_addr);
+	snprintf(port, sizeof(port), "%d", ntohs(sin->sin_port));
 	
-	if (expirey) {	/* Registration */
-		time_t nowtime;
-		time(&nowtime);
-		nowtime += expirey;
-		snprintf(regseconds, sizeof(regseconds), "%d", (int)nowtime);	/* Expiration time */
-		ast_inet_ntoa(ipaddr, sizeof(ipaddr), sin->sin_addr);
-		snprintf(port, sizeof(port), "%d", ntohs(sin->sin_port));
-	}
 	if (fullcontact)
 		ast_update_realtime("sippeers", "name", peername, "ipaddr", ipaddr, "port", port, "regseconds", regseconds, "username", username, "fullcontact", fullcontact, NULL);
 	else