commit cbd8d9d4f58a88ff57a4720ef17c7e7be147ea9b
author Chris Fries <cfries@google.com> Wed Apr 19 19:24:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 19 19:24:26 2017 +0000
tree 9b53ef05ae95376d550f4b01d3b1e357d6c4444a
parent 0a4ff0fb31bdc4baa162ede84dbbf6a66236f337
parent ab74c778dfb620be6677435a7a4eda3ef01ce169

Merge "libsparse: Fix odd-sized input files total_blks" am: 652ce94f40
am: ab74c778df

Change-Id: I5bc6a0df02d86fa0f56f866ebdcb18314858634a

libsparse/output_file.c

diff --git a/libsparse/output_file.c b/libsparse/output_file.c
index 2115998..51e60ef 100644
--- a/libsparse/output_file.c
+++ b/libsparse/output_file.c
@@ -584,7 +584,7 @@
 				.file_hdr_sz = SPARSE_HEADER_LEN,
 				.chunk_hdr_sz = CHUNK_HEADER_LEN,
 				.blk_sz = out->block_size,
-				.total_blks = out->len / out->block_size,
+				.total_blks = DIV_ROUND_UP(out->len, out->block_size),
 				.total_chunks = chunks,
 				.image_checksum = 0
 		};