diff options
author | Marcel Moolenaar <marcel@FreeBSD.org> | 2016-09-24 17:29:27 +0000 |
---|---|---|
committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2016-09-24 17:29:27 +0000 |
commit | ac3425511d79506483f5781a983d5caa6275b37c (patch) | |
tree | 62963561350b23c6dc66b755290c59c20ad10c53 /usr.bin/mkimg | |
parent | 2b4da8aa2021023fed30cb168d9770d431760882 (diff) | |
download | src-ac3425511d79506483f5781a983d5caa6275b37c.tar.gz src-ac3425511d79506483f5781a983d5caa6275b37c.zip |
Update local variable 'block' after calling capacity_resize(),
otherwise format_resize(), which is called right after, isn't
getting the current/actual image size. Rather than rounding up,
format_resize() could end up truncating the size and we don't
allow that by design.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=306299
Diffstat (limited to 'usr.bin/mkimg')
-rw-r--r-- | usr.bin/mkimg/mkimg.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index 5a4b9f9b26fa..5d41e3bbd48b 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -463,13 +463,16 @@ mkimg(void) block = scheme_metadata(SCHEME_META_IMG_END, block); error = image_set_size(block); - if (!error) + if (!error) { error = capacity_resize(block); - if (!error) + block = image_get_size(); + } + if (!error) { error = format_resize(block); + block = image_get_size(); + } if (error) errc(EX_IOERR, error, "image sizing"); - block = image_get_size(); ncyls = block / (nsecs * nheads); error = scheme_write(block); if (error) |