From patchwork Tue Sep 15 07:39:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22394 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 3626D44B636 for ; Tue, 15 Sep 2020 10:40:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1CA2E68BBB8; Tue, 15 Sep 2020 10:40:48 +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 178BC68BA41 for ; Tue, 15 Sep 2020 10:40:36 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id z4so2179559wrr.4 for ; Tue, 15 Sep 2020 00:40:36 -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=Mjg1nDQhmUI/IbiX3nX9zoqcXLC3meUKD/c3D3o3Des=; b=RHYx0rQY4FwO7j1F6lTCPTx6wHgRC4/OKLCmbYAFXdKfb6aQd8NcafM1Fs5jUzXivR i97TH8aI0TsmsZv+IIsneLg/jsL18Z56/WPcd0y01GUZmKYaXdWR1BmeZsIDmp1pL4IL iGJp5DGX4wSuUG+9cXwOgXncnryJ/+z7iV5ScQM+erCHfiDI1H2GdpfIRxYujWyVG+ar QwPpQt1YvAhxClyObQqK6L8BSMPvOWGLsvIq1C0urbvQ57E0MgLdtCIUrxgqTCPv7HFD iwUz7wJAjQguCr5HPsl2jqFeGcz/r11EoJZ36gSEJHmo64h13Rzm0BpnjxW6lI4WgMtg iiTQ== 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=Mjg1nDQhmUI/IbiX3nX9zoqcXLC3meUKD/c3D3o3Des=; b=Uhcm5jFw05PMs2+04tNmM45wufpDCN4nKHR3vcP71//DIkB5j9A8BAPLAfMwEoG0mb KDQQOJrOSwEvLcK5zACJ0TXeugeKpff4DhbnEk79IcidqR0487R+HPmXn0L6kszc4KOi oqjp05laMG4B+n/kx9HImJeZsEBrgwt9IHCOPg0HSHYsxyb9RBFnGPcl80Jpmz/WK2AV up0v43xWQNGDbFNaqDcwfYZFHqRDawFlIifDVWK5GKUbkhKBqtuIns1Z5mGKemBAW30J 0Z//MRMQ2RHBM6jAXEGuqYfuJDUdotRahyQdQ2HZkab4IHt99IABP1CqzJECHZGZEHxU Sqmg== X-Gm-Message-State: AOAM530Jy3lwrjKmGzRhTZHOImcAI+2Fk1AmOsfGUUGdtJ4hLc2OkSZ6 F6pqfDYA+5/MCMG771fH/LMrrwAm/wQ= X-Google-Smtp-Source: ABdhPJx9gRK4W0W03jSTKC//7zOJ9UjX2A+9JljpQWXDBk4vLWaGl4XPY6RNppmFbGPj5LxKdZeuqg== X-Received: by 2002:adf:e952:: with SMTP id m18mr19600294wrn.171.1600155635347; Tue, 15 Sep 2020 00:40:35 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d23sm6112125wmb.6.2020.09.15.00.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 00:40:34 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 09:39:39 +0200 Message-Id: <20200915074000.102622-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> References: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/30] avcodec/hmm4video: Cleanup generically on 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/hnm4video.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/hnm4video.c b/libavcodec/hnm4video.c index 177ce1d47a..ac080e398b 100644 --- a/libavcodec/hnm4video.c +++ b/libavcodec/hnm4video.c @@ -486,9 +486,6 @@ static av_cold int hnm_decode_init(AVCodecContext *avctx) || avctx->width * avctx->height == 0 || avctx->height % 2) { av_log(avctx, AV_LOG_ERROR, "av_mallocz() failed\n"); - av_freep(&hnm->buffer1); - av_freep(&hnm->buffer2); - av_freep(&hnm->processed); return AVERROR(ENOMEM); } @@ -519,4 +516,5 @@ AVCodec ff_hnm4_video_decoder = { .close = hnm_decode_end, .decode = hnm_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };