[Asterisk-cvs] asterisk/apps app_parkandannounce.c,1.3,1.3.2.1

[citats at lists.digium.com]

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

Modified Files:
      Tag: v1-0_stable
	app_parkandannounce.c 
Log Message:
Make ParkAndAnnounce check some things (bug 1194)



Index: app_parkandannounce.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_parkandannounce.c,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- app_parkandannounce.c	23 Apr 2003 19:09:13 -0000	1.3
+++ app_parkandannounce.c	11 Mar 2004 06:16:27 -0000	1.3.2.1
@@ -68,13 +68,17 @@
   int outstate;
 
   struct localuser *u;
-  if (!data) {
-    ast_log(LOG_WARNING, "Park requires an argument (parkinglot)\n");
+  if (!data || (data && !strlen(data))) {
+    ast_log(LOG_WARNING, "ParkAndAnnounce requires arguments: (announce:template|timeout|dial|[return_context])\n");
     return -1;
   }
   
   l=strlen(data)+2;
   orig_s=malloc(l);
+  if (!orig_s) {
+    ast_log(LOG_WARNING, "Out of memory\n");
+    return -1;
+  }
   s=orig_s;
   strncpy(s,data,l);
 
@@ -85,9 +89,10 @@
     return -1;
   }
   
-  timeout = atoi(strsep(&s, "|"));
-  timeout *= 1000;
-
+  if (s) {
+    timeout = atoi(strsep(&s, "|"));
+    timeout *= 1000;
+  }
   dial=strsep(&s, "|");
   if (! dial) {
     ast_log(LOG_WARNING, "PARK: A dial resouce must be specified i.e: Console/dsp or Zap/g1/5551212\n");