Merge pull request #54 from henrygab/patch-2

hathach · web-flow · commit 73456ac80edb · 2019-03-13T01:08:06.000-07:00
Avoid returning uninitialized memory
diff --git a/src/usb/msc_uf2.c b/src/usb/msc_uf2.c
@@ -64,6 +64,7 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer,
 {
   void const* response = NULL;
   int32_t resplen = 0;
+  memset(buffer, 0, bufsize);
 
   switch ( scsi_cmd[0] )
   {
@@ -114,6 +115,7 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer,
 int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize)
 {
   (void) lun;
+  memset(buffer, 0, bufsize);
 
   // since we return block size each, offset should always be zero
   TU_ASSERT(offset == 0, -1);

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer,`
`64`	`64`	`{`
`65`	`65`	`void const* response = NULL;`
`66`	`66`	`int32_t resplen = 0;`
	`67`	`+ memset(buffer, 0, bufsize);`
`67`	`68`
`68`	`69`	`switch ( scsi_cmd[0] )`
`69`	`70`	`{`
`@@ -114,6 +115,7 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer,`
`114`	`115`	`int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize)`
`115`	`116`	`{`
`116`	`117`	`(void) lun;`
	`118`	`+ memset(buffer, 0, bufsize);`
`117`	`119`
`118`	`120`	`// since we return block size each, offset should always be zero`
`119`	`121`	`TU_ASSERT(offset == 0, -1);`