diff options
| author | Simon Ser <contact@emersion.fr> | 2022-02-08 09:52:24 +0100 |
|---|---|---|
| committer | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-02-08 09:20:13 -0500 |
| commit | f707f583e17cb5e8323ceb4bfd951ad0465b7d10 (patch) | |
| tree | 9de2eaecf63cb4f8e1c0af7ba1c7c9d7a8fd01a4 | |
| parent | ac7892371ce1ef7a05619492f0896f525b4dbdc3 (diff) | |
| download | sway-f707f583e17cb5e8323ceb4bfd951ad0465b7d10.tar.xz | |
Remove all sprintf calls
Replace them with snprintf, which ensures buffer overflows won't
happen.
| -rw-r--r-- | sway/tree/container.c | 2 | ||||
| -rw-r--r-- | sway/tree/root.c | 2 | ||||
| -rw-r--r-- | swaynag/config.c | 4 | ||||
| -rw-r--r-- | swaynag/swaynag.c | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 527759ba..09766ce5 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -1706,7 +1706,7 @@ static void update_marks_texture(struct sway_container *con, for (int i = 0; i < con->marks->length; ++i) { char *mark = con->marks->items[i]; if (mark[0] != '_') { - sprintf(part, "[%s]", mark); + snprintf(part, len + 1, "[%s]", mark); strcat(buffer, part); } } diff --git a/sway/tree/root.c b/sway/tree/root.c index 73f3993c..8508e9eb 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c @@ -209,7 +209,7 @@ static pid_t get_parent_pid(pid_t child) { FILE *stat = NULL; size_t buf_size = 0; - sprintf(file_name, "/proc/%d/stat", child); + snprintf(file_name, sizeof(file_name), "/proc/%d/stat", child); if ((stat = fopen(file_name, "r"))) { if (getline(&buffer, &buf_size, stat) != -1) { diff --git a/swaynag/config.c b/swaynag/config.c index 6db7cce5..ede0938c 100644 --- a/swaynag/config.c +++ b/swaynag/config.c @@ -414,8 +414,8 @@ int swaynag_load_config(char *path, struct swaynag *swaynag, list_t *types) { } free(name); } else { - char *flag = malloc(sizeof(char) * (nread + 3)); - sprintf(flag, "--%s", line); + char *flag = malloc(nread + 3); + snprintf(flag, nread + 3, "--%s", line); char *argv[] = {"swaynag", flag}; result = swaynag_parse_options(2, argv, swaynag, types, type, NULL, NULL); diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c index 03ec0411..23d23f38 100644 --- a/swaynag/swaynag.c +++ b/swaynag/swaynag.c @@ -28,8 +28,9 @@ static bool terminal_execute(char *terminal, char *command) { fprintf(tmp, "#!/bin/sh\nrm %s\n%s", fname, command); fclose(tmp); chmod(fname, S_IRUSR | S_IWUSR | S_IXUSR); - char *cmd = malloc(sizeof(char) * (strlen(terminal) + strlen(" -e ") + strlen(fname) + 1)); - sprintf(cmd, "%s -e %s", terminal, fname); + size_t cmd_size = strlen(terminal) + strlen(" -e ") + strlen(fname) + 1; + char *cmd = malloc(cmd_size); + snprintf(cmd, cmd_size, "%s -e %s", terminal, fname); execlp("sh", "sh", "-c", cmd, NULL); sway_log_errno(SWAY_ERROR, "Failed to run command, execlp() returned."); free(cmd); |