Browse Source

avformat/rl2: Fix DoS due to lack of eof check

Fixes: loop.rl2

Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 96f24d1bee)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.3.4
孙浩 and 张洪亮(望初) Michael Niedermayer 7 years ago
parent
commit
8cb0f2c4e5
1 changed files with 12 additions and 3 deletions
  1. +12
    -3
      libavformat/rl2.c

+ 12
- 3
libavformat/rl2.c View File

@@ -170,12 +170,21 @@ static av_cold int rl2_read_header(AVFormatContext *s)
}

/** read offset and size tables */
for(i=0; i < frame_count;i++)
for(i=0; i < frame_count;i++) {
if (avio_feof(pb))
return AVERROR_INVALIDDATA;
chunk_size[i] = avio_rl32(pb);
for(i=0; i < frame_count;i++)
}
for(i=0; i < frame_count;i++) {
if (avio_feof(pb))
return AVERROR_INVALIDDATA;
chunk_offset[i] = avio_rl32(pb);
for(i=0; i < frame_count;i++)
}
for(i=0; i < frame_count;i++) {
if (avio_feof(pb))
return AVERROR_INVALIDDATA;
audio_size[i] = avio_rl32(pb) & 0xFFFF;
}

/** build the sample index */
for(i=0;i<frame_count;i++){


Loading…
Cancel
Save