[FFmpeg-cvslog] avformat/mov: Check requested_sample before using it

Michael Niedermayer git at videolan.org
Tue Jul 2 23:01:18 EEST 2024


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jun  6 23:24:44 2024 +0200| [64df7d4c1ee30b4be500f6aac2fc81b78b987af6] | committer: Michael Niedermayer

avformat/mov: Check requested_sample before using it

I am not sure the case described by coverity is possible
but its more robust checking the argument first

Fixes: CID1598441 Improper use of negative value

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64df7d4c1ee30b4be500f6aac2fc81b78b987af6
---

 libavformat/mov.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7b1f90c890..a3951a6942 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -10486,7 +10486,7 @@ static int mov_seek_stream(AVFormatContext *s, AVStream *st, int64_t timestamp,
         // If we've reached a different sample trying to find a good pts to
         // seek to, give up searching because we'll end up seeking back to
         // sample 0 on every seek.
-        if (!can_seek_to_key_sample(st, requested_sample, next_ts) && sample != requested_sample)
+        if (sample != requested_sample && !can_seek_to_key_sample(st, requested_sample, next_ts))
             break;
 
         timestamp = next_ts;



More information about the ffmpeg-cvslog mailing list