From ecaaf9ca05d5df53a2d1799cee5c5fe2312927b0 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Sun, 25 Jan 2009 13:38:38 +0000 Subject: [PATCH] Merged revisions 170980 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r170980 | seanbright | 2009-01-25 08:35:48 -0500 (Sun, 25 Jan 2009) | 16 lines Merged revisions 170979 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170979 | seanbright | 2009-01-25 08:33:20 -0500 (Sun, 25 Jan 2009) | 9 lines 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@170981 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_page.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/app_page.c b/apps/app_page.c index 2a8446faf5..3e4f2c94ac 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -111,12 +111,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)); return -1; }