hopefully final bugfix to not et segfaulst using list_next

[my-code/api.git] / list / list.c

diff --git a/list/list.c b/list/list.c
index 063583c..0cfb441 100644 (file)
--- a/list/list.c
+++ b/list/list.c
@@ -83,12 +83,17 @@ int list_search_data(t_list *list,void *data,int first_bytes) {
 
   list_reset(list);
 
-  while(list->current!=NULL) {
-    if(first_bytes<=list->current->data_len)
-      if(!(memcmp(list->current->data,data,first_bytes))) return L_SUCCESS;
-    list_next(list);
+  if(list->start==NULL) {
+    dprintf(list->outfd,"[list] empty list\n");
+    return L_EMPTY_LIST;
   }
 
+  do {
+    if(list->current!=NULL)
+      if(first_bytes<=list->current->data_len)
+        if(!(memcmp(list->current->data,data,first_bytes))) return L_SUCCESS;
+  } while(list_next(list)!=L_NO_NEXT_ELEMENT);
+
   return L_NO_SUCH_ELEMENT;
 }
 
@@ -154,7 +159,7 @@ int list_count(t_list *list) {
   list_reset(list);
 
   if(list->current!=NULL) count++;
-  while(list_next(list)!=L_NO_NEXT_ELEMENT) count++;
+  if(count) while(list_next(list)!=L_NO_NEXT_ELEMENT) count++;
 
   return count;
 }