From patchwork Tue Dec 7 09:41:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 32103 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6014873iog; Tue, 7 Dec 2021 01:46:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJx9WP6O6TzYBbQJwp65U8Hh2OO0Yt8KeAa/Pmjyv9FwVxn+ilvm6juH5fV0SC+vbwIMrpqq X-Received: by 2002:aa7:db47:: with SMTP id n7mr7361360edt.303.1638870379443; Tue, 07 Dec 2021 01:46:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638870379; cv=none; d=google.com; s=arc-20160816; b=N90g8JgbT7yCYDe47rpmeL00/YtZ6fU5EoA90FdsDXWHvfbeu4G2XFGtfSyhNV9P1R 1vphPo0GRMzbELG7sf2ch+wQfbsZjv/g/qb9FZ02UQB6hdDShxATO/C9jbxqZ7BbtDSW n8uRd2LDtL+r3DeWbZAhzjcFzfbZNkRz6vYq7nMw7J81+YJUtF6J8AG2mkHSEAbyjxq7 Cd8W4zoszk7ColE/DAkeUEs5/7GQajCKzuDBsHGx7UR+1iBoT8ncfwmEmHoH/RzhFeZe 2LqSiRT58FDrMpXCAdg4dxx5XWfzcqdJYX9Z8SjpSBaLGao1sAtESZCOTGNci2Y/rnEM 6JJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=hF/sGQ6IDJ0Jpqx0d57nLqMcUZB7lwU3BEF9vXqUyFE=; b=Xgvin2oDEMLZ5J8/1/b7gm4BtIx/jnftDJjkizWV9VONXfLba0yd4DAbw1vzfcAGYO 7CfcTd5qQiupFAkuUDK4uVSzEzimN+zIeDgl2C5ooFSPpRQF0prz8YA0wWsILtYJYXA+ FDWGdMLgeu9KZwmHYjmluc+dxy75cqyfNIxQRDEuy5yU+zJGaW5mXvIT1h/e4fd+sybm MIgU6gQAzLsuPfq695yRvWjlZ7mKgFzc5c6HdJlxg1NNQcfIdsQauFilKRzaJwrgqZwz PoAaTFeNYwAiByHmQsuS5grt3NaJz27XRCWcndHHnWw6joYUSumFzSDIdBMYEGGEd6Qr rR5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r13si21244106edv.421.2021.12.07.01.46.15; Tue, 07 Dec 2021 01:46:19 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B057268AE59; Tue, 7 Dec 2021 11:46:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 027A468A43D for ; Tue, 7 Dec 2021 11:45:54 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10190"; a="236279422" X-IronPort-AV: E=Sophos;i="5.87,293,1631602800"; d="scan'208";a="236279422" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2021 01:45:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,293,1631602800"; d="scan'208";a="657630449" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by fmsmga001.fm.intel.com with ESMTP; 07 Dec 2021 01:45:51 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 17:41:38 +0800 Message-Id: <20211207094140.2151055-2-jianhua.wu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211207094140.2151055-1-jianhua.wu@intel.com> References: <20211207094140.2151055-1-jianhua.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avfilter/vf_transpose: fix un-checked potential memory allocation failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Wu Jianhua Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rqL6I5AGFe1v Signed-off-by: Wu Jianhua --- libavfilter/vf_transpose.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index f9f0d70cd5..b964daeee3 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -328,6 +328,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, static int filter_frame(AVFilterLink *inlink, AVFrame *in) { + int err = 0; AVFilterContext *ctx = inlink->dst; TransContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; @@ -339,10 +340,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) { - av_frame_free(&in); - return AVERROR(ENOMEM); + err = AVERROR(ENOMEM); + goto fail; } - av_frame_copy_props(out, in); + + err = av_frame_copy_props(out, in); + if (err < 0) + goto fail; if (in->sample_aspect_ratio.num == 0) { out->sample_aspect_ratio = in->sample_aspect_ratio; @@ -356,6 +360,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) FFMIN(outlink->h, ff_filter_get_nb_threads(ctx))); av_frame_free(&in); return ff_filter_frame(outlink, out); + +fail: + av_frame_free(&in); + av_frame_free(&out); + return err; } #define OFFSET(x) offsetof(TransContext, x)