From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A3C7D460F4 for ; Mon, 1 Jul 2024 08:36:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2985D68D69C; Mon, 1 Jul 2024 11:36:04 +0300 (EEST) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".