diff options
| author | Frank Liberato <liberato@chromium.org> | 2017-01-24 10:58:17 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-08 21:17:51 +0100 |
| commit | d59582a567cf1eca7f99b8f7586afdf721ff1e1d (patch) | |
| tree | 828ab508d98e108f4fc18ce96fff30f092deae4a | |
| parent | 17a9e90d1f897b70f38a15aeabea089a334bb477 (diff) | |
| download | ffmpeg-d59582a567cf1eca7f99b8f7586afdf721ff1e1d.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>
(cherry picked from commit 95bde49982a82bc10470c0adab5969ffe635d064)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/flacdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 4c1f943581..221b3e820d 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -49,7 +49,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) { |