diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-25 13:33:20 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-25 13:33:20 +0000 |
| commit | 32597fb0788b6d8b1ee6d3698354624ddc72b7de (patch) | |
| tree | 6bec2854f09d6e7eb19629c20baeca811e2f70a7 /apps/app_page.c | |
| parent | 727f8200dc3a03d2c324447844bb29113231542f (diff) | |
Resolve a logic error that was causing Page() to crash when more than one
channel was specified.
(closes issue #14308)
Reported by: bluefox
Patches:
20090124__bug14308.diff.txt uploaded by seanbright (license 71)
Tested by: kc0bvu
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@170979 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_page.c')
| -rw-r--r-- | apps/app_page.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/app_page.c b/apps/app_page.c index c94e1b11a..896b31b34 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -120,12 +120,15 @@ static int page_exec(struct ast_channel *chan, void *data) /* Count number of extensions in list by number of ampersands + 1 */ num_dials = 1; tmp2 = tmp; - while (*tmp2 && *tmp2++ == '&') { - num_dials++; + while (*tmp2) { + if (*tmp2 == '&') { + num_dials++; + } + tmp2++; } - if (!(dial_list = ast_calloc(num_dials, sizeof(void *)))) { - ast_log(LOG_ERROR, "Can't allocate %ld bytes for dial list\n", (long)(sizeof(void *) * num_dials)); + if (!(dial_list = ast_calloc(num_dials, sizeof(struct ast_dial *)))) { + ast_log(LOG_ERROR, "Can't allocate %ld bytes for dial list\n", (long)(sizeof(struct ast_dial *) * num_dials)); ast_module_user_remove(u); return -1; } |