From 5300f5375526dbca5f3e9eb73be863cd13f7150d Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 21 Jan 2014 15:28:38 -0600 Subject: [PATCH] UPSTREAM: cbfstool: correct size left calculation for "empty" entries After removing a file sandwiched between two other files, that file could no longer be re-added at the same location. cbfstool tried to add the file, and a new "empty" entry, which, together, would no longer fit, so it continued checking for the next available space. Change the behavior to add the file if there is enough space for the file alone, then only add the "empty" entry if there is enough space for it. Change-Id: I885bb574bb230905bd42ca0fb6d4a6ef9b0cae03 Signed-off-by: Alexandru Gagniuc Signed-off-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/186983 --- util/cbfstool/cbfs_image.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index bfceea3b65..0eefd1519c 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -377,6 +377,10 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, DEBUG("cbfs_add_entry: space at 0x%x+0x%x(%d) bytes\n", addr, addr_next - addr, addr_next - addr); + + /* Will the file fit? Don't yet worry if we have space for a new + * "empty" entry. We take care of that later. + */ if (addr + need_size > addr_next) continue; @@ -396,6 +400,16 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, entry = cbfs_find_next_entry(image, entry); new_size = (cbfs_get_entry_addr(image, next) - cbfs_get_entry_addr(image, entry)); + + /* Entry was added and no space for new "empty" entry */ + if (new_size < cbfs_calculate_file_header_size("")) { + DEBUG("No need for new \"empty\" entry\n"); + /* No need to increase the size of the just + * stored file to extend to next file. Alignment + * of next file takes care of this. + */ + return 0; + } new_size -= cbfs_calculate_file_header_size(""); DEBUG("new size: %d\n", new_size); cbfs_create_empty_entry(image, entry, new_size, "");