[FFmpeg-cvslog] avformat/flacdec: Check avio_read result when reading flac block header.

[Frank Liberato]

ffmpeg | branch: master | Frank Liberato <liberato at chromium.org> | Tue Jan 24 10:58:17 2017 -0800| [95bde49982a82bc10470c0adab5969ffe635d064] | committer: Michael Niedermayer

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 at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95bde49982a82bc10470c0adab5969ffe635d064
---

 libavformat/flacdec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index 3060dc4..66baba5 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) {