From patchwork Wed Jun 24 13:27:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20568 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 9B04744B153 for ; Wed, 24 Jun 2020 16:34:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7BF40680109; Wed, 24 Jun 2020 16:34:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9071668B21B for ; Wed, 24 Jun 2020 16:34:30 +0300 (EEST) Received: by mail-qt1-f195.google.com with SMTP id i3so1610026qtq.13 for ; Wed, 24 Jun 2020 06:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YkVrQS2wB5aIf4T+FiQCiNeFVDchCHz6W25WzrJ83Ts=; b=p9G29dbA+4jvQkIFGIv/3wqiGZHeUDM77agmt9kffCb7CJbIGJ9yyh5bShijfHxDXx YbOIGCNsNjdfd4PP9QFeI4tf5z5rVoXESUBY6HZXpEyptoVfDy2aNXKRWdmatKUNndaE HC/5kljGh5oRDiXtj+w0SdwvT8i/qPvYnyjrD7qIQhnSFvLaVFrh0eF27e2mCcE2h4fY xZUm9CF81nmA7UU9irQSzf3F31gTAttZ4qD4AdW2xP27wNzqxP+3v8GS5wlDBD2vLOmR dDjuXsPxVn0I+8GDdcNDw6GcvGDSVh9CulCGn65vd5ZI5mIa9cxz3xLGGN8p9gwFklQz YfYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YkVrQS2wB5aIf4T+FiQCiNeFVDchCHz6W25WzrJ83Ts=; b=F92CYRbp9XWzR9sNJ0Ili4PEZZWU8MQSbgpfsHUjKExIgPHZ4qZg8SwB8LewUTdQnM +GfKFaheh22pGF5Hm0SGtMLClPkBawvfYii6pH7EkykJ8eh5t4hdKRs5RG9ENhr5uSGT 5ycScK+lpT/zNqXVZbiw8yO7YZYd55r+Ue1QQu3w7P+nE/D+uS+5RctGfP4+GrwSTM2m 0JeDbcyy0G7q/9FWO7IflmuTgy3BM4qwgUD1UPFbiZOmtOv6+w+UomMO3rD+td8av5Z0 5NH2wAztwH9fjENXgkiymLZiWCYK28YVT/En9znDm9RpGtpWnkt4Insmh7ZBGh5wT1/e bHsw== X-Gm-Message-State: AOAM532ejOO/budAmF5tb6zfOuG6jPRYkxOPrimOZNthdF1OwQEbXZj4 7x4tKFynpCVr++Wvid10R66P942z X-Google-Smtp-Source: ABdhPJwFC/LqHElTNNVOxacb4aE1gScqTxVAryarv2OgmYcMCiIRgQvPkFXG6RA1+ePC+5e4DmBYtw== X-Received: by 2002:a37:4b05:: with SMTP id y5mr1051835qka.382.1593005293665; Wed, 24 Jun 2020 06:28:13 -0700 (PDT) Received: from localhost.localdomain ([191.83.220.40]) by smtp.gmail.com with ESMTPSA id k2sm3239673qkf.127.2020.06.24.06.28.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 06:28:13 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jun 2020 10:27:25 -0300 Message-Id: <20200624132725.1483-3-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200624132725.1483-1-jamrial@gmail.com> References: <20200624132725.1483-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/mlpenc: free filter state buffers on allocation 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavcodec/mlpenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index 4d50f0ea33..52ea06ed91 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -1820,7 +1820,8 @@ static int apply_filter(MLPEncodeContext *ctx, unsigned int channel) if (!filter_state_buffer[i]) { av_log(ctx->avctx, AV_LOG_ERROR, "Not enough memory for applying filters.\n"); - return AVERROR(ENOMEM); + ret = AVERROR(ENOMEM); + goto free_and_return; } }