Fix corner case when using fr_cursor_remove and fr_cursor_next_by_da together

diff --git a/src/lib/cursor.c b/src/lib/cursor.c
index 6602047..39b9f9e 100644 (file)
--- a/src/lib/cursor.c
+++ b/src/lib/cursor.c
@@ -265,6 +265,9 @@ VALUE_PAIR *fr_cursor_remove(vp_cursor_t *cursor)
        *last = vp->next;
        vp->next = NULL;
 
+       /* Fixup cursor->found if we removed the VP it was referring to */
+       if (vp == cursor->found) cursor->found = *last;
+
        return vp;
 }