diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-08-23 10:20:50 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-08-29 11:36:20 +1000 |
| commit | fa4cadae60e41923e81107e06fb1814edace36bd (patch) | |
| tree | 497eb93bbf353fd9cb7b968cd7935a5affbc194a /libevdev/libevdev.c | |
| parent | 4b715dd9286cfe555239976d6f93a6ac7b8b957d (diff) | |
| download | libevdev-fa4cadae60e41923e81107e06fb1814edace36bd.tar.gz | |
Use libevdev_get_event_type_max from libevdev_get_event_code_name
This will check for invalid types for us, and we can do a better check
for signed/unsigned comparison.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'libevdev/libevdev.c')
| -rw-r--r-- | libevdev/libevdev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index c316e34..fbfd8f0 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -1190,10 +1190,9 @@ libevdev_get_event_type_name(unsigned int type) const char* libevdev_get_event_code_name(unsigned int type, unsigned int code) { - if (type > EV_MAX) - return NULL; + int max = libevdev_get_event_type_max(type); - if (code > ev_max[type]) + if (max == -1 || code > (unsigned int)max) return NULL; return event_type_map[type][code]; |