[media] tw686x: avoid going past array
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 26 Apr 2016 09:33:06 +0000 (06:33 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 26 Apr 2016 09:38:53 +0000 (06:38 -0300)
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

index d2a0147..253e108 100644 (file)
@@ -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];
        }