Check memory and next/prev pointers are still valid

diff --git a/src/main/state.c b/src/main/state.c
index c14fe2daabeab9578e5fb6d6bbb8761fda1bf9ec..3785584dba447424eaf777b243d433ac246a2202 100644 (file)
--- a/src/main/state.c
+++ b/src/main/state.c
@@ -236,8 +236,12 @@ static void state_entry_unlink(fr_state_tree_t *state, fr_state_entry_t *entry)
 {
        fr_state_entry_t *prev, *next;
 
-       prev = entry->prev;
-       next = entry->next;
+       /*
+        *      Check the memory is still valid
+        */
+       (void) talloc_get_type_abort(entry, fr_state_entry_t);
+       prev = entry->prev ? talloc_get_type_abort(entry->prev, fr_state_entry_t) : NULL;
+       next = entry->next ? talloc_get_type_abort(entry->next, fr_state_entry_t) : NULL;
 
        if (prev) {
                rad_assert(state->head != entry);