leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] tw686x: Don't go past array

Browse Source 
Depending on the compiler version, currently it produces the
following warnings:
	tw686x-video.c: In function 'tw686x_video_init':
	tw686x-video.c:65:543: warning: array subscript is above array bounds [-Warray-bounds]

This is actually bogus with the current code, as it currently
hardcodes the framerate to 30 frames/sec, however a potential
use after the array size could happen when the driver adds support
for setting the framerate. So, fix it.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2016-04-23 06:21:09 -03:00
parent 1a2b2c708c
commit 363d79f1d5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/pci/tw686x/tw686x-video.c
View File

@ -61,8 +61,17 @@ static unsigned int tw686x_fields_map(v4l2_std_id std, unsigned int fps)
8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 0, 0
};
unsigned int i =
(std & V4L2_STD_625_50) ? std_625_50[fps] : std_525_60[fps];
unsigned int i;
if (std & V4L2_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))
fps = 25;
i = std_625_50[fps];
}
return map[i];
}