SPIFFS: fix unaligned read in HAL (#3261)

igrr · web-flow · commit f211014dd325 · 2017-05-21T10:30:03.000-05:00
Ref. #3065
diff --git a/cores/esp8266/spiffs_hal.cpp b/cores/esp8266/spiffs_hal.cpp
@@ -60,7 +60,7 @@ int32_t spiffs_hal_read(uint32_t addr, uint32_t size, uint8_t *dst) {
                 __LINE__, addr, size, alignedBegin, alignedEnd);
             return SPIFFS_ERR_INTERNAL;
         }
-        memcpy(dst, &tmp + 4 - nb, nb);
+        memcpy(dst, ((uint8_t*) &tmp) + 4 - nb, nb);
     }
 
     if (alignedEnd != alignedBegin) {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ int32_t spiffs_hal_read(uint32_t addr, uint32_t size, uint8_t *dst) {`
`60`	`60`	`__LINE__, addr, size, alignedBegin, alignedEnd);`
`61`	`61`	`return SPIFFS_ERR_INTERNAL;`
`62`	`62`	`}`
`63`		`- memcpy(dst, &tmp + 4 - nb, nb);`
	`63`	`+ memcpy(dst, ((uint8_t*) &tmp) + 4 - nb, nb);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if (alignedEnd != alignedBegin) {`