diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-09 16:20:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-09 17:10:26 +0200 |
| commit | cf31e2df08e39082241c8e2e10eaacb115c69a6c (patch) | |
| tree | ca5ab40d6f3a8204bb5e9c796168001773eb1aa2 | |
| parent | 33529104e56a0655b224d6082f885e6b828041ee (diff) | |
| download | ffmpeg-cf31e2df08e39082241c8e2e10eaacb115c69a6c.tar.gz | |
avcodec/mpegvideo: Fix null pointer dereference with grayscale decoding with mpeg2_field_encoding.ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 103244203a..11d6729195 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1896,11 +1896,13 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) for(i=0; i<avctx->height; i++) memset(s->last_picture_ptr->f->data[0] + s->last_picture_ptr->f->linesize[0]*i, 0x80, avctx->width); - for(i=0; i<FF_CEIL_RSHIFT(avctx->height, v_chroma_shift); i++) { - memset(s->last_picture_ptr->f->data[1] + s->last_picture_ptr->f->linesize[1]*i, - 0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift)); - memset(s->last_picture_ptr->f->data[2] + s->last_picture_ptr->f->linesize[2]*i, - 0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift)); + if (s->last_picture_ptr->f->data[2]) { + for(i=0; i<FF_CEIL_RSHIFT(avctx->height, v_chroma_shift); i++) { + memset(s->last_picture_ptr->f->data[1] + s->last_picture_ptr->f->linesize[1]*i, + 0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift)); + memset(s->last_picture_ptr->f->data[2] + s->last_picture_ptr->f->linesize[2]*i, + 0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift)); + } } if(s->codec_id == AV_CODEC_ID_FLV1 || s->codec_id == AV_CODEC_ID_H263){ |