From 6999975f6a4af20eddcd0110aedd88e60b29b1c7 Mon Sep 17 00:00:00 2001 From: YZBruh Date: Fri, 15 Aug 2025 20:04:25 +0300 Subject: [PATCH] Revert "fix memory leak" This reverts commit 47382ebf1c4d3de05a4fdf0870ec69da063ac8cc. --- include/PartitionManager/PartitionManager.hpp | 10 ---------- src/PartitionManager.cpp | 15 ++++++++------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/include/PartitionManager/PartitionManager.hpp b/include/PartitionManager/PartitionManager.hpp index 0ba01aa..c5d9f52 100644 --- a/include/PartitionManager/PartitionManager.hpp +++ b/include/PartitionManager/PartitionManager.hpp @@ -70,16 +70,6 @@ public: bool forceProcess; }; -class protector final { -private: - basic_variables *_var = nullptr; - -public: - ~protector(); - - void setVariablePtr(basic_variables *&_var); -}; - using FunctionBase = basic_function; using FunctionManager = basic_function_manager; using VariableTable = basic_variables; diff --git a/src/PartitionManager.cpp b/src/PartitionManager.cpp index 2a66b35..f032f68 100644 --- a/src/PartitionManager.cpp +++ b/src/PartitionManager.cpp @@ -25,18 +25,21 @@ namespace PartitionManager { -__attribute__((constructor)) void init() { +__attribute__((constructor)) +void init() { Helper::LoggingProperties::setLogFile("/sdcard/Documents/last_pmt_logs.log"); } +__attribute__((destructor)) +void cleanup() { + delete Variables; +} + auto Variables = new VariableTable(); -void protector::setVariablePtr(basic_variables *&_var) { this->_var = _var; } -protector::~protector() { delete _var; } - basic_variables::~basic_variables() { delete PartMap; } basic_variables::basic_variables() - : logFile(Helper::LoggingProperties::FILE), onLogical(false), + : logFile("/sdcard/Documents/last_pmt_logs.log"), onLogical(false), quietProcess(false), verboseMode(false), viewVersion(false), forceProcess(false) { try { @@ -49,8 +52,6 @@ int Main(int argc, char **argv) { try { // try-catch start CLI::App AppMain{"Partition Manager Tool"}; - protector prot; - prot.setVariablePtr(Variables); FunctionManager FuncManager; AppMain.fallthrough(true);