From: Ali H. Fardan <raiz@firemail.cc>
Date: Sun, 28 Aug 2016 15:19:53 +0000 (+0300)
Subject: worked around the buffer overrun in smprintf()
X-Git-Url: https://git.atheridis.org/?a=commitdiff_plain;h=94a62b864b56d8bad1fb68925dcee7c71015bc54;p=suckless%2Fslstatus.git

worked around the buffer overrun in smprintf()
---

diff --git a/slstatus.c b/slstatus.c
index 628c0f4..08866d2 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -78,14 +78,15 @@ setstatus(const char *str)
 static char *
 smprintf(const char *fmt, ...)
 {
-	/* FIXME: This code should have
-	bound checks, it is vulnerable to
-	buffer overflows */
 	va_list ap;
+	char tmp[120];
 	char *ret = NULL;
 
 	va_start(ap, fmt);
-	if (vasprintf(&ret, fmt, ap) < 0)
+	vsnprintf(tmp, sizeof(tmp)-1, fmt, ap);
+	tmp[strlen(tmp)+1] = '\0';
+
+	if (asprintf(&ret, "%s", tmp) < 0)
 		return NULL;
 
 	va_end(ap);