blob: 94aebeaf60b970d0a3df010a78b182615d932ad5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From 2c63dd5278059b4513a265299915c4237e5b0178 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 16 Jun 2019 17:14:18 -0700
Subject: [PATCH] Avoid initializer index range
Upstream: https://gitlab.freedesktop.org/libevdev/libevdev/merge_requests/11
---
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 d750186..29cb615 100644
--- a/libevdev/libevdev.c
+++ b/libevdev/libevdev.c
@@ -1708,7 +1708,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.23.0
|
