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
1.6.0
Jason Parker 19 years ago
parent fe37e0dd7f
commit 2607a74599

@ -1423,7 +1423,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
ZT_BUFFERINFO bi; ZT_BUFFERINFO bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET; char *buf = __buf + AST_FRIENDLY_OFFSET;
char *exitkeys; char *exitkeys = NULL;
if (!(user = ast_calloc(1, sizeof(*user)))) if (!(user = ast_calloc(1, sizeof(*user))))
return ret; return ret;
@ -2006,7 +2006,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
} else { } else {
ast_debug(2, "Exit by single digit did not work in meetme. Extension %s does not exist in context %s\n", tmp, exitcontext); 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]; char exitkey[2];
exitkey[0] = f->subclass; exitkey[0] = f->subclass;

Loading…
Cancel
Save