From 5d5cd1d426f0d2ba0d10dce5ead0a9eae576324c Mon Sep 17 00:00:00 2001
From: "Earle F. Philhower, III" <earlephilhower@yahoo.com>
Date: Sun, 21 Jul 2019 16:21:35 -0700
Subject: [PATCH] Clear updater state on any error (#6325)

Fixes #2090

The Updater checks that an update isn't already in progress on ::begin,
but when an error happens in the middle of an upload it's impossible to
actually reset this flag w/o a reboot.

Reset the state members (esp. _size) on any error condition so
that you can restart the transfer with a new ::begin.  Any error
condition is fatal, anyway, so there is no reason not to clear the
current state at that point.
---
 cores/esp8266/Updater.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cores/esp8266/Updater.cpp b/cores/esp8266/Updater.cpp
index 44d43f572..2992d3c95 100644
--- a/cores/esp8266/Updater.cpp
+++ b/cores/esp8266/Updater.cpp
@@ -205,7 +205,6 @@ bool UpdaterClass::end(bool evenIfRemaining){
 #endif
     if (sigLen != _verify->length()) {
       _setError(UPDATE_ERROR_SIGN);
-      _reset();
       return false;
     }
 
@@ -231,7 +230,6 @@ bool UpdaterClass::end(bool evenIfRemaining){
     uint8_t *sig = (uint8_t*)malloc(sigLen);
     if (!sig) {
       _setError(UPDATE_ERROR_SIGN);
-      _reset();
       return false;
     }
     ESP.flashRead(_startAddress + binSize, (uint32_t *)sig, sigLen);
@@ -244,7 +242,6 @@ bool UpdaterClass::end(bool evenIfRemaining){
 #endif
     if (!_verify->verify(_hash, (void *)sig, sigLen)) {
       _setError(UPDATE_ERROR_SIGN);
-      _reset();
       return false;
     }
 #ifdef DEBUG_UPDATER
@@ -254,7 +251,6 @@ bool UpdaterClass::end(bool evenIfRemaining){
     _md5.calculate();
     if (strcasecmp(_target_md5.c_str(), _md5.toString().c_str())) {
       _setError(UPDATE_ERROR_MD5);
-      _reset();
       return false;
     }
 #ifdef DEBUG_UPDATER
@@ -467,7 +463,6 @@ size_t UpdaterClass::writeStream(Stream &data) {
             if(toRead == 0) { //Timeout
                 _currentAddress = (_startAddress + _size);
                 _setError(UPDATE_ERROR_STREAM);
-                _reset();
                 return written;
             }
         }
@@ -494,6 +489,7 @@ void UpdaterClass::_setError(int error){
 #ifdef DEBUG_UPDATER
   printError(DEBUG_UPDATER);
 #endif
+  _reset(); // Any error condition invalidates the entire update, so clear partial status
 }
 
 void UpdaterClass::printError(Print &out){