Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45c175c4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] tw686x: avoid going past array 



Fix those two warnings:
	drivers/media/pci/tw686x/tw686x-video.c:69 tw686x_fields_map() error: buffer overflow 'std_525_60' 31 <= 31
	drivers/media/pci/tw686x/tw686x-video.c:73 tw686x_fields_map() error: buffer overflow 'std_625_50' 26 <= 26

I had those changes at the last version of my patch, but I ended
by merging the previous version by mistake.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 363d79f1

drivers/media/pci/tw686x/tw686x-video.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -64,11 +64,11 @@ static unsigned int tw686x_fields_map(v4l2_std_id std, unsigned int fps) 
	unsigned int i;

	unsigned int i;





	if (std & V4L2_STD_525_60) {

	if (std & V4L2_STD_525_60) {

		if (fps > ARRAY_SIZE(std_525_60))

		if (fps >= ARRAY_SIZE(std_525_60))

			fps = 30;

			fps = 30;

		i = std_525_60[fps];

		i = std_525_60[fps];

	} else {

	} else {

		if (fps > ARRAY_SIZE(std_625_50))

		if (fps >= ARRAY_SIZE(std_625_50))

			fps = 25;

			fps = 25;

		i = std_625_50[fps];

		i = std_625_50[fps];

	}

	}