[FFmpeg-cvslog] avcodec/jpeg2000dec: Check bpno in decode_cblk()
ffmpeg | branch: master | Michael Niedermayer | Fri Dec 4 16:23:24 2015 +0100| [a85b02dcf70f62a6a433a607143f1f78fa5648bb] | committer: Michael Niedermayer avcodec/jpeg2000dec: Check bpno in decode_cblk() Fixes: undefined shift Fixes: c409ef86f892335a0a164b5871174d5a/asan_heap-oob_1dff564_2159_162b7234616deab02b544410455eb07b.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a85b02dcf70f62a6a433a607143f1f78fa5648bb --- libavcodec/jpeg2000dec.c |4 1 file changed, 4 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 8cdc729..515d6a0 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1493,6 +1493,10 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, ff_mqc_initdec(&t1->mqc, cblk->data, 0, 1); while (passno--) { +if (bpno < 0) { +av_log(s->avctx, AV_LOG_ERROR, "bpno became negative\n"); +return AVERROR_INVALIDDATA; +} switch(pass_t) { case 0: decode_sigpass(t1, width, height, bpno + 1, bandpos, ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000dec: Check bpno in decode_cblk()
ffmpeg | branch: release/2.5 | Michael Niedermayer | Fri Dec 4 16:23:24 2015 +0100| [f217aca5ba799ad597d19b66ff769c323c4e6fa6] | committer: Michael Niedermayer avcodec/jpeg2000dec: Check bpno in decode_cblk() Fixes: undefined shift Fixes: c409ef86f892335a0a164b5871174d5a/asan_heap-oob_1dff564_2159_162b7234616deab02b544410455eb07b.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit a85b02dcf70f62a6a433a607143f1f78fa5648bb) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f217aca5ba799ad597d19b66ff769c323c4e6fa6 --- libavcodec/jpeg2000dec.c |4 1 file changed, 4 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index ae0c9bb..39e99cc 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1081,6 +1081,10 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, ff_mqc_initdec(&t1->mqc, cblk->data); while (passno--) { +if (bpno < 0) { +av_log(s->avctx, AV_LOG_ERROR, "bpno became negative\n"); +return AVERROR_INVALIDDATA; +} switch(pass_t) { case 0: decode_sigpass(t1, width, height, bpno + 1, bandpos, ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000dec: Check bpno in decode_cblk()
ffmpeg | branch: release/2.8 | Michael Niedermayer | Fri Dec 4 16:23:24 2015 +0100| [ea4d9cb3e559d0ad31ec648097216f30462095fd] | committer: Michael Niedermayer avcodec/jpeg2000dec: Check bpno in decode_cblk() Fixes: undefined shift Fixes: c409ef86f892335a0a164b5871174d5a/asan_heap-oob_1dff564_2159_162b7234616deab02b544410455eb07b.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit a85b02dcf70f62a6a433a607143f1f78fa5648bb) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea4d9cb3e559d0ad31ec648097216f30462095fd --- libavcodec/jpeg2000dec.c |4 1 file changed, 4 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 214ff05..36ef001 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1489,6 +1489,10 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, ff_mqc_initdec(&t1->mqc, cblk->data, 0, 1); while (passno--) { +if (bpno < 0) { +av_log(s->avctx, AV_LOG_ERROR, "bpno became negative\n"); +return AVERROR_INVALIDDATA; +} switch(pass_t) { case 0: decode_sigpass(t1, width, height, bpno + 1, bandpos, ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000dec: Check bpno in decode_cblk()
ffmpeg | branch: release/2.4 | Michael Niedermayer | Fri Dec 4 16:23:24 2015 +0100| [311de799a81ed67b62805f9d72684a5405563c93] | committer: Michael Niedermayer avcodec/jpeg2000dec: Check bpno in decode_cblk() Fixes: undefined shift Fixes: c409ef86f892335a0a164b5871174d5a/asan_heap-oob_1dff564_2159_162b7234616deab02b544410455eb07b.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit a85b02dcf70f62a6a433a607143f1f78fa5648bb) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=311de799a81ed67b62805f9d72684a5405563c93 --- libavcodec/jpeg2000dec.c |4 1 file changed, 4 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index ee4f195..67f88d9 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1079,6 +1079,10 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, ff_mqc_initdec(&t1->mqc, cblk->data); while (passno--) { +if (bpno < 0) { +av_log(s->avctx, AV_LOG_ERROR, "bpno became negative\n"); +return AVERROR_INVALIDDATA; +} switch(pass_t) { case 0: decode_sigpass(t1, width, height, bpno + 1, bandpos, ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000dec: Check bpno in decode_cblk()
ffmpeg | branch: release/2.7 | Michael Niedermayer | Fri Dec 4 16:23:24 2015 +0100| [0f331f94c0db42647bb950c8ae529e43215c32df] | committer: Michael Niedermayer avcodec/jpeg2000dec: Check bpno in decode_cblk() Fixes: undefined shift Fixes: c409ef86f892335a0a164b5871174d5a/asan_heap-oob_1dff564_2159_162b7234616deab02b544410455eb07b.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit a85b02dcf70f62a6a433a607143f1f78fa5648bb) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f331f94c0db42647bb950c8ae529e43215c32df --- libavcodec/jpeg2000dec.c |4 1 file changed, 4 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index caaf2f7..54006af 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1106,6 +1106,10 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, ff_mqc_initdec(&t1->mqc, cblk->data); while (passno--) { +if (bpno < 0) { +av_log(s->avctx, AV_LOG_ERROR, "bpno became negative\n"); +return AVERROR_INVALIDDATA; +} switch(pass_t) { case 0: decode_sigpass(t1, width, height, bpno + 1, bandpos, ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000dec: Check bpno in decode_cblk()
ffmpeg | branch: release/2.6 | Michael Niedermayer | Fri Dec 4 16:23:24 2015 +0100| [7294d95689f9d70f565cb3aa8f485bed1d79928b] | committer: Michael Niedermayer avcodec/jpeg2000dec: Check bpno in decode_cblk() Fixes: undefined shift Fixes: c409ef86f892335a0a164b5871174d5a/asan_heap-oob_1dff564_2159_162b7234616deab02b544410455eb07b.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit a85b02dcf70f62a6a433a607143f1f78fa5648bb) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7294d95689f9d70f565cb3aa8f485bed1d79928b --- libavcodec/jpeg2000dec.c |4 1 file changed, 4 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 66f126f..1f71afd 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1081,6 +1081,10 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, ff_mqc_initdec(&t1->mqc, cblk->data); while (passno--) { +if (bpno < 0) { +av_log(s->avctx, AV_LOG_ERROR, "bpno became negative\n"); +return AVERROR_INVALIDDATA; +} switch(pass_t) { case 0: decode_sigpass(t1, width, height, bpno + 1, bandpos, ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog