Merge branch 'bugfix/esp_flash_write_temp_buffer_lifetime' into 'master'

esp_flash: fix write issue using buffer on stack out of lifetime

See merge request espressif/esp-idf!9932
This commit is contained in:
Michael (XIAO Xufeng) 2020-09-10 17:49:04 +08:00
commit 37e3f20252

View File

@ -631,14 +631,14 @@ esp_err_t IRAM_ATTR esp_flash_write(esp_flash_t *chip, const void *buffer, uint3
do { do {
uint32_t write_len; uint32_t write_len;
const void *write_buf; const void *write_buf;
uint32_t temp_buf[8];
if (direct_write) { if (direct_write) {
write_len = MIN(length, MAX_WRITE_CHUNK); write_len = MIN(length, MAX_WRITE_CHUNK);
write_buf = buffer; write_buf = buffer;
} else { } else {
uint32_t buf[8]; write_len = MIN(length, sizeof(temp_buf));
write_len = MIN(length, sizeof(buf)); memcpy(temp_buf, buffer, write_len);
memcpy(buf, buffer, write_len); write_buf = temp_buf;
write_buf = buf;
} }
err = rom_spiflash_api_funcs->start(chip); err = rom_spiflash_api_funcs->start(chip);