fix: Fix a couple of buffer overrun hazards.

Pointed out by @berkakinci. Fixes esnet#1134.
hanvari · Jul 3, 2021 · 691c474 · 691c474
1 parent b3772db
commit 691c474
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/iperf_api.c b/src/iperf_api.c
@@ -4557,10 +4557,11 @@ iperf_printf(struct iperf_test *test, const char* format, ...)
 	char linebuffer[1024];
 	int i = 0;
 	if (ct) {
-	    i = sprintf(linebuffer, "%s", ct);
+	    i = snprintf(linebuffer, sizeof(linebuffer), "%s", ct);
 	}
 	va_start(argp, format);
-	r = vsnprintf(linebuffer + i, sizeof(linebuffer), format, argp);
+	r = vsnprintf(linebuffer + i, sizeof(linebuffer) - i, format, argp);
+        r += i;
 	va_end(argp);
 	fprintf(test->outfile, "%s", linebuffer);