[FFmpeg-cvslog] raw demuxer: initialize end of partial packets

Janne Grunau git at videolan.org
Wed Dec 5 17:36:55 CET 2012


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Sat Dec  1 23:42:11 2012 +0100| [54c7fe6d68444cc3c5d4fdda2f2126ed79eac855] | committer: Janne Grunau

raw demuxer: initialize end of partial packets

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

 libavformat/rawdec.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 1c9aabd..5e95d10 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -45,6 +45,10 @@ int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
     if (ret < 0) {
         av_free_packet(pkt);
         return ret;
+    } else if (ret < size) {
+        /* initialize end of packet for partial reads to avoid reading
+         * uninitialized data on allowed overreads */
+        memset(pkt->data + ret, 0, FF_INPUT_BUFFER_PADDING_SIZE);
     }
     pkt->size = ret;
     return ret;



More information about the ffmpeg-cvslog mailing list