From f9898d7db457e57f84178c3ae58b4972ad66587d Mon Sep 17 00:00:00 2001
From: Andrea Fioraldi <andreafioraldi@gmail.com>
Date: Fri, 1 Oct 2021 16:05:45 +0200
Subject: [PATCH] Fix bpkt/hook remove

---
 cpu.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cpu.c b/cpu.c
index c059d02f90..d171a0c51f 100644
--- a/cpu.c
+++ b/cpu.c
@@ -155,8 +155,9 @@ int libafl_qemu_remove_breakpoint(uint64_t addr)
 
             *bp = (*bp)->next;
             r = 1;
+        } else {
+            bp = &(*bp)->next;
         }
-        bp = &(*bp)->next;
     }
     return r;
 }
@@ -198,8 +199,9 @@ int libafl_qemu_remove_hook(uint64_t addr)
 
             *hk = (*hk)->next;
             r = 1;
+        } else {
+            hk = &(*hk)->next;
         }
-        hk = &(*hk)->next;
     }
     return r;
 }