[FFmpeg-cvslog] oma: check avio_read() return value

Mans Rullgard git at videolan.org
Fri Jun 3 05:24:55 CEST 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Wed Jun  1 17:30:28 2011 +0100| [4c1e56ede86b68b5c600bde4ebeea6153c46f7f9] | committer: Mans Rullgard

oma: check avio_read() return value

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

 libavformat/oma.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavformat/oma.c b/libavformat/oma.c
index 6dd56cf..6fdf75f 100644
--- a/libavformat/oma.c
+++ b/libavformat/oma.c
@@ -80,6 +80,8 @@ static int oma_read_header(AVFormatContext *s,
 
     ff_id3v2_read(s, ID3v2_EA3_MAGIC);
     ret = avio_read(s->pb, buf, EA3_HEADER_SIZE);
+    if (ret < EA3_HEADER_SIZE)
+        return -1;
 
     if (memcmp(buf, ((const uint8_t[]){'E', 'A', '3'}),3) || buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) {
         av_log(s, AV_LOG_ERROR, "Couldn't find the EA3 header !\n");



More information about the ffmpeg-cvslog mailing list