[FFmpeg-cvslog] avformat/asfdec: Allow packet_obj_size == 0

Michael Niedermayer git at videolan.org
Mon Jun 29 05:17:14 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 29 04:57:51 2015 +0200| [4ccd2b31f0e9504e5d6151e50215c6dbb437c16a] | committer: Michael Niedermayer

avformat/asfdec: Allow packet_obj_size == 0

Fixes Ticket3521

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/asfdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 60acf34..a8cae56 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1062,7 +1062,7 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb)
         int64_t end = avio_tell(pb) + asf->packet_replic_size;
         AVRational aspect;
         asfst->packet_obj_size = avio_rl32(pb);
-        if (asfst->packet_obj_size >= (1 << 24) || asfst->packet_obj_size <= 0) {
+        if (asfst->packet_obj_size >= (1 << 24) || asfst->packet_obj_size < 0) {
             av_log(s, AV_LOG_ERROR, "packet_obj_size %d invalid\n", asfst->packet_obj_size);
             asfst->packet_obj_size = 0;
             return AVERROR_INVALIDDATA;



More information about the ffmpeg-cvslog mailing list