diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index e26c530106..8464a2bbb9 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -130,7 +130,7 @@ int parse_elf_to_payload(const struct buffer *input, struct buffer *output,
 
 		segments++;
 	}
-	/* allocate the segment header array */
+	/* Allocate and initialize the segment header array */
 	segs = calloc(segments, sizeof(*segs));
 	if (segs == NULL) {
 		ret = -1;
@@ -250,7 +250,7 @@ int parse_flat_binary_to_payload(const struct buffer *input,
 				 enum comp_algo algo)
 {
 	comp_func_ptr compress;
-	struct cbfs_payload_segment segs[2];
+	struct cbfs_payload_segment segs[2] = {0};
 	int doffset, len = 0;
 
 	compress = compression_function(algo);
@@ -295,7 +295,7 @@ int parse_fv_to_payload(const struct buffer *input, struct buffer *output,
 			enum comp_algo algo)
 {
 	comp_func_ptr compress;
-	struct cbfs_payload_segment segs[2];
+	struct cbfs_payload_segment segs[2] = {0};
 	int doffset, len = 0;
 	firmware_volume_header_t *fv;
 	ffs_file_header_t *fh;