aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-01-27 17:13:10 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-01-28 15:53:54 +0100
commitb15ae71305b29b497e7b56c7ae5f2982fb5e91ed (patch)
tree0e7f483407b157c37c3827c211642b031482acdb
parent6fec0dbd2e155b93b3a59dd03df1b4daeaa73f3b (diff)
downloadffmpeg-b15ae71305b29b497e7b56c7ae5f2982fb5e91ed.tar.gz
avcodec/jpeg2000dec: More completely check cdef
Fixes out of array access Fixes: j2k-poc.bin Found-by: Lucas Leong <wmliang.tw@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 0aada30510d809bccfd539a90ea37b61188f2cb4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/jpeg2000dec.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 36ef001672..c4705cfc78 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1695,11 +1695,15 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
if (tile->codsty[0].mct)
mct_decode(s, tile);
- if (s->cdef[0] < 0) {
- for (x = 0; x < s->ncomponents; x++)
- s->cdef[x] = x + 1;
- if ((s->ncomponents & 1) == 0)
- s->cdef[s->ncomponents-1] = 0;
+ for (x = 0; x < s->ncomponents; x++) {
+ if (s->cdef[x] < 0) {
+ for (x = 0; x < s->ncomponents; x++) {
+ s->cdef[x] = x + 1;
+ }
+ if ((s->ncomponents & 1) == 0)
+ s->cdef[s->ncomponents-1] = 0;
+ break;
+ }
}
if (s->precision <= 8) {