[FFmpeg-cvslog] avformat/aviobuf: Fix signed integer overflow in avio_seek()

Vitaly Buka git at videolan.org
Sun Sep 17 13:57:12 EEST 2017


ffmpeg | branch: release/3.2 | Vitaly Buka <vitalybuka-at-google.com at ffmpeg.org> | Sun Aug 20 11:56:47 2017 -0700| [50cb32480b7691933756bc8a04265a1e488b5e06] | committer: Michael Niedermayer

avformat/aviobuf: Fix signed integer overflow in avio_seek()

Signed integer overflow is undefined behavior.
Detected with clang and -fsanitize=signed-integer-overflow

Signed-off-by: Vitaly Buka <vitalybuka at google.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit eca2a49716ae1f42804dd3545da2f740edf03250)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/aviobuf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 134d627a6e..02f6d38966 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -249,6 +249,8 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence)
         offset1 = pos + (s->buf_ptr - s->buffer);
         if (offset == 0)
             return offset1;
+        if (offset > INT64_MAX - offset1)
+            return AVERROR(EINVAL);
         offset += offset1;
     }
     if (offset < 0)



More information about the ffmpeg-cvslog mailing list