[FFmpeg-cvslog] mpegts: Pad the packet buffer in handle_packet().

Alex Converse git at videolan.org
Sun Mar 4 04:47:42 CET 2012


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Fri Mar  2 10:13:07 2012 -0800| [1aa708988ac131cf7d5c8bd59aca256a7c974df9] | committer: Alex Converse

mpegts: Pad the packet buffer in handle_packet().

This allows it to be used with get_bits without the thread of overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org

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

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

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 32901a1..fb0c416 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1772,7 +1772,7 @@ static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size)
 static int handle_packets(MpegTSContext *ts, int nb_packets)
 {
     AVFormatContext *s = ts->stream;
-    uint8_t packet[TS_PACKET_SIZE];
+    uint8_t packet[TS_PACKET_SIZE+FF_INPUT_BUFFER_PADDING_SIZE];
     int packet_num, ret = 0;
 
     if (avio_tell(s->pb) != ts->last_pos) {
@@ -1794,6 +1794,7 @@ static int handle_packets(MpegTSContext *ts, int nb_packets)
 
     ts->stop_parse = 0;
     packet_num = 0;
+    memset(packet + TS_PACKET_SIZE, 0, FF_INPUT_BUFFER_PADDING_SIZE);
     for(;;) {
         if (ts->stop_parse>0)
             break;



More information about the ffmpeg-cvslog mailing list