diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-26 17:41:28 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-10 16:04:26 +0200 |
commit | 32ad867b246b9502ce27004a74229b36e81451a1 (patch) | |
tree | 7046c02eb0c348456aef881200e125a80a42a584 | |
parent | ee92e68f6c052d2d30d22dbdd1531b16655f3a09 (diff) | |
download | ffmpeg-32ad867b246b9502ce27004a74229b36e81451a1.tar.gz |
avformat/flvdec: Check for avio_read() failure in amf_get_string()
Suggested-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cb316676112c01e8d66420908b6b3d06b3b498e3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavformat/flvdec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 709d8cbbf1..db514049e4 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -385,13 +385,18 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, static int amf_get_string(AVIOContext *ioc, char *buffer, int buffsize) { + int ret; int length = avio_rb16(ioc); if (length >= buffsize) { avio_skip(ioc, length); return -1; } - avio_read(ioc, buffer, length); + ret = avio_read(ioc, buffer, length); + if (ret < 0) + return ret; + if (ret < length) + return AVERROR_INVALIDDATA; buffer[length] = '\0'; |