From 28178b8c1ccaca987f6bca458ed1f7b51a07f4ae Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Sat, 28 Feb 2026 16:39:13 -1000
Subject: [PATCH] fixes

---
 esphome/components/api/api_pb2.h    | 3 +++
 esphome/components/api/proto.h      | 8 ++++++--
 script/api_protobuf/api_protobuf.py | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 2d4bdfbaece..cfd3e075439 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -329,6 +329,7 @@ class InfoResponseProtoMessage : public ProtoMessage {
 #endif
 
  protected:
+  ~InfoResponseProtoMessage() = default;
 };
 
 class StateResponseProtoMessage : public ProtoMessage {
@@ -339,6 +340,7 @@ class StateResponseProtoMessage : public ProtoMessage {
 #endif
 
  protected:
+  ~StateResponseProtoMessage() = default;
 };
 
 class CommandProtoMessage : public ProtoDecodableMessage {
@@ -349,6 +351,7 @@ class CommandProtoMessage : public ProtoDecodableMessage {
 #endif
 
  protected:
+  ~CommandProtoMessage() = default;
 };
 class HelloRequest final : public ProtoDecodableMessage {
  public:
diff --git a/esphome/components/api/proto.h b/esphome/components/api/proto.h
index ac6e707ee75..750fff08102 100644
--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -452,8 +452,6 @@ class DumpBuffer {
 
 class ProtoMessage {
  public:
-  // No virtual destructor - messages are never deleted polymorphically
-  // (all are stack-allocated and used through references)
   // Default implementation for messages with no fields
   virtual void encode(ProtoWriteBuffer &buffer) const {}
   // Default implementation for messages with no fields
@@ -464,6 +462,11 @@ class ProtoMessage {
   virtual const char *dump_to(DumpBuffer &out) const = 0;
   virtual const char *message_name() const { return "unknown"; }
 #endif
+
+ protected:
+  // Non-virtual: messages are never deleted polymorphically.
+  // Protected prevents accidental `delete base_ptr` (compile error).
+  ~ProtoMessage() = default;
 };
 
 // Base class for messages that support decoding
@@ -483,6 +486,7 @@ class ProtoDecodableMessage : public ProtoMessage {
   static uint32_t count_repeated_field(const uint8_t *buffer, size_t length, uint32_t target_field_id);
 
  protected:
+  ~ProtoDecodableMessage() = default;
   virtual bool decode_varint(uint32_t field_id, ProtoVarInt value) { return false; }
   virtual bool decode_length(uint32_t field_id, ProtoLengthDelimited value) { return false; }
   virtual bool decode_32bit(uint32_t field_id, Proto32Bit value) { return false; }
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index 081d5d23a88..9c9cda4d36e 100755
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -2473,8 +2473,6 @@ def build_base_class(
     out = f"class {base_class_name} : public {parent_class} {{\n"
     out += " public:\n"
 
-    # No virtual destructor - messages are never deleted polymorphically
-
     # Base classes don't implement encode/decode/calculate_size
     # Derived classes handle these with their specific field numbers
     cpp = ""
@@ -2482,6 +2480,8 @@ def build_base_class(
     out += indent("\n".join(public_content)) + "\n"
     out += "\n"
     out += " protected:\n"
+    # Non-virtual protected destructor prevents accidental polymorphic deletion
+    protected_content.insert(0, f"~{base_class_name}() = default;")
     out += indent("\n".join(protected_content))
     if protected_content:
         out += "\n"