aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-14 17:26:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-12 00:47:05 +0100
commit1aedd7645a3d01a9a674a7e62d90811a88bc6b04 (patch)
treedea3c432ad1084fa217653f09bf2363edc017595
parent9f993d2d4ba256155b52529922e7da0144e64b99 (diff)
downloadffmpeg-1aedd7645a3d01a9a674a7e62d90811a88bc6b04.tar.gz
avformat/aviobuf: Check that avio_seek() target is non negative
Fixes out of array access Suggested-by: Andrew Scherkus <scherkus@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ed86dbd05d61363dc1c0d33f3267e2177c985fdd) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/aviobuf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 626261ab24..8c6be84017 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -203,6 +203,9 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence)
return offset1;
offset += offset1;
}
+ if (offset < 0)
+ return AVERROR(EINVAL);
+
offset1 = offset - pos;
if (!s->must_flush &&
offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) {