Skip to content

Commit 2843a5a

Browse files
committed
backport #7491
1 parent 1cdec7b commit 2843a5a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

cores/esp8266/Esp.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -697,15 +697,16 @@ static SpiFlashOpResult spi_flash_write_puya(uint32_t offset, uint32_t *data, si
697697
} else {
698698
bytesLeft = 0;
699699
}
700-
rc = spi_flash_read(pos, flash_write_puya_buf, bytesNow);
700+
size_t bytesAligned = (bytesNow + 3) & ~3;
701+
rc = spi_flash_read(pos, flash_write_puya_buf, bytesAligned);
701702
if (rc != SPI_FLASH_RESULT_OK) {
702703
return rc;
703704
}
704-
for (size_t i = 0; i < bytesNow / 4; ++i) {
705+
for (size_t i = 0; i < bytesAligned / 4; ++i) {
705706
flash_write_puya_buf[i] &= *ptr;
706707
++ptr;
707708
}
708-
rc = spi_flash_write(pos, flash_write_puya_buf, bytesNow);
709+
rc = spi_flash_write(pos, flash_write_puya_buf, bytesAligned);
709710
pos += bytesNow;
710711
}
711712
return rc;

0 commit comments

Comments
 (0)