[FFmpeg-cvslog] avformat/mov: Use 64bit for str_size

Michael Niedermayer git at videolan.org
Wed Jul 24 17:50:44 EEST 2024


ffmpeg | branch: release/4.3 | Michael Niedermayer <michael at niedermayer.cc> | Thu Jul 11 20:03:45 2024 +0200| [02e6d29c3331b47aa686f98a1bc0cd87d507efa7] | committer: Michael Niedermayer

avformat/mov: Use 64bit for str_size

We assign a 64bit variable to it before checking

Fixes: CID1604544 Overflowed integer argument

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 046d069552f5c2824f36fcf95d409670208dc94b)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index d10e312827..84937d8161 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -308,7 +308,8 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     char *str = NULL;
     const char *key = NULL;
     uint16_t langcode = 0;
-    uint32_t data_type = 0, str_size, str_size_alloc;
+    uint32_t data_type = 0, str_size_alloc;
+    uint64_t str_size;
     int (*parse)(MOVContext*, AVIOContext*, unsigned, const char*) = NULL;
     int raw = 0;
     int num = 0;



More information about the ffmpeg-cvslog mailing list