alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

workspace_next_name: fix string length for ws_num >= 100

Browse source 
The check didn't include && ws_num < 100 so l would always be 1 or 2
Instead of fixing logic it's simpler to just call snprintf twice to get
length and use that.

Also change malloc failure check to sway_assert because both callers of
this function do not do null check and would segfault...

Found through static analysis.
This commit is contained in:
Dominique Martinet 2018-07-01 22:46:48 +09:00
parent 9c9ee3e4ef
commit c78ab67877
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/tree/workspace.c
View file

@ -109,7 +109,6 @@ static bool workspace_valid_on_output(const char *output_name,
char *workspace_next_name(const char *output_name) { char *workspace_next_name(const char *output_name) {
wlr_log(L_DEBUG, "Workspace: Generating new workspace name for output %s", wlr_log(L_DEBUG, "Workspace: Generating new workspace name for output %s",
output_name); output_name);
int l = 1;
// Scan all workspace bindings to find the next available workspace name, // Scan all workspace bindings to find the next available workspace name,
// if none are found/available then default to a number // if none are found/available then default to a number
struct sway_mode *mode = config->current_mode; struct sway_mode *mode = config->current_mode;
@ -202,14 +201,9 @@ char *workspace_next_name(const char *output_name) {
// As a fall back, get the current number of active workspaces // As a fall back, get the current number of active workspaces
// and return that + 1 for the next workspace's name // and return that + 1 for the next workspace's name
int ws_num = root_container.children->length; int ws_num = root_container.children->length;
if (ws_num >= 10) { int l = snprintf(NULL, 0, "%d", ws_num);
l = 2;
} else if (ws_num >= 100) {
l = 3;
}
char *name = malloc(l + 1); char *name = malloc(l + 1);
if (!name) { if (!sway_assert(name, "Cloud not allocate workspace name")) {
wlr_log(L_ERROR, "Could not allocate workspace name");
return NULL; return NULL;
} }
sprintf(name, "%d", ws_num++); sprintf(name, "%d", ws_num++);