From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 27 Feb 2008 18:15:10 +0000 (+0000)
Subject: Ensure the session ID can't be 0.
X-Git-Tag: 1.4.19~127
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11550c7be6d94a804d8c631508c104545f021b65;p=thirdparty%2Fasterisk.git

Ensure the session ID can't be 0.


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

diff --git a/main/manager.c b/main/manager.c
index 3edbc3e224..b78ecf5e35 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2660,7 +2660,12 @@ static char *generic_http_callback(int format, struct sockaddr_in *requestor, co
 		ast_mutex_init(&s->__lock);
 		ast_mutex_lock(&s->__lock);
 		s->inuse = 1;
-		s->managerid = rand() ^ (unsigned long) s;
+		/*!\note There is approximately a 1 in 1.8E19 chance that the following
+		 * calculation will produce 0, which is an invalid ID, but due to the
+		 * properties of the rand() function (and the constantcy of s), that
+		 * won't happen twice in a row.
+		 */
+		while ((s->managerid = rand() ^ (unsigned long) s) == 0);
 		AST_LIST_LOCK(&sessions);
 		AST_LIST_INSERT_HEAD(&sessions, s, list);
 		/* Hook into the last spot in the event queue */