From: Russell Bryant <russell@russellbryant.com>
Date: Sat, 23 Oct 2004 12:42:16 +0000 (+0000)
Subject: fix potential segfault in MeetMeAdmin (bug #2681)
X-Git-Tag: 1.0.11.1~423
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d91f0dadc9e9bf25553241b84590fb05234c4180;p=thirdparty%2Fasterisk.git

fix potential segfault in MeetMeAdmin (bug #2681)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index ef2ff3de91..ba63f554d0 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1454,14 +1454,17 @@ static int admin_exec(struct ast_channel *chan, void *data) {
 		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);