From patchwork Thu Apr 4 16:56:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Matthews X-Patchwork-Id: 12616 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7DE6644918F for ; Thu, 4 Apr 2019 19:56:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 657F368AAB8; Thu, 4 Apr 2019 19:56:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2E2968A87F for ; Thu, 4 Apr 2019 19:56:37 +0300 (EEST) Received: by mail-qt1-f173.google.com with SMTP id k2so4105514qtm.1 for ; Thu, 04 Apr 2019 09:56:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IV3RKmM4IADD43Qm0oIyJHdE2nfI9vuFoVqym9YKRYM=; b=VCnUdPQMoWEn829tNK9BRUfljw+ShZbhWbYTEUbiYg3yYvD8q67z0uO5eMggkRwxk/ Q97GuheuX5R9qi6K8m3wp5b+pkXK13jNKJpzglNFYJUdZDuj2OH6UNoUEvnbHPWU1ond gRK3oQhFk/9AflJSzZewZsaG0CWthlm1XtFMt4JT4s0nVWv4EUjJ4w5Dk/c42gcp9++y Stg+WGxWuknGS9DoT6xmJXK598u9s9RuZT1UimRK9ZBNxGoBcwpi60YeaPsirOLNsrts fyrmr213BZ+IyibSMSKxcN2pCArlfSmLXq5a2W7FumZLZmU3rXIh1Ziw5fjz8p38w22B 4j3Q== X-Gm-Message-State: APjAAAV7VCf0cZpjRH5NLDzQ6oWdY7OzY36KLXo1F3CXnAkfCCQr/5ea oK4Q7KIxivPuPygRkAqJhKaxMo+p X-Google-Smtp-Source: APXvYqyLipFDGy9Y++wVvb/bpRcbmve4hkgpZ0ySvsLhggJ7ElCd6kUp+6HfE+yQVJ9vad03UIZh1A== X-Received: by 2002:ac8:30bc:: with SMTP id v57mr6593825qta.26.1554396996297; Thu, 04 Apr 2019 09:56:36 -0700 (PDT) Received: from bellini.lan (192-222-144-238.qc.cable.ebox.net. [192.222.144.238]) by smtp.gmail.com with ESMTPSA id i24sm10436557qtm.3.2019.04.04.09.56.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 09:56:35 -0700 (PDT) From: Tristan Matthews To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2019 12:56:26 -0400 Message-Id: <20190404165626.22548-1-tmatth@videolan.org> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] matroskaenc: fix leak on error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Tristan Matthews MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- 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) {