Skip to content

Commit

Permalink
avformat/paf: Check for EOF in read_table()
Browse files Browse the repository at this point in the history
Fixes: OOM
Fixes: 26528/clusterfuzz-testcase-minimized-ffmpeg_dem_PAF_fuzzer-5081929248145408
Fixes: 26584/clusterfuzz-testcase-minimized-ffmpeg_dem_PAF_fuzzer-5172661183053824

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  • Loading branch information
michaelni committed Nov 4, 2020
1 parent dad9a86 commit 437b730
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions libavformat/paf.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,18 @@ static int read_close(AVFormatContext *s)
return 0;
}

static void read_table(AVFormatContext *s, uint32_t *table, uint32_t count)
static int read_table(AVFormatContext *s, uint32_t *table, uint32_t count)
{
int i;

for (i = 0; i < count; i++)
for (i = 0; i < count; i++) {
if (avio_feof(s->pb))
return AVERROR_INVALIDDATA;
table[i] = avio_rl32(s->pb);
}

avio_skip(s->pb, 4 * (FFALIGN(count, 512) - count));
return 0;
}

static int read_header(AVFormatContext *s)
Expand Down Expand Up @@ -171,9 +175,15 @@ static int read_header(AVFormatContext *s)

avio_seek(pb, p->buffer_size, SEEK_SET);

read_table(s, p->blocks_count_table, p->nb_frames);
read_table(s, p->frames_offset_table, p->nb_frames);
read_table(s, p->blocks_offset_table, p->frame_blks);
ret = read_table(s, p->blocks_count_table, p->nb_frames);
if (ret < 0)
goto fail;
ret = read_table(s, p->frames_offset_table, p->nb_frames);
if (ret < 0)
goto fail;
ret = read_table(s, p->blocks_offset_table, p->frame_blks);
if (ret < 0)
goto fail;

p->got_audio = 0;
p->current_frame = 0;
Expand Down

0 comments on commit 437b730

Please sign in to comment.