aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-05-11 18:25:24 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-05-11 18:25:24 +0000
commit43ca34854bed985ff426bcbb2151b87587c4d508 (patch)
tree069cdabe857272bb415df0aa308ef2ffe887af86 /libbb
parentce53b0dae63188dce0177ec7cdefcc1ea6bfc9bc (diff)
downloadbusybox-w32-43ca34854bed985ff426bcbb2151b87587c4d508.tar.gz
busybox-w32-43ca34854bed985ff426bcbb2151b87587c4d508.tar.bz2
busybox-w32-43ca34854bed985ff426bcbb2151b87587c4d508.zip
Bug fix from Vladimir Oleynik, and suggestion I add my copyright notice
to the file. git-svn-id: svn://busybox.net/trunk/busybox@15072 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb')
-rw-r--r--libbb/llist.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libbb/llist.c b/libbb/llist.c
index 0d599db6b..842e8f7bb 100644
--- a/libbb/llist.c
+++ b/libbb/llist.c
@@ -5,6 +5,7 @@
5 * Copyright (C) 2003 Glenn McGrath 5 * Copyright (C) 2003 Glenn McGrath
6 * Copyright (C) 2005 Vladimir Oleynik 6 * Copyright (C) 2005 Vladimir Oleynik
7 * Copyright (C) 2005 Bernhard Fischer 7 * Copyright (C) 2005 Bernhard Fischer
8 * Copyright (C) 2006 Rob Landley <rob@landley.net>
8 * 9 *
9 * Licensed under the GPL v2, see the file LICENSE in this tarball. 10 * Licensed under the GPL v2, see the file LICENSE in this tarball.
10 */ 11 */
@@ -57,8 +58,8 @@ void *llist_pop(llist_t **head)
57 else { 58 else {
58 void *next = (*head)->link; 59 void *next = (*head)->link;
59 data = (*head)->data; 60 data = (*head)->data;
60 *head = (*head)->link; 61 free(*head);
61 free(next); 62 *head = next;
62 } 63 }
63 64
64 return data; 65 return data;