[FFmpeg-cvslog] roq: fix excessive memory alloc

Michael Niedermayer git at videolan.org
Tue Dec 20 18:31:46 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 20 18:00:30 2011 +0100| [c1acd58198187b9d0ca9386add4c10fca33d2c21] | committer: Michael Niedermayer

roq: fix excessive memory alloc
Fixes Ticket802
Bug found by: Oana Stratulat

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

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

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

diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c
index eb11c69..9ac32eb 100644
--- a/libavformat/idroqdec.c
+++ b/libavformat/idroqdec.c
@@ -30,6 +30,7 @@
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
+#include "avio_internal.h"
 
 #define RoQ_MAGIC_NUMBER 0x1084
 #define RoQ_CHUNK_PREAMBLE_SIZE 8
@@ -125,6 +126,8 @@ static int roq_read_packet(AVFormatContext *s,
         if(chunk_size > INT_MAX)
             return AVERROR_INVALIDDATA;
 
+        chunk_size = ffio_limit(pb, chunk_size);
+
         switch (chunk_type) {
 
         case RoQ_INFO:



More information about the ffmpeg-cvslog mailing list