From patchwork Thu Dec 9 09:36:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 32217 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp105953iog; Thu, 9 Dec 2021 01:37:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJwXfNI++/baF71UHTfsVhlL4Gq2fiNuQRc6ixbD06KWFPd2IExu/+IarusS9cDuhzHM2i9l X-Received: by 2002:a05:6402:2805:: with SMTP id h5mr26905985ede.267.1639042638188; Thu, 09 Dec 2021 01:37:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639042638; cv=none; d=google.com; s=arc-20160816; b=RfR8GNwyKMNtAQssYLvx4LFyTYDRKtfdlAX6Y8WjvYL2hTA1z2yriIo1aKmBPiCrg1 CKx7CVvfqjLyvnNc+Y7jryGSncaTQxUgZCL4GlRiEaFFmrajtxkLf9yD6EXW1XMDjxaH RhVhpAUr0ktUoNW8hR/q1YuFMiAaGP8CzKftKKhf3vOyvgk3rG91XRm1eWRiu+IubAyO MF8z7hDk/z+8EljFlOfPFYCs3V0KDXis57koIwN/AjTJo7MdyVEKvsmXn3QLgzRrT4gS eTDEAA/eVzEXkQ9HUIX0AtW+v+pWfGMfG+EuvuWc6sCTBipcYSClX47Dtj+fOmYO8BGL WEew== 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:dkim-signature:delivered-to; bh=hF/sGQ6IDJ0Jpqx0d57nLqMcUZB7lwU3BEF9vXqUyFE=; b=mr0HRqSZWezHG+M7B3rmjLCCHVRy+CUFvyv0fbM2T0w4zJXrol1gm8MUo97Nnqd7KZ GKRkqp380ydY8DdvKu4lpHWTQgR6B6ls+Yl3lRZtAN57WdwPH3VD1vbd7PtOYGQgVnXk SuTgw79Mm9iURIDH3tP3U+PkFjftWGQtixf5nWyytATs2JBcJP/yeiV+2q74KqDxfKQW 2u8QKCTw7U4EDgoP3ey2zP+a2gw/1uVuVjLwVkHqnkzWwiSzn9ctJ9ve5YDz6JNuImF/ pklQvRSWJlrAMLdYN0cmyohcx88bpUhpdodqyl3cb96OE36xzj9MIw+azJ8yzhEXhw6q T7vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=S7Kbv52f; 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 dz21si11896429edb.49.2021.12.09.01.37.17; Thu, 09 Dec 2021 01:37:18 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=S7Kbv52f; 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 E324968AC87; Thu, 9 Dec 2021 11:37:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2C1B68AB96 for ; Thu, 9 Dec 2021 11:37:05 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639042630; x=1670578630; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jfNnXH77PBV82Ez8p0Bl/HO0VKWyyQLNZyFOHBlthiM=; b=S7Kbv52fLFRfV+aZKwH0xUzW1WQYshi6n+aM1RsR0emg94lKh4r1uRgW M1ibgzAgnB3hP/CvPL46f34INjxdvNU8Obn4FaOpXRulP6MyY4/mtzbQM TtTaco7A/bBvHwHvuizLBnImvGEkTLghcN4kXX39Xdre4vtKgkPMFYbRu KG8nDb3rxBp2G6ovBSp71RDCoEjN994FBMIQGUkQUoQca1W6Zx5fmFxcg 74g0wasxC9cGygUed6I/9eImk1feXuBkbd2oWRXEsiDxzhTsRcJAFl9xy iFRQ6USL5Sv2D0o3eD/qoKCuo80VNiOZ57X38VQH1iiKjWrODjFEEo6On Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10192"; a="237864449" X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="237864449" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 01:37:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="462064116" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga003.jf.intel.com with ESMTP; 09 Dec 2021 01:37:02 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Dec 2021 17:36:52 +0800 Message-Id: <20211209093654.3149267-2-jianhua.wu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211209093654.3149267-1-jianhua.wu@intel.com> References: <20211209093654.3149267-1-jianhua.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: R3k2o5ABfTZX 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)