Merge branch 'bugfix/ota_magic_byte_issue_v3.1' into 'release/v3.1'

Bugfix/ota magic byte issue v3.1 (backport v3.1)

See merge request idf/esp-idf!4003
This commit is contained in:
Jiang Jiang Jian
2019-01-09 12:00:57 +08:00

View File

@ -145,8 +145,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] != ESP_IMAGE_HEADER_MAGIC) {
ESP_LOGE(TAG, "OTA image has invalid magic byte (expected 0xE9, saw 0x%02x", data_bytes[0]);
return ESP_ERR_OTA_VALIDATE_FAILED;
}