diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 14:50:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 14:52:12 +0200 |
| commit | 6a0b5e34763c14a1e35e767f374ffb98fa64732f (patch) | |
| tree | f99f089161a27a192b35f58f8f67ea2d6b575968 /libavcodec/mpegvideo.c | |
| parent | 5b881499a8e40ad0aa3424ec4d9adeb8008c4189 (diff) | |
| download | ffmpeg-6a0b5e34763c14a1e35e767f374ffb98fa64732f.tar.gz | |
avcodec/mpegvideo: fix null pointer dereference
Fixes: 111342.ogm with ffplay
Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f2ca9b33c6..7d9da5c106 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -931,7 +931,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, #define UPDATE_PICTURE(pic)\ do {\ ff_mpeg_unref_picture(s, &s->pic);\ - if (s1->pic.f->buf[0])\ + if (s1->pic.f && s1->pic.f->buf[0])\ ret = ff_mpeg_ref_picture(s, &s->pic, &s1->pic);\ else\ ret = update_picture_tables(&s->pic, &s1->pic);\ |