# HG changeset patch # User reimar # Date 1365169611 0 # Node ID 01f4eea55d751e31d6be2202eeca142d78068746 # Parent 506cefd8a5f0b782d78868c862698f924a719a42 Detect invalid data from FFmpeg. Fixes the crash part of bug #2135. diff -r 506cefd8a5f0 -r 01f4eea55d75 libmpcodecs/vd_ffmpeg.c --- a/libmpcodecs/vd_ffmpeg.c Fri Apr 05 12:43:11 2013 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Fri Apr 05 13:46:51 2013 +0000 @@ -473,6 +473,10 @@ sh_video_t *sh = s->opaque; uint8_t *source[MP_MAX_PLANES]= {src->data[0] + offset[0], src->data[1] + offset[1], src->data[2] + offset[2]}; int strides[MP_MAX_PLANES] = {src->linesize[0], src->linesize[1], src->linesize[2]}; + if (!src->data[0]) { + mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "BUG in FFmpeg, draw_slice called with NULL pointer!\n"); + return; + } if (height < 0) { int i;