aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-13 22:20:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-13 22:38:45 +0100
commitc2e3b564b32d596f5a66d47409f9e07a067a3084 (patch)
tree205b1222a5a8d008a3d7a18bd343989905ef0735
parent67c90d26058264bfd24ae1a0bfd64ca117d5af81 (diff)
downloadffmpeg-c2e3b564b32d596f5a66d47409f9e07a067a3084.tar.gz
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.
-rw-r--r--libavcodec/mmvideo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index f52bf3ada2..00284c9a04 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)