[FFmpeg-cvslog] rmdec: Avoid allocating huge packets

Michael Niedermayer git at videolan.org
Sun Dec 25 00:23:38 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 24 21:26:52 2011 +0100| [66f71f3b5e2e7b6e5049bd9831c371e16aff8a53] | committer: Michael Niedermayer

rmdec: Avoid allocating huge packets

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

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

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

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 5b9bfb8..7524023 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -24,6 +24,7 @@
 #include "libavutil/dict.h"
 #include "avformat.h"
 #include "internal.h"
+#include "avio_internal.h"
 #include "riff.h"
 #include "rm.h"
 
@@ -612,6 +613,7 @@ static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb,
     }
     if(type != 1){  // not whole frame
         len2 = get_num(pb, &len);
+        len2 = ffio_limit(pb, len2);
         pos  = get_num(pb, &len);
         pic_num = avio_r8(pb); len--;
     }



More information about the ffmpeg-cvslog mailing list