Commit f787d951 authored Oct 23, 2012 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Oct 30, 2012

perf tools: Fix strbuf_addf() when the buffer needs to grow



This was found during chasing down the header output regression.  The
strbuf_addf() was checking buffer length with a result of vscnprintf()
which cannot be greater than that of strbuf_avail().

Since numa topology and pmu mapping info in header were converted to use
strbuf, it sometimes caused uninteresting behaviors with the broken
strbuf.

Fix it by using vsnprintf() which returns desired output string length
regardless of the available buffer size and grow the buffer if needed.

Reported-by: Andrew Jones <drjones@redhat.com>
Tested-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andrew Jones <drjones@redhat.com>
Link: http://lkml.kernel.org/r/1350999890-6920-2-git-send-email-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 1234471e

tools/perf/util/strbuf.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -90,17 +90,17 @@ void strbuf_addf(struct strbuf sb, const char fmt, ...)
		if (!strbuf_avail(sb))
		strbuf_grow(sb, 64);
		va_start(ap, fmt);
		len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
		len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
		va_end(ap);
		if (len < 0)
		die("your vscnprintf is broken");
		die("your vsnprintf is broken");
		if (len > strbuf_avail(sb)) {
		strbuf_grow(sb, len);
		va_start(ap, fmt);
		len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
		len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
		va_end(ap);
		if (len > strbuf_avail(sb)) {
		die("this should not happen, your snprintf is broken");
		die("this should not happen, your vsnprintf is broken");
		}
		}
		strbuf_setlen(sb, sb->len + len);

Admin message