aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Liberato <liberato@chromium.org>2017-01-24 10:58:17 -0800
committerMichael Niedermayer <michael@niedermayer.cc>2017-01-25 22:08:28 +0100
commit95bde49982a82bc10470c0adab5969ffe635d064 (patch)
tree4ad75d35f39eead3f3d8557e9fbf92cc421b0be8
parentf227fc4c2a9f355d787621f8c3698bd1921fb019 (diff)
downloadffmpeg-95bde49982a82bc10470c0adab5969ffe635d064.tar.gz
avformat/flacdec: Check avio_read result when reading flac block header.
Return AVERROR_INVALIDDATA if all four bytes aren't present. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/flacdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index 3060dc45fd..66baba5922 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -65,7 +65,8 @@ static int flac_read_header(AVFormatContext *s)
/* process metadata blocks */
while (!avio_feof(s->pb) && !metadata_last) {
- avio_read(s->pb, header, 4);
+ if (avio_read(s->pb, header, 4) != 4)
+ return AVERROR(AVERROR_INVALIDDATA);
flac_parse_block_header(header, &metadata_last, &metadata_type,
&metadata_size);
switch (metadata_type) {