From 4bc982c3a8f2a4b21e449fc0db93d46d505f7d95 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 2 Oct 2014 10:16:26 +0200 Subject: data_layout: improve memory handling - free empty_blk if it's allocated and there's an error - only free empty_blk if it's non-NULL. While POSIX requests such free()s to be safe, some implementations (eg Solaris) aren't compliant. Found-by: Coverity Scan Signed-off-by: Patrick Georgi Signed-off-by: Stephen Warren --- src/data_layout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/data_layout.c b/src/data_layout.c index 01f00ab..db0a0f0 100644 --- a/src/data_layout.c +++ b/src/data_layout.c @@ -1004,12 +1004,14 @@ write_block_raw(build_image_context *context) { size_t bytes = pages_to_write * context->page_size; - if (fwrite(data, 1, bytes, context->raw_file) != bytes) + if (fwrite(data, 1, bytes, context->raw_file) != bytes) { + if (empty_blk) free(empty_blk); return -1; + } } } - free(empty_blk); + if (empty_blk) free(empty_blk); return 0; } -- cgit v1.2.1