backport #7491

d-a-v · d-a-v · commit 2843a5ace10e · 2020-08-02T20:14:22.000+02:00
diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp
@@ -697,15 +697,16 @@ static SpiFlashOpResult spi_flash_write_puya(uint32_t offset, uint32_t *data, si
         } else {
             bytesLeft = 0;
         }
-        rc = spi_flash_read(pos, flash_write_puya_buf, bytesNow);
+        size_t bytesAligned = (bytesNow + 3) & ~3;
+        rc = spi_flash_read(pos, flash_write_puya_buf, bytesAligned);
         if (rc != SPI_FLASH_RESULT_OK) {
             return rc;
         }
-        for (size_t i = 0; i < bytesNow / 4; ++i) {
+        for (size_t i = 0; i < bytesAligned / 4; ++i) {
             flash_write_puya_buf[i] &= *ptr;
             ++ptr;
         }
-        rc = spi_flash_write(pos, flash_write_puya_buf, bytesNow);
+        rc = spi_flash_write(pos, flash_write_puya_buf, bytesAligned);
         pos += bytesNow;
     }
     return rc;

Original file line number	Diff line number	Diff line change
`@@ -697,15 +697,16 @@ static SpiFlashOpResult spi_flash_write_puya(uint32_t offset, uint32_t *data, si`
`697`	`697`	`} else {`
`698`	`698`	`bytesLeft = 0;`
`699`	`699`	`}`
`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);`
`701`	`702`	`if (rc != SPI_FLASH_RESULT_OK) {`
`702`	`703`	`return rc;`
`703`	`704`	`}`
`704`		`- for (size_t i = 0; i < bytesNow / 4; ++i) {`
	`705`	`+ for (size_t i = 0; i < bytesAligned / 4; ++i) {`
`705`	`706`	`flash_write_puya_buf[i] &= *ptr;`
`706`	`707`	`++ptr;`
`707`	`708`	`}`
`708`		`- rc = spi_flash_write(pos, flash_write_puya_buf, bytesNow);`
	`709`	`+ rc = spi_flash_write(pos, flash_write_puya_buf, bytesAligned);`
`709`	`710`	`pos += bytesNow;`
`710`	`711`	`}`
`711`	`712`	`return rc;`