aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Buka <vitalybuka-at-google.com@ffmpeg.org>2017-08-20 11:56:47 -0700
committerMichael Niedermayer <michael@niedermayer.cc>2017-09-17 12:21:32 +0200
commit50cb32480b7691933756bc8a04265a1e488b5e06 (patch)
tree94a01687a111ccf4b39033329fdf980c3c8fb71b
parent74410f2abab091b2fdf995fdb669873e8f7e1d0e (diff)
downloadffmpeg-50cb32480b7691933756bc8a04265a1e488b5e06.tar.gz
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@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit eca2a49716ae1f42804dd3545da2f740edf03250) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/aviobuf.c2
1 files changed, 2 insertions, 0 deletions
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)