From: Supreet Deshpande <supreet.deshpande@espressif.com>
Date: Mon, 10 Dec 2018 11:46:38 +0000 (+0530)
Subject: bugfix/ota_magic_byte_issue: Fixes OTA magic byte error
X-Git-Tag: v3.3-beta2~171^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55d5ee1e79a42e21129b92106b52d910b9d4aaca;p=esp-idf

bugfix/ota_magic_byte_issue: Fixes OTA magic byte error

On enabling flash encryption, OTA fails with magic byte error in the second chunk
if the http data is split into two or more chunks and first chunk is less than 16.
---

diff --git a/components/app_update/esp_ota_ops.c b/components/app_update/esp_ota_ops.c
index 5d415ffeca..40cd89d49c 100644
--- a/components/app_update/esp_ota_ops.c
+++ b/components/app_update/esp_ota_ops.c
@@ -183,8 +183,7 @@ esp_err_t esp_ota_write(esp_ota_handle_t handle, const void *data, size_t size)
         if (it->handle == handle) {
             // must erase the partition before writing to it
             assert(it->erased_size > 0 && "must erase the partition before writing to it");
-
-            if(it->wrote_size == 0 && size > 0 && data_bytes[0] != 0xE9) {
+            if(it->wrote_size == 0 && it->partial_bytes == 0 && size > 0 && data_bytes[0] != 0xE9) {
                 ESP_LOGE(TAG, "OTA image has invalid magic byte (expected 0xE9, saw 0x%02x", data_bytes[0]);
                 return ESP_ERR_OTA_VALIDATE_FAILED;
             }