mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

add error handling for scroll button out of range

Browse source 
user will be informed if the scroll button indentifier values causes
underflow or overflow.
This commit is contained in:
Robert Kubosz 2018-07-13 11:39:39 +02:00
parent 89db5b5716
commit f8bc928b2d
Failed to generate hash of commit
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/commands/input/scroll_button.c
View file

@ -1,5 +1,6 @@
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include <errno.h>
#include "sway/config.h" #include "sway/config.h"
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/input/input-manager.h" #include "sway/input/input-manager.h"
@ -18,13 +19,19 @@ struct cmd_results *input_cmd_scroll_button(int argc, char **argv) {
struct input_config *new_config = struct input_config *new_config =
new_input_config(current_input_config->identifier); new_input_config(current_input_config->identifier);
errno = 0;
char *endptr; char *endptr;
long scroll_button = strtol(*argv, &endptr, 10); int scroll_button = strtol(*argv, &endptr, 10);
if (endptr == *argv && scroll_button == 0) { if (endptr == *argv && scroll_button == 0) {
free_input_config(new_config); free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "scroll_button", return cmd_results_new(CMD_INVALID, "scroll_button",
"Scroll button identifier must be an integer."); "Scroll button identifier must be an integer.");
} }
if (errno == ERANGE) {
free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "scroll_button",
"Scroll button identifier out of range.");
}
if (scroll_button < 0) { if (scroll_button < 0) {
free_input_config(new_config); free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "scroll_button", return cmd_results_new(CMD_INVALID, "scroll_button",