MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/concatdec: check that there's extradata before trying to copy it

Browse Source 
The first argument for memcpy must not be NULL.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2022-11-17 10:52:33 -03:00
parent cb925c0bc0
commit 63db6a02a7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/concatdec.c
View File

@ -181,8 +181,9 @@ static int copy_stream_props(AVStream *st, AVStream *source_st)
if (ret < 0)
return ret;
}
memcpy(st->codecpar->extradata, source_st->codecpar->extradata,
source_st->codecpar->extradata_size);
if (source_st->codecpar->extradata_size)
memcpy(st->codecpar->extradata, source_st->codecpar->extradata,
source_st->codecpar->extradata_size);
return 0;
}
if ((ret = avcodec_parameters_copy(st->codecpar, source_st->codecpar)) < 0)