Commit f7679dab authored Jun 22, 2009 by Roel Kluin Committed by Ingo Molnar Jun 24, 2009

perf_counter tools: Fix strbuf_fread() error path handling



size_t res cannot be less than 0 - fread returns 0 on error.

[ Updated by: René Scharfe <rene.scharfe@lsrfire.ath.cx> ]

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Junio C Hamano <gitster@pobox.com>
LKML-Reference: <4A3FB479.2090902@lsrfire.ath.cx>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent cca03c0a

tools/perf/util/strbuf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ size_t strbuf_fread(struct strbuf sb, size_t size, FILE f)
		res = fread(sb->buf + sb->len, 1, size, f);
		if (res > 0)
		strbuf_setlen(sb, sb->len + res);
		else if (res < 0 && oldalloc == 0)
		else if (oldalloc == 0)
		strbuf_release(sb);
		return res;
		}