diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-26 17:41:28 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-26 18:37:12 +0100 |
commit | cb316676112c01e8d66420908b6b3d06b3b498e3 (patch) | |
tree | d6a7d0ee7c80fd3d4e5f05602423258e00f5a7c3 /libavformat/flvdec.c | |
parent | 2ef522c918d48b9f101548b2cadce02003cb3510 (diff) | |
download | ffmpeg-cb316676112c01e8d66420908b6b3d06b3b498e3.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>
Diffstat (limited to 'libavformat/flvdec.c')
-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 8571a626ae..c1f02125bc 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -384,13 +384,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'; |