Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avformat/flvdec: don't leak extradata pointer on realloc failure

Browse source
This commit is contained in:
Timo Rothenpieler 2025-01-07 19:17:54 +01:00
parent 9201f872b1
commit af74fe7139
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libavformat/flvdec.c
View file

@ -975,14 +975,18 @@ static int flv_queue_extradata(FLVContext *flv, AVIOContext *pb, int stream,
int new_count = stream + 1;
if (flv->mt_extradata_cnt < new_count) {
flv->mt_extradata = av_realloc(flv->mt_extradata,
sizeof(*flv->mt_extradata) *
new_count);
flv->mt_extradata_sz = av_realloc(flv->mt_extradata_sz,
sizeof(*flv->mt_extradata_sz) *
new_count);
if (!flv->mt_extradata || !flv->mt_extradata_sz)
void *tmp = av_realloc_array(flv->mt_extradata, new_count,
sizeof(*flv->mt_extradata));
if (!tmp)
return AVERROR(ENOMEM);
flv->mt_extradata = tmp;
tmp = av_realloc_array(flv->mt_extradata_sz, new_count,
sizeof(*flv->mt_extradata_sz));
if (!tmp)
return AVERROR(ENOMEM);
flv->mt_extradata_sz = tmp;
// Set newly allocated pointers/sizes to 0
for (int i = flv->mt_extradata_cnt; i < new_count; i++) {
flv->mt_extradata[i] = NULL;