Fix WS_Printf off by one error/truncation handling.

336bd586 · Dag Haavi Finstad · 5659c4d0 · 336bd586
Commit 336bd586 authored Feb 04, 2014 by Dag Haavi Finstad
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

cache_ws.c bin/varnishd/cache/cache_ws.c +3 -2

No files found.
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -175,11 +175,12 @@ WS_Printf(struct ws *ws, const char *fmt, ...)
 	p = ws->f;
 	va_start(ap, fmt);
 	v = vsnprintf(p, u, fmt, ap);
-	if (v > u) {
+	va_end(ap);
+	if (v >= u) {
 		WS_Release(ws, 0);
 		p = NULL;
 	} else {
-		WS_Release(ws, v);
+		WS_Release(ws, v + 1);
 	}
 	return (p);
 }