commit 9c8fb7d025920eacf264e290010e235452235c83
parent 1b7f554474552bd6c463b417305562d6d7dfd3d3
Author: Dominique Martinet <asmadeus@codewreck.org>
Date: Sat, 30 Jun 2018 16:49:13 +0900
invoke_swaybar: fix message length header size
size_t/ssize_t are 8 bytes on 64bit systems, so use the proper size to
transmit that information.
This could lead to ridiculously large alloc as len is not initialized to zero
Found through static analysis
Diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sway/config/bar.c b/sway/config/bar.c
@@ -174,7 +174,7 @@ void invoke_swaybar(struct bar_config *bar) {
if (!command) {
const char msg[] = "Unable to allocate swaybar command string";
size_t msg_len = sizeof(msg);
- if (write(filedes[1], &msg_len, sizeof(int))) {};
+ if (write(filedes[1], &msg_len, sizeof(size_t))) {};
if (write(filedes[1], msg, msg_len)) {};
close(filedes[1]);
exit(1);
@@ -189,8 +189,8 @@ void invoke_swaybar(struct bar_config *bar) {
}
wlr_log(L_DEBUG, "Spawned swaybar %d", bar->pid);
close(filedes[0]);
- ssize_t len;
- if (read(filedes[1], &len, sizeof(int)) == sizeof(int)) {
+ size_t len;
+ if (read(filedes[1], &len, sizeof(size_t)) == sizeof(size_t)) {
char *buf = malloc(len);
if(!buf) {
wlr_log(L_ERROR, "Cannot allocate error string");