From 57829ddd760ed88d490968209a4b503364692a26 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Fri, 26 Dec 2025 20:23:13 -1000
Subject: [PATCH] fixes

---
 esphome/components/ota/ota_backend_esp8266.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/esphome/components/ota/ota_backend_esp8266.cpp b/esphome/components/ota/ota_backend_esp8266.cpp
index 09e0d4b359..bcba252006 100644
--- a/esphome/components/ota/ota_backend_esp8266.cpp
+++ b/esphome/components/ota/ota_backend_esp8266.cpp
@@ -53,8 +53,9 @@ std::unique_ptr<ota::OTABackend> make_ota_backend() { return make_unique<ota::ES
 OTAResponseTypes ESP8266OTABackend::begin(size_t image_size) {
   // Handle UPDATE_SIZE_UNKNOWN (0) by calculating available space
   if (image_size == 0) {
+    // Round down to sector boundary: subtract one sector, then mask to sector alignment
     // NOLINTNEXTLINE(readability-static-accessed-through-instance)
-    image_size = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+    image_size = (ESP.getFreeSketchSpace() - FLASH_SECTOR_SIZE) & ~(FLASH_SECTOR_SIZE - 1);
   }
 
   // Check boot mode - if boot mode is UART download mode,
@@ -91,13 +92,9 @@ OTAResponseTypes ESP8266OTABackend::begin(size_t image_size) {
     return OTA_RESPONSE_ERROR_ESP8266_NOT_ENOUGH_SPACE;
   }
 
-  // Allocate buffer for sector writes
+  // Allocate buffer for sector writes (use smaller buffer if memory constrained)
   // NOLINTNEXTLINE(readability-static-accessed-through-instance)
-  if (ESP.getFreeHeap() > 2 * FLASH_SECTOR_SIZE) {
-    this->buffer_size_ = FLASH_SECTOR_SIZE;
-  } else {
-    this->buffer_size_ = MIN_BUFFER_SIZE;
-  }
+  this->buffer_size_ = (ESP.getFreeHeap() > 2 * FLASH_SECTOR_SIZE) ? FLASH_SECTOR_SIZE : MIN_BUFFER_SIZE;
 
   this->buffer_ = make_unique<uint8_t[]>(this->buffer_size_);
   if (!this->buffer_) {