From patchwork Thu Oct 17 09:11:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15810 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 DE1B144751D for ; Thu, 17 Oct 2019 12:12:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B771A68A848; Thu, 17 Oct 2019 12:12:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4420468A832 for ; Thu, 17 Oct 2019 12:12:44 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id j11so1454929wrp.1 for ; Thu, 17 Oct 2019 02:12:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ROiGd2edP4QUXLBed3lHegnEYLXeNkxCX/1H4o/ilvQ=; b=lm+sz57AdLTJSQk1WD4EVgIbdvq5YbaLHdHuK7cigmrrF/GnKqlEMea+MROzcgKjqa AQvozbuQ85SjDCMnHT48hl4kaBi2npYNJcy+0UrC1LTb4fQGfgb8zGx7k/yXJb+0K/Fz Xpr1g+WnpOncHjk91jAZSCCbNffplrM+nxb8M6V8bkqkaVEcD7I9paR7pw5a9dVZzMBB 8sYYcov2yW+FD8LWOPjYV+4z+uWC38DyfjiFcZNRn9+kgPk1QjFMoQWyeV3tctxcoxrf FHfaWUVLuyrzlqIUuWU6LdMBcLPVbHW+FCW/0yMgd/BTWRDItkOi9JLtL3Xh9KYC1o/K HRoA== 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:mime-version :content-transfer-encoding; bh=ROiGd2edP4QUXLBed3lHegnEYLXeNkxCX/1H4o/ilvQ=; b=rgPRqE7mtjNm9gH2NWFf67PAYAaLHlgWenE4ELtH7k+gNQLBP2E4aluagAE0jZB4Cj RmKNOzlfTwfyvbqNVaAn//YDbxpyVVE2rHF427DbRenclTu6/Hi7Cb3uBl4Wwd+AYVd+ OgTVchJCzDQKDfPT+xQ0BHz5nGnVx5DdaBcHLo4Oh7RXeKFIRmb3IcjS+/ZP9lkmgtyW cARzuFc/VHbYIBfl8xqxyAWiUbQahHNvJ9y7Y+iDVPHnuI2HlyfywWJkK9oUss03KwiG vkP1rdmce9+X/RdaZmI1p2jm+n9VSFT51ehNlndcDstjInjMlBl4+kovrkEh9RDeu4VR K90A== X-Gm-Message-State: APjAAAWcYYhHm1WKQoH6you1zldM0pLcJWRexEnNp6bRcymlwRKeo760 rrVlaBY7JeZcZXv2dpUWoS3L3BI1 X-Google-Smtp-Source: APXvYqxYdWli9McYwbd5w47aN2a4Vh3//8M90tZiMqCpNJNmla30rM2SY+ZlEK/+PZNeukK+BQjBoA== X-Received: by 2002:adf:ed43:: with SMTP id u3mr2051146wro.236.1571303563659; Thu, 17 Oct 2019 02:12:43 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id h10sm1400486wrq.95.2019.10.17.02.12.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 02:12:43 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Oct 2019 11:11:55 +0200 Message-Id: <20191017091154.23947-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/ac3enc: Fix memleak 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes ticket #8294. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3enc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 76872a8fe0..25318f8631 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -2051,7 +2051,8 @@ av_cold int ff_ac3_encode_close(AVCodecContext *avctx) av_freep(&block->cpl_coord_mant); } - s->mdct_end(s); + if (s->mdct_end) + s->mdct_end(s); return 0; } @@ -2433,7 +2434,7 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx) ret = validate_options(s); if (ret) - return ret; + goto init_fail; avctx->frame_size = AC3_BLOCK_SIZE * s->num_blocks; avctx->initial_padding = AC3_BLOCK_SIZE;