[asterisk-commits] mjordan: branch 11 r372392 - in /branches/11: ./ apps/app_followme.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Sep  5 19:59:23 2012
New Revision: 372392

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372392
Log:
Allow numbers to be greater than 90 characters when configured in FollowMe

When parsing a 'number' defined in followme.conf, FollowMe previouisly parsed
the number in the configuration file into a buffer with a length of 90
characters.  This can artificially limit some parallel dial scenarios.  This
patch allows for numbers of any length to be defined in the configuration
file.

Note that Clod Patry originally wrote a patch to fix this problem and received
a Ship It! on the JIRA issue.  The patch originally expanded the buffer to 256
characters.  Instead, the patch being committed duplicates the string in the
config file on the stack before parsing it for consumption by the application.

(closes issue ASTERISK-16879)
Reported by: Clod Patry
Tested by: mjordan
patches:
  followme_no_limit.diff uploaded by Clod Patry (license #5138)

Slightly modified for this commit.
........

Merged revisions 372390 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 372391 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    branches/11/   (props changed)
    branches/11/apps/app_followme.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/apps/app_followme.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/apps/app_followme.c?view=diff&rev=372392&r1=372391&r2=372392
==============================================================================
--- branches/11/apps/app_followme.c (original)
+++ branches/11/apps/app_followme.c Wed Sep  5 19:59:23 2012
@@ -385,7 +385,7 @@
 	char *cat = NULL, *tmp;
 	struct ast_variable *var;
 	struct number *cur, *nm;
-	char numberstr[90];
+	char *numberstr;
 	int timeout;
 	int numorder;
 	const char *takecallstr;
@@ -501,7 +501,7 @@
 				int idx = 0;
 
 				/* Add a new number */
-				ast_copy_string(numberstr, var->value, sizeof(numberstr));
+				numberstr = ast_strdupa(var->value);
 				if ((tmp = strchr(numberstr, ','))) {
 					*tmp++ = '\0';
 					timeout = atoi(tmp);