about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2019-11-20 01:10:10 -0800
committerJune McEnroe <june@causal.agency>2019-11-20 15:23:46 -0500
commitd6055480175938d9d8d968db326469833cff5bf3 (patch)
tree4748ef07aff9f263ace5e29054284dba5e4cd19e
parentclient: Include time.h for gmtime and strftime (diff)
downloadpounce-d6055480175938d9d8d968db326469833cff5bf3.tar.gz
pounce-d6055480175938d9d8d968db326469833cff5bf3.zip
Avoid a couple VLAs with constant size
These are really just regular arrays masquerading as VLAs.
Diffstat (limited to '')
-rw-r--r--dispatch.c5
-rw-r--r--local.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/dispatch.c b/dispatch.c
index d762105..c2e2d50 100644
--- a/dispatch.c
+++ b/dispatch.c
@@ -58,8 +58,7 @@ static void eventRemove(size_t i) {
 }
 
 static ssize_t sendfd(int sock, int fd) {
-	size_t len = CMSG_SPACE(sizeof(int));
-	char buf[len];
+	char buf[CMSG_SPACE(sizeof(int))];
 
 	char x = 0;
 	struct iovec iov = { .iov_base = &x, .iov_len = 1 };
@@ -67,7 +66,7 @@ static ssize_t sendfd(int sock, int fd) {
 		.msg_iov = &iov,
 		.msg_iovlen = 1,
 		.msg_control = buf,
-		.msg_controllen = len,
+		.msg_controllen = sizeof(buf),
 	};
 
 	struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
diff --git a/local.c b/local.c
index 6ef452b..c147259 100644
--- a/local.c
+++ b/local.c
@@ -165,8 +165,7 @@ size_t localUnix(int fds[], size_t cap, const char *path) {
 }
 
 static int recvfd(int sock) {
-	size_t len = CMSG_SPACE(sizeof(int));
-	char buf[len];
+	char buf[CMSG_SPACE(sizeof(int))];
 
 	char x;
 	struct iovec iov = { .iov_base = &x, .iov_len = 1 };
@@ -174,7 +173,7 @@ static int recvfd(int sock) {
 		.msg_iov = &iov,
 		.msg_iovlen = 1,
 		.msg_control = buf,
-		.msg_controllen = len,
+		.msg_controllen = sizeof(buf),
 	};
 	if (0 > recvmsg(sock, &msg, 0)) return -1;
 
g'> 2020-06-25Use DisableForwarding in sshd_configJune McEnroe 2019-12-19Remove READMEJune McEnroe 2019-12-15Update git URLsJune McEnroe 2019-08-05Add buymeacoffee linkJune McEnroe Can't hurt, I guess? I don't expect to get anything... 2019-07-27Use braces in MakefileJune McEnroe 2019-07-27Make copyright headers consistentJune McEnroe 2019-07-08Remove NetHack from indexJune McEnroe 2019-04-08Don't install rc.kfcgi eitherJune McEnroe 2019-03-28Remove rc.kfcgiJune McEnroe I sent a better version of it to the port maintainer and it is now in the ports tree. 2019-01-16Reformat index.html with explore linkJune McEnroe 2019-01-16Return false from keydown handler in exploreJune McEnroe 2019-01-08Draw lines to tile edgeJune McEnroe 2019-01-08Factor out default pathsJune McEnroe 2019-01-08Remove incorrect default coordinatesJune McEnroe 2019-01-07Set img src when explore fragment changesJune McEnroe 2019-01-07Compress PNG data in imageJune McEnroe kcgi never enables compression for FastCGI. 2019-01-07madvise MADV_NOCORE in imageJune McEnroe 2019-01-07Add license notice to explore JavaScriptJune McEnroe 2019-01-07Add Q/Home binding in exploreJune McEnroe 2019-01-07Fix explore image URLJune McEnroe 2019-01-07Add HOME button, ssh link, AGPL notice to exploreJune McEnroe 2019-01-06Add meta viewport to exploreJune McEnroe 2019-01-06Set background and max-width in exploreJune McEnroe 2019-01-06Swallow writes after the connection is closedJune McEnroe It was not okay. 2019-01-06Handle KCGI_HUPJune McEnroe I hope it's okay that I keep writing to the fwopen stream after streamWrite returns -1. 2019-01-06Install html filesJune McEnroe