virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Code Issues Releases Activity

avcodec/wmaprodec: get frame during frame decode

Browse Source 
Fixes: memleak
Fixes: 17615/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XMA2_fuzzer-5681306024804352

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 0f89a2293ea5f642a67700225d76948ed154418e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-09-25 15:54:45 +02:00
parent 9e635252fb
commit 955c310b75
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/wmaprodec.c
View File

@ -1765,6 +1765,12 @@ static int xma_decode_packet(AVCodecContext *avctx, void *data,
AVFrame *frame = data;
int i, ret, offset = INT_MAX;
if (!s->frames[s->current_stream]->data[0]) {
s->frames[s->current_stream]->nb_samples = 512;
if ((ret = ff_get_buffer(avctx, s->frames[s->current_stream], 0)) < 0) {
return ret;
}
}
/* decode current stream packet */
ret = decode_packet(avctx, &s->xma[s->current_stream], s->frames[s->current_stream],
&got_stream_frame_ptr, avpkt);
@ -1889,10 +1895,6 @@ static av_cold int xma_decode_init(AVCodecContext *avctx)
s->frames[i] = av_frame_alloc();
if (!s->frames[i])
return AVERROR(ENOMEM);
s->frames[i]->nb_samples = 512;
if ((ret = ff_get_buffer(avctx, s->frames[i], 0)) < 0) {
return AVERROR(ENOMEM);
}
s->start_channel[i] = start_channels;
start_channels += s->xma[i].nb_channels;