From patchwork Fri Mar 5 23:21:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26212 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 A0FF0449B3D for ; Sat, 6 Mar 2021 01:27:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7886D68A9E8; Sat, 6 Mar 2021 01:27:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC21A6807D2 for ; Sat, 6 Mar 2021 01:27:17 +0200 (EET) Received: by mail-lj1-f174.google.com with SMTP id e2so5008784ljo.7 for ; Fri, 05 Mar 2021 15:27:17 -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:reply-to :mime-version:content-transfer-encoding; bh=MsySgcJJ+YMnK/MHA8I8BmMHrGO915I1iJhadEmBxOg=; b=jm0rEumjwyTOLuQvt3oGdfaPWcxIaWSanAsPTzz8jZMYeU+I3NIWHW5zcFYZvyS6QI UojTu0NEF1SQjp5w7/hGzfyWLLEV3xLfadiNfl+U6ehhLk6sYXk1qMUUlO81sHg1ae51 wszTgqVxzsDlkslrekjaK5H7P47zZ/sdJM+k86sqYy5GcchpLH59t6Jp6vihks8f5d10 GuprdE1x5IJy9I5dSUWx4tOVN7YNAOFBRnFp9+2diAcvieIN4qT6pFY/yyhene8MjG3o jzw1kGFn8HZs/4LnpLi/AB3TBS4/zNhqECoxpsFE1trHTD1xjpf4cHSRGSLk67NCpp64 I8dA== 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:reply-to:mime-version:content-transfer-encoding; bh=MsySgcJJ+YMnK/MHA8I8BmMHrGO915I1iJhadEmBxOg=; b=dUQex/Xz4F+uorFxARzHhb+TsKjEmb10LxGENHv/FGPiu1cHjgxBCeeczEsZ7Mn4o+ kP3LM0XG+tGUT6lWXdxjTWUvjAS4nXTQr77d75X3dEEmUHpDS3usv+9UZXHzKmdSttwC 0JOqE1dTR51OjJHLcTj7S8ZzEuGog+DtZw60Qnx92gLOwZx0rydNtppVuUV0UelH8tZQ Nd4ohTkDPhThnVgxsy8hf53BjyIITVWonRh6teeXVgH5wYa79+GSgIxwtDGLYe5ZQW7G zoNocDCfcAi+WfREnxcGRouxnhJAIzLxIV1qmWAUXYeMbtgZZVTAEJnwQaaOeGykmH9q d18g== X-Gm-Message-State: AOAM531IfMMhT97qr5oqjEq+JIlLwSgUrRnSYT25zHHEwNHVeFOEOLlr aiZceMbeBOJtOpC2R6uXHGvYOwRQEVo= X-Google-Smtp-Source: ABdhPJxKabMoueMxaPOIhnk3o9DlsN3p1xlUNj9sPEIS86a5zkFRz4IHCL3yIpLCyw+Nfr8mbz0bPA== X-Received: by 2002:a17:906:2710:: with SMTP id z16mr3854115ejc.176.1614986525683; Fri, 05 Mar 2021 15:22:05 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u17sm2492232edr.0.2021.03.05.15.22.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 15:22:05 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Mar 2021 00:21:04 +0100 Message-Id: <20210305232104.496745-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210305232104.496745-1-andreas.rheinhardt@gmail.com> References: <20210305232104.496745-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/mmaldec: Return early upon 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" This avoids freeing a NULL AVBufferRef*. Signed-off-by: Andreas Rheinhardt --- libavcodec/mmaldec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 7486f3c526..0ea07ea787 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -495,21 +495,20 @@ static int ffmmal_add_packet(AVCodecContext *avctx, const AVPacket *avpkt, data = buf->data; } } - if (!buf) { - ret = AVERROR(ENOMEM); - goto done; - } + if (!buf) + return AVERROR(ENOMEM); + if (avpkt) ctx->packets_sent++; } else { data = ""; if (ctx->eos_sent) - goto done; + return 0; if (!ctx->packets_sent) { // Short-cut the flush logic to avoid upsetting MMAL. ctx->eos_sent = 1; ctx->eos_received = 1; - goto done; + return 0; } }