[media] tw686x: avoid going past array
diff mbox

Message ID 45c175c4ae9695d6d2f30a45ab7f3866cfac184b.1461663494.git.mchehab@osg.samsung.com
State New
Headers show

Commit Message

Mauro Carvalho Chehab April 26, 2016, 9:38 a.m. UTC
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: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---
 drivers/media/pci/tw686x/tw686x-video.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch
diff mbox

diff --git a/drivers/media/pci/tw686x/tw686x-video.c b/drivers/media/pci/tw686x/tw686x-video.c
index d2a0147e6492..253e10823ba3 100644
--- a/drivers/media/pci/tw686x/tw686x-video.c
+++ b/drivers/media/pci/tw686x/tw686x-video.c
@@ -64,11 +64,11 @@  static unsigned int tw686x_fields_map(v4l2_std_id std, unsigned int fps)
 	unsigned int i;
 
 	if (std & V4L2_STD_525_60) {
-		if (fps > ARRAY_SIZE(std_525_60))
+		if (fps >= ARRAY_SIZE(std_525_60))
 			fps = 30;
 		i = std_525_60[fps];
 	} else {
-		if (fps > ARRAY_SIZE(std_625_50))
+		if (fps >= ARRAY_SIZE(std_625_50))
 			fps = 25;
 		i = std_625_50[fps];
 	}