From 3ff74cb7e1f62fe95b77f74a5428bc4c787627b7 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 16 Jun 2019 17:14:18 -0700 Subject: [PATCH] Avoid initializer index range --- libevdev/libevdev.c | 2 +- libevdev/make-event-names.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index e5abe91..1dc71ed 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -1639,7 +1639,7 @@ libevdev_property_get_name(unsigned int prop) LIBEVDEV_EXPORT int libevdev_event_type_get_max(unsigned int type) { - if (type > EV_MAX) + if (type > EV_MAX || !ev_max[type]) return -1; return ev_max[type]; diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py index 716c1d7..de3a725 100755 --- a/libevdev/make-event-names.py +++ b/libevdev/make-event-names.py @@ -94,7 +94,6 @@ def print_map(bits): print("#pragma GCC diagnostic ignored \"-Woverride-init\"") print("#endif") print("static const int ev_max[EV_MAX + 1] = {") - print(" [0 ... EV_MAX] = -1,") for prefix in prefixes: if prefix in ["BTN_", "EV_", "INPUT_PROP_", "MT_TOOL_"]: continue -- 2.20.1