[Asterisk-cvs] asterisk/apps app_read.c,1.3,1.4

[citats at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv1554/apps

Modified Files:
	app_read.c 
Log Message:
More app_read.c fixes (bug 1261)


Index: app_read.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_read.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- app_read.c	21 Mar 2004 00:33:05 -0000	1.3
+++ app_read.c	22 Mar 2004 03:46:19 -0000	1.4
@@ -48,7 +48,7 @@
 	int res = 0;
 	struct localuser *u;
 	char tmp[256];
-	char tmp2[256]="";
+	char *varname;
 	char *filename;
 	char *stringp;
 	char *maxdigitstr;
@@ -58,10 +58,12 @@
 		return -1;
 	}
 	strncpy(tmp, (char *)data, sizeof(tmp)-1);
-	stringp=tmp;
-	strsep(&stringp, "|");
+	stringp=(char *)calloc(1,strlen(tmp)+1);
+	snprintf(stringp,strlen(tmp)+1,"%s",tmp);
+	varname = strsep(&stringp, "|");
 	filename = strsep(&stringp, "|");
 	maxdigitstr = strsep(&stringp,"|");
+	if (!(filename) || (strlen(filename)==0)) filename = NULL;
 	if (maxdigitstr)
 	{
 	    maxdigits = atoi(maxdigitstr);
@@ -71,7 +73,7 @@
 	    else
 		ast_verbose(VERBOSE_PREFIX_3 "Accepting a maximum of %i digits.\n", maxdigits);
 	}	
-	if (!strlen(tmp)) {
+	if (!(varname) || (strlen(varname)==0)) {
 		ast_log(LOG_WARNING, "Read requires an variable name\n");
 		return -1;
 	}
@@ -80,12 +82,13 @@
 		/* Answer if the line isn't up. */
 		res = ast_answer(chan);
 	}
+	strncpy(tmp, (char *)varname, sizeof(tmp)-1);
 	if (!res) {
 		ast_stopstream(chan);
-		res = ast_app_getdata(chan, filename, tmp2, maxdigits, 0);
+		res = ast_app_getdata(chan, filename, tmp, maxdigits, 0);
 		if (!res)
-			pbx_builtin_setvar_helper(chan, tmp, tmp2);
-		ast_verbose(VERBOSE_PREFIX_3 "User entered '%s'\n", tmp2);
+			pbx_builtin_setvar_helper(chan, varname, tmp);
+		ast_verbose(VERBOSE_PREFIX_3 "User entered '%s'\n", tmp);
 	}
 	LOCAL_USER_REMOVE(u);
 	return res;