Merged revisions 104704 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r104704 | tilghman | 2008-02-27 12:15:10 -0600 (Wed, 27 Feb 2008) | 2 lines

Ensure the session ID can't be 0.

........

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

diff --git a/main/manager.c b/main/manager.c
index 7fb16a403ebc580a6909469bbd45b5c8c29c862f..3eeecd5b6b570c4f5ea3e27cea47002e6919a9d8 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -3443,7 +3443,12 @@ static struct ast_str *generic_http_callback(enum output_format format,
                ast_mutex_init(&s->__lock);
                ast_mutex_lock(&s->__lock);
                s->inuse = 1;
-               s->managerid = (rand() ^ (unsigned long) s) | 1;        /* make sure it is non-zero */
+               /*!\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);
                s->last_ev = grab_last();
                AST_LIST_LOCK(&sessions);
                AST_LIST_INSERT_HEAD(&sessions, s, list);