From 1d52a4cb8c64ba097ad8b1b847ca0e011172d6b5 Mon Sep 17 00:00:00 2001
From: Levi Neely <lkn@darkstar.example.net>
Date: Sun, 8 Mar 2026 21:38:48 +0100
Subject: [PATCH] Fix control_tools.cpp mixed allocations - use pmem_free for
 pshm_read results

---
 control_tools.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/control_tools.cpp b/control_tools.cpp
index 07a0129..88cb916 100644
--- a/control_tools.cpp
+++ b/control_tools.cpp
@@ -48,6 +48,13 @@
 #include "pclsync/pfs.h"
 
 #include "rpcclient.h"
+
+// Forward declare pmem_free for cleaning up pshm_read() results
+extern "C" {
+  void pmem_free(int subsystem, void *ptr);
+}
+
+#define PMEM_SUBSYS_OTHER 0
 #include "CLI11.hpp"
 
 namespace cc = console_client;
@@ -138,13 +145,13 @@ void setup_app(CLI::App *app) {
           std::getline(std::cin, response);
           if (response != "y" && response != "Y") {
             std::cout << "Finalize cancelled" << std::endl;
-            free(pending);
+            pmem_free(PMEM_SUBSYS_OTHER, pending);
             if (errm) { free(errm); }
             delete rpc;
             return;
           }
         }
-        free(pending);
+        pmem_free(PMEM_SUBSYS_OTHER, pending);
       }
     }
     if (errm) { free(errm); errm = NULL; }
@@ -219,7 +226,7 @@ void setup_app(CLI::App *app) {
     char *status_str = nullptr;
     if (pshm_read((void**)&status_str, nullptr) && status_str) {
       std::cout << status_str << std::endl;
-      free(status_str);
+      pmem_free(PMEM_SUBSYS_OTHER, status_str);
     } else {
       std::cerr << "Failed to read status from daemon." << std::endl;
       if (errm) { free(errm); }
@@ -312,10 +319,10 @@ void setup_app(CLI::App *app) {
       } else {
         std::cerr << "No synchronized folders found." << std::endl;
       }
-      if(flist) { free(flist); }
+      if(flist) { pmem_free(PMEM_SUBSYS_OTHER, flist); }
     } else {
       std::cerr << "failed to read folder list from shm" << std::endl;
-      if(flist) { free(flist); }
+      if(flist) { pmem_free(PMEM_SUBSYS_OTHER, flist); }
       return -1;
     }
     if(errm) { free(errm); }