Bug fix from Vladimir Oleynik, and suggestion I add my copyright notice

to the file.

diff --git a/libbb/llist.c b/libbb/llist.c
index 0d599db6b4974cbce25285b9855c11402b114ec6..842e8f7bbb20eb2ac67168f324f4c1979a54f451 100644 (file)
--- a/libbb/llist.c
+++ b/libbb/llist.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2003 Glenn McGrath
  * Copyright (C) 2005 Vladimir Oleynik
  * Copyright (C) 2005 Bernhard Fischer
+ * Copyright (C) 2006 Rob Landley <rob@landley.net>
  *
  * Licensed under the GPL v2, see the file LICENSE in this tarball.
  */
@@ -57,8 +58,8 @@ void *llist_pop(llist_t **head)
        else {
                void *next = (*head)->link;
                data = (*head)->data;
-               *head = (*head)->link;
-               free(next);
+               free(*head);
+               *head = next;
        }
 
        return data;