diff options
| author | Jason Parker <jparker@digium.com> | 2007-07-03 21:21:51 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2007-07-03 21:21:51 +0000 |
| commit | 2607a745997b8b35fd6facae6a2efa166605705b (patch) | |
| tree | 9c98cb5ef983387ddecc91c7020e90eac5aca956 /apps/app_meetme.c | |
| parent | fe37e0dd7f4b9054786c919dffbac979b8906e05 (diff) | |
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
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 83d60c6aa..5c75e8606 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; |