[asterisk-commits] qwell: trunk r73174 - /trunk/apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Jul  3 16:21:51 2007
New Revision: 73174

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73174
Log:
Fix a build warning, and potential issue if option p is not set at all.

Modified:
    trunk/apps/app_meetme.c

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=73174&r1=73173&r2=73174
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Tue Jul  3 16:21:51 2007
@@ -1423,7 +1423,7 @@
 	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 @@
 					} 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;