Activate owning-memory clang-tidy check (#1891)

* Activate owning-memory clang-tidy check * Lint * Lint * Fix issue with new NfcTag constructor * Update pointers for number and select * Add back the NOLINT to display buffer * Fix merge * DSMR fixes * Nextion fixes * Fix pipsolar * Fix lwip socket * Format * Change socket fix Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
2025-10-17 17:23:45 +01:00 · 2021-09-13 11:31:02 +02:00
parent e0cff214b2
commit a4867a00ea
75 changed files with 293 additions and 321 deletions
--- a/esphome/components/nextion/binary_sensor/nextion_binarysensor.cpp
+++ b/esphome/components/nextion/binary_sensor/nextion_binarysensor.cpp
@@ -33,7 +33,7 @@ void NextionBinarySensor::update() {
  if (this->variable_name_.empty())  // This is a touch component
    return;

-  this->nextion_->add_to_get_queue(this);
+  this->nextion_->add_to_get_queue(shared_from_this());
 }

 void NextionBinarySensor::set_state(bool state, bool publish, bool send_to_nextion) {
@@ -48,7 +48,7 @@ void NextionBinarySensor::set_state(bool state, bool publish, bool send_to_nexti
      this->needs_to_send_update_ = true;
    } else {
      this->needs_to_send_update_ = false;
-      this->nextion_->add_no_result_to_queue_with_set(this, (int) state);
+      this->nextion_->add_no_result_to_queue_with_set(shared_from_this(), (int) state);
    }
  }

--- a/esphome/components/nextion/binary_sensor/nextion_binarysensor.h
+++ b/esphome/components/nextion/binary_sensor/nextion_binarysensor.h
@@ -10,7 +10,8 @@ class NextionBinarySensor;

 class NextionBinarySensor : public NextionComponent,
                            public binary_sensor::BinarySensorInitiallyOff,
-                            public PollingComponent {
+                            public PollingComponent,
+                            public std::enable_shared_from_this<NextionBinarySensor> {
 public:
  NextionBinarySensor(NextionBase *nextion) { this->nextion_ = nextion; }

--- a/esphome/components/nextion/nextion.cpp
+++ b/esphome/components/nextion/nextion.cpp
@@ -196,7 +196,7 @@ void Nextion::print_queue_members_() {
  ESP_LOGN(TAG, "print_queue_members_ (top 10) size %zu", this->nextion_queue_.size());
  ESP_LOGN(TAG, "*******************************************");
  int count = 0;
-  for (auto *i : this->nextion_queue_) {
+  for (auto &i : this->nextion_queue_) {
    if (count++ == 10)
      break;

@@ -257,8 +257,9 @@ bool Nextion::remove_from_q_(bool report_empty) {
    return false;
  }

-  NextionQueue *nb = this->nextion_queue_.front();
-  NextionComponentBase *component = nb->component;
+  auto nb = std::move(this->nextion_queue_.front());
+  this->nextion_queue_.pop_front();
+  auto &component = nb->component;

  ESP_LOGN(TAG, "Removing %s from the queue", component->get_variable_name().c_str());

@@ -266,10 +267,8 @@ bool Nextion::remove_from_q_(bool report_empty) {
    if (component->get_variable_name() == "sleep_wake") {
      this->is_sleeping_ = false;
    }
-    delete component;
  }
-  delete nb;
-  this->nextion_queue_.pop_front();
+
  return true;
 }

@@ -358,7 +357,7 @@ void Nextion::process_nextion_commands_() {
          int index = 0;
          int found = -1;
          for (auto &nb : this->nextion_queue_) {
-            NextionComponentBase *component = nb->component;
+            auto &component = nb->component;

            if (component->get_queue_type() == NextionQueueType::WAVEFORM_SENSOR) {
              ESP_LOGW(TAG, "Nextion reported invalid Waveform ID %d or Channel # %d was used!",
@@ -369,9 +368,6 @@ void Nextion::process_nextion_commands_() {

              found = index;

-              delete component;
-              delete nb;
-
              break;
            }
            ++index;
@@ -468,8 +464,9 @@ void Nextion::process_nextion_commands_() {
          break;
        }

-        NextionQueue *nb = this->nextion_queue_.front();
-        NextionComponentBase *component = nb->component;
+        auto nb = std::move(this->nextion_queue_.front());
+        this->nextion_queue_.pop_front();
+        auto &component = nb->component;

        if (component->get_queue_type() != NextionQueueType::TEXT_SENSOR) {
          ESP_LOGE(TAG, "ERROR: Received string return but next in queue \"%s\" is not a text sensor",
@@ -480,9 +477,6 @@ void Nextion::process_nextion_commands_() {
          component->set_state_from_string(to_process, true, false);
        }

-        delete nb;
-        this->nextion_queue_.pop_front();
-
        break;
      }
        //  0x71 0x01 0x02 0x03 0x04 0xFF 0xFF 0xFF
@@ -511,8 +505,9 @@ void Nextion::process_nextion_commands_() {
          ++dataindex;
        }

-        NextionQueue *nb = this->nextion_queue_.front();
-        NextionComponentBase *component = nb->component;
+        auto nb = std::move(this->nextion_queue_.front());
+        this->nextion_queue_.pop_front();
+        auto &component = nb->component;

        if (component->get_queue_type() != NextionQueueType::SENSOR &&
            component->get_queue_type() != NextionQueueType::BINARY_SENSOR &&
@@ -526,9 +521,6 @@ void Nextion::process_nextion_commands_() {
          component->set_state_from_int(value, true, false);
        }

-        delete nb;
-        this->nextion_queue_.pop_front();
-
        break;
      }

@@ -690,7 +682,7 @@ void Nextion::process_nextion_commands_() {
        int index = 0;
        int found = -1;
        for (auto &nb : this->nextion_queue_) {
-          auto component = nb->component;
+          auto &component = nb->component;
          if (component->get_queue_type() == NextionQueueType::WAVEFORM_SENSOR) {
            size_t buffer_to_send = component->get_wave_buffer().size() < 255 ? component->get_wave_buffer().size()
                                                                              : 255;  // ADDT command can only send 255
@@ -707,8 +699,6 @@ void Nextion::process_nextion_commands_() {
                                                 component->get_wave_buffer().begin() + buffer_to_send);
            }
            found = index;
-            delete component;
-            delete nb;
            break;
          }
          ++index;
@@ -737,7 +727,7 @@ void Nextion::process_nextion_commands_() {

  if (!this->nextion_queue_.empty() && this->nextion_queue_.front()->queue_time + this->max_q_age_ms_ < ms) {
    for (int i = 0; i < this->nextion_queue_.size(); i++) {
-      NextionComponentBase *component = this->nextion_queue_[i]->component;
+      auto &component = this->nextion_queue_[i]->component;
      if (this->nextion_queue_[i]->queue_time + this->max_q_age_ms_ < ms) {
        if (this->nextion_queue_[i]->queue_time == 0)
          ESP_LOGD(TAG, "Removing old queue type \"%s\" name \"%s\" queue_time 0",
@@ -754,12 +744,10 @@ void Nextion::process_nextion_commands_() {
          if (component->get_variable_name() == "sleep_wake") {
            this->is_sleeping_ = false;
          }
-          delete component;
        }

-        delete this->nextion_queue_[i];
-
        this->nextion_queue_.erase(this->nextion_queue_.begin() + i);
+        i--;

      } else {
        break;
@@ -911,16 +899,16 @@ uint16_t Nextion::recv_ret_string_(std::string &response, uint32_t timeout, bool
 * @param variable_name Name for the queue
 */
 void Nextion::add_no_result_to_queue_(const std::string &variable_name) {
-  nextion::NextionQueue *nextion_queue = new nextion::NextionQueue;
+  auto nextion_queue = make_unique<nextion::NextionQueue>();

-  nextion_queue->component = new nextion::NextionComponentBase;
+  nextion_queue->component = make_unique<nextion::NextionComponentBase>();
  nextion_queue->component->set_variable_name(variable_name);

  nextion_queue->queue_time = millis();

-  this->nextion_queue_.push_back(nextion_queue);
-
  ESP_LOGN(TAG, "Add to queue type: NORESULT component %s", nextion_queue->component->get_variable_name().c_str());
+
+  this->nextion_queue_.push_back(std::move(nextion_queue));
 }

 /**
@@ -991,7 +979,7 @@ bool Nextion::add_no_result_to_queue_with_printf_(const std::string &variable_na
 * @param is_sleep_safe The command is safe to send when the Nextion is sleeping
 */

-void Nextion::add_no_result_to_queue_with_set(NextionComponentBase *component, int state_value) {
+void Nextion::add_no_result_to_queue_with_set(std::shared_ptr<NextionComponentBase> component, int state_value) {
  this->add_no_result_to_queue_with_set(component->get_variable_name(), component->get_variable_name_to_send(),
                                        state_value);
 }
@@ -1019,7 +1007,8 @@ void Nextion::add_no_result_to_queue_with_set_internal_(const std::string &varia
 * @param state_value String value to set
 * @param is_sleep_safe The command is safe to send when the Nextion is sleeping
 */
-void Nextion::add_no_result_to_queue_with_set(NextionComponentBase *component, const std::string &state_value) {
+void Nextion::add_no_result_to_queue_with_set(std::shared_ptr<NextionComponentBase> component,
+                                              const std::string &state_value) {
  this->add_no_result_to_queue_with_set(component->get_variable_name(), component->get_variable_name_to_send(),
                                        state_value);
 }
@@ -1039,11 +1028,11 @@ void Nextion::add_no_result_to_queue_with_set_internal_(const std::string &varia
                                            state_value.c_str());
 }

-void Nextion::add_to_get_queue(NextionComponentBase *component) {
+void Nextion::add_to_get_queue(std::shared_ptr<NextionComponentBase> component) {
  if ((!this->is_setup() && !this->ignore_is_setup_))
    return;

-  nextion::NextionQueue *nextion_queue = new nextion::NextionQueue;
+  auto nextion_queue = make_unique<nextion::NextionQueue>();

  nextion_queue->component = component;
  nextion_queue->queue_time = millis();
@@ -1054,7 +1043,7 @@ void Nextion::add_to_get_queue(NextionComponentBase *component) {
  std::string command = "get " + component->get_variable_name_to_send();

  if (this->send_command_(command)) {
-    this->nextion_queue_.push_back(nextion_queue);
+    this->nextion_queue_.push_back(std::move(nextion_queue));
  }
 }

@@ -1066,13 +1055,13 @@ void Nextion::add_to_get_queue(NextionComponentBase *component) {
 * @param buffer_to_send The buffer size
 * @param buffer_size The buffer data
 */
-void Nextion::add_addt_command_to_queue(NextionComponentBase *component) {
+void Nextion::add_addt_command_to_queue(std::shared_ptr<NextionComponentBase> component) {
  if ((!this->is_setup() && !this->ignore_is_setup_) || this->is_sleeping())
    return;

-  nextion::NextionQueue *nextion_queue = new nextion::NextionQueue;
+  auto nextion_queue = make_unique<nextion::NextionQueue>();

-  nextion_queue->component = new nextion::NextionComponentBase;
+  nextion_queue->component = std::make_shared<nextion::NextionComponentBase>();
  nextion_queue->queue_time = millis();

  size_t buffer_to_send = component->get_wave_buffer_size() < 255 ? component->get_wave_buffer_size()
@@ -1081,7 +1070,7 @@ void Nextion::add_addt_command_to_queue(NextionComponentBase *component) {
  std::string command = "addt " + to_string(component->get_component_id()) + "," +
                        to_string(component->get_wave_channel_id()) + "," + to_string(buffer_to_send);
  if (this->send_command_(command)) {
-    this->nextion_queue_.push_back(nextion_queue);
+    this->nextion_queue_.push_back(std::move(nextion_queue));
  }
 }

--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -707,17 +707,18 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
  void set_nextion_sensor_state(NextionQueueType queue_type, const std::string &name, float state);
  void set_nextion_text_state(const std::string &name, const std::string &state);

-  void add_no_result_to_queue_with_set(NextionComponentBase *component, int state_value) override;
+  void add_no_result_to_queue_with_set(std::shared_ptr<NextionComponentBase> component, int state_value) override;
  void add_no_result_to_queue_with_set(const std::string &variable_name, const std::string &variable_name_to_send,
                                       int state_value) override;

-  void add_no_result_to_queue_with_set(NextionComponentBase *component, const std::string &state_value) override;
+  void add_no_result_to_queue_with_set(std::shared_ptr<NextionComponentBase> component,
+                                       const std::string &state_value) override;
  void add_no_result_to_queue_with_set(const std::string &variable_name, const std::string &variable_name_to_send,
                                       const std::string &state_value) override;

-  void add_to_get_queue(NextionComponentBase *component) override;
+  void add_to_get_queue(std::shared_ptr<NextionComponentBase> component) override;

-  void add_addt_command_to_queue(NextionComponentBase *component) override;
+  void add_addt_command_to_queue(std::shared_ptr<NextionComponentBase> component) override;

  void update_components_by_prefix(const std::string &prefix);

@@ -728,7 +729,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
  void set_auto_wake_on_touch_internal(bool auto_wake_on_touch) { this->auto_wake_on_touch_ = auto_wake_on_touch; }

 protected:
-  std::deque<NextionQueue *> nextion_queue_;
+  std::deque<std::unique_ptr<NextionQueue>> nextion_queue_;
  uint16_t recv_ret_string_(std::string &response, uint32_t timeout, bool recv_flag);
  void all_components_send_state_(bool force_update = false);
  uint64_t comok_sent_ = 0;
--- a/esphome/components/nextion/nextion_base.h
+++ b/esphome/components/nextion/nextion_base.h
@@ -24,18 +24,19 @@ class NextionBase;

 class NextionBase {
 public:
-  virtual void add_no_result_to_queue_with_set(NextionComponentBase *component, int state_value) = 0;
+  virtual void add_no_result_to_queue_with_set(std::shared_ptr<NextionComponentBase> component, int state_value) = 0;
  virtual void add_no_result_to_queue_with_set(const std::string &variable_name,
                                               const std::string &variable_name_to_send, int state_value) = 0;

-  virtual void add_no_result_to_queue_with_set(NextionComponentBase *component, const std::string &state_value) = 0;
+  virtual void add_no_result_to_queue_with_set(std::shared_ptr<NextionComponentBase> component,
+                                               const std::string &state_value) = 0;
  virtual void add_no_result_to_queue_with_set(const std::string &variable_name,
                                               const std::string &variable_name_to_send,
                                               const std::string &state_value) = 0;

-  virtual void add_addt_command_to_queue(NextionComponentBase *component) = 0;
+  virtual void add_addt_command_to_queue(std::shared_ptr<NextionComponentBase> component) = 0;

-  virtual void add_to_get_queue(NextionComponentBase *component) = 0;
+  virtual void add_to_get_queue(std::shared_ptr<NextionComponentBase> component) = 0;

  virtual void set_component_background_color(const char *component, Color color) = 0;
  virtual void set_component_pressed_background_color(const char *component, Color color) = 0;
--- a/esphome/components/nextion/nextion_component_base.h
+++ b/esphome/components/nextion/nextion_component_base.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <utility>
+#include <memory>
 #include "esphome/core/defines.h"

 namespace esphome {
@@ -22,7 +23,7 @@ class NextionComponentBase;
 class NextionQueue {
 public:
  virtual ~NextionQueue() = default;
-  NextionComponentBase *component;
+  std::shared_ptr<NextionComponentBase> component;
  uint32_t queue_time = 0;
 };

--- a/esphome/components/nextion/nextion_upload.cpp
+++ b/esphome/components/nextion/nextion_upload.cpp
@@ -275,12 +275,12 @@ void Nextion::upload_tft() {
    } else {
 #endif
      ESP_LOGD(TAG, "Allocating buffer size %d, Heap size is %u", chunk_size, ESP.getFreeHeap());
-      this->transfer_buffer_ = new (std::nothrow) uint8_t[chunk_size];
-      if (this->transfer_buffer_ == nullptr) {  // Try a smaller size
+      this->transfer_buffer_ = new (std::nothrow) uint8_t[chunk_size];  // NOLINT(cppcoreguidelines-owning-memory)
+      if (this->transfer_buffer_ == nullptr) {                          // Try a smaller size
        ESP_LOGD(TAG, "Could not allocate buffer size: %d trying 4096 instead", chunk_size);
        chunk_size = 4096;
        ESP_LOGD(TAG, "Allocating %d buffer", chunk_size);
-        this->transfer_buffer_ = new uint8_t[chunk_size];
+        this->transfer_buffer_ = new (std::nothrow) uint8_t[chunk_size];  // NOLINT(cppcoreguidelines-owning-memory)

        if (!this->transfer_buffer_)
          this->upload_end_();
@@ -322,7 +322,7 @@ void Nextion::upload_end_() {
 WiFiClient *Nextion::get_wifi_client_() {
  if (this->tft_url_.compare(0, 6, "https:") == 0) {
    if (this->wifi_client_secure_ == nullptr) {
-      this->wifi_client_secure_ = new BearSSL::WiFiClientSecure();
+      this->wifi_client_secure_ = new BearSSL::WiFiClientSecure();  // NOLINT(cppcoreguidelines-owning-memory)
      this->wifi_client_secure_->setInsecure();
      this->wifi_client_secure_->setBufferSizes(512, 512);
    }
@@ -330,7 +330,7 @@ WiFiClient *Nextion::get_wifi_client_() {
  }

  if (this->wifi_client_ == nullptr) {
-    this->wifi_client_ = new WiFiClient();
+    this->wifi_client_ = new WiFiClient();  // NOLINT(cppcoreguidelines-owning-memory)
  }
  return this->wifi_client_;
 }
--- a/esphome/components/nextion/sensor/nextion_sensor.cpp
+++ b/esphome/components/nextion/sensor/nextion_sensor.cpp
@@ -34,7 +34,7 @@ void NextionSensor::update() {
    return;

  if (this->wave_chan_id_ == UINT8_MAX) {
-    this->nextion_->add_to_get_queue(this);
+    this->nextion_->add_to_get_queue(shared_from_this());
  } else {
    if (this->send_last_value_) {
      this->add_to_wave_buffer(this->last_value_);
@@ -62,9 +62,9 @@ void NextionSensor::set_state(float state, bool publish, bool send_to_nextion) {
          double to_multiply = pow(10, this->precision_);
          int state_value = (int) (state * to_multiply);

-          this->nextion_->add_no_result_to_queue_with_set(this, (int) state_value);
+          this->nextion_->add_no_result_to_queue_with_set(shared_from_this(), (int) state_value);
        } else {
-          this->nextion_->add_no_result_to_queue_with_set(this, (int) state);
+          this->nextion_->add_no_result_to_queue_with_set(shared_from_this(), (int) state);
        }
      }
    }
@@ -103,7 +103,7 @@ void NextionSensor::wave_update_() {
           buffer_to_send, this->wave_buffer_.size(), this->component_id_, this->wave_chan_id_);
 #endif

-  this->nextion_->add_addt_command_to_queue(this);
+  this->nextion_->add_addt_command_to_queue(shared_from_this());
 }

 }  // namespace nextion
--- a/esphome/components/nextion/sensor/nextion_sensor.h
+++ b/esphome/components/nextion/sensor/nextion_sensor.h
@@ -8,7 +8,10 @@ namespace esphome {
 namespace nextion {
 class NextionSensor;

-class NextionSensor : public NextionComponent, public sensor::Sensor, public PollingComponent {
+class NextionSensor : public NextionComponent,
+                      public sensor::Sensor,
+                      public PollingComponent,
+                      public std::enable_shared_from_this<NextionSensor> {
 public:
  NextionSensor(NextionBase *nextion) { this->nextion_ = nextion; }
  void send_state_to_nextion() override { this->set_state(this->state, false, true); };
--- a/esphome/components/nextion/switch/nextion_switch.cpp
+++ b/esphome/components/nextion/switch/nextion_switch.cpp
@@ -20,7 +20,7 @@ void NextionSwitch::process_bool(const std::string &variable_name, bool on) {
 void NextionSwitch::update() {
  if (!this->nextion_->is_setup())
    return;
-  this->nextion_->add_to_get_queue(this);
+  this->nextion_->add_to_get_queue(shared_from_this());
 }

 void NextionSwitch::set_state(bool state, bool publish, bool send_to_nextion) {
@@ -32,7 +32,7 @@ void NextionSwitch::set_state(bool state, bool publish, bool send_to_nextion) {
      this->needs_to_send_update_ = true;
    } else {
      this->needs_to_send_update_ = false;
-      this->nextion_->add_no_result_to_queue_with_set(this, (int) state);
+      this->nextion_->add_no_result_to_queue_with_set(shared_from_this(), (int) state);
    }
  }
  if (publish) {
--- a/esphome/components/nextion/switch/nextion_switch.h
+++ b/esphome/components/nextion/switch/nextion_switch.h
@@ -8,7 +8,10 @@ namespace esphome {
 namespace nextion {
 class NextionSwitch;

-class NextionSwitch : public NextionComponent, public switch_::Switch, public PollingComponent {
+class NextionSwitch : public NextionComponent,
+                      public switch_::Switch,
+                      public PollingComponent,
+                      public std::enable_shared_from_this<NextionSwitch> {
 public:
  NextionSwitch(NextionBase *nextion) { this->nextion_ = nextion; }

--- a/esphome/components/nextion/text_sensor/nextion_textsensor.cpp
+++ b/esphome/components/nextion/text_sensor/nextion_textsensor.cpp
@@ -18,7 +18,7 @@ void NextionTextSensor::process_text(const std::string &variable_name, const std
 void NextionTextSensor::update() {
  if (!this->nextion_->is_setup())
    return;
-  this->nextion_->add_to_get_queue(this);
+  this->nextion_->add_to_get_queue(shared_from_this());
 }

 void NextionTextSensor::set_state(const std::string &state, bool publish, bool send_to_nextion) {
@@ -29,7 +29,7 @@ void NextionTextSensor::set_state(const std::string &state, bool publish, bool s
    if (this->nextion_->is_sleeping() || !this->visible_) {
      this->needs_to_send_update_ = true;
    } else {
-      this->nextion_->add_no_result_to_queue_with_set(this, state);
+      this->nextion_->add_no_result_to_queue_with_set(shared_from_this(), state);
    }
  }

--- a/esphome/components/nextion/text_sensor/nextion_textsensor.h
+++ b/esphome/components/nextion/text_sensor/nextion_textsensor.h
@@ -8,7 +8,10 @@ namespace esphome {
 namespace nextion {
 class NextionTextSensor;

-class NextionTextSensor : public NextionComponent, public text_sensor::TextSensor, public PollingComponent {
+class NextionTextSensor : public NextionComponent,
+                          public text_sensor::TextSensor,
+                          public PollingComponent,
+                          public std::enable_shared_from_this<NextionTextSensor> {
 public:
  NextionTextSensor(NextionBase *nextion) { this->nextion_ = nextion; }
  void update() override;