diskbuilder: Initialize FAT entries properly

Author: fwsGonzo

diskimagebuild/fat_internal.hpp

@@ -37,12 +37,12 @@ static const uint8_t LAST_LONG_ENTRY = 0x40;
 struct cl_dir
 {
   uint8_t  shortname[11];
-  uint8_t  attrib;
+  uint8_t  attrib     = 0;
   uint8_t  pad1[8];
-  uint16_t cluster_hi;
-  uint32_t modified;
-  uint16_t cluster_lo;
-  uint32_t filesize;
+  uint16_t cluster_hi = 0;
+  uint32_t modified   = 0;
+  uint16_t cluster_lo = 0;
+  uint32_t filesize   = 0;
 
 } __attribute__((packed));
 

diskimagebuild/writer.cpp

@@ -127,6 +127,7 @@ void create_preamble(
   cl_dir ent;
   ent.attrib = ATTR_DIRECTORY;
   ent.filesize = 0;
+  ent.modified = 0;
   // . current directory
   memcpy((char*) ent.shortname, ".            ", SHORTNAME_LEN);
   ent.cluster_hi = fsys.to_cluster_hi(self);
@@ -152,6 +153,7 @@ cl_dir create_entry(const std::string& name, uint8_t attr, uint32_t size)
   ent.cluster_hi = 0; /// SET THIS
   ent.cluster_lo = 0; /// SET THIS
   ent.filesize   = size;
+  ent.modified   = 0;
   return ent;
 }
 
@@ -163,6 +165,7 @@ void fill_unused(std::vector<cl_dir>& ents, int num)
   ent.cluster_hi = 0;
   ent.cluster_lo = 0;
   ent.filesize   = 0;
+  ent.modified   = 0;
   while (num-- > 0) ents.push_back(ent);
 }
 void mod16_test(std::vector<cl_dir>& ents, int& mod16, int long_entries)
@@ -229,7 +232,11 @@ long Dir::write(FileSys& fsys, FILE* file, long pos, long parent)
   {
     cl_dir last;
     last.shortname[0] = 0x0; // last entry
-    last.attrib = 0;
+    last.cluster_hi = 0;
+    last.cluster_lo = 0;
+    last.attrib   = 0;
+    last.modified = 0;
+    last.filesize = 0;
     ents.push_back(last);
   }
 

src/drivers/virtioblk.cpp

@@ -231,8 +231,7 @@ void VirtioBlk::read (block_t blk, on_read_func func) {
 void VirtioBlk::read (block_t blk, size_t cnt, on_read_func func) {
 
   // create big buffer for collecting all the disk data
-  uint8_t* bufdata = new uint8_t[block_size() * cnt];
-  buffer_t bigbuf { bufdata, std::default_delete<uint8_t[]>() };
+  buffer_t bigbuf { new uint8_t[block_size() * cnt], std::default_delete<uint8_t[]>() };
   // (initialized) boolean array of partial jobs
   auto results = std::make_shared<size_t> (cnt);
   bool shipped = false;