Make sure index >= 0 before initializing
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3518 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
bda9935856
commit
b0f97e0c75
|
@ -3750,6 +3750,13 @@ struct ast_frame *zt_read(struct ast_channel *ast)
|
|||
|
||||
index = zt_get_index(ast, p, 0);
|
||||
|
||||
/* Hang up if we don't really exist */
|
||||
if (index < 0) {
|
||||
ast_log(LOG_WARNING, "We dont exist?\n");
|
||||
ast_mutex_unlock(&p->lock);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
p->subs[index].f.frametype = AST_FRAME_NULL;
|
||||
p->subs[index].f.datalen = 0;
|
||||
p->subs[index].f.samples = 0;
|
||||
|
@ -3761,13 +3768,6 @@ struct ast_frame *zt_read(struct ast_channel *ast)
|
|||
p->subs[index].f.src = "zt_read";
|
||||
p->subs[index].f.data = NULL;
|
||||
|
||||
/* Hang up if we don't really exist */
|
||||
if (index < 0) {
|
||||
ast_log(LOG_WARNING, "We dont exist?\n");
|
||||
ast_mutex_unlock(&p->lock);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* make sure it sends initial key state as first frame */
|
||||
if (p->radio && (!p->firstradio))
|
||||
{
|
||||
|
|
Reference in New Issue