From: Anton Khirnov Date: Tue, 8 Jan 2013 07:04:59 +0000 (+0100) Subject: v4l2: do not assert on a value received from outside of Libav X-Git-Tag: n1.2~21^2~500 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=49dc82eef776634ac2da41fca9f105df25129ad8 v4l2: do not assert on a value received from outside of Libav --- diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index eb5de151f3..d57bd755d5 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -460,7 +460,12 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) return AVERROR(errno); } - assert (buf.index < s->buffers); + + if (buf.index >= s->buffers) { + av_log(ctx, AV_LOG_ERROR, "Invalid buffer index received.\n"); + return AVERROR(EINVAL); + } + if (s->frame_size > 0 && buf.bytesused != s->frame_size) { av_log(ctx, AV_LOG_ERROR, "The v4l2 frame is %d bytes, but %d bytes are expected\n",