[asterisk-commits] seanbright: branch 1.6.1 r170982 - in /branches/1.6.1: ./ apps/app_page.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Sun Jan 25 07:40:52 2009
New Revision: 170982

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=170982
Log:
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
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_page.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_page.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_page.c?view=diff&rev=170982&r1=170981&r2=170982
==============================================================================
--- branches/1.6.1/apps/app_page.c (original)
+++ branches/1.6.1/apps/app_page.c Sun Jan 25 07:40:52 2009
@@ -111,12 +111,15 @@
 	/* Count number of extensions in list by number of ampersands + 1 */
 	num_dials = 1;
 	tmp2 = tmp;
-	while (*tmp2 && *tmp2++ == '&') {
-		num_dials++;
-	}
-
-	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));
+	while (*tmp2) {
+		if (*tmp2 == '&') {
+			num_dials++;
+		}
+		tmp2++;
+	}
+
+	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;
 	}