From 4e42a371598a4a076505605bb5aec24e8b99f828 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 14 Dec 2016 16:16:47 +0100 Subject: [PATCH] UPSTREAM: util/cbfstool: Handle error condition more carefully BUG=None BRANCH=None TEST=None Signed-off-by: Patrick Georgi Found-by: Coverity Scan #1295494 Reviewed-on: https://review.coreboot.org/17861 Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) Change-Id: I72a7776d530d1cf0b8fa39e558990df3dc7f7805 Reviewed-on: https://chromium-review.googlesource.com/420522 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Furquan Shaikh --- util/cbfstool/common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 3093ba1465..5a47c2f45b 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -71,12 +71,13 @@ int buffer_from_file(struct buffer *buffer, const char *filename) return -1; } buffer->offset = 0; - buffer->size = get_file_size(fp); - if (buffer->size == -1u) { + off_t file_size = get_file_size(fp); + if (file_size < 0) { fprintf(stderr, "could not determine size of %s\n", filename); fclose(fp); return -1; } + buffer->size = file_size; buffer->name = strdup(filename); buffer->data = (char *)malloc(buffer->size); assert(buffer->data);