Resolve updater size check bug (#4550)

Adam5Wu · devyte · commit 2d39bcba7d8b · 2018-03-23T15:01:17.000-03:00
diff --git a/cores/esp8266/Updater.cpp b/cores/esp8266/Updater.cpp
@@ -86,7 +86,7 @@ bool UpdaterClass::begin(size_t size, int command) {
     //size of the update rounded to a sector
     uint32_t roundedSize = (size + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
     //address where we will start writing the update
-    updateStartAddress = updateEndAddress - roundedSize;
+    updateStartAddress = (updateEndAddress > roundedSize)? (updateEndAddress - roundedSize) : 0;
 
 #ifdef DEBUG_UPDATER
         DEBUG_UPDATER.printf("[begin] roundedSize:       0x%08X (%d)\n", roundedSize, roundedSize);
@@ -390,4 +390,4 @@ void UpdaterClass::printError(Print &out){
   }
 }
 
-UpdaterClass Update;
+UpdaterClass Update;

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ bool UpdaterClass::begin(size_t size, int command) {`
`86`	`86`	`//size of the update rounded to a sector`
`87`	`87`	`uint32_t roundedSize = (size + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));`
`88`	`88`	`//address where we will start writing the update`
`89`		`- updateStartAddress = updateEndAddress - roundedSize;`
	`89`	`+ updateStartAddress = (updateEndAddress > roundedSize)? (updateEndAddress - roundedSize) : 0;`
`90`	`90`
`91`	`91`	`#ifdef DEBUG_UPDATER`
`92`	`92`	`DEBUG_UPDATER.printf("[begin] roundedSize: 0x%08X (%d)\n", roundedSize, roundedSize);`
`@@ -390,4 +390,4 @@ void UpdaterClass::printError(Print &out){`
`390`	`390`	`}`
`391`	`391`	`}`
`392`	`392`
`393`		`-UpdaterClass Update;`
	`393`	`+UpdaterClass Update;`