mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	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/trunk@170980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -170,12 +170,15 @@ static int page_exec(struct ast_channel *chan, void *data) | |||||||
| 	/* Count number of extensions in list by number of ampersands + 1 */ | 	/* Count number of extensions in list by number of ampersands + 1 */ | ||||||
| 	num_dials = 1; | 	num_dials = 1; | ||||||
| 	tmp = args.devices; | 	tmp = args.devices; | ||||||
| 	while (*tmp && *tmp++ == '&') { | 	while (*tmp) { | ||||||
| 		num_dials++; | 		if (*tmp == '&') { | ||||||
|  | 			num_dials++; | ||||||
|  | 		} | ||||||
|  | 		tmp++; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	if (!(dial_list = ast_calloc(num_dials, sizeof(void *)))) { | 	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(void *) * num_dials)); | 		ast_log(LOG_ERROR, "Can't allocate %ld bytes for dial list\n", (long)(sizeof(struct ast_dial *) * num_dials)); | ||||||
| 		return -1; | 		return -1; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user