diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-11 14:28:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-15 18:54:34 +0200 |
| commit | 40ffbe7678b7679d668d268f42cd28d0ccbfacd3 (patch) | |
| tree | 79129c8adcd84abd80efd330509f2e5be9e6c9a2 | |
| parent | ed7fe48445c78ce6b9c68f76b6d3973edf016e44 (diff) | |
| download | ffmpeg-40ffbe7678b7679d668d268f42cd28d0ccbfacd3.tar.gz | |
avcodec/mpc8: Correct end truncation
Fixes Ticket5478
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b21f674876badefc68e4deecdb4a1d46de10b67c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mpc8.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index a8feb6c4ce..8894457c7e 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -415,10 +415,14 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data, c->cur_frame++; c->last_bits_used = get_bits_count(gb); - if(get_bits_left(gb) < 8) // we have only padding left - c->last_bits_used = buf_size << 3; if(c->cur_frame >= c->frames) c->cur_frame = 0; + if(c->cur_frame == 0 && get_bits_left(gb) < 8) {// we have only padding left + c->last_bits_used = buf_size << 3; + } else if (get_bits_left(gb) < 0) { + av_log(avctx, AV_LOG_ERROR, "Overread %d\n", -get_bits_left(gb)); + c->last_bits_used = buf_size << 3; + } *got_frame_ptr = 1; |