mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-20 00:36:01 -04:00
spi_flash: fix errors for GCC 8 support
components/spi_flash/partition.c: In function 'load_partitions': components/spi_flash/partition.c:179:66: error: argument to 'sizeof' in 'strncpy' call is the same expression as the source; did you mean to use the size of the destination? [-Werror=sizeof-pointer-memaccess] strncpy(item->info.label, (const char*) it->label, sizeof(it->label)); ^
This commit is contained in:
parent
714a9bda92
commit
f42b91fe46
@ -134,7 +134,7 @@ bool bootloader_common_erase_part_type_data(const char *list_erase, bool ota_dat
|
||||
fl_ota_data_erase = true;
|
||||
}
|
||||
// partition->label is not null-terminated string.
|
||||
strncpy(label, (char *)&partition->label, sizeof(partition->label));
|
||||
strncpy(label, (char *)&partition->label, sizeof(label) - 1);
|
||||
if (fl_ota_data_erase == true || (bootloader_common_label_search(list_erase, label) == true)) {
|
||||
err = esp_rom_spiflash_erase_area(partition->pos.offset, partition->pos.size);
|
||||
if (err != ESP_OK) {
|
||||
|
@ -176,7 +176,7 @@ static esp_err_t load_partitions()
|
||||
}
|
||||
|
||||
// it->label may not be zero-terminated
|
||||
strncpy(item->info.label, (const char*) it->label, sizeof(it->label));
|
||||
strncpy(item->info.label, (const char*) it->label, sizeof(item->info.label) - 1);
|
||||
item->info.label[sizeof(it->label)] = 0;
|
||||
// add it to the list
|
||||
if (last == NULL) {
|
||||
|
Loading…
Reference in New Issue
Block a user