From patchwork Sun Sep 13 02:57:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22326 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 80BBC449E91 for ; Sun, 13 Sep 2020 05:58:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 671A768BBDA; Sun, 13 Sep 2020 05:58:44 +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 ED1E668BBB6 for ; Sun, 13 Sep 2020 05:58:33 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id w5so15041868wrp.8 for ; Sat, 12 Sep 2020 19:58:33 -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=FSkP1ejAn4CBe35nzokphEqOjHT11GUwvmThJCp1+ZI=; b=QakuFyOq0DJ7xr3Ufks3hm9pwd5oToJqCLf1uROpaAylK2Vld5QXT5k70jOMYUiMGn Wv/XlQU3xoChZ1/wVQ5RG0j++q97xlvF/vzd6fWXopFmZxbFLqAWPzoR+prh01FfEd4W 7cX9vcKHFhIAtWfCuUXSmcERbdpj9id+fdvtAhmAUuY+5EXdImgf2P3Du/I3V1kJCtDK tFaAk/qfdgSiBqqvyLixrIqHu8fIoXh6gCr1d8BlMeqoMxQowcNhyZeNMUgNm2eWCMn5 iXudXpQS+Nf+v5RXNvmpQRpbbvkn1j/3a7gCQprrBG9d8DRXAjpT+NzItmPnE4jEkwUL 96nQ== 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=FSkP1ejAn4CBe35nzokphEqOjHT11GUwvmThJCp1+ZI=; b=YevW9vdNIDm7eBU0SxpZiUiq/ZZu9Q26OTFFldIvIwIqjF+JCqE8UDOIjrNZx+giDL jyehiP9tmrfO7Y11Smkfg4iWjcCJtZy2lVlawoehw2mfyWII6rsz+bknapB1ey7uo2cX /t+i0HUqyyHdAU/K/1JF9UsbAX39ozPdNib5YrUfBP4UyUTfi8nLlhrrpJ3ntjBf3CDC WjVQR9qVt6H7Xr5TV+y/gVvvoFI6X9WAddIwWmpzwGPYy/ZZl2g+tJBjrzUipaN/KXY9 uIgyZQDtWba3h9fEW71fFNDfQkWWO7wdYikuS8Eh8OQPmjMUBeLh2FDGQ1148Aa+nqe1 UXkQ== X-Gm-Message-State: AOAM533HHfDUuhtse/GbE9W6VZYhtBw6ih0hP5IwNs6zdGggdElgs4h6 uzBKxnrnwc2YWYZcT91KnTtmgC7DUeE= X-Google-Smtp-Source: ABdhPJxlZquqaeuqYdocWZf9MPeZfpMZGPRO+eNTAzkG4TE/j3lrRqMgZAYGvBcISnIYMWnJ0EcSrw== X-Received: by 2002:adf:f44d:: with SMTP id f13mr9074252wrp.224.1599965913168; Sat, 12 Sep 2020 19:58:33 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id f3sm11883355wmb.35.2020.09.12.19.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2020 19:58:32 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 04:57:52 +0200 Message-Id: <20200913025753.274772-15-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 15/16] avcodec/vb: 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" In other words: Set the FF_CODEC_CAP_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavcodec/vb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/vb.c b/libavcodec/vb.c index d9c6b93a73..fe419c7663 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -262,11 +262,8 @@ static av_cold int decode_init(AVCodecContext *avctx) c->frame = av_mallocz(avctx->width * avctx->height); c->prev_frame = av_mallocz(avctx->width * avctx->height); - if (!c->frame || !c->prev_frame) { - av_freep(&c->frame); - av_freep(&c->prev_frame); + if (!c->frame || !c->prev_frame) return AVERROR(ENOMEM); - } return 0; } @@ -291,4 +288,5 @@ AVCodec ff_vb_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };