Fix memory leaks related to ActDisk

Max Aehle · Max Aehle · commit 540d4239eabf · 2024-02-14T14:26:03.000+01:00
diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp
@@ -241,8 +241,8 @@ class CConfig {
   *Marker_CHTInterface,           /*!< \brief Conjugate heat transfer interface markers. */
   *Marker_ActDiskInlet,           /*!< \brief Actuator disk inlet markers. */
   *Marker_ActDiskOutlet,          /*!< \brief Actuator disk outlet markers. */
-  *Marker_ActDiskBemInlet,        /*!< \brief Actuator disk BEM inlet markers. */
-  *Marker_ActDiskBemOutlet,       /*!< \brief Actuator disk BEM outlet markers. */
+  *Marker_ActDiskBemInlet=nullptr,        /*!< \brief Actuator disk BEM inlet markers. */
+  *Marker_ActDiskBemOutlet=nullptr,       /*!< \brief Actuator disk BEM outlet markers. */
   *Marker_Inlet,                  /*!< \brief Inlet flow markers. */
   *Marker_Inlet_Species,          /*!< \brief Inlet species markers. */
   *Marker_Inlet_Turb,             /*!< \brief Inlet turbulent markers. */
diff --git a/Common/include/option_structure.inl b/Common/include/option_structure.inl
@@ -1696,7 +1696,22 @@ class COptionActDisk : public COptionBase {
     this->name = name;
   }
 
-  ~COptionActDisk() override{};
+  ~COptionActDisk() override {
+    for (int i = 0; i < this->inlet_size; i++) {
+      delete[] this->press_jump[i];
+      delete[] this->temp_jump[i];
+      delete[] this->omega[i];
+    }
+    delete[] press_jump;
+    delete[] temp_jump;
+    delete[] omega;
+
+    delete[] marker_inlet;
+    delete[] marker_outlet;
+
+    SetDefault();
+  };
+
   string SetValue(const vector<string>& option_value) override {
     COptionBase::SetValue(option_value);
     const int mod_num = 8;
@@ -1717,7 +1732,9 @@ class COptionActDisk : public COptionBase {
     unsigned short nVals = totalVals / mod_num;
     this->inlet_size = nVals;
     this->outlet_size = nVals;
+    delete[] this->marker_inlet;
     this->marker_inlet = new string[this->inlet_size];
+    delete[] this->marker_outlet;
     this->marker_outlet = new string[this->outlet_size];
 
     this->press_jump = new su2double*[this->inlet_size];
