From eb07148bfddb26632b4b2eec3bb635c95fa50827 Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Sat, 9 Aug 2025 17:23:58 +0200
Subject: [PATCH] Support hook deletion during hook deletion

---
 src/backends/icicle-emulator/icicle_x86_64_emulator.cpp   | 2 ++
 src/backends/unicorn-emulator/unicorn_x86_64_emulator.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/backends/icicle-emulator/icicle_x86_64_emulator.cpp b/src/backends/icicle-emulator/icicle_x86_64_emulator.cpp
index cb759e3a..b63b8aa6 100644
--- a/src/backends/icicle-emulator/icicle_x86_64_emulator.cpp
+++ b/src/backends/icicle-emulator/icicle_x86_64_emulator.cpp
@@ -377,7 +377,9 @@ namespace icicle
             }
 
             icicle_remove_hook(this->emu_, id);
+            const auto obj = std::move(entry->second);
             this->hooks_.erase(entry);
+            (void)obj;
         }
 
         void serialize_state(utils::buffer_serializer& buffer, const bool is_snapshot) const override
diff --git a/src/backends/unicorn-emulator/unicorn_x86_64_emulator.cpp b/src/backends/unicorn-emulator/unicorn_x86_64_emulator.cpp
index 52629f76..000027e5 100644
--- a/src/backends/unicorn-emulator/unicorn_x86_64_emulator.cpp
+++ b/src/backends/unicorn-emulator/unicorn_x86_64_emulator.cpp
@@ -605,7 +605,9 @@ namespace unicorn
 
                 if (entry != this->hooks_.end())
                 {
+                    const auto obj = std::move(*entry);
                     this->hooks_.erase(entry);
+                    (void)obj;
                 }
             }