Merge branch 'flasher-bugfix' into develop

b626b828 · Federico Vaga · 1b4d1050 · 83769b62 · b626b828
Commit b626b828 authored Mar 22, 2021 by Federico Vaga
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

svec-flasher.c software/tools/vme-flasher/svec-flasher.c +4 -2

No files found.
--- a/software/tools/vme-flasher/svec-flasher.c
+++ b/software/tools/vme-flasher/svec-flasher.c
@@ -237,6 +237,7 @@ int flash_program(uint32_t addr, const uint8_t * data, int size, uint32_t flash_
 	int ret = 0;
 	int sector_size;
 	int *sector_map;
+	int sector_map_size;

 	if (flash_id == ID_M25P128)
 		sector_size = FLASH_SECTOR_SIZE_M25P128;
@@ -245,12 +246,13 @@ int flash_program(uint32_t addr, const uint8_t * data, int size, uint32_t flash_
 	else
 		return -ENODEV;

-	sector_map = (int *)malloc(sizeof(int) * FLASH_SIZE / sector_size);
+	sector_map_size = sizeof(int) * FLASH_SIZE / sector_size;
+	sector_map = (int *)malloc(sector_map_size);

 	if (sector_map == NULL)
 		return -ENOMEM;

-	memset(sector_map, 0, sizeof(sector_map));
+	memset(sector_map, 0, sector_map_size);

 	const uint8_t *p = data;