Updater: read data back from flash before calculating MD5

igrr · igrr · commit 0c58dc15362a · 2016-06-16T16:25:17.000+08:00
diff --git a/cores/esp8266/Updater.cpp b/cores/esp8266/Updater.cpp
@@ -202,12 +202,14 @@ bool UpdaterClass::end(bool evenIfRemaining){
 }
 
 bool UpdaterClass::_writeBuffer(){
-
   if(!_async) yield();
   bool result = ESP.flashEraseSector(_currentAddress/FLASH_SECTOR_SIZE);
   if(!_async) yield();
   if (result) {
       result = ESP.flashWrite(_currentAddress, (uint32_t*) _buffer, _bufferLen);
+      if (result) {
+        result = ESP.flashRead(_currentAddress, (uint32_t*) _buffer, _bufferLen);
+      }
   }
   if(!_async) yield();
 

Original file line number	Diff line number	Diff line change
`@@ -202,12 +202,14 @@ bool UpdaterClass::end(bool evenIfRemaining){`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`bool UpdaterClass::_writeBuffer(){`
`205`		`-`
`206`	`205`	`if(!_async) yield();`
`207`	`206`	`bool result = ESP.flashEraseSector(_currentAddress/FLASH_SECTOR_SIZE);`
`208`	`207`	`if(!_async) yield();`
`209`	`208`	`if (result) {`
`210`	`209`	`result = ESP.flashWrite(_currentAddress, (uint32_t*) _buffer, _bufferLen);`
	`210`	`+ if (result) {`
	`211`	`+ result = ESP.flashRead(_currentAddress, (uint32_t*) _buffer, _bufferLen);`
	`212`	`+ }`
`211`	`213`	`}`
`212`	`214`	`if(!_async) yield();`
`213`	`215`