Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/flicvideo: fix infinite loops

Browse Source 
Fixes #2995.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
pull/36/merge
Paul B Mahol 12 years ago
parent c99d27287d
commit f5498ef38d
1 changed files with 4 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavcodec/flicvideo.c

6
libavcodec/flicvideo.c
Unescape View File

@ -202,7 +202,8 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
frame_size -= 16; frame_size -= 16;
/* iterate through the chunks */ /* iterate through the chunks */
while ((frame_size >= 6) && (num_chunks > 0)) { while ((frame_size >= 6) && (num_chunks > 0) &&
bytestream2_get_bytes_left(&g2) >= 4) {
int stream_ptr_after_chunk; int stream_ptr_after_chunk;
chunk_size = bytestream2_get_le32(&g2); chunk_size = bytestream2_get_le32(&g2);
if (chunk_size > frame_size) { if (chunk_size > frame_size) {
@ -519,7 +520,8 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
frame_size -= 16; frame_size -= 16;
/* iterate through the chunks */ /* iterate through the chunks */
while ((frame_size > 0) && (num_chunks > 0)) { while ((frame_size > 0) && (num_chunks > 0) &&
bytestream2_get_bytes_left(&g2) >= 4) {
int stream_ptr_after_chunk; int stream_ptr_after_chunk;
chunk_size = bytestream2_get_le32(&g2); chunk_size = bytestream2_get_le32(&g2);
if (chunk_size > frame_size) { if (chunk_size > frame_size) {

Write Preview
Loading…
Cancel
Save