diff options
Diffstat (limited to 'tools/mkfs.hefs.cc')
| -rw-r--r-- | tools/mkfs.hefs.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/mkfs.hefs.cc b/tools/mkfs.hefs.cc index eda81efa..879b5668 100644 --- a/tools/mkfs.hefs.cc +++ b/tools/mkfs.hefs.cc @@ -159,8 +159,10 @@ int main(int argc, char** argv) { "BootNode::magic too small to hold kOpenHeFSMagicLen"); std::memset(boot_node.magic, 0, sizeof(boot_node.magic)); + size_t magic_copy = (sizeof(boot_node.magic) < kOpenHeFSMagicLen - 1) ? sizeof(boot_node.magic) : (kOpenHeFSMagicLen - 1); + std::memcpy(boot_node.magic, kOpenHeFSMagic, magic_copy); boot_node.magic[magic_copy] = 0; @@ -170,7 +172,7 @@ int main(int argc, char** argv) { size_t label_units = std::min(kDiskLabel.size(), vol_slots - 1); - for (size_t i = 0; i < label_units; ++i) { + for (size_t i{}; i < label_units; ++i) { boot_node.volumeName[i] = static_cast<char8_t>(kDiskLabel[i]); } |