From patchwork Mon Jul 1 08:36:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 50240 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1635753vqv; Mon, 1 Jul 2024 01:36:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXEeUxUoVr0PUSEGkjnzSDCf2cgq1y15sbQEhD+ARrn4vB0hLGbNvAVJnHFAbHEJldgQXCLnUxV7JV67EJZxA5vnz3+PEmxCNznpQ== X-Google-Smtp-Source: AGHT+IGpAaE7+qtfvOHT5O79JQvjtwrQhFll5qEv/2CZMuhyuxTq2UyUjScTgqnbLudxqQSGQCnw X-Received: by 2002:a05:6512:e88:b0:52c:d5a5:bf7 with SMTP id 2adb3069b0e04-52e8277120bmr3117447e87.4.1719822969176; Mon, 01 Jul 2024 01:36:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719822969; cv=none; d=google.com; s=arc-20160816; b=fKkdK8okOxnyV+T1LmxgwrqBvBy3QEDtedgNcvhYERy6ZxLr5HRMc0qKAjaZJUOnfc n5OH0uRZCmN2/8V6tHf6lSXdJhas1QOJ6vehJQlMp4Ar9JxmCCb2KHVVgyJZCEqbgYNK YMmDk3NCxVjlxfozFH9x7BU6/Xo2wVp2OVeF1pyUiGYopWDT04XOR1BTnN1+M7zirlTg lDACeS7wrjzwSKCGqWv+25H7uJ2NoqS5XwaEbginQCDsjDqmuf/PJ3klWjrhtpT5x1gV jCfjJ7wq7zUPavTNnP4SDbgoglNWedK5iofqXdFP0daiM+lmlY71ykpQvzsV1WHfsT0c sVqw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=JYr/vvLD8B5nLlQMA4hc6Jw6RLEtFyXLKhT2HaSCucU=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=iz+4QSgg4apUMUS1pjK3+sH8J/A6bXJ5HefU39B3PAuiQhrnpImSEs01VG/s/+aiIw UG5nP/wPJM6+ozKOnFBlSiuGyr4ysBJQNel2V+Zd5MEbH7pOh44dlXjYDDdV6SlKDIpS 5kn83tB9u9Vn2V2Pnxqi2vbCCESjrkbAKYXlwPUii3LzLETrS4hKbIc2xmMm3lGwcVKO 75t0kwKusC8dqjThr14RDBuZr3rnq7spdKvrq8H2Mb+iCBMDwq1KZSk7W93cYs2t8Ddo EgMD8Av4EmPxg53M8BOmuvDWZqzAOKqKZmQUmPVOPBDuNA/a9zSshMS5qcZsDgyiyoln vDsQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=ZMLdsPBj; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a72ab04a9fesi338247666b.285.2024.07.01.01.36.08; Mon, 01 Jul 2024 01:36:09 -0700 (PDT) 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=ZMLdsPBj; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9DD8B68CC21; Mon, 1 Jul 2024 11:36:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA98A68D07E for ; Mon, 1 Jul 2024 11:35:56 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1719822963; x=1751358963; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=rGoSVjXlBxBBVoXYW7o7IfrQLyyDtQI3s5hsRAWt7tM=; b=ZMLdsPBjOY4ibVNm8FHRiuYjS4D8cq5vOgUiwSx0mhw5OpJjvzZVkWP8 uZKfTuuCxwCbFXs57OeMKJOmH5ijMPm1nRh1wGFd/7/iF0sfz4zVBYx8i +lJgRYXdi5ir7aNwrgWjA5kP+IcSEAGGZNiX+zKnbGrUOxs5CKvGflgWk tZML3EEUxtrCsCWwcqUaAEBFvn605C+WRhzS1TzxvsKijDqAhWq81BD52 uw8QCngjJLQ7ImMeXtyL4MqU+7J2/LJNRXazkOls5dvlBIRZDRO8UYBGN 2/UfzHQdf1rl3zmFRnUvy/1m5uxZm/IccYmg6OLZWo4xG7JaqNdrj1Xld Q==; X-CSE-ConnectionGUID: IB/PKVxwRSaJ4yVlkV7JDw== X-CSE-MsgGUID: IAOU1hQdRwu1bgd8JQaevw== X-IronPort-AV: E=McAfee;i="6700,10204,11119"; a="17066262" X-IronPort-AV: E=Sophos;i="6.09,175,1716274800"; d="scan'208";a="17066262" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jul 2024 01:35:52 -0700 X-CSE-ConnectionGUID: /eTI4daOR9KOunJt1UlxiA== X-CSE-MsgGUID: 3Zq2+w+WQWyOs8MOz3lG7A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,175,1716274800"; d="scan'208";a="76155879" Received: from unknown (HELO t-dg2.sh.intel.com) ([10.239.159.57]) by orviesa002.jf.intel.com with ESMTP; 01 Jul 2024 01:35:50 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jul 2024 16:36:12 +0800 Message-Id: <20240701083612.682571-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/vaapi_{decode, av1}: Fix memory leak in fail codepath 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: fei.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HaJ5RzmUQfAk From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/vaapi_av1.c | 9 +++++---- libavcodec/vaapi_decode.c | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index fe0852318d..5451b6055b 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -404,14 +404,15 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx, nb_params = s->tg_end - s->tg_start + 1; if (ctx->nb_slice_params < nb_params) { - ctx->slice_params = av_realloc_array(ctx->slice_params, - nb_params, - sizeof(*ctx->slice_params)); - if (!ctx->slice_params) { + VASliceParameterBufferAV1 *tmp = av_realloc_array(ctx->slice_params, + nb_params, + sizeof(*ctx->slice_params)); + if (!tmp) { ctx->nb_slice_params = 0; err = AVERROR(ENOMEM); goto fail; } + ctx->slice_params = tmp; ctx->nb_slice_params = nb_params; } diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 7c91d50f7b..a59194340f 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -74,13 +74,14 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, av_assert0(pic->nb_slices <= pic->slices_allocated); if (pic->nb_slices == pic->slices_allocated) { - pic->slice_buffers = + VABufferID *tmp = av_realloc_array(pic->slice_buffers, pic->slices_allocated ? pic->slices_allocated * 2 : 64, 2 * sizeof(*pic->slice_buffers)); - if (!pic->slice_buffers) + if (!tmp) return AVERROR(ENOMEM); + pic->slice_buffers = tmp; pic->slices_allocated = pic->slices_allocated ? pic->slices_allocated * 2 : 64; } av_assert0(pic->nb_slices + 1 <= pic->slices_allocated);