RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/options: fix leaks in avcodec_copy_context 

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
This commit is contained in:
Lukasz Marek 2014-11-27 00:41:16 +01:00
parent 66f379da15
commit 8616c5b75a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/options.c
View File

@ -190,6 +190,11 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
} }
av_opt_free(dest); av_opt_free(dest);
av_freep(&dest->rc_override);
av_freep(&dest->intra_matrix);
av_freep(&dest->inter_matrix);
av_freep(&dest->extradata);
av_freep(&dest->subtitle_header);
memcpy(dest, src, sizeof(*dest)); memcpy(dest, src, sizeof(*dest));
av_opt_copy(dest, src); av_opt_copy(dest, src);
@ -206,6 +211,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
dest->slice_offset = NULL; dest->slice_offset = NULL;
dest->hwaccel = NULL; dest->hwaccel = NULL;
dest->internal = NULL; dest->internal = NULL;
dest->coded_frame = NULL;
/* reallocate values that should be allocated separately */ /* reallocate values that should be allocated separately */
dest->extradata = NULL; dest->extradata = NULL;
@ -225,6 +231,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
} }
alloc_and_copy_or_fail(extradata, src->extradata_size, alloc_and_copy_or_fail(extradata, src->extradata_size,
FF_INPUT_BUFFER_PADDING_SIZE); FF_INPUT_BUFFER_PADDING_SIZE);
dest->extradata_size = src->extradata_size;
alloc_and_copy_or_fail(intra_matrix, 64 * sizeof(int16_t), 0); alloc_and_copy_or_fail(intra_matrix, 64 * sizeof(int16_t), 0);
alloc_and_copy_or_fail(inter_matrix, 64 * sizeof(int16_t), 0); alloc_and_copy_or_fail(inter_matrix, 64 * sizeof(int16_t), 0);
alloc_and_copy_or_fail(rc_override, src->rc_override_count * sizeof(*src->rc_override), 0); alloc_and_copy_or_fail(rc_override, src->rc_override_count * sizeof(*src->rc_override), 0);
@ -239,11 +246,10 @@ fail:
av_freep(&dest->intra_matrix); av_freep(&dest->intra_matrix);
av_freep(&dest->inter_matrix); av_freep(&dest->inter_matrix);
av_freep(&dest->extradata); av_freep(&dest->extradata);
#if FF_API_MPV_OPT av_freep(&dest->subtitle_header);
FF_DISABLE_DEPRECATION_WARNINGS dest->subtitle_header_size = 0;
av_freep(&dest->rc_eq); dest->extradata_size = 0;
FF_ENABLE_DEPRECATION_WARNINGS av_opt_free(dest);
#endif
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }