highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/movenc: Free extradata after successfull allocation of new instead of before

Browse Source 
This avoids erroring out with extradata lost and extradata size mismatching

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-08-19 15:58:53 +02:00
parent 4f6f56114e
commit ca906e8190
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/movenc.c
View File

@ -4923,11 +4923,11 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt)
int side_size = 0; int side_size = 0;
uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size);
if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) { if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) {
av_free(par->extradata); void *newextra = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE);
par->extradata = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!newextra)
if (!par->extradata) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} av_free(par->extradata);
par->extradata = newextra;
memcpy(par->extradata, side, side_size); memcpy(par->extradata, side, side_size);
par->extradata_size = side_size; par->extradata_size = side_size;
mov->need_rewrite_extradata = 1; mov->need_rewrite_extradata = 1;