[FFmpeg-devel] [PATCH] matroskaenc: fix leak on error

Tristan Matthews tmatth at videolan.org
Tue Apr 9 16:28:29 EEST 2019


On Thu, Apr 4, 2019 at 12:56 PM Tristan Matthews <tmatth at videolan.org> wrote:
>
> ---
>  libavformat/matroskaenc.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
> index b9f99c4463..1a06103c5d 100644
> --- a/libavformat/matroskaenc.c
> +++ b/libavformat/matroskaenc.c
> @@ -694,8 +694,10 @@ static int put_flac_codecpriv(AVFormatContext *s,
>          av_dict_set(&dict, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK", buf, 0);
>
>          len = ff_vorbiscomment_length(dict, vendor, NULL, 0);
> -        if (len >= ((1<<24) - 4))
> +        if (len >= ((1<<24) - 4)) {
> +            av_dict_free(&dict);
>              return AVERROR(EINVAL);
> +        }
>
>          data = av_malloc(len + 4);
>          if (!data) {
> --
> 2.17.1
>

Ping (this shouldn't conflict with any of the recent matroskaenc patches).

Best,
Tristan


More information about the ffmpeg-devel mailing list