mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit workspace numbers within 0..INT32_MAX

Browse source 
See 83c7aff089
This commit is contained in:
Jason Nader 2020-03-13 03:50:37 +09:00 committed by Brian Ashworth
parent 7dd9cd29a6
commit 50dc49f35a
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sway/ipc-json.c
View file

@ -384,8 +384,19 @@ static json_object *ipc_json_describe_scratchpad_output(void) {
static void ipc_json_describe_workspace(struct sway_workspace *workspace, static void ipc_json_describe_workspace(struct sway_workspace *workspace,
json_object *object) { json_object *object) {
int num = isdigit(workspace->name[0]) ? atoi(workspace->name) : -1; int num;
if (isdigit(workspace->name[0])) {
errno = 0;
char *endptr = NULL;
long long parsed_num = strtoll(workspace->name, &endptr, 10);
if (errno != 0 || parsed_num > INT32_MAX || parsed_num < 0 || endptr == workspace->name) {
num = -1;
} else {
num = (int) parsed_num;
}
} else {
num = -1;
}
json_object_object_add(object, "num", json_object_new_int(num)); json_object_object_add(object, "num", json_object_new_int(num));
json_object_object_add(object, "fullscreen_mode", json_object_new_int(1)); json_object_object_add(object, "fullscreen_mode", json_object_new_int(1));
json_object_object_add(object, "output", workspace->output ? json_object_object_add(object, "output", workspace->output ?