diff options
author | Michael Niedermayer <[email protected]> | 2021-01-26 17:41:28 +0100 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2021-10-17 21:34:53 +0200 |
commit | 790ead23269e8e8dfffbc4242c907c4fba3292e1 (patch) | |
tree | 83a29d89c1b3d687db3c5bdb7a29235ff0f47b16 | |
parent | a3f58614c4744ab84a7e6b12d1308a3d07bb597b (diff) |
avformat/flvdec: Check for avio_read() failure in amf_get_string()
Suggested-by: Anton Khirnov <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit cb316676112c01e8d66420908b6b3d06b3b498e3)
Signed-off-by: Michael Niedermayer <[email protected]>
-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 b88c26f659..f9437b9e81 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -287,13 +287,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'; |