diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-05-01 09:04:12 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2016-05-01 09:04:12 -0400 |
| commit | 4915f9761840f05c5a80e92e0efd5318982663b6 (patch) | |
| tree | fd8b8a5b39fac14390595442a87cc3caf7c4afe9 | |
| parent | f7869d815a17b062f867478ceacc8c1d1cbac6c2 (diff) | |
| parent | e53ba08626e432f9ec14a7002a0d3ffd00b93c5d (diff) | |
| download | sway-4915f9761840f05c5a80e92e0efd5318982663b6.tar.xz | |
Merge pull request #625 from 1ace/fix/buffer-overflow
Fix a couple potential buffer overflows
| -rw-r--r-- | common/ipc-client.c | 3 | ||||
| -rw-r--r-- | sway/commands.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/common/ipc-client.c b/common/ipc-client.c index 93f2963c..997a87d1 100644 --- a/common/ipc-client.c +++ b/common/ipc-client.c @@ -32,7 +32,8 @@ int ipc_open_socket(const char *socket_path) { sway_abort("Unable to open Unix socket"); } addr.sun_family = AF_UNIX; - strcpy(addr.sun_path, socket_path); + strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path)); + addr.sun_path[sizeof(addr.sun_path) - 1] = 0; int l = sizeof(addr.sun_family) + strlen(addr.sun_path); if (connect(socketfd, (struct sockaddr *)&addr, l) == -1) { sway_abort("Unable to connect to %s", socket_path); diff --git a/sway/commands.c b/sway/commands.c index 79591925..73e9ffaf 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -506,7 +506,8 @@ static struct cmd_results *cmd_exec_always(int argc, char **argv) { // Put argument into cmd array char cmd[4096]; - strcpy(cmd, tmp); + strncpy(cmd, tmp, sizeof(cmd)); + cmd[sizeof(cmd) - 1] = 0; free(tmp); sway_log(L_DEBUG, "Executing %s", cmd); |