diff --git a/df_datalink_sp/src/util/clist.c b/df_datalink_sp/src/util/clist.c
index 33c2382..7174b87 100644
--- a/df_datalink_sp/src/util/clist.c
+++ b/df_datalink_sp/src/util/clist.c
@@ -60,15 +60,16 @@ void clist_clear(clist_t *self)
   clist_node_t *next;
   clist_node_t *curr = self->head;
 
-  while (len)
+  while (curr != NULL)
   {
     next = curr->next;
     if (self->free)
       self->free(curr->val);
     LIST_FREE(curr);
     curr = next;
-    len--;
   }
+  self->len = 0;
+  self->head = NULL;
 }
 
 /*