aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/ipc-client.c2
-rw-r--r--sway/commands.c2
-rw-r--r--sway/commands/exec_always.c2
-rw-r--r--sway/ipc-server.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/common/ipc-client.c b/common/ipc-client.c
index 117e9910..a88df080 100644
--- a/common/ipc-client.c
+++ b/common/ipc-client.c
@@ -48,7 +48,7 @@ int ipc_open_socket(const char *socket_path) {
48 sway_abort("Unable to open Unix socket"); 48 sway_abort("Unable to open Unix socket");
49 } 49 }
50 addr.sun_family = AF_UNIX; 50 addr.sun_family = AF_UNIX;
51 strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path)); 51 strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
52 addr.sun_path[sizeof(addr.sun_path) - 1] = 0; 52 addr.sun_path[sizeof(addr.sun_path) - 1] = 0;
53 int l = sizeof(struct sockaddr_un); 53 int l = sizeof(struct sockaddr_un);
54 if (connect(socketfd, (struct sockaddr *)&addr, l) == -1) { 54 if (connect(socketfd, (struct sockaddr *)&addr, l) == -1) {
diff --git a/sway/commands.c b/sway/commands.c
index 54d84450..99f42524 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -601,7 +601,7 @@ struct cmd_results *add_color(const char *name,
601 "Invalid color definition %s", color); 601 "Invalid color definition %s", color);
602 } 602 }
603 } 603 }
604 strncpy(buffer, color, len); 604 strcpy(buffer, color);
605 // add default alpha channel if color was defined without it 605 // add default alpha channel if color was defined without it
606 if (len == 7) { 606 if (len == 7) {
607 buffer[7] = 'f'; 607 buffer[7] = 'f';
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 954950e7..af4e4965 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -32,7 +32,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
32 32
33 // Put argument into cmd array 33 // Put argument into cmd array
34 char cmd[4096]; 34 char cmd[4096];
35 strncpy(cmd, tmp, sizeof(cmd)); 35 strncpy(cmd, tmp, sizeof(cmd) - 1);
36 cmd[sizeof(cmd) - 1] = 0; 36 cmd[sizeof(cmd) - 1] = 0;
37 free(tmp); 37 free(tmp);
38 wlr_log(L_DEBUG, "Executing %s", cmd); 38 wlr_log(L_DEBUG, "Executing %s", cmd);
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 045802e1..39d1d0a7 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -64,7 +64,7 @@ void ipc_init(struct sway_server *server) {
64 64
65 // We want to use socket name set by user, not existing socket from another sway instance. 65 // We want to use socket name set by user, not existing socket from another sway instance.
66 if (getenv("SWAYSOCK") != NULL && access(getenv("SWAYSOCK"), F_OK) == -1) { 66 if (getenv("SWAYSOCK") != NULL && access(getenv("SWAYSOCK"), F_OK) == -1) {
67 strncpy(ipc_sockaddr->sun_path, getenv("SWAYSOCK"), sizeof(ipc_sockaddr->sun_path)); 67 strncpy(ipc_sockaddr->sun_path, getenv("SWAYSOCK"), sizeof(ipc_sockaddr->sun_path) - 1);
68 ipc_sockaddr->sun_path[sizeof(ipc_sockaddr->sun_path) - 1] = 0; 68 ipc_sockaddr->sun_path[sizeof(ipc_sockaddr->sun_path) - 1] = 0;
69 } 69 }
70 70