Commit f7679dab authored by Roel Kluin's avatar Roel Kluin Committed by Ingo Molnar

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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarRoel 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: default avatarIngo Molnar <mingo@elte.hu>
parent cca03c0a
...@@ -259,7 +259,7 @@ size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f) ...@@ -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); res = fread(sb->buf + sb->len, 1, size, f);
if (res > 0) if (res > 0)
strbuf_setlen(sb, sb->len + res); strbuf_setlen(sb, sb->len + res);
else if (res < 0 && oldalloc == 0) else if (oldalloc == 0)
strbuf_release(sb); strbuf_release(sb);
return res; return res;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment