diff options
| author | Jason Nader <jason.nader@protonmail.com> | 2020-03-13 03:50:37 +0900 |
|---|---|---|
| committer | Brian Ashworth <bosrsf04@gmail.com> | 2020-03-12 19:43:45 -0400 |
| commit | 50dc49f35a41de7b59c27c6f796f3ec9a9a4878a (patch) | |
| tree | 7a22df4764204c4ca1ef2587b9b1cf3894e394b5 /sway | |
| parent | 7dd9cd29a6cb0f075f7face47f8a0629bf13f0c6 (diff) | |
| download | sway-50dc49f35a41de7b59c27c6f796f3ec9a9a4878a.tar.xz | |
Limit workspace numbers within 0..INT32_MAX
See https://github.com/i3/i3/commit/83c7aff089a6728b6e522d934d656a8e09463112
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/ipc-json.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index d3731092..1ebc3bd2 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -384,8 +384,19 @@ static json_object *ipc_json_describe_scratchpad_output(void) { static void ipc_json_describe_workspace(struct sway_workspace *workspace, 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, "fullscreen_mode", json_object_new_int(1)); json_object_object_add(object, "output", workspace->output ? |