virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avutil/frame: Fix direct pointer compare between different array

Browse Source 
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili
2025-02-11 21:21:48 +08:00
parent f926b60455
commit 88d9ecaa7b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/frame.c
View File

@ -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) AVBufferRef *av_frame_get_plane_buffer(const AVFrame *frame, int plane)
{ {
uint8_t *data; uintptr_t data;
int planes; int planes;
if (frame->nb_samples) { 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]) if (plane < 0 || plane >= planes || !frame->extended_data[plane])
return NULL; 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++) { for (int i = 0; i < FF_ARRAY_ELEMS(frame->buf) && frame->buf[i]; i++) {
AVBufferRef *buf = frame->buf[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; return buf;
} }
for (int i = 0; i < frame->nb_extended_buf; i++) { for (int i = 0; i < frame->nb_extended_buf; i++) {
AVBufferRef *buf = frame->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 buf;
} }
return NULL; return NULL;