diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-02 22:06:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-13 00:44:27 +0200 |
| commit | e4bae0a140677869ffad76fd742d6f4ecbd57b2c (patch) | |
| tree | a6513935b12942e0d371a4829c2cbfab882293cb | |
| parent | 520c3d23036f6df4af8a6a8c3c0ba4965bca4f98 (diff) | |
| download | ffmpeg-e4bae0a140677869ffad76fd742d6f4ecbd57b2c.tar.gz | |
mmvideo/mm_decode_intra: check horizontal coordinate too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ae2132ac90f02330b0988e6e26ee0d53e41cd196)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mmvideo.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 4214eeb964..b74424cc13 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -104,6 +104,9 @@ static int mm_decode_intra(MmContext * s, int half_horiz, int half_vert) if (half_horiz) run_length *=2; + if (run_length > s->avctx->width - x) + return AVERROR_INVALIDDATA; + if (color) { memset(s->frame.data[0] + y*s->frame.linesize[0] + x, color, run_length); if (half_vert) |