[FFmpeg-cvslog] matroskadec: fix out of bounds write

Ronald S. Bultje git at videolan.org
Sun Nov 6 20:18:56 CET 2011


ffmpeg | branch: release/0.5 | Ronald S. Bultje <rsbultje at gmail.com> | Sat Oct 15 00:03:55 2011 +0200| [8acc0546bbb0deacdf1e79f5486a0811840246fc] | committer: Michael Niedermayer

matroskadec: fix out of bounds write

Signed-off-by: Janne Grunau <janne-libav at jannau.net>
(cherry picked from commit 723229c11f1400e6a09c8a1c9c27193f376eb1d1)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d51c7b4cbe022f6b3b026735dc7e29eb50bbf129)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index d9ffec3..0d75c5c 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1641,7 +1641,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
                         lace_size[n] = lace_size[n - 1] + snum;
                         total += lace_size[n];
                     }
-                    lace_size[n] = size - total;
+                    lace_size[laces - 1] = size - total;
                     break;
                 }
             }



More information about the ffmpeg-cvslog mailing list