virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

lavfi/mptestsrc: fix invalid access in case of negative linesize

Browse Source 
In particular, fix crash with:
ffplay -f lavfi mptestsrc,vflip
This commit is contained in:
Stefano Sabatini 2013-04-17 22:11:21 +02:00
parent 7c1a002c78
commit c6a43a7244
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/vsrc_mptestsrc.c
View File

@ -301,9 +301,10 @@ static int request_frame(AVFilterLink *outlink)
{ {
MPTestContext *test = outlink->src->priv; MPTestContext *test = outlink->src->priv;
AVFrame *picref; AVFrame *picref;
int w = WIDTH, h = HEIGHT, ch = h>>test->vsub; int w = WIDTH, h = HEIGHT, cw = w>>test->hsub, ch = h>>test->vsub;
unsigned int frame = test->frame_nb; unsigned int frame = test->frame_nb;
enum test_type tt = test->test; enum test_type tt = test->test;
int i;
if (test->max_pts >= 0 && test->pts > test->max_pts) if (test->max_pts >= 0 && test->pts > test->max_pts)
return AVERROR_EOF; return AVERROR_EOF;
@ -313,9 +314,12 @@ static int request_frame(AVFilterLink *outlink)
picref->pts = test->pts++; picref->pts = test->pts++;
// clean image // clean image
memset(picref->data[0], 0, picref->linesize[0] * h); for (i = 0; i < h; i++)
memset(picref->data[1], 128, picref->linesize[1] * ch); memset(picref->data[0] + i*picref->linesize[0], 0, w);
memset(picref->data[2], 128, picref->linesize[2] * ch); for (i = 0; i < ch; i++) {
memset(picref->data[1] + i*picref->linesize[1], 128, cw);
memset(picref->data[2] + i*picref->linesize[2], 128, cw);
}
if (tt == TEST_ALL && frame%30) /* draw a black frame at the beginning of each test */ if (tt == TEST_ALL && frame%30) /* draw a black frame at the beginning of each test */
tt = (frame/30)%(TEST_NB-1); tt = (frame/30)%(TEST_NB-1);