From patchwork Fri Nov 27 01:02:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24096 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 909B344A78E for ; Fri, 27 Nov 2020 03:14:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 722FD68BC5A; Fri, 27 Nov 2020 03:14:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A054968B737 for ; Fri, 27 Nov 2020 03:14:19 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id a186so3670685wme.1 for ; Thu, 26 Nov 2020 17:14:19 -0800 (PST) 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=6GY1k/Nh4lehiFgPG+fDCe4Pi26tC0vr/+rfsiGlXvo=; b=PKgchdFKRmAg3NCZdfAgyOOX3mkFzrQfbGXjDU11qZh3j2lh7oqDdt71qmIhtDoRrd GOOajXO2LB3jvnztG3+4iaMNOKn1N9YyciJuKS0f/y4zeVXw65qJIdX5Wr/kIIVjOXdR +X/1kz+hJTCygVDE0ZaK3Pvc9BcsILXU9s6VMnp7vCa7KQsvLelJ7p9qVtaVbYhdxy+/ SfvlYUhrq90QUCLF7y06KaGSIabj3Rjh8oNFWtLgibQmen8t36lJt7RQF78raZTyA4NH AJwaPryOMMolLonQxSNKPvwX6EsdNf7mYXnzAemDtTOWxdCMnBthecTcyxfVUKjUlm4k 9Iaw== 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=6GY1k/Nh4lehiFgPG+fDCe4Pi26tC0vr/+rfsiGlXvo=; b=VGv908yqL94rWeGjJM5mgl7MEAMfEJIegonWVYU1Gvy7qgAbWuTIF1tRJm7dmM7FPI MwuaxxL9lQJqhE5Rb9VJOdOoOGCJ0P6/ELESlv5p8JVPTVl+VNjr+O7r2D9L+Wif3mSo zTgM1Qa6JOoy/bs6bS1EHYGVZ2tn3J6mEmzEiuf27CSv3aKWLPBGcU6p7FYLVOeoWXDP pLSgYFxnGsnecHlFAnza7bKEhVMzSiZXoNKXUI0gRS7mlvLadTRdBOTupDpBlSHBJ80S C1lV5nEUM0pOUgB/8awp/U9tjPs8s7vlwgcJMtYdLmU7+MmH64N1fVdJ9eq74ZnEBkGV 1utw== X-Gm-Message-State: AOAM533Cs1cpExvfiZpuz8gDmNKbbne4mw/ncjYkOm5KcHoxSLGk8h62 nuX2iF6BZnIE6l7k8dQC4bmx7jjHLFfaQg== X-Google-Smtp-Source: ABdhPJzq3cweVKC8dRWRRdF21mhHZqzxehy5tFA6YdFp8Umm3TtAeocUI7FB/VZBcx9UD+Su4y2zng== X-Received: by 2002:a1c:6456:: with SMTP id y83mr6063387wmb.59.1606439221276; Thu, 26 Nov 2020 17:07:01 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l8sm10504450wro.46.2020.11.26.17.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Nov 2020 17:07:00 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Nov 2020 02:02:24 +0100 Message-Id: <20201127010249.2724610-20-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/45] avcodec/xxan: 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/xxan.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c index afe60e1564..865dfa8f87 100644 --- a/libavcodec/xxan.c +++ b/libavcodec/xxan.c @@ -71,16 +71,12 @@ static av_cold int xan_decode_init(AVCodecContext *avctx) if (!s->y_buffer) return AVERROR(ENOMEM); s->scratch_buffer = av_malloc(s->buffer_size + 130); - if (!s->scratch_buffer) { - xan_decode_end(avctx); + if (!s->scratch_buffer) return AVERROR(ENOMEM); - } s->pic = av_frame_alloc(); - if (!s->pic) { - xan_decode_end(avctx); + if (!s->pic) return AVERROR(ENOMEM); - } return 0; } @@ -447,4 +443,5 @@ AVCodec ff_xan_wc4_decoder = { .close = xan_decode_end, .decode = xan_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };