avcodec/jpeg2000dec: fix boolean operator

Fixes CID1271791 #7-6 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · f8f155a18a
parent 04da0d2586
commit f8f155a18a
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@ -1559,7 +1559,7 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
                        int cn   = bytestream2_get_be16(&s->g);
                        int av_unused typ  = 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;
                    }
                }