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

Laurent Aimar git at videolan.org
Tue Sep 13 23:51:46 CEST 2011


ffmpeg | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Sep 12 20:50:13 2011 +0200| [e055932f5636a82275837968eea9c8fcb5bca474] | committer: Martin Storsjö

Check for invalid packet size in the smacker demuxer.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

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

diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 2749466..cff1af6 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -304,6 +304,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