diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-26 17:41:28 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-09 22:02:20 +0200 |
commit | 279b58906dc88026a83068ef489a422bbe19778c (patch) | |
tree | 611bd40b78f39771cd0f5ecb3b560a71b41ecc2d | |
parent | 6791fd5c1332ad99f9b9330ae3225633cff7b9fa (diff) | |
download | ffmpeg-279b58906dc88026a83068ef489a422bbe19778c.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 140c1a5490..f0c8e1fe66 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -347,13 +347,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'; |