[FFmpeg-cvslog] avcodec/motion_est: don't add offsets to NULL pointers
James Almer
git at videolan.org
Fri Jul 18 20:58:09 EEST 2025
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Jul 13 20:01:26 2025 -0300| [585a8d53576f19a14394d7728ed2831e1bee8dbf] | committer: James Almer
avcodec/motion_est: don't add offsets to NULL pointers
Fixes: libavcodec/motion_est.c:94:31: runtime error: applying zero offset to null pointer
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=585a8d53576f19a14394d7728ed2831e1bee8dbf
---
libavcodec/motion_est.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 93be712cc0..3273451f9a 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -91,12 +91,12 @@ static inline void init_ref(MotionEstContext *c, uint8_t *const src[3],
};
int i;
for(i=0; i<3; i++){
- c->src[0][i]= src [i] + offset[i];
- c->ref[0][i]= ref [i] + offset[i];
+ c->src[0][i]= src[i] ? FF_PTR_ADD(src[i], offset[i]) : NULL;
+ c->ref[0][i]= ref[i] ? FF_PTR_ADD(ref[i], offset[i]) : NULL;
}
if(ref_index){
for(i=0; i<3; i++){
- c->ref[ref_index][i]= ref2[i] + offset[i];
+ c->ref[ref_index][i]= ref2[i] ? FF_PTR_ADD(ref2[i], offset[i]) : NULL;
}
}
}
More information about the ffmpeg-cvslog
mailing list