[Asterisk-cvs] asterisk/apps app_meetme.c,1.60,1.60.2.1

[russell at lists.digium.com]

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

Modified Files:
      Tag: v1-0
	app_meetme.c 
Log Message:
fix potential segfault in MeetMeAdmin (bug #2681)


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.60
retrieving revision 1.60.2.1
diff -u -d -r1.60 -r1.60.2.1
--- app_meetme.c	7 Sep 2004 01:22:56 -0000	1.60
+++ app_meetme.c	23 Oct 2004 12:42:16 -0000	1.60.2.1
@@ -1454,14 +1454,17 @@
 		command = strsep(&params, "|");
 		caller = strsep(&params, "|");
 		
-		ast_mutex_lock(&conflock);
+		if (!command) {
+			ast_log(LOG_WARNING, "MeetmeAdmin requires a command!\n");
+			ast_mutex_unlock(&conflock);
+			return -1;
+		}
 		cnf = confs;
 		while (cnf) {
 			if (strcmp(cnf->confno, conf) == 0) 
 				break;
 			cnf = cnf->next;
 		}
-		ast_mutex_unlock(&conflock);
 		
 		if (caller)
 			user = find_user(cnf, caller);