diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-13 22:20:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-16 14:46:08 +0100 |
| commit | 1749b0d74d792439c6d740212e6d8f0a54dded50 (patch) | |
| tree | 6f4f439900e33a13c2366e21bdc4162f2e2a0e21 | |
| parent | 568e9062bd29e13e0bfa42f2ac8411d01608634d (diff) | |
| download | ffmpeg-1749b0d74d792439c6d740212e6d8f0a54dded50.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.
(cherry picked from commit c2e3b564b32d596f5a66d47409f9e07a067a3084)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mmvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 87eeee2c94..706605379d 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) |