avcodec/jpeg2000dec: fix boolean operator

Fixes CID1271791 #7-6

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-13 15:15:55 +02:00
parent 04da0d2586
commit f8f155a18a

View File

@ -1559,7 +1559,7 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
int cn = bytestream2_get_be16(&s->g); int cn = bytestream2_get_be16(&s->g);
int av_unused typ = bytestream2_get_be16(&s->g); int av_unused typ = bytestream2_get_be16(&s->g);
int asoc = bytestream2_get_be16(&s->g); int asoc = bytestream2_get_be16(&s->g);
if (cn < 4 || asoc < 4) if (cn < 4 && asoc < 4)
s->cdef[cn] = asoc; s->cdef[cn] = asoc;
} }
} }