[FFmpeg-cvslog] Check for invalid packet size in the smacker demuxer.

Laurent Aimar git at videolan.org
Thu Nov 3 03:57:36 CET 2011


ffmpeg | branch: release/0.5 | Laurent Aimar <fenrir at videolan.org> | Mon Sep 12 20:50:13 2011 +0200| [ecd6fa11c2cde5ca3fb787a2cfeb594d6205684b] | committer: Michael Niedermayer

Check for invalid packet size in the smacker demuxer.

Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit e055932f5636a82275837968eea9c8fcb5bca474)

Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

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

diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 8ec28bc..fa4f631 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -292,6 +292,8 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt)
             }
             flags >>= 1;
         }
+        if (frame_size < 0)
+            return AVERROR_INVALIDDATA;
         if (av_new_packet(pkt, frame_size + 768))
             return AVERROR(ENOMEM);
         if(smk->frm_size[smk->cur_frame] & 1)



More information about the ffmpeg-cvslog mailing list