diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-27 18:15:10 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-27 18:15:10 +0000 |
| commit | 34efc185b1ebd77f6c6cae2adcce0995b753fd93 (patch) | |
| tree | cdc878a06b45e41c1dd828467379f5502f859384 /main | |
| parent | 6e111b8e30538e48c5525b571cc86040519f6ecb (diff) | |
Ensure the session ID can't be 0.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@104704 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index 3edbc3e22..b78ecf5e3 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 */ |