diff mbox series

[FFmpeg-devel,08/27] avformat/cafenc: Fix potential integer overflow

Message ID AM7PR03MB6660D589E11302C0954708328FA39@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 42fe438482dd0f1f59d86e27a88a616ad966706b
Headers show
Series [FFmpeg-devel,01/27] avformat/astenc: Simplify writing padding
Related show

Commit Message

Andreas Rheinhardt Sept. 23, 2021, 3:28 p.m. UTC
(As long as avio_write() only accepts an int, it makes no sense
to try to support sizes that don't fit into an int.)

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/cafenc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c
index 816e978945..622ae14264 100644
--- a/libavformat/cafenc.c
+++ b/libavformat/cafenc.c
@@ -213,7 +213,7 @@  static int caf_write_packet(AVFormatContext *s, AVPacket *pkt)
     avio_write(s->pb, pkt->data, pkt->size);
     if (!s->streams[0]->codecpar->block_align) {
         void *pkt_sizes = caf->pkt_sizes;
-        int i, alloc_size = caf->size_entries_used + 5;
+        int i, alloc_size = caf->size_entries_used + 5U;
         if (alloc_size < 0) {
             caf->pkt_sizes = NULL;
         } else {
@@ -257,7 +257,7 @@  static int caf_write_trailer(AVFormatContext *s)
             }
             avio_seek(pb, file_size, SEEK_SET);
             ffio_wfourcc(pb, "pakt");
-            avio_wb64(pb, caf->size_entries_used + 24);
+            avio_wb64(pb, caf->size_entries_used + 24U);
             avio_wb64(pb, caf->packets); ///< mNumberPackets
             avio_wb64(pb, caf->packets * packet_size); ///< mNumberValidFrames
             avio_wb32(pb, 0); ///< mPrimingFrames