ffmpeg | branch: release/2.3 | Michael Niedermayer <michae...@gmx.at> | Mon Aug 11 15:16:29 2014 +0200| [dbf5d7e5cd16d4f02b57c24922b1f77755c0427b] | committer: Michael Niedermayer
avcodec/huffyuvdec: fix overread checks Fixes: ffvhuff_f.avi Found-by: Piotr Bandurski <ami_st...@o2.pl> Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit ba47d519e537299179d20b9a599c5824589a3f7a) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dbf5d7e5cd16d4f02b57c24922b1f77755c0427b --- libavcodec/huffyuvdec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 74872d2..662095f 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -625,9 +625,9 @@ static void decode_422_bitstream(HYuvContext *s, int count) READ_2PIX(s->temp[0][2 * i ], s->temp[1][i], 1); READ_2PIX(s->temp[0][2 * i + 1], s->temp[2][i], 2); } - for (; i < count && get_bits_left(&s->gb) > 0; i++) { + for (; i < count && BITS_LEFT(re, &s->gb) > 0; i++) { READ_2PIX(s->temp[0][2 * i ], s->temp[1][i], 1); - if (get_bits_left(&s->gb) <= 0) break; + if (BITS_LEFT(re, &s->gb) <= 0) break; READ_2PIX(s->temp[0][2 * i + 1], s->temp[2][i], 2); } for (; i < count; i++) @@ -666,7 +666,7 @@ static void decode_plane_bitstream(HYuvContext *s, int count, int plane) if (s->bps <= 8) { OPEN_READER(re, &s->gb); if (count >= (get_bits_left(&s->gb)) / (32 * 2)) { - for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) { + for (i = 0; i < count && BITS_LEFT(re, &s->gb) > 0; i++) { READ_2PIX_PLANE(s->temp[0][2 * i], s->temp[0][2 * i + 1], plane, OP8bits); } } else { @@ -678,7 +678,7 @@ static void decode_plane_bitstream(HYuvContext *s, int count, int plane) } else if (s->bps <= 14) { OPEN_READER(re, &s->gb); if (count >= (get_bits_left(&s->gb)) / (32 * 2)) { - for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) { + for (i = 0; i < count && BITS_LEFT(re, &s->gb) > 0; i++) { READ_2PIX_PLANE(s->temp16[0][2 * i], s->temp16[0][2 * i + 1], plane, OP14bits); } } else { @@ -707,7 +707,7 @@ static void decode_gray_bitstream(HYuvContext *s, int count) count/=2; if (count >= (get_bits_left(&s->gb)) / (32 * 2)) { - for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) { + for (i = 0; i < count && BITS_LEFT(re, &s->gb) > 0; i++) { READ_2PIX(s->temp[0][2 * i], s->temp[0][2 * i + 1], 0); } } else { @@ -724,7 +724,7 @@ static av_always_inline void decode_bgr_1(HYuvContext *s, int count, int i; OPEN_READER(re, &s->gb); - for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) { + for (i = 0; i < count && BITS_LEFT(re, &s->gb) > 0; i++) { unsigned int index; int code, n; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
