From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 496FC4C37B for ; Sun, 3 Aug 2025 00:24:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 83ABB68BC2E; Sun, 3 Aug 2025 03:24:37 +0300 (EEST) Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 0937668BB7E for ; Sun, 3 Aug 2025 03:24:30 +0300 (EEST) Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-71a34087749so19706807b3.2 for ; Sat, 02 Aug 2025 17:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754180668; x=1754785468; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=lJxGZ5ku8SfNzah6y5Oox21/DSJax4OG0hAo87U3iYw=; b=PtJcrjd/ZEUNZszvDkknAiDaJq6HT/A+W73rceokyJ7mC/MV8XDkC8FNRlDXNP5qyo T68np9np8eRCDyTfHu37BsiCM0tjSl+KU+h6/uBbyBP7+e/sF3hBHlRwyPSnPIRV9RKc vjY9o7y2w1FYgbHbgcOLP9eXNswdrpjgc9BrPDt/NMWDJYHlJbEPH7GRn4RHVrCCblgo xJ7SecGz6qzEKBMzsWshvRWnFeFVmAriDg3myMinkSbXb2KzarkPV+2BrIcLSr2tUe0+ JL1OUkGYU8Ov0/l9BaG4GZBFN/Mjd8Abdcf52sa0ZVje3EoGD51uFui7SkzUgP1ZZhkB 7IGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754180668; x=1754785468; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lJxGZ5ku8SfNzah6y5Oox21/DSJax4OG0hAo87U3iYw=; b=RRT893FzI6ERYAVizYFCh2ju+M8dzuabdlV9nnCe/D/55eBPorbSZjAyKmepWxBDGh kzgC42UTcruyz5yqwXYNjYPrOxaFQmSwdW6gvUAdKAf8krWmP4S3aKbqVZIKgIhlBbg9 nOOjVetsRHuM8pgZe2mNCaweA9yZ6jGTrJbVFzZvZnTN/4ffqFjFrMI51NVJHAW7uHr6 8iei07oJ1Ezgcvl13LiZWxjaN2+hClMOkquzGntvT+4Cv53GoF8Vs23PojbEWFH4B19k XO99GyaKiYEetwIDkVLEzInIeyRIAF5IvUKZBVRPa25q3LgDIUOTmFeeF1ddWFqk9Fey aALw== X-Gm-Message-State: AOJu0YzXU0qUtfCUFuKz8KK8FUeN5HN5Q08cjTbsNhSSJZUyWIlhKA0x NjdmDzDXoy97OGlfCIV0lyfpHCg0RwGf54hHcmIqehdlzrGbfXwQt/6xawepjw== X-Gm-Gg: ASbGnctLidcYH6ADYpbi7yJNT+3KFZT6urMM9PuID9XpS1Cndq3cElMffd0zyhHDbyF n6OhbwR2tkbutqCnNBl6i+VZIUDkt2VHwvaBotaS/DdHZ8QXXeEIkCqEAvXQOkz2vbEdBJyT4Et wqu25SP+LIopiclzigSk0DHw0EHOZVxuOvz9NauIQ8FarWIGjTrHbMk24UBgSf7lXK7zwZR+AE1 0e8kmrvY81nzHaDcClyHMiboX85yULJ+t261lVxV3jdmW7qd1j3ZiZ4GiEiAepd0Fmd0wrYsN8Z qZJXXYhRDbjIxMS21Y8i3sPdRyJs33HDSXNv3e8c+Ng6Rv3DMqtDq5w/YhF4hqg24vNe2KZKKCf 87taj7dWB1SJeiAyVMX7o/HgtCzPwAlbksyDi8Luj/715 X-Google-Smtp-Source: AGHT+IFIN7sNyI/8Y+yu6h95FLLyspKYfgZJ2wh5oEKFrjN4xkxytjHlu0FDb/JXcRL6PbRMPWxTYg== X-Received: by 2002:a05:690c:4486:b0:719:dbb5:e76a with SMTP id 00721157ae682-71b7f92968fmr55319197b3.42.1754180668018; Sat, 02 Aug 2025 17:24:28 -0700 (PDT) Received: from newman.cs.purdue.edu ([128.10.127.250]) by smtp.gmail.com with ESMTPSA id 00721157ae682-71b5a599d10sm18601467b3.47.2025.08.02.17.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Aug 2025 17:24:27 -0700 (PDT) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Aug 2025 00:24:25 +0000 Message-Id: <20250803002425.24534-1-jiashengjiangcool@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/amfenc: Add check and av_frame_free() for av_frame_alloc() 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: Jiasheng Jiang 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: Add check and av_frame_free() for the return value of av_frame_alloc() to avoid potential NULL pointer dereference and memory leak. Fixes: 88a8ba5c99 ("avcodec/amfenc: redesign to use hwcontext_amf.") Signed-off-by: Jiasheng Jiang --- libavcodec/amfenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index b16b642e4c..64ec232509 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -683,6 +683,10 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) int64_t pts = 0; int max_b_frames = ctx->max_b_frames < 0 ? 0 : ctx->max_b_frames; + if (!frame) { + return AVERROR(ENOMEM); + } + if (!ctx->encoder){ av_frame_free(&frame); return AVERROR(EINVAL); @@ -690,6 +694,7 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) // check if some outputs are available av_fifo_read(ctx->output_list, &buffer, 1); if (buffer != NULL) { // return already retrieved output + av_frame_free(&frame); ret = amf_copy_buffer(avctx, avpkt, buffer); buffer->pVtbl->Release(buffer); return ret; -- 2.25.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".