From patchwork Mon Sep 14 05:27:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22358 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 41AA3448021 for ; Mon, 14 Sep 2020 08:34:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2075068BBA5; Mon, 14 Sep 2020 08:34:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EFC468BADC for ; Mon, 14 Sep 2020 08:33:53 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id m6so17233599wrn.0 for ; Sun, 13 Sep 2020 22:33:53 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=V4UyhUpoZeeBms2C/pp3Iz4tYiGg5sG7S+BJhBXhDWs=; b=c8PKUrsGwSAJsxrMGYL3c0wxA0AnF2i8rbTRCeZarYTZufPbirZtEqt5LCodn3J5jh PMDJ3tDhw9hLR7yla7BYQl5VBhXubu/s550VxYTNwEo1ZRSP8ycAnsHGttkVpSQx6J9Z QLPIywGfaEP7o3TWORdspfZNyfMW0GsP6u0QlOT3Ymuq3bj5R0KjRGMxeGf7jQaYSTwA wqMK0Ct5nl18mbMzQihcncPKtG4KbTO6MIF0wDD9oMo14JPWh3POSxaAjxeR1283DhVn 8laHFPUqIUZFLtaChYsiu5bWCmLQzvLDd34OC6i1kX4aWKTP2uF1o/MadGMFV978SogY HABA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=V4UyhUpoZeeBms2C/pp3Iz4tYiGg5sG7S+BJhBXhDWs=; b=WSJtR5o8vBqw7auj67de3bwXYyWdP5eOGsQ4gv05TkXZqJW9tlPgKhmql5+SpH7tBU 8I4DuggqufeFqXK2pjxszcGe6yRFq7ogtafxU6maejPUDTBQawGQZy2W+eOn0ngXdY/B V8dDrK0YKhgRqDulguHc1VgoBXS2UuK3+LDDXF63sHLUwycMH5ak0Iz3slTxmHttw2hL fT6s2J3jmE3xlgWWI4GYHhrh7fSFBEuMvJLF3lfLAD1YTorKTkF1NisBG95c9w/mFn4+ VPym+q/d0oVop+V7Ouw+H18frRC6pWBy5xaRTXkOVJdyiSqjaWzHVNjGOgNR4YlAc/do jWHg== X-Gm-Message-State: AOAM530w46HKxmb+SvMVYDCC5FY3kxZ/9v7s0Osvbd7cWcwaTTS7Z7dE c14sGNAm27K5HXjA1VErnomPXRI/jMU= X-Google-Smtp-Source: ABdhPJx5k09KaIAXq6ZDHuXHDUS+Kx05aYjT1gjRR4fRssU03VP2JcdZNTVNNY27vWsnxS+IU16Y0g== X-Received: by 2002:aa7:db02:: with SMTP id t2mr15348422eds.95.1600061300672; Sun, 13 Sep 2020 22:28:20 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id f4sm8251421edm.76.2020.09.13.22.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Sep 2020 22:28:20 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Sep 2020 07:27:29 +0200 Message-Id: <20200914052747.124118-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> References: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/40] avcodec/atrac3: Cleanup generically after init failure 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/atrac3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 067aa23f1f..ef2f8428dc 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -977,7 +977,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) /* initialize the MDCT transform */ if ((ret = ff_mdct_init(&q->mdct_ctx, 9, 1, 1.0 / 32768)) < 0) { av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); - av_freep(&q->decoded_bytes_buffer); return ret; } @@ -1002,7 +1001,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) q->units = av_mallocz_array(avctx->channels, sizeof(*q->units)); if (!q->units || !q->fdsp) { - atrac3_decode_close(avctx); return AVERROR(ENOMEM); } @@ -1021,6 +1019,7 @@ AVCodec ff_atrac3_decoder = { .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; AVCodec ff_atrac3al_decoder = { @@ -1035,4 +1034,5 @@ AVCodec ff_atrac3al_decoder = { .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };