[FFmpeg-cvslog] mmvideo: restore initial y value.

Michael Niedermayer git at videolan.org
Tue Mar 13 22:43:39 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 13 22:20:39 2012 +0100| [c2e3b564b32d596f5a66d47409f9e07a067a3084] | committer: Michael Niedermayer

mmvideo: restore initial y value.

This bug might have been exploitable (out of HEAP buffer writes)

Bug introduced by libav
	commit a55d5bdc6e28a2cfefc440d792de5cc4f02377e2
	Date:   Tue Mar 6 15:15:42 2012 -0800

	    algmm: convert to bytestream2 API.

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

 libavcodec/mmvideo.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index f52bf3a..00284c9 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -127,7 +127,7 @@ static int mm_decode_intra(MmContext * s, int half_horiz, int half_vert)
  */
 static int mm_decode_inter(MmContext * s, int half_horiz, int half_vert)
 {
-    int data_off = bytestream2_get_le16(&s->gb), y;
+    int data_off = bytestream2_get_le16(&s->gb), y = 0;
     GetByteContext data_ptr;
 
     if (bytestream2_get_bytes_left(&s->gb) < data_off)



More information about the ffmpeg-cvslog mailing list