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 ESMTPS id 1411F4CAFE for ; Tue, 11 Feb 2025 13:22:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0BD5668BE22; Tue, 11 Feb 2025 15:22:06 +0200 (EET) Received: from out203-205-221-191.mail.qq.com (out203-205-221-191.mail.qq.com [203.205.221.191]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59BA968BE1D for ; Tue, 11 Feb 2025 15:21:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1739280110; bh=DciY4qvnZSlRB4W/YT+3hr6nMQ3cDrXphf6Jp/2fQr4=; h=From:To:Cc:Subject:Date; b=XAP0xGLsi7LuwrwoXGdi3X/AKA4hPiKpGjQe0HUC0XjPdr9UGxG9In/2Uhox3Lu19 7RgiUFzaa5J7rFzW92K3k12TDWWvlD43wJ6RkyPBHiNHq6AzLuLebmfcf8atMrQPVF /er06S5X/gtiM5j5On+MmVuLmXHopXnKUXQS0cJ0= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.207]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id 571266A5; Tue, 11 Feb 2025 21:21:49 +0800 X-QQ-mid: xmsmtpt1739280109tcfxzslps Message-ID: X-QQ-XMAILINFO: NafziRg7Bx69gpNYb7plf19o+itQmHJ9PQ7VLOwdnV0DzvUtpKW8+tJ1GiAjO5 cT/fKNTDg5cfYPC/764OJK1gBn5woXT/US3Du6rzptnLZBb7jrJgaKoSmK7BBmrCu0iAvWqVvuIj jEgBgrll9gl269Bq+DROktTQGMOydTCJusfAdwEkALXvNkh8GdbOOWbneM28w5uCpLQmNBO4UpW4 fdmEl7HFnAI/+bAB9NyCmCaif9egNK4Qfmy+zOEvZVAR67bJ5HkvbnHVSZupJUUQzWRGgbv3+XxN FcNPNCUNILtiblJV2YHAVXVFDqgcPkeTEhFyj1eYruJBGhXOZR/TlAofkESX5oWf5xLa/0q/IQ2G mMB2iWaUm1jE0JVVL/fLrOyP9kxtTC2c5fV+CfjLYNYwOpBWwnUk9Grn3BMd9f6j9oxYHzyW4BSV 4xPZw0hlz/LgIK7AmctWo9EssBH5Z52QyAONuPOnUJUvjwerFwCz95lBFBIVDTcAEX75HUtS/1sE OzIueJe/M37WbtPbgQs7YGx9H5RaIr1J7IoLLy3IjOzaiYeLKWRYzsdYVv3NS3TPqPeoWknVY3Hx XX+65mqGDj0w/0C8ROFSKYeGhNTIgrWb454Wq9hJYW2M0WQxgywn3UL4cZr/z4WKbnXPxDLF4M8z 86zLFvgV6kmp+cPvsiYsq0TEqdyKoRIvvXvKNYW0tIkok2BS7paDnKzPE6cGTpjLl1+hZjs+uEKQ 1Uh6QKWJvs4Zn1zAqtcn0pGRgjNzy1nfWpgXSIVyzDDwCBQR4efVvbIZJdsrGLud9ni5LA6qK1P0 xV6+0EQyh+620stGu/LFacVjhkhmJUr0i6vWULcnnatJNNyFsLiDhrKGGznRAe+rnENNuOd4DRIz +MfqD4/HivY0dOkUmCBHLFancMAjZk8VADGQ+L/LQFS3SKEdgI4p7MfHT6oCwBPBtEaohukuY28R 810UJzxXGn254GDi0a5jvG0JzevTgoo/IbQ0YLJYk= X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Feb 2025 21:21:48 +0800 X-OQ-MSGID: <20250211132148.31688-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 4/4] avutil/frame: Fix direct pointer compare between different array 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: Zhao Zhili 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: Zhao Zhili --- libavutil/frame.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 992115e04f..492b467ebd 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -730,7 +730,7 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) AVBufferRef *av_frame_get_plane_buffer(const AVFrame *frame, int plane) { - uint8_t *data; + uintptr_t data; int planes; if (frame->nb_samples) { @@ -743,16 +743,20 @@ AVBufferRef *av_frame_get_plane_buffer(const AVFrame *frame, int plane) if (plane < 0 || plane >= planes || !frame->extended_data[plane]) return NULL; - data = frame->extended_data[plane]; + data = (uintptr_t)frame->extended_data[plane]; for (int i = 0; i < FF_ARRAY_ELEMS(frame->buf) && frame->buf[i]; i++) { AVBufferRef *buf = frame->buf[i]; - if (data >= buf->data && data < buf->data + buf->size) + uintptr_t buf_begin = (uintptr_t)buf->data; + + if (data >= buf_begin && data < buf_begin + buf->size) return buf; } for (int i = 0; i < frame->nb_extended_buf; i++) { AVBufferRef *buf = frame->extended_buf[i]; - if (data >= buf->data && data < buf->data + buf->size) + uintptr_t buf_begin = (uintptr_t)buf->data; + + if (data >= buf_begin && data < buf_begin + buf->size) return buf; } return NULL; -- 2.46.0 _______________________________________________ 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".