util/cbfstool/common.c: Deduplicate buffer_create() logic
BUG=b:207808292,b:231152447
TEST=builds with vboot_ref uprev.
Change-Id: Id7d9b6f5254b08720eebb37151e12ee68ed7f8d7
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65145
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index ea22bd6..8ae9120 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -46,17 +46,17 @@
perror(filename);
return -1;
}
- buffer->offset = 0;
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 = ALIGN_UP(file_size, size_granularity);
- buffer->name = strdup(filename);
- buffer->data = (char *)malloc(buffer->size);
- assert(buffer->data);
+ if (buffer_create(buffer, ALIGN_UP(file_size, size_granularity), filename)) {
+ fprintf(stderr, "could not allocate buffer\n");
+ fclose(fp);
+ return -1;
+ }
if (fread(buffer->data, 1, file_size, fp) != (size_t)file_size) {
fprintf(stderr, "incomplete read: %s\n", filename);
fclose(fp);