From: Jason Parker <jparker@digium.com>
Date: Tue, 3 Jul 2007 21:21:51 +0000 (+0000)
Subject: Fix a build warning, and potential issue if option p is not set at all.
X-Git-Tag: 1.6.0-beta1~3^2~2162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2607a745997b8b35fd6facae6a2efa166605705b;p=thirdparty%2Fasterisk.git

Fix a build warning, and potential issue if option p is not set at all.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 83d60c6aab..5c75e86068 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1423,7 +1423,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 	ZT_BUFFERINFO bi;
 	char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
 	char *buf = __buf + AST_FRIENDLY_OFFSET;
-	char *exitkeys;
+	char *exitkeys = NULL;
 
 	if (!(user = ast_calloc(1, sizeof(*user))))
 		return ret;
@@ -2006,7 +2006,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 					} else {
 						ast_debug(2, "Exit by single digit did not work in meetme. Extension %s does not exist in context %s\n", tmp, exitcontext);
 					}
-				} else if ((f->frametype == AST_FRAME_DTMF) && (strchr(exitkeys, f->subclass)) && (confflags & CONFFLAG_KEYEXIT)) {
+				} else if ((f->frametype == AST_FRAME_DTMF) && (confflags & CONFFLAG_KEYEXIT) && (strchr(exitkeys, f->subclass))) {
 					char exitkey[2];
 
 					exitkey[0] = f->subclass;