From patchwork Fri Nov 27 01:02:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24059 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 B45EF44A929 for ; Fri, 27 Nov 2020 03:07:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9247268B9C2; Fri, 27 Nov 2020 03:07:01 +0200 (EET) 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 A328768B9A1 for ; Fri, 27 Nov 2020 03:06:55 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id 23so3943900wrc.8 for ; Thu, 26 Nov 2020 17:06:55 -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=DfrCpmQGOORDEa199fECTfl+DQgHSRctGfGOe89nxB0=; b=ak5xqeXMvimM6HHjHRLDLCSeuJ9MbhWDSD5OxLIuDc2OKvQ8kyf1FRvnZk0eEnpMv5 EnAVYwMlm9bno6d6uIZK+YHmxMVU9p0uX+XS3dTN/x/ri0Sh096v7E7QC0C9TzvXix11 jX9cVPp4tMxeZdUtnQiIeIBc5/7XzRtZ/awCWiXbhmboYdU2Suzezk9QEpkS5Z1J3eqV HfQonZESW+EcwmT7FOMA02Tsal2Vy5X2Vy7QMaRkLzeRsb+cvi92CH0m3wYijPm9Y6ik 5mdFJOvYNx7Mh2SpHd/tzanCplUz7efiyUP9cCe0Z+4WE7gozK4GNadFnRB9qWjBgPXR QhZA== 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=DfrCpmQGOORDEa199fECTfl+DQgHSRctGfGOe89nxB0=; b=hCjp30XU6zyrE+vluUmvPuMz8qlHT9XL2IKRfR5ak0DDA9OCuu+uvYag3vidmiEPrn 5WZKsG/7iH5SD0/RwSr5/ujkGRUL71R+bn6+bB7foMWEgaVb6ZjfjeHP2AGMAC4zbCXw 8MYkNM+vERjSTr5HhH2d+xbids7RMaQ7Rsv/qvs4iz/DyYBD+MW6h8MM0liV0rw/1JHJ m+Z4uFwcQ2qVz96TQfbbAvpedU+5PthqTRiP4ll0D44/n7hLfmJ6fSmrfcywdBcDzpPX 2/dPeWC/OKBPlUYN7q0jyyjzuADBy+a3L7F/YfY/tx0YsRYNTMipbgHkdU36iWcLQpPr ptgw== X-Gm-Message-State: AOAM532zVXBIiQNUEWPXhvJZWWmUH31/SwhXbLABSeYcfvx1pZLzdRYk fpOBzkSu0WaMLHp56NA6bpHoI3RqKGhuDA== X-Google-Smtp-Source: ABdhPJwy8gxBOwGrx3XCuLTr6Wea+V6KzhjQU9q2lhAdilbejSJIypMb8aGZKmx52WQAYMk/4vm3kA== X-Received: by 2002:adf:ca02:: with SMTP id o2mr7060709wrh.13.1606439215059; Thu, 26 Nov 2020 17:06:55 -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.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Nov 2020 17:06:54 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Nov 2020 02:02:18 +0100 Message-Id: <20201127010249.2724610-14-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 14/45] avcodec/xan: 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/xan.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/xan.c b/libavcodec/xan.c index 1ccf164847..5318aab797 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -100,16 +100,12 @@ static av_cold int xan_decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); s->buffer2_size = avctx->width * avctx->height; s->buffer2 = av_malloc(s->buffer2_size + 130); - if (!s->buffer2) { - av_freep(&s->buffer1); + if (!s->buffer2) return AVERROR(ENOMEM); - } s->last_frame = av_frame_alloc(); - if (!s->last_frame) { - xan_decode_end(avctx); + if (!s->last_frame) return AVERROR(ENOMEM); - } return 0; } @@ -649,4 +645,5 @@ AVCodec ff_xan_wc3_decoder = { .close = xan_decode_end, .decode = xan_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };