From fa4cadae60e41923e81107e06fb1814edace36bd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 23 Aug 2013 10:20:50 +1000 Subject: [PATCH] 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 --- libevdev/libevdev.c | 5 ++--- 1 file 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];