esp8266#1499

r3wald · Jan 25, 2016 · b2a6ab8 · b2a6ab8
1 parent bac5ce0
commit b2a6ab8
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
@@ -241,31 +241,33 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha
                         DEBUG_HTTP_UPDATE("[httpUpdate] runUpdate flash...\n");
                     }
 
-                    uint8_t buf[4];
-                    if(tcp->peekBytes(&buf[0], 4) != 4) {
-                        DEBUG_HTTP_UPDATE("[httpUpdate] peekBytes magic header failed\n");
-                        lastError = HTTP_UE_BIN_VERIFY_HEADER_FAILED;
-                        http->end();
-                        return HTTP_UPDATE_FAILED;
-                    }
+                    if(!spiffs) {
+                        uint8_t buf[4];
+                        if(tcp->peekBytes(&buf[0], 4) != 4) {
+                            DEBUG_HTTP_UPDATE("[httpUpdate] peekBytes magic header failed\n");
+                            lastError = HTTP_UE_BIN_VERIFY_HEADER_FAILED;
+                            http->end();
+                            return HTTP_UPDATE_FAILED;
+                        }
 
-                    // check for valid first magic byte
-                    if(buf[0] != 0xE9) {
-                        DEBUG_HTTP_UPDATE("[httpUpdate] magic header not starts with 0xE9\n");
-                        lastError = HTTP_UE_BIN_VERIFY_HEADER_FAILED;
-                        http->end();
-                        return HTTP_UPDATE_FAILED;
+                        // check for valid first magic byte
+                        if(buf[0] != 0xE9) {
+                            DEBUG_HTTP_UPDATE("[httpUpdate] magic header not starts with 0xE9\n");
+                            lastError = HTTP_UE_BIN_VERIFY_HEADER_FAILED;
+                            http->end();
+                            return HTTP_UPDATE_FAILED;
 
-                    }
+                        }
 
-                    uint32_t bin_flash_size = ESP.magicFlashChipSize((buf[3] & 0xf0) >> 4);
+                        uint32_t bin_flash_size = ESP.magicFlashChipSize((buf[3] & 0xf0) >> 4);
 
-                    // check if new bin fits to SPI flash
-                    if(bin_flash_size > ESP.getFlashChipRealSize()) {
-                        DEBUG_HTTP_UPDATE("[httpUpdate] magic header, new bin not fits SPI Flash\n");
-                        lastError = HTTP_UE_BIN_FOR_WRONG_FLASH;
-                        http->end();
-                        return HTTP_UPDATE_FAILED;
+                        // check if new bin fits to SPI flash
+                        if(bin_flash_size > ESP.getFlashChipRealSize()) {
+                            DEBUG_HTTP_UPDATE("[httpUpdate] magic header, new bin not fits SPI Flash\n");
+                            lastError = HTTP_UE_BIN_FOR_WRONG_FLASH;
+                            http->end();
+                            return HTTP_UPDATE_FAILED;
+                        }
                     }
 
                     if(runUpdate(*tcp, len, http->header("x-MD5"), command)) {