frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extmod: Use ARRAY_SIZE rather than sentinel 

When the array gets down to size zero (which it does in later patches),
gcc complains that the index is out of bounds.  Avoid this by using
ARRAY_SIZE on extensionModules instead.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Stéphane Marchesin <stephane.marchesin@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Daniel Stone 2012-07-10 02:02:59 +01:00 committed by Keith Packard
parent d35884da2f
commit f48d8f58b3
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/dixmods/extmod/modinit.c
View File

@ -101,12 +101,6 @@ static ExtensionModule extensionModules[] = {
NULL,
NULL},
#endif
{ /* DON'T delete this entry ! */
NULL,
NULL,
NULL,
NULL,
NULL}
};
static XF86ModuleVersionInfo VersRec = {
@ -134,7 +128,7 @@ extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
/* XXX the option stuff here is largely a sample/test case */
for (i = 0; extensionModules[i].name != NULL; i++) {
for (i = 0; i < ARRAY_SIZE(extensionModules); i++) {
#ifdef XSELINUX
if (!strcmp(SELINUX_EXTENSION_NAME, extensionModules[i].name)) {
pointer o;